ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.140 by root, Fri May 18 13:15:29 2007 UTC vs.
Revision 1.263 by root, Sat Apr 3 22:30:21 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24
25//+GPL
24 26
25#include <global.h> 27#include <global.h>
26#include <sproto.h> 28#include <sproto.h>
27#include <sounds.h> 29#include <sounds.h>
28#include <living.h> 30#include <living.h>
… …
33#include <algorithm> 35#include <algorithm>
34#include <functional> 36#include <functional>
35 37
36playervec players; 38playervec players;
37 39
38void
39display_motd (const object *op)
40{
41 char buf[MAX_BUF];
42 char motd[HUGE_BUF];
43 FILE *fp;
44 int comp;
45 int size;
46
47 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
48 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
49 return;
50
51 motd[0] = '\0';
52 size = 0;
53
54 while (fgets (buf, MAX_BUF, fp))
55 {
56 if (*buf == '#')
57 continue;
58
59 strncat (motd + size, buf, HUGE_BUF - size);
60 size += strlen (buf);
61 }
62
63 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
64 close_and_delete (fp, comp);
65}
66
67void
68send_rules (const object *op)
69{
70 char buf[MAX_BUF];
71 char rules[HUGE_BUF];
72 FILE *fp;
73 int comp;
74 int size;
75
76 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
77 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
78 return;
79
80 rules[0] = '\0';
81 size = 0;
82
83 while (fgets (buf, MAX_BUF, fp))
84 {
85 if (*buf == '#')
86 continue;
87
88 if (size + strlen (buf) >= HUGE_BUF)
89 {
90 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
91 break;
92 }
93
94 strncat (rules + size, buf, HUGE_BUF - size);
95 size += strlen (buf);
96 }
97
98 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
99 close_and_delete (fp, comp);
100}
101
102void
103send_news (const object *op)
104{
105 char buf[MAX_BUF];
106 char news[HUGE_BUF];
107 char subject[MAX_BUF];
108 FILE *fp;
109 int comp;
110 int size;
111
112 sprintf (buf, "%s/%s", settings.confdir, settings.news);
113 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
114 return;
115
116 news[0] = '\0';
117 subject[0] = '\0';
118 size = 0;
119
120 while (fgets (buf, MAX_BUF, fp))
121 {
122 if (*buf == '#')
123 continue;
124
125 if (*buf == '%')
126 { /* send one news */
127 if (size > 0)
128 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
129
130 strcpy (subject, buf + 1);
131 strip_endline (subject);
132 size = 0;
133 news[0] = '\0';
134 }
135 else
136 {
137 if (size + strlen (buf) >= HUGE_BUF)
138 {
139 LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
140 break;
141 }
142 strncat (news + size, buf, HUGE_BUF - size);
143 size += strlen (buf);
144 }
145 }
146
147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149 close_and_delete (fp, comp);
150}
151
152float
153player::weapon_speed () const
154{
155 return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
156}
157
158/* This loads the first map an puts the player on it. */ 40/* This loads the first map an puts the player on it. */
159static void 41static void
160set_first_map (object *op) 42set_first_map (object *op)
161{ 43{
162 op->contr->maplevel = first_map_path; 44 op->contr->maplevel = first_map_path;
163 op->x = -1; 45 op->x = -1;
164 op->y = -1; 46 op->y = -1;
165}
166
167void
168player::enter_map ()
169{
170 object *tmp = object::create ();
171
172 EXIT_PATH (tmp) = maplevel;
173 EXIT_X (tmp) = ob->x;
174 EXIT_Y (tmp) = ob->y;
175 ob->enter_exit (tmp);
176
177 tmp->destroy ();
178} 47}
179 48
180void 49void
181player::activate () 50player::activate ()
182{ 51{
… …
187 ob->remove (); 56 ob->remove ();
188 ob->map = 0; 57 ob->map = 0;
189 ob->activate_recursive (); 58 ob->activate_recursive ();
190 CLEAR_FLAG (ob, FLAG_FRIENDLY); 59 CLEAR_FLAG (ob, FLAG_FRIENDLY);
191 add_friendly_object (ob); 60 add_friendly_object (ob);
192 enter_map ();
193} 61}
194 62
195void 63void
196player::deactivate () 64player::deactivate ()
197{ 65{
… …
204 72
205 if (ob->map) 73 if (ob->map)
206 maplevel = ob->map->path; 74 maplevel = ob->map->path;
207 75
208 ob->remove (); 76 ob->remove ();
77 ob->enemy = 0; // sometimes keeps an extra refcount on itself
209 ob->map = 0; 78 ob->map = 0;
210 party = 0; 79 party = 0;
211 80
212 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this 81 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
213 82
… …
227 ob->close_container (); //TODO: client-specific 96 ob->close_container (); //TODO: client-specific
228 97
229 ns->update_look = 0; 98 ns->update_look = 0;
230 ns->look_position = 0; 99 ns->look_position = 0;
231 100
232 clear_los (ob); 101 clear_los ();
233 102
234 ns->reset_stats (); 103 ns->reset_stats ();
235 104
236 /* make sure he's a player -- needed because of class change. */ 105 /* make sure he's a player -- needed because of class change. */
237 ob->type = PLAYER; // we are paranoid 106 ob->type = PLAYER; // we are paranoid
238 ob->race = ob->arch->clone.race; 107 ob->race = ob->arch->race;
239 108
240 ob->carrying = sum_weight (ob); 109 ob->update_weight ();
241 link_player_skills (ob); 110 link_skills ();
242 111
243 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
244
245 assign (title, ob->arch->clone.name); 112 assign (title, ob->arch->object::name);
246 113
247 /* if it's a dragon player, set the correct title here */ 114 /* if it's a dragon player, set the correct title here */
248 if (is_dragon_pl (ob)) 115 if (ob->is_dragon ())
249 { 116 {
250 object *tmp, *abil = 0, *skin = 0; 117 object *tmp, *abil = 0, *skin = 0;
251
252 shstr_cmp dragon_ability_force ("dragon_ability_force");
253 shstr_cmp dragon_skin_force ("dragon_skin_force");
254 118
255 for (tmp = ob->inv; tmp; tmp = tmp->below) 119 for (tmp = ob->inv; tmp; tmp = tmp->below)
256 if (tmp->type == FORCE) 120 if (tmp->type == FORCE)
257 if (tmp->arch->name == dragon_ability_force) 121 if (tmp->arch->archname == shstr_dragon_ability_force)
258 abil = tmp; 122 abil = tmp;
259 else if (tmp->arch->name == dragon_skin_force) 123 else if (tmp->arch->archname == shstr_dragon_skin_force)
260 skin = tmp; 124 skin = tmp;
261 125
262 set_dragon_name (ob, abil, skin); 126 set_dragon_name (ob, abil, skin);
263 } 127 }
264 128
265 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 129 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
266 130
267 esrv_new_player (this, ob->weight + ob->carrying); 131 esrv_new_player (this);
132
133 ob->update_stats ();
134
135 ns->floorbox_update ();
136 esrv_send_inventory (ob, ob);
137 esrv_add_spells (this, 0);
268 138
269 ob->flag [FLAG_READY_WEAPON] = false; 139 ob->flag [FLAG_READY_WEAPON] = false;
270 ob->flag [FLAG_READY_SKILL] = false; 140 ob->flag [FLAG_READY_SKILL] = false;
141 ob->flag [FLAG_READY_RANGE] = false;
271 ob->flag [FLAG_READY_BOW] = false; 142 ob->flag [FLAG_READY_BOW] = false;
272 143
273 for (object *op = ob->inv; op; op = op->below) 144 for (object *op = ob->inv; op; op = op->below)
274 if (op->flag [FLAG_APPLIED]) 145 if (op->flag [FLAG_APPLIED])
275 switch (op->type) 146 switch (op->type)
276 { 147 {
277 case SKILL: 148 case SKILL:
278 ob->flag [FLAG_APPLIED] = false; 149 op->flag [FLAG_APPLIED] = false;
279 break; 150 break;
280 151
152 case SPELL:
281 case WAND: 153 case WAND:
282 case ROD: 154 case ROD:
283 case HORN: 155 case HORN:
284 case BOW: 156 case BOW:
157 case RANGED:
285 ranged_ob = op; 158 ranged_ob = op;
159 op->flag [FLAG_APPLIED] = false;
286 break; 160 break;
287 161
288 case WEAPON: 162 case WEAPON:
289 combat_ob = op; 163 combat_ob = op;
164 op->flag [FLAG_APPLIED] = false;
290 break; 165 break;
291 } 166 }
292 167
293 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 168 ob->update_stats (); // we unapplied stuff above
294 ob->update_stats ();
295 169
296 ns->floorbox_update (); 170 ob->current_weapon = 0;
297 esrv_send_inventory (ob, ob); 171 if (object *item = combat_ob ? combat_ob : ranged_ob)
298 esrv_add_spells (this, 0); 172 ob->apply (item);
299 173
300 activate (); 174 activate ();
301
302 send_rules (ob);
303 send_news (ob);
304 display_motd (ob);
305 175
306 INVOKE_PLAYER (CONNECT, this); 176 INVOKE_PLAYER (CONNECT, this);
307 INVOKE_PLAYER (LOGIN, this); 177 INVOKE_PLAYER (LOGIN, this);
308} 178}
309 179
310void 180void
311player::disconnect () 181player::disconnect ()
312{ 182{
183 if (ob)
184 {
185 ob->close_container (); //TODO: client-specific
186 ob->drop_unpaid_items ();
187 }
188
313 if (ns) 189 if (ns)
314 { 190 {
315 if (active) 191 if (active)
316 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 192 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
317 193
… …
320 ns->reset_stats (); 196 ns->reset_stats ();
321 ns->pl = 0; 197 ns->pl = 0;
322 ns = 0; 198 ns = 0;
323 } 199 }
324 200
325 if (ob) 201 // this is important for the player scheduler to get the correct refcount
326 ob->close_container (); //TODO: client-specific 202 // when ns = 0
203 observe = viewpoint = ob;
327 204
328 deactivate (); 205 deactivate ();
329} 206}
207
208//-GPL
330 209
331// the need for this function can be explained 210// the need for this function can be explained
332// by load_object not returning the object 211// by load_object not returning the object
333void 212void
334player::set_object (object *op) 213player::set_object (object *op)
335{ 214{
336 ob = op; 215 ob = observe = viewpoint = op;
337 ob->contr = this; /* this aren't yet in archetype */ 216 ob->contr = this; /* this aren't yet in archetype */
338 217
218 ob->speed = 1.0f;
339 ob->speed_left = 0.5f; 219 ob->speed_left = 0.5f;
340 ob->speed = 1.0f; 220
341 ob->direction = 5; /* So player faces south */ 221 ob->direction = 5; /* So player faces south */
342} 222}
223
224void
225player::set_observe (object *op)
226{
227 observe = viewpoint = op ? op : ob;
228 do_los = 1;
229}
230
231void
232player::set_viewpoint (object *op)
233{
234 viewpoint = op ? op : (object *)observe;
235 do_los = 1;
236}
237
238//+GPL
343 239
344player::player () 240player::player ()
345{ 241{
346 /* There are some elements we want initialised to non zero value - 242 /* There are some elements we want initialised to non zero value -
347 * we deal with that below this point. 243 * we deal with that below this point.
… …
353 savebed_map = first_map_path; /* Init. respawn position */ 249 savebed_map = first_map_path; /* Init. respawn position */
354 250
355 gen_sp_armour = 10; 251 gen_sp_armour = 10;
356 bowtype = bow_normal; 252 bowtype = bow_normal;
357 petmode = pet_normal; 253 petmode = pet_normal;
358 listening = 10;
359 usekeys = containers; 254 usekeys = containers;
360 peaceful = 1; /* default peaceful */ 255 peaceful = 1; /* default peaceful */
361 do_los = 1; 256 do_los = 1;
257
258 weapon_sp = 1.0f;
259 weapon_sp_left = 0.5f;
362} 260}
363 261
364void 262void
365player::do_destroy () 263player::do_destroy ()
366{ 264{
… …
371 if (ob) 269 if (ob)
372 { 270 {
373 ob->destroy_inv (false); 271 ob->destroy_inv (false);
374 ob->destroy (); 272 ob->destroy ();
375 } 273 }
274
275 ob = observe = viewpoint = 0;
376} 276}
377 277
378player::~player () 278player::~player ()
379{ 279{
380 /* Clear item stack */ 280 /* Clear item stack */
381 free (stack_items); 281 free (stack_items);
282}
283
284/*
285 * get_player_archetype() return next player archetype from archetype
286 * list. Not very efficient routine, but used only creating new players.
287 * Note: there MUST be at least one player archetype!
288 */
289static archetype *
290get_player_archetype (archetype *at)
291{
292 // archetypes could have been reloaded
293 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
294
295 if (!nat)
296 return at;
297
298 archvec::iterator i = archetypes.find (nat);
299
300 for (;;)
301 {
302 if (++i == archetypes.end ())
303 i = archetypes.begin ();
304 else if (*i == at)
305 cleanup ("not a single player archetype found");
306
307 if ((*i)->type == PLAYER)
308 return *i;
309 }
382} 310}
383 311
384/* Tries to add player on the connection passed in ns. 312/* Tries to add player on the connection passed in ns.
385 * All we can really get in this is some settings like host and display 313 * All we can really get in this is some settings like host and display
386 * mode. 314 * mode.
… …
388player * 316player *
389player::create () 317player::create ()
390{ 318{
391 player *pl = new player; 319 player *pl = new player;
392 320
393 pl->set_object (arch_to_object (get_player_archetype (0))); 321 pl->set_object (get_player_archetype (0)->instance ());
394 322
395 pl->ob->roll_stats (); 323 pl->ob->roll_stats ();
396 pl->ob->stats.wc = 2; 324 pl->ob->stats.wc = 2;
397 pl->ob->run_away = 25; /* Then we panick... */ 325 pl->ob->run_away = 25; /* Then we panick... */
398 326
399 set_first_map (pl->ob); 327 set_first_map (pl->ob);
400 328
401 return pl; 329 return pl;
402}
403
404/*
405 * get_player_archetype() return next player archetype from archetype
406 * list. Not very efficient routine, but used only creating new players.
407 * Note: there MUST be at least one player archetype!
408 */
409archetype *
410get_player_archetype (archetype *at)
411{
412 archetype *start = at;
413
414 for (;;)
415 {
416 if (at == NULL || at->next == NULL)
417 at = first_archetype;
418 else
419 at = at->next;
420
421 if (at->clone.type == PLAYER)
422 return at;
423
424 if (at == start)
425 {
426 LOG (llevError, "No Player archetypes\n");
427 exit (-1);
428 }
429 }
430} 330}
431 331
432object * 332object *
433get_nearest_player (object *mon) 333get_nearest_player (object *mon)
434{ 334{
… …
437 unsigned lastdist; 337 unsigned lastdist;
438 rv_vector rv; 338 rv_vector rv;
439 339
440 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 340 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
441 { 341 {
442 /* We should not find free objects on this friendly list, but it
443 * does periodically happen. Given that, lets deal with it.
444 * While unlikely, it is possible the next object on the friendly
445 * list is also free, so encapsulate this in a while loop.
446 */
447 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
448 {
449 object *tmp = ol->ob;
450
451 /* Can't do much more other than log the fact, because the object
452 * itself will have been cleared.
453 */
454 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
455 tmp->debug_desc ());
456 ol = ol->next;
457 remove_friendly_object (tmp);
458 if (!ol)
459 return op;
460 }
461
462 /* Remove special check for player from this. First, it looks to cause
463 * some crashes (ol->ob->contr not set properly?), but secondly, a more
464 * complicated method of state checking would be needed in any case -
465 * as it was, a clever player could type quit, and the function would
466 * skip them over while waiting for confirmation. Remove
467 * on_same_map check, as can_detect_enemy also does this
468 */
469 if (!can_detect_enemy (mon, ol->ob, &rv)) 342 if (!can_detect_enemy (mon, ol->ob, &rv))
470 continue; 343 continue;
471 344
472 if (lastdist > rv.distance) 345 if (lastdist > rv.distance)
473 { 346 {
… …
668 541
669 return firstdir; 542 return firstdir;
670} 543}
671 544
672void 545void
673give_initial_items (object *pl, treasurelist * items) 546give_initial_items (object *pl, treasurelist *items)
674{ 547{
675 object *op, *next = NULL;
676
677 if (pl->randomitems != NULL) 548 if (pl->randomitems)
678 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 549 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
679 550
680 for (op = pl->inv; op; op = next) 551 for (object *next, *op = pl->inv; op; op = next)
681 { 552 {
682 next = op->below; 553 next = op->below;
683 554
684 /* Forces get applied per default, unless they have the 555 /* Forces get applied per default, unless they have the
685 * flag "neutral" set. Sorry but I can't think of a better way 556 * flag "neutral" set. Sorry but I can't think of a better way
… …
690 /* we never give weapons/armour if these cannot be used 561 /* we never give weapons/armour if these cannot be used
691 * by this player due to race restrictions 562 * by this player due to race restrictions
692 */ 563 */
693 if (pl->type == PLAYER) 564 if (pl->type == PLAYER)
694 { 565 {
695 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 566 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
567 &&
696 (op->type == ARMOUR || op->type == BOOTS || 568 (op->type == ARMOUR || op->type == BOOTS
697 op->type == CLOAK || op->type == HELMET || 569 || op->type == CLOAK || op->type == HELMET
698 op->type == SHIELD || op->type == GLOVES || 570 || op->type == SHIELD || op->type == GLOVES
571 || op->type == BRACERS || op->type == GIRDLE))
699 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 572 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
700 { 573 {
701 op->destroy (); 574 op->destroy ();
702 continue; 575 continue;
703 } 576 }
704 } 577 }
705 578
706 /* This really needs to be better - we should really give 579 /* Here we remove duplicated skills (as duplicated spell objects have
707 * a substitute spellbook. The problem is that we don't really 580 * _very_ confusing effects for players), which could for instance be
708 * have a good idea what to replace it with (need something like 581 * generated by bad treasurelists. - elmex
709 * a first level treasurelist for each skill.)
710 * remove duplicate skills also
711 */ 582 */
712 if (op->type == SPELLBOOK || op->type == SKILL) 583 if (op->type == SKILL)
713 { 584 {
714 object *tmp;
715
716 for (tmp = op->below; tmp; tmp = tmp->below) 585 for (object *tmp = op->below; tmp; tmp = tmp->below)
717 if (tmp->type == op->type && tmp->name == op->name) 586 if (tmp->type == op->type && tmp->name == op->name)
718 break;
719
720 if (tmp)
721 { 587 {
722 op->destroy (); 588 op->destroy ();
589 LOG (llevError,
723 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 590 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
724 continue; 591 break;
725 } 592 }
726 593
727 if (op->nrof > 1) 594 if (op->nrof > 1)
728 op->nrof = 1; 595 op->nrof = 1;
729 } 596 }
730 597
731 if (op->type == SPELLBOOK && op->inv) 598 if (op->type == SPELLBOOK && op->inv)
732 {
733 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 599 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
734 }
735 600
736 /* Give starting characters identified, uncursed, and undamned 601 /* Give starting characters identified, uncursed, and undamned
737 * items. Just don't identify gold or silver, or it won't be 602 * items. Just don't identify gold or silver, or it won't be
738 * merged properly. 603 * merged properly.
739 */ 604 */
740 if (need_identify (op)) 605 if (need_identify (op))
741 { 606 {
742 SET_FLAG (op, FLAG_IDENTIFIED); 607 SET_FLAG (op, FLAG_IDENTIFIED);
743 CLEAR_FLAG (op, FLAG_CURSED); 608 CLEAR_FLAG (op, FLAG_CURSED);
744 CLEAR_FLAG (op, FLAG_DAMNED); 609 CLEAR_FLAG (op, FLAG_DAMNED);
745 } 610 }
611
746 if (op->type == SPELL) 612 if (op->type == SPELL)
747 { 613 {
748 op->destroy (); 614 op->destroy ();
749 continue; 615 continue;
750 } 616 }
… …
752 { 618 {
753 SET_FLAG (op, FLAG_CAN_USE_SKILL); 619 SET_FLAG (op, FLAG_CAN_USE_SKILL);
754 op->stats.exp = 0; 620 op->stats.exp = 0;
755 op->level = 1; 621 op->level = 1;
756 } 622 }
757 /* lock all 'normal items by default */ 623 else /* lock all 'normal items by default */
758 else
759 SET_FLAG (op, FLAG_INV_LOCKED); 624 SET_FLAG (op, FLAG_INV_LOCKED);
760 } /* for loop of objects in player inv */ 625 } /* for loop of objects in player inv */
761 626
762 /* Need to set up the skill pointers */ 627 /* Need to set up the skill pointers */
763 link_player_skills (pl); 628 pl->contr->link_skills ();
764} 629}
765 630
766void 631void
767get_party_password (object *op, partylist *party) 632get_party_password (object *op, partylist *party)
768{ 633{
… …
778 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 643 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
779} 644}
780 645
781/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 646/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
782static int 647static int
783roll_stat (void) 648roll_stat ()
784{ 649{
785 int a[4], i, j, k; 650 int a[4], i, j, k;
786 651
787 for (i = 0; i < 4; i++) 652 for (i = 0; i < 4; i++)
788 a[i] = (int) rndm (6) + 1; 653 a[i] = (int) rndm (6) + 1;
… …
869static void 734static void
870start_info (object *op) 735start_info (object *op)
871{ 736{
872 char buf[MAX_BUF]; 737 char buf[MAX_BUF];
873 738
874 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 739 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
875 new_draw_info (NDI_UNIQUE, 0, op, buf); 740 new_draw_info (NDI_UNIQUE, 0, op, buf);
876 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
877 //new_draw_info (NDI_UNIQUE, 0, op, " ");
878} 741}
879 742
880/* This function takes the key that is passed, and does the 743/* This function takes the key that is passed, and does the
881 * appropriate action with it (change race, or other things). 744 * appropriate action with it (change race, or other things).
882 * The function name is for historical reasons - now we have 745 * The function name is for historical reasons - now we have
… …
885 */ 748 */
886void 749void
887player::chargen_race_done () 750player::chargen_race_done ()
888{ 751{
889 /* this must before then initial items are given */ 752 /* this must before then initial items are given */
890 esrv_new_player (ob->contr, ob->weight + ob->carrying); 753 esrv_new_player (ob->contr);
891 754
892 treasurelist *tl = treasurelist::find ("starting_wealth"); 755 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
893 if (tl) 756 if (tl)
894 create_treasure (tl, ob, 0, 0, 0); 757 create_treasure (tl, ob, 0, 0, 0);
895 758
896 INVOKE_PLAYER (BIRTH, ob->contr); 759 INVOKE_PLAYER (BIRTH, ob->contr);
897 INVOKE_PLAYER (LOGIN, ob->contr); 760 INVOKE_PLAYER (LOGIN, ob->contr);
898 761
899 ob->contr->ns->state = ST_PLAYING; 762 ob->contr->ns->state = ST_PLAYING;
900 763
901 if (ob->msg) 764 if (ob->msg)
902 ob->msg = 0; 765 ob->msg = 0;
903
904 /* We create this now because some of the unique maps will need it
905 * to save here.
906 */
907 {
908 char buf[MAX_BUF];
909 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
910 make_path_to_file (buf);
911 }
912 766
913 start_info (ob); 767 start_info (ob);
914 CLEAR_FLAG (ob, FLAG_WIZ); 768 CLEAR_FLAG (ob, FLAG_WIZ);
915 give_initial_items (ob, ob->randomitems); 769 give_initial_items (ob, ob->randomitems);
916 link_player_skills (ob);
917 esrv_send_inventory (ob, ob); 770 esrv_send_inventory (ob, ob);
918 ob->update_stats (); 771 ob->update_stats ();
919 772
920 /* This moves the player to a different start map, if there 773 /* This moves the player to a different start map, if there
921 * is one for this race 774 * is one for this race
922 */ 775 */
923 if (*first_map_ext_path) 776 if (*first_map_ext_path)
924 { 777 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
925 object *tmp;
926 char mapname[MAX_BUF];
927
928 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
929 tmp = object::create ();
930 EXIT_PATH (tmp) = mapname;
931 EXIT_X (tmp) = ob->x;
932 EXIT_Y (tmp) = ob->y;
933 ob->enter_exit (tmp); /* we don't really care if it succeeded;
934 * if the map isn't there, then stay on the
935 * default initial map */
936 tmp->destroy ();
937 }
938 else 778 else
939 LOG (llevDebug, "first_map_ext_path not set\n"); 779 LOG (llevDebug, "first_map_ext_path not set\n");
940} 780}
941 781
942void 782void
… …
952 int x = ob->x, y = ob->y; 792 int x = ob->x, y = ob->y;
953 793
954 ob->remove_statbonus (); 794 ob->remove_statbonus ();
955 ob->remove (); 795 ob->remove ();
956 ob->arch = get_player_archetype (ob->arch); 796 ob->arch = get_player_archetype (ob->arch);
957 ob->arch->clone.copy_to (ob); 797 ob->arch->copy_to (ob);
958 ob->instantiate (); 798 ob->instantiate ();
959 ob->stats = ob->contr->orig_stats; 799 ob->stats = ob->contr->orig_stats;
960 ob->name = ob->name_pl = name; 800 ob->name = ob->name_pl = name;
961 ob->x = x; 801 ob->x = x;
962 ob->y = y; 802 ob->y = y;
963 SET_ANIMATION (ob, 2); /* So player faces south */ 803 SET_ANIMATION (ob, 2); /* So player faces south */
964 insert_ob_in_map (ob, ob->map, ob, 0); 804 insert_ob_in_map (ob, ob->map, ob, 0);
965 assign (ob->contr->title, ob->arch->clone.name); 805 assign (ob->contr->title, ob->arch->object::name);
966 ob->add_statbonus (); 806 ob->add_statbonus ();
967 } 807 }
968 while (!allowed_class (ob)); 808 while (!allowed_class (ob));
969 809
970 update_object (ob, UP_OBJ_FACE); 810 update_object (ob, UP_OBJ_FACE);
… …
973 ob->stats.hp = ob->stats.maxhp; 813 ob->stats.hp = ob->stats.maxhp;
974 ob->stats.sp = ob->stats.maxsp; 814 ob->stats.sp = ob->stats.maxsp;
975 ob->stats.grace = 0; 815 ob->stats.grace = 0;
976} 816}
977 817
978void 818static void
979flee_player (object *op) 819flee_player (object *op)
980{ 820{
981 int dir, diff; 821 int dir, diff;
982 rv_vector rv; 822 rv_vector rv;
983 823
… …
986 LOG (llevDebug, "Fleeing player is dead.\n"); 826 LOG (llevDebug, "Fleeing player is dead.\n");
987 CLEAR_FLAG (op, FLAG_SCARED); 827 CLEAR_FLAG (op, FLAG_SCARED);
988 return; 828 return;
989 } 829 }
990 830
991 if (op->enemy == NULL) 831 if (!op->enemy)
992 { 832 {
993 LOG (llevDebug, "Fleeing player had no enemy.\n"); 833 LOG (llevDebug, "Fleeing player had no enemy.\n");
994 CLEAR_FLAG (op, FLAG_SCARED); 834 CLEAR_FLAG (op, FLAG_SCARED);
995 return; 835 return;
996 } 836 }
997 837
998 /* Seen some crashes here. Since we don't store an
999 * op->enemy_count, it is possible that something destroys the
1000 * actual enemy, and the object is recycled.
1001 */
1002 if (op->enemy->map == NULL)
1003 {
1004 CLEAR_FLAG (op, FLAG_SCARED);
1005 op->enemy = NULL;
1006 return;
1007 }
1008
1009 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 838 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
1010 { 839 {
1011 op->enemy = NULL; 840 op->enemy = NULL;
1012 CLEAR_FLAG (op, FLAG_SCARED); 841 CLEAR_FLAG (op, FLAG_SCARED);
1013 return; 842 return;
… …
1016 get_rangevector (op, op->enemy, &rv, 0); 845 get_rangevector (op, op->enemy, &rv, 0);
1017 846
1018 dir = absdir (4 + rv.direction); 847 dir = absdir (4 + rv.direction);
1019 for (diff = 0; diff < 3; diff++) 848 for (diff = 0; diff < 3; diff++)
1020 { 849 {
1021 int m = 1 - (RANDOM () & 2); 850 int m = 1 - rndm (2) * 2;
1022 851
1023 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 852 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
1024 return; 853 return;
1025 } 854 }
1026 855
1027 /* Cornered, get rid of scared */ 856 /* Cornered, get rid of scared */
1028 CLEAR_FLAG (op, FLAG_SCARED); 857 CLEAR_FLAG (op, FLAG_SCARED);
… …
1037check_pick (object *op) 866check_pick (object *op)
1038{ 867{
1039 object *tmp, *next; 868 object *tmp, *next;
1040 int stop = 0; 869 int stop = 0;
1041 int wvratio; 870 int wvratio;
1042 char putstring[128];
1043 871
1044 /* if you're flying, you cna't pick up anything */ 872 /* if you're flying, you can't pick up anything */
1045 if (op->move_type & MOVE_FLYING) 873 if (op->move_type & MOVE_FLYING)
1046 return 1; 874 return 1;
1047 875
1048 next = op->below; 876 next = op->below;
877
878 int cnt = MAX_ITEM_PER_ACTION;
879#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1049 880
1050 /* loop while there are items on the floor that are not marked as 881 /* loop while there are items on the floor that are not marked as
1051 * destroyed */ 882 * destroyed */
1052 while (next && !next->destroyed ()) 883 while (next && !next->destroyed ())
1053 { 884 {
1054 tmp = next; 885 tmp = next;
1055 next = tmp->below; 886 next = tmp->below;
1056 887
888 if (cnt <= 0)
889 {
890 op->failmsg ("Couldn't pickup all items at once.");
891 return 0;
892 }
893
1057 if (op->destroyed ()) 894 if (op->destroyed ())
1058 return 0; 895 return 0;
1059 896
1060 if (!can_pick (op, tmp)) 897 if (!can_pick (op, tmp))
1061 continue; 898 continue;
1062 899
1063 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 900 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1064 { 901 {
1065 if (item_matched_string (op, tmp, op->contr->search_str)) 902 if (item_matched_string (op, tmp, op->contr->search_str))
1066 pick_up (op, tmp); 903 CHK_PICK_PICKUP;
904
1067 continue; 905 continue;
1068 } 906 }
1069 907
1070 /* high not bit set? We're using the old autopickup model */ 908 /* pickup handling */
909 if (op->contr->mode & PU_DEBUG)
910 {
911 /* some debugging code to figure out item information */
912 const char *str = tmp->name
913 ? format ("item name: %s item type: %d weight/value: %d",
914 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
915 : format ("item name: %s item type: %d weight/value: %d",
916 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
917
918 new_draw_info (NDI_UNIQUE, 0, op, str);
919 }
920
921 if (op->contr->mode & PU_INHIBIT)
922 return 1;
923
924 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
925 return 1;
926
927 /* philosophy:
928 * It's easy to grab an item type from a pile, as long as it's
929 * generic. This takes no game-time. For more detailed pickups
930 * and selections, select-items should be used. This is a
931 * grab-as-you-run type mode that's really useful for arrows for
932 * example.
933 * The drawback: right now it has no frontend, so you need to
934 * stick the bits you want into a calculator in hex mode and then
935 * convert to decimal and then 'pickup <#>
936 */
937
938 /* the first two modes are exclusive: if NOTHING we return, if
939 * STOP then we stop. All the rest are applied sequentially,
940 * meaning if any test passes, the item gets picked up. */
941
942 /* if mode is set to pick nothing up, return */
943 if (op->contr->mode == PU_NOTHING)
944 return 1;
945
946 /* if mode is set to stop when encountering objects, return */
947 /* take STOP before INHIBIT since it doesn't actually pick
948 * anything up */
949 if (op->contr->mode & PU_STOP)
950 return 0;
951
952 /* useful for going into stores and not losing your settings... */
953 /* and for battles wher you don't want to get loaded down while
954 * fighting */
955 if (op->contr->mode & PU_INHIBIT)
956 return 1;
957
958 /* prevent us from turning into auto-thieves :) */
959 if (QUERY_FLAG (tmp, FLAG_UNPAID))
960 continue;
961
962 /* ignore known cursed objects */
963 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
964 continue;
965
966 /* all food and drink if desired */
967 /* question: don't pick up known-poisonous stuff? */
1071 if (!(op->contr->mode & PU_NEWMODE)) 968 if (op->contr->mode & PU_FOOD)
969 if (tmp->type == FOOD)
1072 { 970 {
1073 switch (op->contr->mode) 971 CHK_PICK_PICKUP;
972 continue;
973 }
974
975 if (op->contr->mode & PU_DRINK)
976 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
977 {
978 CHK_PICK_PICKUP;
979 continue;
980 }
981
982 if (op->contr->mode & PU_POTION)
983 if (tmp->type == POTION)
984 {
985 CHK_PICK_PICKUP;
986 continue;
987 }
988
989 /* spellbooks, skillscrolls and normal books/scrolls */
990 if (op->contr->mode & PU_SPELLBOOK)
991 if (tmp->type == SPELLBOOK)
992 {
993 CHK_PICK_PICKUP;
994 continue;
995 }
996
997 if (op->contr->mode & PU_SKILLSCROLL)
998 if (tmp->type == SKILLSCROLL)
999 {
1000 CHK_PICK_PICKUP;
1001 continue;
1002 }
1003
1004 if (op->contr->mode & PU_READABLES)
1005 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1006 {
1007 CHK_PICK_PICKUP;
1008 continue;
1009 }
1010
1011 /* wands/staves/rods/horns */
1012 if (op->contr->mode & PU_MAGIC_DEVICE)
1013 if (tmp->type == WAND
1014 || tmp->type == ROD
1015 || tmp->type == HORN
1016 || tmp->type == POWER_CRYSTAL)
1017 {
1018 CHK_PICK_PICKUP;
1019 continue;
1020 }
1021
1022 /* pick up all magical items */
1023 if (op->contr->mode & PU_MAGICAL)
1024 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1025 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1026 {
1027 CHK_PICK_PICKUP;
1028 continue;
1029 }
1030
1031 if (op->contr->mode & PU_VALUABLES)
1032 {
1033 if (tmp->type == MONEY || tmp->type == GEM)
1074 { 1034 {
1075 case 0: 1035 CHK_PICK_PICKUP;
1076 return 1; /* don't pick up */ 1036 continue;
1077 case 1:
1078 pick_up (op, tmp);
1079 return 1;
1080 case 2:
1081 pick_up (op, tmp);
1082 return 0;
1083 case 3:
1084 return 0; /* stop before pickup */
1085 case 4:
1086 pick_up (op, tmp);
1087 break;
1088 case 5:
1089 pick_up (op, tmp);
1090 stop = 1;
1091 break;
1092 case 6:
1093 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1094 pick_up (op, tmp);
1095 break;
1096
1097 case 7:
1098 if (tmp->type == MONEY || tmp->type == GEM)
1099 pick_up (op, tmp);
1100 break;
1101
1102 default:
1103 /* use value density */
1104 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1105 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1106 pick_up (op, tmp);
1107 } 1037 }
1108 } 1038 }
1109 else 1039
1110 { /* old model */ 1040 /* rings & amulets - talismans seems to be typed AMULET */
1111 /* NEW pickup handling */
1112 if (op->contr->mode & PU_DEBUG) 1041 if (op->contr->mode & PU_JEWELS)
1042 if (tmp->type == RING
1043 || tmp->type == AMULET
1044 || tmp->type == GIRDLE
1045 || tmp->type == SKILL_TOOL)
1113 { 1046 {
1114 /* some debugging code to figure out item information */ 1047 CHK_PICK_PICKUP;
1115 if (tmp->name != NULL)
1116 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1117 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1118 else
1119 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1120 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1121
1122 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1123 }
1124
1125 /* philosophy:
1126 * It's easy to grab an item type from a pile, as long as it's
1127 * generic. This takes no game-time. For more detailed pickups
1128 * and selections, select-items should be used. This is a
1129 * grab-as-you-run type mode that's really useful for arrows for
1130 * example.
1131 * The drawback: right now it has no frontend, so you need to
1132 * stick the bits you want into a calculator in hex mode and then
1133 * convert to decimal and then 'pickup <#>
1134 */
1135
1136 /* the first two modes are exclusive: if NOTHING we return, if
1137 * STOP then we stop. All the rest are applied sequentially,
1138 * meaning if any test passes, the item gets picked up. */
1139
1140 /* if mode is set to pick nothing up, return */
1141
1142 if (op->contr->mode & PU_NOTHING)
1143 return 1;
1144
1145 /* if mode is set to stop when encountering objects, return */
1146 /* take STOP before INHIBIT since it doesn't actually pick
1147 * anything up */
1148
1149 if (op->contr->mode & PU_STOP)
1150 return 0;
1151
1152 /* useful for going into stores and not losing your settings... */
1153 /* and for battles wher you don't want to get loaded down while
1154 * fighting */
1155 if (op->contr->mode & PU_INHIBIT)
1156 return 1;
1157
1158 /* prevent us from turning into auto-thieves :) */
1159 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1160 continue; 1048 continue;
1049 }
1161 1050
1162 /* ignore known cursed objects */ 1051 /* we don't forget dragon food */
1163 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 1052 if (op->contr->mode & PU_FLESH)
1053 if (tmp->type == FLESH)
1054 {
1055 CHK_PICK_PICKUP;
1164 continue; 1056 continue;
1057 }
1165 1058
1166 /* all food and drink if desired */ 1059 /* bows and arrows. Bows are good for selling! */
1167 /* question: don't pick up known-poisonous stuff? */ 1060 if (op->contr->mode & PU_BOW)
1061 if (tmp->type == BOW)
1062 {
1063 CHK_PICK_PICKUP;
1064 continue;
1065 }
1066
1067 if (op->contr->mode & PU_ARROW)
1068 if (tmp->type == ARROW)
1069 {
1070 CHK_PICK_PICKUP;
1071 continue;
1072 }
1073
1074 /* all kinds of armor etc. */
1075 if (op->contr->mode & PU_ARMOUR)
1076 if (tmp->type == ARMOUR)
1077 {
1078 CHK_PICK_PICKUP;
1079 continue;
1080 }
1081
1082 if (op->contr->mode & PU_HELMET)
1083 if (tmp->type == HELMET)
1084 {
1085 CHK_PICK_PICKUP;
1086 continue;
1087 }
1088
1089 if (op->contr->mode & PU_SHIELD)
1090 if (tmp->type == SHIELD)
1091 {
1092 CHK_PICK_PICKUP;
1093 continue;
1094 }
1095
1168 if (op->contr->mode & PU_FOOD) 1096 if (op->contr->mode & PU_BOOTS)
1169 if (tmp->type == FOOD) 1097 if (tmp->type == BOOTS)
1098 {
1099 CHK_PICK_PICKUP;
1100 continue;
1101 }
1102
1103 if (op->contr->mode & PU_GLOVES)
1104 if (tmp->type == GLOVES || tmp->type == BRACERS)
1105 {
1106 CHK_PICK_PICKUP;
1107 continue;
1108 }
1109
1110 if (op->contr->mode & PU_CLOAK)
1111 if (tmp->type == CLOAK)
1112 {
1113 CHK_PICK_PICKUP;
1114 continue;
1115 }
1116
1117 /* hoping to catch throwing daggers here */
1118 if (op->contr->mode & PU_MISSILEWEAPON)
1119 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1120 {
1121 CHK_PICK_PICKUP;
1122 continue;
1123 }
1124
1125 /* careful: chairs and tables are weapons! */
1126 if (op->contr->mode & PU_ALLWEAPON)
1127 {
1128 if (tmp->type == WEAPON)
1129 if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1170 { 1130 {
1171 pick_up (op, tmp); 1131 CHK_PICK_PICKUP;
1172 continue; 1132 continue;
1173 } 1133 }
1134 }
1174 1135
1136 /* misc stuff that's useful */
1175 if (op->contr->mode & PU_DRINK) 1137 if (op->contr->mode & PU_KEY)
1176 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1138 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1177 { 1139 {
1178 pick_up (op, tmp); 1140 CHK_PICK_PICKUP;
1179 continue; 1141 continue;
1180 } 1142 }
1181 1143
1144 /* any of the last 4 bits set means we use the ratio for value
1145 * pickups */
1182 if (op->contr->mode & PU_POTION) 1146 if (op->contr->mode & PU_RATIO)
1183 if (tmp->type == POTION) 1147 {
1148 /* use value density to decide what else to grab */
1149 /* >=7 was >= op->contr->mode */
1150 /* >=7 is the old standard setting. Now we take the last 4 bits
1184 { 1151 */
1185 pick_up (op, tmp);
1186 continue;
1187 }
1188
1189 /* spellbooks, skillscrolls and normal books/scrolls */
1190 if (op->contr->mode & PU_SPELLBOOK)
1191 if (tmp->type == SPELLBOOK)
1192 {
1193 pick_up (op, tmp);
1194 continue;
1195 }
1196
1197 if (op->contr->mode & PU_SKILLSCROLL)
1198 if (tmp->type == SKILLSCROLL)
1199 {
1200 pick_up (op, tmp);
1201 continue;
1202 }
1203
1204 if (op->contr->mode & PU_READABLES)
1205 if (tmp->type == BOOK || tmp->type == SCROLL)
1206 {
1207 pick_up (op, tmp);
1208 continue;
1209 }
1210
1211 /* wands/staves/rods/horns */
1212 if (op->contr->mode & PU_MAGIC_DEVICE)
1213 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1214 {
1215 pick_up (op, tmp);
1216 continue;
1217 }
1218
1219 /* pick up all magical items */
1220 if (op->contr->mode & PU_MAGICAL) 1152 wvratio = op->contr->mode & PU_RATIO;
1221 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1153 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1222 {
1223 pick_up (op, tmp);
1224 continue;
1225 }
1226
1227 if (op->contr->mode & PU_VALUABLES)
1228 { 1154 {
1229 if (tmp->type == MONEY || tmp->type == GEM) 1155#if 0
1156 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1157 if (tmp->name != NULL)
1230 { 1158 {
1231 pick_up (op, tmp); 1159 fprintf (stderr, "%s", tmp->name);
1232 continue;
1233 } 1160 }
1234 }
1235
1236 /* rings & amulets - talismans seems to be typed AMULET */
1237 if (op->contr->mode & PU_JEWELS)
1238 if (tmp->type == RING || tmp->type == AMULET)
1239 {
1240 pick_up (op, tmp);
1241 continue;
1242 }
1243
1244 /* we don't forget dragon food */
1245 if (op->contr->mode & PU_FLESH)
1246 if (tmp->type == FLESH)
1247 {
1248 pick_up (op, tmp);
1249 continue;
1250 }
1251
1252 /* bows and arrows. Bows are good for selling! */
1253 if (op->contr->mode & PU_BOW)
1254 if (tmp->type == BOW)
1255 {
1256 pick_up (op, tmp);
1257 continue;
1258 }
1259
1260 if (op->contr->mode & PU_ARROW)
1261 if (tmp->type == ARROW)
1262 {
1263 pick_up (op, tmp);
1264 continue;
1265 }
1266
1267 /* all kinds of armor etc. */
1268 if (op->contr->mode & PU_ARMOUR)
1269 if (tmp->type == ARMOUR)
1270 {
1271 pick_up (op, tmp);
1272 continue;
1273 }
1274
1275 if (op->contr->mode & PU_HELMET)
1276 if (tmp->type == HELMET)
1277 {
1278 pick_up (op, tmp);
1279 continue;
1280 }
1281
1282 if (op->contr->mode & PU_SHIELD)
1283 if (tmp->type == SHIELD)
1284 {
1285 pick_up (op, tmp);
1286 continue;
1287 }
1288
1289 if (op->contr->mode & PU_BOOTS)
1290 if (tmp->type == BOOTS)
1291 {
1292 pick_up (op, tmp);
1293 continue;
1294 }
1295
1296 if (op->contr->mode & PU_GLOVES)
1297 if (tmp->type == GLOVES)
1298 {
1299 pick_up (op, tmp);
1300 continue;
1301 }
1302
1303 if (op->contr->mode & PU_CLOAK)
1304 if (tmp->type == CLOAK)
1305 {
1306 pick_up (op, tmp);
1307 continue;
1308 }
1309
1310 /* hoping to catch throwing daggers here */
1311 if (op->contr->mode & PU_MISSILEWEAPON)
1312 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1313 {
1314 pick_up (op, tmp);
1315 continue;
1316 }
1317
1318 /* careful: chairs and tables are weapons! */
1319 if (op->contr->mode & PU_ALLWEAPON)
1320 {
1321 if (tmp->type == WEAPON && tmp->name != NULL)
1322 {
1323 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&
1324 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
1325 {
1326 pick_up (op, tmp);
1327 continue;
1328 }
1329 }
1330
1331 if (tmp->type == WEAPON && tmp->name == NULL)
1332 {
1333 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
1334 {
1335 pick_up (op, tmp);
1336 continue;
1337 }
1338 }
1339 }
1340
1341 /* misc stuff that's useful */
1342 if (op->contr->mode & PU_KEY)
1343 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1344 {
1345 pick_up (op, tmp);
1346 continue;
1347 }
1348
1349 /* any of the last 4 bits set means we use the ratio for value
1350 * pickups */
1351 if (op->contr->mode & PU_RATIO)
1352 {
1353 /* use value density to decide what else to grab */
1354 /* >=7 was >= op->contr->mode */
1355 /* >=7 is the old standard setting. Now we take the last 4 bits
1356 * and multiply them by 5, giving 0..15*5== 5..75 */
1357 wvratio = (op->contr->mode & PU_RATIO) * 5;
1358 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1359 {
1360 pick_up (op, tmp);
1361#if 0
1362 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1363 if (tmp->name != NULL)
1364 {
1365 fprintf (stderr, "%s", tmp->name);
1366 }
1367 else 1161 else
1368 fprintf (stderr, "%s", tmp->arch->name); 1162 fprintf (stderr, "%s", tmp->arch->archname);
1369 fprintf (stderr, ",%d] = ", tmp->type); 1163 fprintf (stderr, ",%d] = ", tmp->type);
1370 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1164 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1371#endif 1165#endif
1166 CHK_PICK_PICKUP;
1372 continue; 1167 continue;
1373 }
1374 } 1168 }
1375 } /* the new pickup model */ 1169 } /* the new pickup model */
1376 } 1170 }
1377 1171
1378 return !stop; 1172 return !stop;
1173}
1174
1175/* routine for both players and monsters. We call this when
1176 * there is a possibility for our action distrubing our hiding
1177 * place or invisiblity spell. Artefact invisiblity causes
1178 * "noise" instead. If we arent invisible to begin with, we
1179 * return 0.
1180 */
1181static int
1182action_makes_visible (object *op)
1183{
1184 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
1185 {
1186 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
1187 {
1188 // artefact invisibility is permanent, but we still make noise
1189 // this is important for game-balance.
1190 if (op->contr)
1191 op->make_noise ();
1192
1193 return 0;
1194 }
1195
1196 if (op->contr && op->contr->tmp_invis == 0)
1197 return 0;
1198
1199 /* If monsters, they should become visible */
1200 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
1201 {
1202 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
1203 return 1;
1204 }
1205 }
1206
1207 return 0;
1379} 1208}
1380 1209
1381/* 1210/*
1382 * Find an arrow in the inventory and after that 1211 * Find an arrow in the inventory and after that
1383 * in the right type container (quiver). Pointer to the 1212 * in the right type container (quiver). Pointer to the
1384 * found object is returned. 1213 * found object is returned.
1385 */ 1214 */
1386object * 1215static object *
1387find_arrow (object *op, const char *type) 1216find_arrow (object *op, const char *type)
1388{ 1217{
1389 object *tmp = 0;
1390
1391 for (op = op->inv; op; op = op->below) 1218 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1392 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1393 tmp = find_arrow (op, type);
1394 else if (op->type == ARROW && op->race == type) 1219 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1220 return splay (tmp);
1221
1222 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1223 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1224 if (object *arrow = find_arrow (tmp, type))
1225 {
1226 splay (tmp);
1395 return op; 1227 return arrow;
1228 }
1396 1229
1397 return tmp; 1230 return 0;
1398} 1231}
1399 1232
1400/* 1233/*
1401 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1234 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1402 * against the target. A full test is not performed, simply a basic test 1235 * against the target. A full test is not performed, simply a basic test
1403 * of resistances. The archer is making a quick guess at what he sees down 1236 * of resistances. The archer is making a quick guess at what he sees down
1404 * the hall. Failing that it does it's best to pick the highest plus arrow. 1237 * the hall. Failing that it does it's best to pick the highest plus arrow.
1405 */ 1238 */
1406object * 1239static object *
1407find_better_arrow (object *op, object *target, const char *type, int *better) 1240find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1408{ 1241{
1409 object *tmp = NULL, *arrow, *ntmp; 1242 object *tmp = NULL, *arrow, *ntmp;
1410 int attacknum, attacktype, betterby = 0, i; 1243 int attacknum, attacktype, betterby = 0, i;
1411 1244
1412 if (!type) 1245 if (!type)
… …
1416 { 1249 {
1417 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1250 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1418 { 1251 {
1419 i = 0; 1252 i = 0;
1420 ntmp = find_better_arrow (arrow, target, type, &i); 1253 ntmp = find_better_arrow (arrow, target, type, &i);
1254
1421 if (i > betterby) 1255 if (i > betterby)
1422 { 1256 {
1423 tmp = ntmp; 1257 tmp = ntmp;
1424 betterby = i; 1258 betterby = i;
1425 } 1259 }
1426 } 1260 }
1427 else if (arrow->type == ARROW && arrow->race == type) 1261 else if (arrow->type == ARROW && arrow->race == type)
1428 { 1262 {
1429 /* allways prefer assasination/slaying */ 1263 /* allways prefer assasination/slaying */
1430 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1264 if (target->race && arrow->slaying.contains (target->race))
1431 { 1265 {
1432 if (arrow->attacktype & AT_DEATH) 1266 if (arrow->attacktype & AT_DEATH)
1433 { 1267 {
1434 *better = 100; 1268 *better = 100;
1435 return arrow; 1269 return arrow;
… …
1443 else 1277 else
1444 { 1278 {
1445 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1279 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1446 { 1280 {
1447 attacktype = 1 << attacknum; 1281 attacktype = 1 << attacknum;
1448 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1282 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1449 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1283 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1450 { 1284 {
1451 tmp = arrow; 1285 tmp = arrow;
1452 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1286 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1453 } 1287 }
1454 } 1288 }
1289
1455 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1290 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1456 { 1291 {
1457 tmp = arrow; 1292 tmp = arrow;
1458 betterby = 2 + arrow->magic + arrow->stats.dam; 1293 betterby = 2 + arrow->magic + arrow->stats.dam;
1459 } 1294 }
1295
1460 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1296 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1461 { 1297 {
1462 tmp = arrow; 1298 tmp = arrow;
1463 betterby = 1 + arrow->magic + arrow->stats.dam; 1299 betterby = 1 + arrow->magic + arrow->stats.dam;
1464 } 1300 }
1465 } 1301 }
1466 } 1302 }
1467 } 1303 }
1304
1468 if (tmp == NULL && arrow == NULL) 1305 if (tmp == NULL && arrow == NULL)
1469 return find_arrow (op, type); 1306 return find_arrow (op, type);
1470 1307
1471 *better = betterby; 1308 *better = betterby;
1472 return tmp; 1309 return tmp;
… …
1476 * find_better_arrow to find a decent arrow to use. 1313 * find_better_arrow to find a decent arrow to use.
1477 * op = the shooter 1314 * op = the shooter
1478 * type = bow->race 1315 * type = bow->race
1479 * dir = fire direction 1316 * dir = fire direction
1480 */ 1317 */
1481object * 1318static object *
1482pick_arrow_target (object *op, const char *type, int dir) 1319pick_arrow_target (object *op, shstr_cmp type, int dir)
1483{ 1320{
1484 object *tmp = NULL; 1321 object *tmp = NULL;
1485 maptile *m; 1322 maptile *m;
1486 int i, mflags, found, number; 1323 int i, mflags, found, number;
1487 sint16 x, y; 1324 sint16 x, y;
… …
1502 for (i = 0, found = 0; i < 20; i++) 1339 for (i = 0, found = 0; i < 20; i++)
1503 { 1340 {
1504 x += freearr_x[dir]; 1341 x += freearr_x[dir];
1505 y += freearr_y[dir]; 1342 y += freearr_y[dir];
1506 mflags = get_map_flags (m, &m, x, y, &x, &y); 1343 mflags = get_map_flags (m, &m, x, y, &x, &y);
1344
1507 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1345 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1508 { 1346 {
1509 tmp = NULL; 1347 tmp = 0;
1510 break; 1348 break;
1511 } 1349 }
1512 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1350 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1513 { 1351 {
1514 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1352 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1515 * perhaps a bad assumption. 1353 * perhaps a bad assumption.
1516 */ 1354 */
1517 tmp = NULL; 1355 tmp = 0;
1518 break; 1356 break;
1519 } 1357 }
1358
1520 if (mflags & P_IS_ALIVE) 1359 if (mflags & P_IS_ALIVE)
1521 {
1522 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1360 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1523 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1361 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1524 {
1525 found++;
1526 break;
1527 }
1528 if (found)
1529 break; 1362 break;
1530 }
1531 } 1363 }
1532 if (tmp == NULL) 1364
1365 if (!tmp)
1533 return find_arrow (op, type); 1366 return find_arrow (op, type);
1534 1367
1535 if (tmp->head) 1368 if (tmp->head)
1536 tmp = tmp->head; 1369 tmp = tmp->head;
1537 1370
… …
1577 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1410 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1578 return 0; 1411 return 0;
1579 } 1412 }
1580 1413
1581 // optimisation: move object to top so we will find it quickly again 1414 // optimisation: move object to top so we will find it quickly again
1582 if (bow->below) 1415 splay (bow);
1583 {
1584 bow->remove ();
1585 op->insert (bow);
1586 }
1587
1588 } 1416 }
1589 1417
1590 if (!bow->race || !bow->skill) 1418 if (!bow->race || !bow->skill)
1591 { 1419 {
1592 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1420 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1618 } 1446 }
1619 1447
1620 /* this should not happen, but sometimes does */ 1448 /* this should not happen, but sometimes does */
1621 if (arrow->nrof == 0) 1449 if (arrow->nrof == 0)
1622 { 1450 {
1451 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1623 arrow->destroy (); 1452 arrow->destroy ();
1624 return 0; 1453 return 0;
1625 } 1454 }
1626 1455
1627 left = arrow; /* these are arrows left to the player */ 1456 left = arrow; /* these are arrows left to the player */
1628 arrow = get_split_ob (arrow, 1); 1457 arrow = arrow->split ();
1629 if (!arrow) 1458 if (!arrow)
1630 { 1459 {
1631 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1460 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1632 return 0; 1461 return 0;
1633 } 1462 }
… …
1637 arrow->direction = dir; 1466 arrow->direction = dir;
1638 1467
1639 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ 1468 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1640 arrow->stats.hp = arrow->stats.dam; 1469 arrow->stats.hp = arrow->stats.dam;
1641 arrow->stats.grace = arrow->attacktype; 1470 arrow->stats.grace = arrow->attacktype;
1471 arrow->custom_name = arrow->slaying;
1642 1472
1643 if (arrow->slaying) 1473#if 0
1644 arrow->spellarg = strdup (arrow->slaying);
1645
1646 if (player *pl = op->contr) 1474 if (player *pl = op->contr)
1647 { 1475 {
1648 if (!pl->has_hit)
1649 {
1650 pl->has_hit = 1;
1651 pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1652 }
1653#if 0
1654 float speed = pl->weapon_sp; 1476 float speed = pl->weapon_sp;
1655 1477
1656 /* penalize ROF for bestarrow */ 1478 /* penalize ROF for bestarrow */
1657 if (pl->bowtype == bow_bestarrow) 1479 if (pl->bowtype == bow_bestarrow)
1658 speed *= .9f; 1480 speed *= .9f;
1659 else 1481 else
1660 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f; 1482 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1661 1483
1662 op->speed_left += speed - op->speed; 1484 op->speed_left += speed - op->speed;
1485 }
1663#endif 1486#endif
1664 }
1665 1487
1666 SET_ANIMATION (arrow, arrow->direction); 1488 SET_ANIMATION (arrow, arrow->direction);
1667 1489
1668 /* update the speed */ 1490 /* update the speed */
1669 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 1491 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1670 + bow->stats.dam / 7.0; 1492 + bow->stats.dam / 7.f;
1671 1493
1672 arrow->set_speed (max (arrow->speed, 2.0)); 1494 arrow->set_speed (max (arrow->speed, 2.f));
1673 arrow->speed_left = 0; 1495 arrow->speed_left = 0;
1674 1496
1675 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1497 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1676 1498
1677 if (op->type == PLAYER) 1499 if (op->type == PLAYER)
… …
1700 1522
1701 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1523 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1702 arrow->move_type = MOVE_FLY_LOW; 1524 arrow->move_type = MOVE_FLY_LOW;
1703 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1525 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1704 1526
1705 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1527 op->play_sound (sound_find ("fire_arrow"));
1706 m->insert (arrow, sx, sy, op); 1528 m->insert (arrow, sx, sy, op);
1707 1529
1708 if (!arrow->destroyed ()) 1530 if (!arrow->destroyed ())
1709 move_arrow (arrow); 1531 move_arrow (arrow);
1710
1711 if (op->type == PLAYER)
1712 {
1713 if (left->destroyed ())
1714 esrv_del_item (op->contr, left->count);
1715 else
1716 esrv_send_item (op, left);
1717 }
1718 1532
1719 return 1; 1533 return 1;
1720} 1534}
1721 1535
1722/* Special fire code for players - this takes into 1536/* Special fire code for players - this takes into
… …
1724 * but monsters can't. Putting that code here 1538 * but monsters can't. Putting that code here
1725 * makes the fire_bow code much cleaner. 1539 * makes the fire_bow code much cleaner.
1726 * this function should only be called if 'op' is a player, 1540 * this function should only be called if 'op' is a player,
1727 * hence the function name. 1541 * hence the function name.
1728 */ 1542 */
1729int 1543static int
1730player_fire_bow (object *op, int dir) 1544player_fire_bow (object *op, int dir)
1731{ 1545{
1732 int ret = 0, wcmod = 0; 1546 int ret;
1733 1547
1734 if (op->contr->bowtype == bow_bestarrow) 1548 if (op->contr->bowtype == bow_bestarrow)
1735 { 1549 {
1736 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1550 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1737 } 1551 }
1738 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1552 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1739 { 1553 {
1740 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1554 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1741 wcmod = -1;
1742
1743 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1555 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1744 } 1556 }
1745 else if (op->contr->bowtype == bow_threewide) 1557 else if (op->contr->bowtype == bow_threewide)
1746 { 1558 {
1747 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1559 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1748 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1560 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1749 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); 1561 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1750 } 1562 }
1751 else if (op->contr->bowtype == bow_spreadshot) 1563 else if (op->contr->bowtype == bow_spreadshot)
1752 { 1564 {
1753 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1565 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1754 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1566 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1755 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1567 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1756 } 1568 }
1757 else 1569 else
1758 { 1570 {
… …
1764} 1576}
1765 1577
1766/* Fires a misc (wand/rod/horn) object in 'dir'. 1578/* Fires a misc (wand/rod/horn) object in 'dir'.
1767 * Broken apart from 'fire' to keep it more readable. 1579 * Broken apart from 'fire' to keep it more readable.
1768 */ 1580 */
1769void 1581static void
1770fire_misc_object (object *op, int dir) 1582fire_misc_object (object *op, int dir)
1771{ 1583{
1772 object *item = op->contr->ranged_ob; 1584 object *item = op->contr->ranged_ob;
1773 1585
1774 if (!item) 1586 if (!item)
… …
1781 { 1593 {
1782 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1594 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1783 return; 1595 return;
1784 } 1596 }
1785 1597
1786 if (!op->change_weapon (item)) 1598 if (!op->apply (item))
1787 return; 1599 return;
1788 1600
1789 if (item->type == WAND) 1601 if (item->type == WAND)
1790 { 1602 {
1791 if (item->stats.food <= 0) 1603 if (item->stats.food <= 0)
1792 { 1604 {
1793 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1605 op->contr->play_sound (sound_find ("wand_poof"));
1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1606 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1795 1607
1796 return; 1608 return;
1797 } 1609 }
1798 } 1610 }
1799 else if (item->type == ROD || item->type == HORN) 1611 else if (item->type == ROD || item->type == HORN)
1800 { 1612 {
1801 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1613 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1614
1615 // using the maximum of the rods charge allows at least one spell cast
1616 // for a rod or horn, this fixes some broken rods.
1617 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1802 { 1618 {
1803 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1619 op->contr->play_sound (sound_find ("wand_poof"));
1804 1620
1805 if (item->type == ROD) 1621 if (item->type == ROD)
1806 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1622 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1807 else 1623 else
1808 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1624 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1811 } 1627 }
1812 } 1628 }
1813 1629
1814 if (cast_spell (op, item, dir, item->inv, NULL)) 1630 if (cast_spell (op, item, dir, item->inv, NULL))
1815 { 1631 {
1816 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1632 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1633
1817 if (item->type == WAND) 1634 if (item->type == WAND)
1818 { 1635 {
1819 if (!(--item->stats.food)) 1636 if (!(--item->stats.food))
1820 { 1637 {
1821 object *tmp; 1638 object *tmp;
1822 1639
1823 if (item->arch) 1640 if (item->arch)
1824 { 1641 {
1825 CLEAR_FLAG (item, FLAG_ANIMATE); 1642 CLEAR_FLAG (item, FLAG_ANIMATE);
1826 item->face = item->arch->clone.face; 1643 item->face = item->arch->face;
1827 item->set_speed (0); 1644 item->set_speed (0);
1828 } 1645 }
1829 1646
1830 if ((tmp = item->in_player ())) 1647 if (object *pl = item->visible_to ())
1831 esrv_update_item (UPD_ANIM, tmp, item); 1648 esrv_update_item (UPD_ANIM, pl, item);
1832 } 1649 }
1833 } 1650 }
1834 else if (item->type == ROD || item->type == HORN) 1651 else if (item->type == ROD || item->type == HORN)
1835 drain_rod_charge (item); 1652 drain_rod_charge (item);
1836 } 1653 }
1837} 1654}
1838 1655
1839/* Received a fire command for the player - go and do it. 1656/* Received a fire command for the player - go and do it.
1840 */ 1657 */
1841void 1658bool
1842fire (object *op, int dir) 1659fire (object *who, int dir)
1843{ 1660{
1844 int spellcost = 0; 1661 int spellcost = 0;
1845 1662
1663 player *pl = who->contr;
1664
1665 if (pl->golem)
1666 {
1667 control_golem (who->contr->golem, dir);
1668 return false;
1669 }
1670
1671 object *ob = pl->ranged_ob;
1672
1673 if (!ob)
1674 return false;
1675
1676 if (who->speed_left > 0.f)
1677 --who->speed_left;
1678 else
1679 return false;
1680
1681 if (!who->apply (ob))
1682 return false;
1683
1846 /* check for loss of invisiblity/hide */ 1684 /* check for loss of invisiblity/hide */
1847 if (action_makes_visible (op)) 1685 if (action_makes_visible (who))
1848 make_visible (op); 1686 make_visible (who);
1849
1850 player *pl = op->contr;
1851
1852 if (pl->golem)
1853 {
1854 control_golem (op->contr->golem, dir);
1855 return;
1856 }
1857
1858 object *ob = pl->ranged_ob;
1859
1860 if (!ob)
1861 return;
1862
1863 if (!op->change_weapon (ob))
1864 return;
1865 1687
1866 switch (ob->type) 1688 switch (ob->type)
1867 { 1689 {
1868 case BOW: 1690 case BOW:
1869 player_fire_bow (op, dir); 1691 player_fire_bow (who, dir);
1870 break; 1692 break;
1871 1693
1872 case SPELL: 1694 case SPELL:
1873 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); 1695 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1874 break; 1696 break;
1875 1697
1876 case BUILDER: 1698 case BUILDER:
1877 apply_map_builder (op, dir); 1699 apply_map_builder (who, dir);
1878 break; 1700 break;
1879 1701
1880 case SKILL: 1702 case SKILL:
1881 do_skill (op, op, ob, dir, 0); 1703 do_skill (who, who, ob, dir, 0);
1882 break; 1704 break;
1883 1705
1706 case RANGED:
1707 do_skill (who, ob, who->chosen_skill, dir, 0);
1708 break;
1709
1884 default: 1710 default:
1885 fire_misc_object (op, dir); 1711 fire_misc_object (who, dir);
1886 break; 1712 break;
1887 } 1713 }
1888}
1889 1714
1890/* find_key 1715 return true;
1891 * We try to find a key for the door as passed. If we find a key 1716}
1892 * and successfully use it, we return the key, otherwise NULL 1717
1893 * This function merges both normal and locked door, since the logic 1718static object *
1894 * for both is the same - just the specific key is different.
1895 * pl is the player,
1896 * inv is the objects inventory to searched
1897 * door is the door we are trying to match against.
1898 * This function can be called recursively to search containers.
1899 */
1900object *
1901find_key (object *pl, object *container, object *door) 1719find_key_ (object *pl, object *container, object *door)
1902{ 1720{
1903 object *tmp, *key; 1721 object *tmp, *key;
1904 1722
1905 /* Should not happen, but sanity checking is never bad */ 1723 /* Should not happen, but sanity checking is never bad */
1906 if (!container->inv) 1724 if (!container->inv)
… …
1909 /* First, lets try to find a key in the top level inventory */ 1727 /* First, lets try to find a key in the top level inventory */
1910 for (tmp = container->inv; tmp; tmp = tmp->below) 1728 for (tmp = container->inv; tmp; tmp = tmp->below)
1911 { 1729 {
1912 if (door->type == DOOR && tmp->type == KEY) 1730 if (door->type == DOOR && tmp->type == KEY)
1913 break; 1731 break;
1732
1914 /* For sanity, we should really check door type, but other stuff 1733 /* For sanity, we should really check door type, but other stuff
1915 * (like containers) can be locked with special keys 1734 * (like containers) can be locked with special keys
1916 */ 1735 */
1917 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1736 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1918 break; 1737 break;
… …
1924 * a key, return 1743 * a key, return
1925 */ 1744 */
1926 if (!tmp) 1745 if (!tmp)
1927 { 1746 {
1928 for (tmp = container->inv; tmp; tmp = tmp->below) 1747 for (tmp = container->inv; tmp; tmp = tmp->below)
1929 {
1930 /* No reason to search empty containers */ 1748 /* No reason to search empty containers */
1931 if (tmp->type == CONTAINER && tmp->inv) 1749 if (tmp->type == CONTAINER && tmp->inv)
1932 {
1933 if ((key = find_key (pl, tmp, door))) 1750 if ((key = find_key_ (pl, tmp, door)))
1934 return key; 1751 return key;
1935 }
1936 }
1937 1752
1938 if (!tmp) 1753 if (!tmp)
1939 return NULL; 1754 return 0;
1940 } 1755 }
1941 1756
1942 /* We get down here if we have found a key. Now if its in a container, 1757 /* We get down here if we have found a key. Now if its in a container,
1943 * see if we actually want to use it 1758 * see if we actually want to use it
1944 */ 1759 */
1945 if (pl != container) 1760 if (pl != container)
1946 { 1761 {
1947 /* Only let players use keys in containers */ 1762 /* Only let players use keys in containers */
1948 if (!pl->contr) 1763 if (!pl->contr)
1949 return NULL; 1764 return 0;
1765
1950 /* cases where this fails: 1766 /* cases where this fails:
1951 * If we only search the player inventory, return now since we 1767 * If we only search the player inventory, return now since we
1952 * are not in the players inventory. 1768 * are not in the players inventory.
1953 * If the container is not active, return now since only active 1769 * If the container is not active, return now since only active
1954 * containers can be used. 1770 * containers can be used.
… …
1958 * inv must have been an container and must have been active. 1774 * inv must have been an container and must have been active.
1959 * 1775 *
1960 * Change the color so that the message doesn't disappear with 1776 * Change the color so that the message doesn't disappear with
1961 * all the others. 1777 * all the others.
1962 */ 1778 */
1963 if (pl->contr->usekeys == key_inventory || 1779 if (pl->contr->usekeys == key_inventory
1964 !QUERY_FLAG (container, FLAG_APPLIED) || 1780 || !QUERY_FLAG (container, FLAG_APPLIED)
1965 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1781 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1966 { 1782 {
1967 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1783 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1968 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1784 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1969 return NULL; 1785 return NULL;
1970 } 1786 }
1971 } 1787 }
1972 1788
1973 return tmp; 1789 return tmp;
1790}
1791
1792/* find_key
1793 * We try to find a key for the door as passed. If we find a key
1794 * and successfully use it, we return the key, otherwise NULL
1795 * This function merges both normal and locked door, since the logic
1796 * for both is the same - just the specific key is different.
1797 * pl is the player,
1798 * inv is the objects inventory to searched
1799 * door is the door we are trying to match against.
1800 * This function can be called recursively to search containers.
1801 */
1802object *
1803find_key (object *pl, object *container, object *door)
1804{
1805 if (door->slaying && is_match_expr (door->slaying))
1806 {
1807 // for match expressions, we try to find the key by applying the match
1808 // to the op itself, which is supposed to find the "key", instead
1809 // of searching through containers ourselves.
1810
1811 return match_one (door->slaying, container, door, pl, pl);
1812 }
1813 else
1814 return find_key_ (pl, container, door);
1974} 1815}
1975 1816
1976/* moved door processing out of move_player_attack. 1817/* moved door processing out of move_player_attack.
1977 * returns 1 if player has opened the door with a key 1818 * returns 1 if player has opened the door with a key
1978 * such that the caller should not do anything more, 1819 * such that the caller should not do anything more,
1979 * 0 otherwise 1820 * 0 otherwise
1980 */ 1821 */
1981static int 1822static int
1982player_attack_door (object *op, object *door) 1823player_attack_door (object *op, object *door)
1983{ 1824{
1984 /* If its a door, try to find a use a key. If we do destroy the door, 1825 /* If its a door, try to find a key. If we do destroy the door,
1985 * might as well return immediately as there is nothing more to do - 1826 * might as well return immediately as there is nothing more to do -
1986 * otherwise, we fall through to the rest of the code. 1827 * otherwise, we fall through to the rest of the code.
1987 */ 1828 */
1988 object *key = find_key (op, op, door); 1829 object *key = find_key (op, op, door);
1989 1830
1990 /* IF we found a key, do some extra work */ 1831 /* If we found a key, do some extra work */
1991 if (key) 1832 if (key)
1992 { 1833 {
1993 object *container = key->env; 1834 object *container = key->env;
1994
1995 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1996 1835
1997 if (action_makes_visible (op)) 1836 if (action_makes_visible (op))
1998 make_visible (op); 1837 make_visible (op);
1999 1838
2000 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1839 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
… …
2002 1841
2003 if (door->type == DOOR) 1842 if (door->type == DOOR)
2004 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1843 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2005 else if (door->type == LOCKED_DOOR) 1844 else if (door->type == LOCKED_DOOR)
2006 { 1845 {
2007 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1846 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2008 remove_door2 (door); /* remove door without violence ;-) */ 1847 remove_door2 (door); /* remove door without violence ;-) */
2009 } 1848 }
2010 1849
2011 /* Do this after we print the message */ 1850 /* Do this after we print the message */
2012 decrease_ob (key); /* Use up one of the keys */ 1851 key->decrease (); /* Use up one of the keys */
2013 /* Need to update the weight the container the key was in */
2014 if (container != op)
2015 esrv_update_item (UPD_WEIGHT, op, container);
2016 1852
2017 return 1; /* Nothing more to do below */ 1853 return 1; /* Nothing more to do below */
2018 } 1854 }
2019 else if (door->type == LOCKED_DOOR) 1855 else if (door->type == LOCKED_DOOR)
2020 { 1856 {
2021 /* Might as well return now - no other way to open this */ 1857 /* Might as well return now - no other way to open this */
2022 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1858 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2023 return 1; 1859 return 1;
2024 } 1860 }
2025 1861
2026 return 0; 1862 return 0;
2027} 1863}
… …
2030 * It should keep the code cleaner. 1866 * It should keep the code cleaner.
2031 * When this is called, the players direction has been updated 1867 * When this is called, the players direction has been updated
2032 * (taking into account confusion.) The player is also actually 1868 * (taking into account confusion.) The player is also actually
2033 * going to try and move (not fire weapons). 1869 * going to try and move (not fire weapons).
2034 */ 1870 */
2035void 1871bool
2036move_player_attack (object *op, int dir) 1872move_player_attack (object *op, int dir)
2037{ 1873{
2038 object *tmp, *mon; 1874 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
2039 int on_battleground; 1875 {
2040 maptile *m; 1876 --op->speed_left;
1877 return true;
1878 }
2041 1879
2042 sint16 nx = freearr_x[dir] + op->x; 1880 sint16 nx = freearr_x[dir] + op->x;
2043 sint16 ny = freearr_y[dir] + op->y; 1881 sint16 ny = freearr_y[dir] + op->y;
2044 1882
2045 on_battleground = op_on_battleground (op, 0, 0); 1883 if (out_of_map (op->map, nx, ny))
1884 return false;
2046 1885
2047 /* If braced, or can't move to the square, and it is not out of the 1886 /* If braced, or can't move to the square, and it is not out of the
2048 * map, attack it. Note order of if statement is important - don't 1887 * map, attack it. Note order of if statement is important - don't
2049 * want to be calling move_ob if braced, because move_ob will move the 1888 * want to be calling move_ob if braced, because move_ob will move the
2050 * player. This is a pretty nasty hack, because if we could 1889 * player. This is a pretty nasty hack, because if we could
2051 * move to some space, it then means that if we are braced, we should 1890 * move to some space, it then means that if we are braced, we should
2052 * do nothing at all. As it is, if we are braced, we go through 1891 * do nothing at all. As it is, if we are braced, we go through
2053 * quite a bit of processing. However, it probably is less than what 1892 * quite a bit of processing. However, it probably is less than what
2054 * move_ob uses. 1893 * move_ob uses.
2055 */ 1894 */
2056 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 1895 maptile *m = op->map->xy_find (nx, ny);
1896
1897 /* Go through all the objects, and find ones of interest. Only stop if
1898 * we find a monster - that is something we know we want to attack.
1899 * if its a door or barrel (can roll) see if there may be monsters
1900 * on the space
1901 */
1902 object *mon;
1903 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
1904 {
1905 if ((mon->flag [FLAG_ALIVE]
1906 || mon->type == LOCKED_DOOR
1907 || mon->flag [FLAG_CAN_ROLL])
1908 && mon != op)
1909 break;
2057 { 1910 }
2058 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 1911
1912 if (!mon) /* This happens anytime the player tries to move */
1913 return false; /* into a wall */
1914
1915 mon = mon->head_ ();
1916
1917 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
1918 if (op->contr->weapon_sp_left > 0.f)
1919 if (player_attack_door (op, mon))
1920 {
1921 --op->contr->weapon_sp_left;
1922 return true;
2059 { 1923 }
2060 m = op->map->xy_find (nx, ny); 1924
2061 if (!m) 1925 /* The following deals with possibly attacking peaceful
2062 return; /* Don't think this should happen */ 1926 * or friendly creatures. Basically, all players are considered
1927 * unaggressive. If the moving player has peaceful set, then the
1928 * object should be pushed instead of attacked. It is assumed that
1929 * if you are braced, you will not attack friends accidently,
1930 * and thus will not push them.
1931 */
1932
1933 /* If the creature is a pet, push it even if the player is not
1934 * peaceful. Our assumption is the creature is a pet if the
1935 * player owns it and it is either friendly or unagressive.
1936 */
1937 if (op->type == PLAYER
1938 && ((mon->owner && mon->owner->contr
1939 && same_party (mon->owner->contr->party, op->contr->party))
1940 || mon->owner == op)
1941 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
1942 {
1943 /* If we're braced, we don't want to switch places with it */
1944 if (op->contr->braced)
1945 return false;
1946
1947 if (op->speed_left > 0.f)
1948 {
1949 --op->speed_left;
1950
1951 op->play_sound (sound_find ("push_player"));
1952 push_ob (mon, dir, op);
1953
1954 if (action_makes_visible (op))
1955 make_visible (op);
1956
1957 return true;
2063 } 1958 }
2064 else 1959 else
2065 m = op->map;
2066
2067 if (!(tmp = m->at (nx, ny).bot))
2068 return; 1960 return false;
1961 }
2069 1962
2070 mon = 0; 1963 bool on_battleground = op_on_battleground (op, 0, 0);
2071 /* Go through all the objects, and find ones of interest. Only stop if
2072 * we find a monster - that is something we know we want to attack.
2073 * if its a door or barrel (can roll) see if there may be monsters
2074 * on the space
2075 */
2076 while (tmp)
2077 {
2078 if (tmp == op)
2079 {
2080 tmp = tmp->above;
2081 continue;
2082 }
2083 1964
2084 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2085 {
2086 mon = tmp;
2087 break;
2088 }
2089
2090 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2091 mon = tmp;
2092
2093 tmp = tmp->above;
2094 }
2095
2096 if (!mon) /* This happens anytime the player tries to move */
2097 return; /* into a wall */
2098
2099 if (mon->head)
2100 mon = mon->head;
2101
2102 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2103 if (player_attack_door (op, mon))
2104 return;
2105
2106 /* The following deals with possibly attacking peaceful
2107 * or frienddly creatures. Basically, all players are considered
2108 * unaggressive. If the moving player has peaceful set, then the
2109 * object should be pushed instead of attacked. It is assumed that
2110 * if you are braced, you will not attack friends accidently,
2111 * and thus will not push them.
2112 */
2113
2114 /* If the creature is a pet, push it even if the player is not
2115 * peaceful. Our assumption is the creature is a pet if the
2116 * player owns it and it is either friendly or unagressive.
2117 */
2118 if (op->type == PLAYER
2119 && ((mon->owner && mon->owner->contr
2120 && same_party (mon->owner->contr->party, op->contr->party))
2121 || mon->owner == op)
2122 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2123 {
2124 /* If we're braced, we don't want to switch places with it */
2125 if (op->contr->braced)
2126 return;
2127
2128 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2129 push_ob (mon, dir, op);
2130 if (op->contr->tmp_invis || op->hide)
2131 make_visible (op);
2132
2133 return;
2134 }
2135
2136 /* in certain circumstances, you shouldn't attack friendly 1965 /* in certain circumstances, you shouldn't attack friendly
2137 * creatures. Note that if you are braced, you can't push 1966 * creatures. Note that if you are braced, you can't push
2138 * someone, but put it inside this loop so that you won't 1967 * someone, but put it inside this loop so that you won't
2139 * attack them either. 1968 * attack them either.
2140 */ 1969 */
2141 if ((mon->type == PLAYER || mon->enemy != op) 1970 if ((mon->type == PLAYER || mon->enemy != op)
2142 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 1971 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2143 && ((op->contr->peaceful 1972 && ((op->contr->peaceful
2144 || (mon->type == PLAYER && mon->contr->peaceful)) 1973 || (mon->type == PLAYER && mon->contr->peaceful))
2145 && !on_battleground)) 1974 && !on_battleground))
1975 {
1976 if (op->speed_left > 0.f)
2146 { 1977 {
1978 --op->speed_left;
1979
2147 if (!op->contr->braced) 1980 if (!op->contr->braced)
2148 { 1981 {
2149 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 1982 op->play_sound (sound_find ("push_player"));
2150 push_ob (mon, dir, op); 1983 push_ob (mon, dir, op);
2151 } 1984 }
2152 else 1985 else
2153 new_draw_info (0, 0, op, "You withhold your attack"); 1986 op->statusmsg ("You withhold your attack");
2154 1987
2155 if (op->contr->tmp_invis || op->hide) 1988 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2156 make_visible (op); 1989 make_visible (op);
2157 }
2158 1990
1991 return true;
1992 }
1993 }
2159 /* If the object is a boulder or other rollable object, then 1994 /* If the object is a boulder or other rollable object, then
2160 * roll it if not braced. You can't roll it if you are braced. 1995 * roll it if not braced. You can't roll it if you are braced.
2161 */ 1996 */
2162 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1997 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
1998 {
1999 if (op->speed_left > 0.f)
2163 { 2000 {
2001 --op->speed_left;
2002
2164 recursive_roll (mon, dir, op); 2003 recursive_roll (mon, dir, op);
2165 if (action_makes_visible (op)) 2004 if (action_makes_visible (op))
2166 make_visible (op); 2005 make_visible (op);
2167 }
2168 2006
2007 return true;
2008 }
2009 }
2169 /* Any generic living creature. Including things like doors. 2010 /* Any generic living creature. Including things like doors.
2170 * Way it works is like this: First, it must have some hit points 2011 * Way it works is like this: First, it must have some hit points
2171 * and be living. Then, it must be one of the following: 2012 * and be living. Then, it must be one of the following:
2172 * 1) Not a player, 2) A player, but of a different party. Note 2013 * 1) Not a player, 2) A player, but of a different party. Note
2173 * that party_number -1 is no party, so attacks can still happen. 2014 * that party_number -1 is no party, so attacks can still happen.
2174 */ 2015 */
2175 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2016 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2176 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2017 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2177 { 2018 {
2178 if (!op->contr->has_hit) 2019 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2179 { 2020 {
2180 op->contr->has_hit = 1; 2021 --op->contr->weapon_sp_left;
2181 op->speed_left += op->contr->weapon_speed () - op->speed;
2182 }
2183 2022
2184 skill_attack (mon, op, 0, 0, 0); 2023 skill_attack (mon, op, 0, 0, 0);
2185
2186 /* If attacking another player, that player gets automatic
2187 * hitback, and doesn't loose luck either.
2188 * Disable hitback on the battleground or if the target is
2189 * the wiz.
2190 */
2191 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2192 {
2193 short luck = mon->stats.luck;
2194
2195 mon->contr->has_hit = 1;
2196 skill_attack (op, mon, 0, 0, 0);
2197 mon->stats.luck = luck;
2198 }
2199 2024
2200 if (action_makes_visible (op)) 2025 if (action_makes_visible (op))
2201 make_visible (op); 2026 make_visible (op);
2202 }
2203 } /* if player should attack something */
2204}
2205 2027
2206int 2028 return true;
2029 }
2030 }
2031
2032 return false;
2033}
2034
2035bool
2207move_player (object *op, int dir) 2036move_player (object *op, int dir)
2208{ 2037{
2209 int pick;
2210
2211 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2038 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2212 return 0; 2039 return 0;
2213 2040
2214 /* Sanity check: make sure dir is valid */ 2041 /* Sanity check: make sure dir is valid */
2215 if ((dir < 0) || (dir >= 9)) 2042 if (dir < 0 || dir >= 9)
2216 { 2043 {
2217 LOG (llevError, "move_player: invalid direction %d\n", dir); 2044 LOG (llevError, "move_player: invalid direction %d\n", dir);
2218 return 0; 2045 return 0;
2219 } 2046 }
2220 2047
… …
2222 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2049 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2223 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2050 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2224 2051
2225 op->facing = dir; 2052 op->facing = dir;
2226 2053
2227 if (op->hide) 2054 if (op->flag [FLAG_HIDDEN])
2228 do_hidden_move (op); 2055 do_hidden_move (op);
2229 2056
2057 bool retval;
2058 int pick = 0;
2059
2230 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2060 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2231 /*nop */ ; 2061 retval = RESULT_INT (0);
2232 else if (op->contr->fire_on) 2062 else if (op->contr->fire_on)
2233 fire (op, dir); 2063 retval = fire (op, dir);
2234 else 2064 else
2235 { 2065 {
2236 move_player_attack (op, dir); 2066 retval = move_player_attack (op, dir);
2237 pick = check_pick (op); 2067 pick = check_pick (op);
2238 } 2068 }
2239 2069
2240 /* Add special check for newcs players and fire on - this way, the 2070 /* Add special check for newcs players and fire on - this way, the
2241 * server can handle repeat firing. 2071 * server can handle repeat firing.
… …
2248 /* Update how the player looks. Use the facing, so direction may 2078 /* Update how the player looks. Use the facing, so direction may
2249 * get reset to zero. This allows for full animation capabilities 2079 * get reset to zero. This allows for full animation capabilities
2250 * for players. 2080 * for players.
2251 */ 2081 */
2252 animate_object (op, op->facing); 2082 animate_object (op, op->facing);
2253 return 0; 2083
2084 return retval;
2254} 2085}
2255 2086
2256/* This is similar to handle_player, below, but is only used by the 2087/* This is similar to handle_player, below, but is only used by the
2257 * new client/server stuff. 2088 * new client/server stuff.
2258 * This is sort of special, in that the new client/server actually uses 2089 * This is sort of special, in that the new client/server actually uses
2259 * the new speed values for commands. 2090 * the new speed values for commands.
2260 * 2091 *
2261 * Returns true if there are more actions we can do. 2092 * Returns true if there are more actions we can do. Should not do
2093 * many actions in a row, as that would be too unfair to other
2094 * players.
2262 */ 2095 */
2263int 2096bool
2264handle_newcs_player (object *op) 2097handle_newcs_player (object *op)
2265{ 2098{
2266 if (QUERY_FLAG (op, FLAG_SCARED)) 2099 if (QUERY_FLAG (op, FLAG_SCARED))
2267 { 2100 {
2268 flee_player (op); 2101 if (op->speed_left > 0.f)
2269
2270 /* If player is still scared, that is his action for this tick */
2271 if (op->flag [FLAG_SCARED])
2272 { 2102 {
2273 --op->speed_left; 2103 --op->speed_left;
2104 flee_player (op);
2105
2274 return 0; 2106 return true;
2275 } 2107 }
2108 else
2109 return false;
2276 } 2110 }
2277 2111
2278 /* call this here - we also will call this in do_ericserver, but 2112 /* call this here - we also will call this in do_ericserver, but
2279 * the players time has been increased when doericserver has been 2113 * the players time has been increased when doericserver has been
2280 * called, so we recheck it here. 2114 * called, so we recheck it here.
2281 */ 2115 */
2282 if (op->contr->ns->handle_command ()) 2116 if (op->contr->ns->handle_command ())
2283 return 1; 2117 return true;
2284 2118
2285 if (op->speed_left > 0.f)
2286 {
2287 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2119 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2288 {
2289 /* All move commands take 1 tick, at least for now */
2290 --op->speed_left;
2291
2292 /* Instead of all the stuff below, let move_player take care
2293 * of it. Also, some of the skill stuff is only put in
2294 * there, as well as the confusion stuff.
2295 */
2296 move_player (op, op->direction); 2120 return move_player (op, op->direction);
2297 2121
2298 return op->speed_left > 0.f;
2299 }
2300 }
2301
2302 return 0; 2122 return false;
2303} 2123}
2304 2124
2305int 2125static int
2306save_life (object *op) 2126save_life (object *op)
2307{ 2127{
2308 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2128 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2309 return 0; 2129 return 0;
2310 2130
2311 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2131 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2312 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2132 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2313 { 2133 {
2314 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2134 op->play_sound (sound_find ("ob_evaporate"));
2315 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2135 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2316
2317 if (op->contr)
2318 esrv_del_item (op->contr, tmp->count);
2319 2136
2320 tmp->destroy (); 2137 tmp->destroy ();
2321 CLEAR_FLAG (op, FLAG_LIFESAVE); 2138 CLEAR_FLAG (op, FLAG_LIFESAVE);
2322 2139
2323 if (op->stats.hp < 0) 2140 if (op->stats.hp < 0)
2324 op->stats.hp = op->stats.maxhp; 2141 op->stats.hp = op->stats.maxhp;
2325 2142
2326 if (op->stats.food < 0) 2143 if (op->stats.food < 0)
2327 op->stats.food = 999; 2144 op->stats.food = MAX_FOOD;
2328 2145
2329 op->update_stats (); 2146 op->update_stats ();
2330 return 1; 2147 return 1;
2331 } 2148 }
2332 2149
… …
2336 return 0; 2153 return 0;
2337} 2154}
2338 2155
2339/* This goes throws the inventory and removes unpaid objects, and puts them 2156/* This goes throws the inventory and removes unpaid objects, and puts them
2340 * back in the map (location and map determined by values of env). This 2157 * back in the map (location and map determined by values of env). This
2341 * function will descend into containers. op is the object to start the search 2158 * function will descend into containers. op is the object to start the search
2342 * from. 2159 * from.
2343 */ 2160 */
2161static void
2162drop_unpaid_items (object *op, object *env)
2163{
2164 while (op)
2165 {
2166 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2167
2168 if (QUERY_FLAG (op, FLAG_UNPAID))
2169 op->insert_at (env);
2170 else if (op->inv)
2171 drop_unpaid_items (op->inv, env);
2172
2173 op = next;
2174 }
2175}
2176
2344void 2177void
2345remove_unpaid_objects (object *op, object *env) 2178object::drop_unpaid_items ()
2346{ 2179{
2347 while (op) 2180 if (!flag [FLAG_REMOVED])
2348 { 2181 ::drop_unpaid_items (inv, this);
2349 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2350
2351 if (QUERY_FLAG (op, FLAG_UNPAID))
2352 {
2353 if (env->type == PLAYER)
2354 esrv_del_item (env->contr, op->count);
2355
2356 op->insert_at (env);
2357 }
2358 else if (op->inv)
2359 remove_unpaid_objects (op->inv, env);
2360
2361 op = next;
2362 }
2363}
2364
2365/*
2366 * Returns pointer a static string containing gravestone text
2367 * Moved from apply.c to player.c - player.c is what
2368 * actually uses this function. player.c may not be quite the
2369 * best, a misc file for object actions is probably better,
2370 * but there isn't one in the server directory.
2371 */
2372char *
2373gravestone_text (object *op)
2374{
2375 static char buf2[MAX_BUF];
2376 char buf[MAX_BUF];
2377 time_t now = time (NULL);
2378
2379 strcpy (buf2, " R.I.P.\n\n");
2380 if (op->type == PLAYER)
2381 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2382 else
2383 sprintf (buf, "%s\n", &op->name);
2384
2385 strncat (buf2, " ", 20 - strlen (buf) / 2);
2386 strcat (buf2, buf);
2387 if (op->type == PLAYER)
2388 sprintf (buf, "who was in level %d when killed\n", op->level);
2389 else
2390 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2391
2392 strncat (buf2, " ", 20 - strlen (buf) / 2);
2393 strcat (buf2, buf);
2394 if (op->type == PLAYER)
2395 {
2396 sprintf (buf, "by %s.\n\n", op->contr->killer);
2397 strncat (buf2, " ", 21 - strlen (buf) / 2);
2398 strcat (buf2, buf);
2399 }
2400
2401 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2402 strncat (buf2, " ", 20 - strlen (buf) / 2);
2403 strcat (buf2, buf);
2404
2405 return buf2;
2406} 2182}
2407 2183
2408void 2184void
2409do_some_living (object *op) 2185do_some_living (object *op)
2410{ 2186{
… …
2462 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2238 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2463 else 2239 else
2464 { 2240 {
2465 gen_grace = op->stats.maxgrace; 2241 gen_grace = op->stats.maxgrace;
2466 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2242 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2467 }
2468
2469 /* Regenerate Spell Points */
2470 if (!op->contr->golem && --op->last_sp < 0)
2471 {
2472 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2473 if (op->stats.sp < op->stats.maxsp)
2474 {
2475 op->stats.sp++;
2476 /* dms do not consume food */
2477 if (!QUERY_FLAG (op, FLAG_WIZ))
2478 {
2479 op->stats.food--;
2480 if (op->contr->digestion < 0)
2481 op->stats.food += op->contr->digestion;
2482 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2483 op->stats.food = last_food;
2484 }
2485 }
2486
2487 if (max_sp > 1)
2488 {
2489 over_sp = (gen_sp + 10) / rate_sp;
2490 if (over_sp > 0)
2491 {
2492 if (op->stats.sp < op->stats.maxsp)
2493 {
2494 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2495
2496 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2497 op->stats.sp--;
2498
2499 if (op->stats.sp > op->stats.maxsp)
2500 op->stats.sp = op->stats.maxsp;
2501 }
2502 op->last_sp = 0;
2503 }
2504 else
2505 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2506 }
2507 else
2508 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2509 } 2243 }
2510 2244
2511 /* Regenerate Grace */ 2245 /* Regenerate Grace */
2512 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2246 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2513 if (--op->last_grace < 0) 2247 if (--op->last_grace < 0)
… …
2534 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2268 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2535 } 2269 }
2536 /* wearing stuff doesn't detract from grace generation. */ 2270 /* wearing stuff doesn't detract from grace generation. */
2537 } 2271 }
2538 2272
2273 if (op->stats.food > 0)
2274 {
2539 /* Regenerate Hit Points */ 2275 /* Regenerate Spell Points */
2540 if (--op->last_heal < 0) 2276 if (!op->contr->golem && --op->last_sp < 0)
2541 {
2542 if (op->stats.hp < op->stats.maxhp)
2543 { 2277 {
2544 op->stats.hp++; 2278 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2545 /* dms do not consume food */ 2279
2546 if (!QUERY_FLAG (op, FLAG_WIZ)) 2280 if (op->stats.sp < op->stats.maxsp)
2547 { 2281 {
2282 op->stats.sp++;
2283
2284 /* dms do not consume food */
2285 if (!QUERY_FLAG (op, FLAG_WIZ))
2286 {
2548 op->stats.food--; 2287 op->stats.food--;
2288
2549 if (op->contr->digestion < 0) 2289 if (op->contr->digestion < 0)
2550 op->stats.food += op->contr->digestion; 2290 op->stats.food += op->contr->digestion;
2551 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2291 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2552 op->stats.food = last_food; 2292 op->stats.food = last_food;
2293 }
2553 } 2294 }
2554 }
2555 2295
2556 if (max_hp > 1) 2296 if (max_sp > 1)
2557 {
2558 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2559 if (over_hp > 0)
2560 { 2297 {
2561 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2298 over_sp = (gen_sp + 10) / rate_sp;
2299 if (over_sp > 0)
2300 {
2301 if (op->stats.sp < op->stats.maxsp)
2302 {
2303 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2304
2305 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2306 op->stats.sp--;
2307
2308 if (op->stats.sp > op->stats.maxsp)
2309 op->stats.sp = op->stats.maxsp;
2310 }
2311
2562 op->last_heal = 0; 2312 op->last_sp = 0;
2313 }
2314 else
2315 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2563 } 2316 }
2564 else 2317 else
2318 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2319 }
2320
2321 /* Regenerate Hit Points */
2322 if (--op->last_heal < 0)
2323 {
2324 if (op->stats.hp < op->stats.maxhp)
2565 { 2325 {
2566 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2326 op->stats.hp++;
2327
2328 /* dms do not consume food */
2329 if (!QUERY_FLAG (op, FLAG_WIZ))
2330 {
2331 op->stats.food--;
2332
2333 if (op->contr->digestion < 0)
2334 op->stats.food += op->contr->digestion;
2335 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2336 op->stats.food = last_food;
2337 }
2567 } 2338 }
2339
2340 if (max_hp > 1)
2341 {
2342 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2343
2344 if (over_hp > 0)
2345 {
2346 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2347 op->last_heal = 0;
2348 }
2349 else
2350 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2568 } 2351 }
2569 else 2352 else
2570 {
2571 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2353 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2572 } 2354 }
2573 } 2355 }
2574 2356
2575 /* Digestion */ 2357 /* Digestion */
2576 if (--op->last_eat < 0) 2358 if (--op->last_eat < 0)
2577 { 2359 {
2578 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2360 int bonus = max (0, op->contr->digestion),
2361 penalty = max (0, -op->contr->digestion);
2579 2362
2580 if (op->contr->gen_hp > 0)
2581 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2363 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2582 else
2583 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2584 2364
2585 /* dms do not consume food */ 2365 /* dms do not consume food */
2586 if (!QUERY_FLAG (op, FLAG_WIZ)) 2366 if (!QUERY_FLAG (op, FLAG_WIZ))
2587 op->stats.food--; 2367 op->stats.food--;
2588 } 2368 }
2589 2369
2590 if (op->stats.food < 0 && op->stats.hp >= 0) 2370 if (op->stats.food < 0 && op->stats.hp >= 0)
2591 { 2371 {
2592 object *tmp, *flesh = 0; 2372 object *flesh = 0;
2593 2373
2594 for (tmp = op->inv; tmp; tmp = tmp->below) 2374 for_inv_removable (op, tmp)
2595 { 2375 {
2596 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2376 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2377 continue;
2378
2379 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2597 { 2380 {
2598 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2381 op->statusmsg ("You blindly grab for a bite of food. "
2599 { 2382 "H<To prevent you from starving, you ate some random item from your backpack.>");
2600 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2383 op->apply (tmp);
2601 manual_apply (op, tmp, 0); 2384
2602 if (op->stats.food >= 0 || op->stats.hp < 0) 2385 if (op->stats.food >= 0 || op->stats.hp < 0)
2603 break; 2386 break;
2604 } 2387 }
2605 else if (tmp->type == FLESH) 2388 else if (tmp->type == FLESH)
2606 flesh = tmp; 2389 flesh = tmp;
2607 } /* End if paid for object */ 2390 }
2608 } /* end of for loop */
2609 2391
2610 /* If player is still starving, it means they don't have any food, so 2392 /* If player is still starving, it means they don't have any food, so
2611 * eat flesh instead. 2393 * eat flesh instead.
2612 */ 2394 */
2613 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2395 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2614 { 2396 {
2615 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2397 op->statusmsg ("You blindly grab for a bite of food. "
2398 "H<To prevent you from starving, you ate some random item from your backpack.>");
2616 manual_apply (op, flesh, 0); 2399 op->apply (flesh);
2617 } 2400 }
2401
2402 // If player is still starving, alert him!
2403 if (op->stats.food < 0)
2404 op->failmsg ("You are starving! "
2405 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2406 }
2407
2408 if (op->stats.food < 0)
2618 } 2409 {
2410 op->stats.hp += op->stats.food;
2411 op->stats.food = 0;
2619 2412
2620 while (op->stats.food < 0 && op->stats.hp >= 0) 2413 if (op->stats.hp < 0)
2621 op->stats.food++, op->stats.hp--; 2414 {
2415 op->contr->killer = archetype::get ("killer_starvation");
2416 op->contr->killer->destroy ();
2417 }
2418 }
2622 2419
2420 /* killer should be set here already */
2623 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2421 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2624 kill_player (op); 2422 kill_player (op);
2625 } 2423 }
2626} 2424}
2627 2425
… …
2631 * file. 2429 * file.
2632 */ 2430 */
2633void 2431void
2634kill_player (object *op) 2432kill_player (object *op)
2635{ 2433{
2636 char buf[MAX_BUF];
2637 int x, y; 2434 int x, y;
2638
2639 //int i;
2640 maptile *map; /* this is for resurrection */ 2435 maptile *map; /* this is for resurrection */
2641
2642 /* int z;
2643 int num_stats_lose;
2644 int lost_a_stat;
2645 int lose_this_stat;
2646 int this_stat; */
2647 int will_kill_again; 2436 int will_kill_again;
2648 archetype *at; 2437 archetype *at;
2649 object *tmp; 2438 object *tmp;
2650 2439
2651 if (save_life (op)) 2440 if (save_life (op))
2652 return; 2441 return;
2653 2442
2443 dynbuf_text deathtab;
2444
2445 /* restore player */
2446 at = archetype::find (shstr_poisoning);
2447 if (object *tmp = present_arch_in_ob (at, op))
2448 {
2449 tmp->destroy ();
2450 deathtab << "Your body feels cleansed...\r";
2451 }
2452
2453 at = archetype::find (shstr_confusion);
2454 if (object *tmp = present_arch_in_ob (at, op))
2455 {
2456 tmp->destroy ();
2457 deathtab << "Your mind feels clearer...\r";
2458 }
2459
2460 cure_disease (op, 0, 0); /* remove any disease */
2461
2462 max_it (op->stats.hp , op->stats.maxhp);
2463 max_it (op->stats.sp , op->stats.maxsp);
2464 max_it (op->stats.grace, op->stats.maxgrace);
2465 max_it (op->stats.food , 200);
2466
2467 // remove all spell effects that are active
2468 // to avoid long-term effects such as word-of-recall
2469 for (object *item = op->inv; item; )
2470 {
2471 object *next = item->below;
2472
2473 if (item->type == SPELL_EFFECT && item->active)
2474 item->destroy ();
2475
2476 item = next;
2477 }
2654 2478
2655 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2479 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2656 * in cities ONLY!!! It is very important that this doesn't get abused. 2480 * in cities ONLY!!! It is very important that this doesn't get abused.
2657 * Look at op_on_battleground() for more info --AndreasV 2481 * Look at op_on_battleground() for more info --AndreasV
2658 */ 2482 */
2659 if (op_on_battleground (op, &x, &y)) 2483 if (op_on_battleground (op, &x, &y))
2660 { 2484 {
2661 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2485 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2662 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2663
2664 /* restore player */
2665 at = archetype::find ("poisoning");
2666 if (object *tmp = present_arch_in_ob (at, op))
2667 {
2668 tmp->destroy ();
2669 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2670 }
2671
2672 at = archetype::find ("confusion");
2673 if (object *tmp = present_arch_in_ob (at, op))
2674 {
2675 tmp->destroy ();
2676 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2677 }
2678
2679 cure_disease (op, 0); /* remove any disease */
2680 op->stats.hp = op->stats.maxhp;
2681 if (op->stats.food <= 0)
2682 op->stats.food = 999;
2683 2486
2684 /* create a bodypart-trophy to make the winner happy */ 2487 /* create a bodypart-trophy to make the winner happy */
2685 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2488 object *tmp = archetype::find (shstr_finger)->instance ();
2686 { 2489
2687 sprintf (buf, "%s's finger", &op->name); 2490 tmp->name = format ("%s's finger" , &op->name);
2688 tmp->name = buf; 2491 tmp->name_pl = format ("%s's fingers", &op->name);
2689 sprintf (buf, " This finger has been cut off %s\n" 2492 tmp->msg = format (
2690 " the %s, when he was defeated at\n level %d by %s.\n", 2493 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2691 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2494 &op->name, op->contr->title,
2692 tmp->msg = buf; 2495 (int)op->level,
2496 op->contr->killer_name ()
2497 );
2693 tmp->value = 0, tmp->type = 0; 2498 tmp->value = 0, tmp->type = 0;
2694 tmp->materialname = "organics"; 2499 tmp->material = name_to_material (shstr_organic);
2695 tmp->insert_at (op, tmp); 2500 tmp->insert_at (op, tmp);
2696 }
2697 2501
2698 /* teleport defeated player to new destination */ 2502 /* teleport defeated player to new destination */
2699 transfer_ob (op, x, y, 0, NULL); 2503 transfer_ob (op, x, y, 0, NULL);
2700 op->contr->braced = 0; 2504 op->contr->braced = 0;
2505
2506 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2701 return; 2507 return;
2702 } 2508 }
2703 2509
2510 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2511 deathtab << "T<YOU HAVE DIED>\n\n";
2512
2704 INVOKE_PLAYER (DEATH, op->contr); 2513 INVOKE_PLAYER (DEATH, op->contr);
2705 2514
2706 command_kill_pets (op, 0); 2515 command_kill_pets (op, 0);
2707 2516
2708 if (op->stats.food < 0) 2517 op->contr->play_sound (sound_find ("player_dies"));
2709 {
2710 sprintf (buf, "%s starved to death.", &op->name);
2711 strcpy (op->contr->killer, "starvation");
2712 }
2713 else
2714 sprintf (buf, "%s died.", &op->name);
2715
2716 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2717 2518
2718 /* save the map location for corpse, gravestone */ 2519 /* save the map location for corpse, gravestone */
2719 x = op->x; 2520 x = op->x;
2720 y = op->y; 2521 y = op->y;
2721 map = op->map; 2522 map = op->map;
… …
2749 2550
2750 lost_a_stat = 0; 2551 lost_a_stat = 0;
2751 2552
2752 for (z = 0; z < num_stats_lose; z++) 2553 for (z = 0; z < num_stats_lose; z++)
2753 { 2554 {
2754 i = RANDOM () % NUM_STATS; 2555 i = rndm (NUM_STATS);
2755 2556
2756 if (settings.stat_loss_on_death) 2557 if (settings.stat_loss_on_death)
2757 { 2558 {
2758 /* Pick a random stat and take a point off it. Tell the player 2559 /* Pick a random stat and take a point off it. Tell the player
2759 * what he lost. 2560 * what he lost.
… …
2766 lost_a_stat = 1; 2567 lost_a_stat = 1;
2767 } 2568 }
2768 else 2569 else
2769 { 2570 {
2770 /* deplete a stat */ 2571 /* deplete a stat */
2771 archetype *deparch = archetype::find ("depletion"); 2572 archetype *deparch = archetype::find (shstr_depletion);
2772 object *dep; 2573 object *dep;
2773 2574
2774 dep = present_arch_in_ob (deparch, op); 2575 dep = present_arch_in_ob (deparch, op);
2775 if (!dep) 2576 if (!dep)
2776 { 2577 {
2777 dep = arch_to_object (deparch); 2578 dep = deparch->instance ();
2778 insert_ob_in_ob (dep, op); 2579 insert_ob_in_ob (dep, op);
2779 } 2580 }
2780 lose_this_stat = 1; 2581 lose_this_stat = 1;
2781 if (settings.balanced_stat_loss) 2582 if (settings.balanced_stat_loss)
2782 { 2583 {
… …
2810 } 2611 }
2811 } 2612 }
2812 2613
2813 if (lose_this_stat) 2614 if (lose_this_stat)
2814 { 2615 {
2815 this_stat = get_attr_value (&(dep->stats), i); 2616 this_stat = get_attr_value (&dep->stats, i);
2816 /* We could try to do something clever like find another 2617 /* We could try to do something clever like find another
2817 * stat to reduce if this fails. But chances are, if 2618 * stat to reduce if this fails. But chances are, if
2818 * stats have been depleted to -50, all are pretty low 2619 * stats have been depleted to -50, all are pretty low
2819 * and should be roughly the same, so it shouldn't make a 2620 * and should be roughly the same, so it shouldn't make a
2820 * difference. 2621 * difference.
… …
2828 lost_a_stat = 1; 2629 lost_a_stat = 1;
2829 } 2630 }
2830 } 2631 }
2831 } 2632 }
2832 } 2633 }
2634
2833 /* If no stat lost, tell the player. */ 2635 /* If no stat lost, tell the player. */
2834 if (!lost_a_stat) 2636 if (!lost_a_stat)
2835 { 2637 {
2836 /* determine_god() seems to not work sometimes... why is this? 2638 /* determine_god() seems to not work sometimes... why is this?
2837 Should I be using something else? GD */ 2639 Should I be using something else? GD */
2838 const char *god = determine_god (op); 2640 shstr_tmp god = determine_god (op);
2839 2641
2840 if (god && (strcmp (god, "none"))) 2642 if (god != shstr_none)
2841 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2643 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2842 else 2644 else
2843 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2645 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2844 } 2646 }
2845#else 2647#else
2846 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2648 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2847#endif 2649#endif
2848 2650
2849 /* Put a gravestone up where the character 'almost' died. List the 2651 /* Put a gravestone up where the character 'almost' died. List the
2850 * exp loss on the stone. 2652 * exp loss on the stone.
2851 */ 2653 */
2852 tmp = arch_to_object (archetype::find ("gravestone")); 2654 tmp = archetype::find (shstr_gravestone)->instance ();
2853 sprintf (buf, "%s's gravestone", &op->name); 2655 tmp->name = format ("%s's gravestone", &op->name);
2854 tmp->name = buf; 2656 tmp->name_pl = format ("%s's gravestones", &op->name);
2855 sprintf (buf, "%s's gravestones", &op->name); 2657 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2856 tmp->name_pl = buf; 2658 &op->name, op->contr->title, op->contr->killer_name ());
2857 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2858 tmp->msg = buf;
2859 tmp->x = op->x, tmp->y = op->y; 2659 tmp->x = op->x, tmp->y = op->y;
2860 insert_ob_in_map (tmp, op->map, NULL, 0); 2660 insert_ob_in_map (tmp, op->map, NULL, 0);
2861 2661
2862 /**************************************/ 2662 /**************************************/
2863 /* */ 2663 /* */
2864 /* Subtract the experience points, */ 2664 /* Subtract the experience points, */
2865 /* if we died cause of food, give us */
2866 /* food, and reset HP's... */
2867 /* */ 2665 /* */
2868 /**************************************/ 2666 /**************************************/
2869 2667
2870 /* remove any poisoning and confusion the character may be suffering. */
2871 /* restore player */
2872 at = archetype::find ("poisoning");
2873 tmp = present_arch_in_ob (at, op);
2874
2875 if (tmp)
2876 {
2877 tmp->destroy ();
2878 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2879 }
2880
2881 at = archetype::find ("confusion");
2882 tmp = present_arch_in_ob (at, op);
2883 if (tmp)
2884 {
2885 tmp->destroy ();
2886 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2887 }
2888
2889 cure_disease (op, 0); /* remove any disease */
2890
2891 /*add_exp(op, (op->stats.exp * -0.20)); */ 2668 /*add_exp(op, (op->stats.exp * -0.20)); */
2892 apply_death_exp_penalty (op); 2669 apply_death_exp_penalty (op);
2893 if (op->stats.food < 100)
2894 op->stats.food = 900;
2895 op->stats.hp = op->stats.maxhp;
2896 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2897 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2898 2670
2899 /* 2671 /*
2900 * Check to see if the player has any unpaid items. If so, remove them 2672 * Check to see if the player has any unpaid items. If so, remove them
2901 * and put them back in the map. 2673 * and put them back in the map.
2902 */ 2674 */
2903 remove_unpaid_objects (op->inv, op); 2675 op->drop_unpaid_items ();
2904 2676
2905 /****************************************/ 2677 /****************************************/
2906 /* */ 2678 /* */
2907 /* Move player to his current respawn- */ 2679 /* Move player to his current respawn- */
2908 /* position (usually last savebed) */ 2680 /* position (usually last savebed) */
… …
2937 if (will_kill_again & (1 << at)) 2709 if (will_kill_again & (1 << at))
2938 force->resist[at] = 100; 2710 force->resist[at] = 100;
2939 2711
2940 insert_ob_in_ob (force, op); 2712 insert_ob_in_ob (force, op);
2941 op->update_stats (); 2713 op->update_stats ();
2942
2943 } 2714 }
2944 2715
2945 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2716 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2946} 2717}
2947 2718
2948void 2719static void
2949loot_object (object *op) 2720loot_object (object *op)
2950{ /* Grab and destroy some treasure */ 2721{ /* Grab and destroy some treasure */
2951 object *tmp, *tmp2, *next; 2722 object *tmp, *tmp2, *next;
2952 2723
2953 op->close_container (); /* close open sack first */ 2724 op->close_container (); /* close open sack first */
… …
2967 2738
2968 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2739 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2969 { 2740 {
2970 if (tmp->nrof > 1) 2741 if (tmp->nrof > 1)
2971 { 2742 {
2972 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2743 tmp->decrease (rndm (1, tmp->nrof - 1));
2973 tmp2->destroy ();
2974 insert_ob_in_map (tmp, op->map, NULL, 0); 2744 insert_ob_in_map (tmp, op->map, NULL, 0);
2975 } 2745 }
2976 else 2746 else
2977 tmp->destroy (); 2747 tmp->destroy ();
2978 } 2748 }
… …
2985 * fix_weight(): Check recursively the weight of all players, and fix 2755 * fix_weight(): Check recursively the weight of all players, and fix
2986 * what needs to be fixed. Refresh windows and fix speed if anything 2756 * what needs to be fixed. Refresh windows and fix speed if anything
2987 * was changed. 2757 * was changed.
2988 */ 2758 */
2989void 2759void
2990fix_weight (void) 2760fix_weight ()
2991{ 2761{
2992 for_all_players (pl) 2762 for_all_players (pl)
2993 { 2763 {
2994 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2764 sint32 old = pl->ob->carrying;
2995 2765
2996 if (old == sum) 2766 pl->ob->update_weight ();
2997 continue; 2767
2768 if (old != pl->ob->carrying)
2769 {
2998 pl->ob->update_stats (); 2770 pl->ob->update_stats ();
2999 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2771 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2772 }
3000 } 2773 }
3001} 2774}
3002 2775
3003void 2776void
3004fix_luck (void) 2777fix_luck ()
3005{ 2778{
3006 for_all_players (pl) 2779 for_all_players (pl)
3007 if (!pl->ob->contr->ns->state) 2780 if (!pl->ob->contr->ns->state)
3008 pl->ob->change_luck (0); 2781 pl->ob->change_luck (0);
3009} 2782}
… …
3046} 2819}
3047 2820
3048void 2821void
3049make_visible (object *op) 2822make_visible (object *op)
3050{ 2823{
3051 op->hide = 0; 2824 op->flag [FLAG_HIDDEN] = 0;
3052 op->invisible = 0; 2825 op->invisible = 0;
2826
3053 if (op->type == PLAYER) 2827 if (op->type == PLAYER)
3054 { 2828 {
3055 op->contr->tmp_invis = 0; 2829 op->contr->tmp_invis = 0;
3056 op->contr->invis_race = 0; 2830 op->contr->invis_race = 0;
3057 } 2831 }
… …
3060} 2834}
3061 2835
3062int 2836int
3063is_true_undead (object *op) 2837is_true_undead (object *op)
3064{ 2838{
3065 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 2839 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3066 return 1; 2840 return 1;
3067 2841
3068 return 0; 2842 return 0;
3069} 2843}
3070 2844
3071/* look at the surrounding terrain to determine 2845/* look at the surrounding terrain to determine
3072 * the hideability of this object. Positive levels 2846 * the hideability of this object. Positive levels
3073 * indicate greater hideability. 2847 * indicate greater hideability.
3074 */ 2848 */
3075
3076int 2849int
3077hideability (object *ob) 2850hideability (object *ob)
3078{ 2851{
3079 int i, level = 0, mflag; 2852 int i, level = 0, mflag;
3080 sint16 x, y; 2853 sint16 x, y;
3081 2854
3082 if (!ob || !ob->map) 2855 if (!ob || !ob->map)
3083 return 0; 2856 return 0;
3084 2857
3085 /* so, on normal lighted maps, its hard to hide */ 2858 /* so, on normal lighted maps, its hard to hide */
3086 level = ob->map->darkness - 2; 2859 level = ob->map->darklevel () - 2;
3087 2860
3088 /* this also picks up whether the object is glowing. 2861 /* this also picks up whether the object is glowing.
3089 * If you carry a light on a non-dark map, its not 2862 * If you carry a light on a non-dark map, its not
3090 * as bad as carrying a light on a pitch dark map */ 2863 * as bad as carrying a light on a pitch dark map */
3091 if (has_carried_lights (ob)) 2864 if (ob->has_carried_lights ())
3092 level = -(10 + (2 * ob->map->darkness)); 2865 level = -(10 + (2 * ob->map->darklevel ()));
3093 2866
3094 /* scan through all nearby squares for terrain to hide in */ 2867 /* scan through all nearby squares for terrain to hide in */
3095 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2868 for (i = 0, x = ob->x, y = ob->y;
2869 i <= SIZEOFFREE1;
2870 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3096 { 2871 {
3097 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2872 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3098 if (mflag & P_OUT_OF_MAP) 2873 if (mflag & P_OUT_OF_MAP)
3099 {
3100 continue; 2874 continue;
3101 } 2875
3102 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2876 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3103 level += 2; 2877 level += 2;
3104 else /* open terrain! */ 2878 else /* open terrain! */
3105 level -= 1; 2879 level -= 1;
3106 } 2880 }
… …
3114/* For Hidden creatures - a chance of becoming 'unhidden' 2888/* For Hidden creatures - a chance of becoming 'unhidden'
3115 * every time they move - as we subtract off 'invisibility' 2889 * every time they move - as we subtract off 'invisibility'
3116 * AND, for players, if they move into a ridiculously unhideable 2890 * AND, for players, if they move into a ridiculously unhideable
3117 * spot (surrounded by clear terrain in broad daylight). -b.t. 2891 * spot (surrounded by clear terrain in broad daylight). -b.t.
3118 */ 2892 */
3119
3120void 2893void
3121do_hidden_move (object *op) 2894do_hidden_move (object *op)
3122{ 2895{
3123 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2896 int hide = 0;
3124 object *skop;
3125 2897
3126 if (!op || !op->map) 2898 if (!op || !op->map)
3127 return; 2899 return;
3128 2900
3129 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 2901 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
2902 int num = random_roll (0, 19, op, PREFER_LOW);
3130 2903
3131 /* its *extremely* hard to run and sneak/hide at the same time! */ 2904 /* its *extremely* hard to run and sneak/hide at the same time! */
3132 if (op->type == PLAYER && op->contr->run_on) 2905 if (op->type == PLAYER && op->contr->run_on)
3133 if (!skop || num >= skop->level) 2906 if (!skop || num >= skop->level)
3134 { 2907 {
… …
3144 num -= hide; 2917 num -= hide;
3145 2918
3146 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 2919 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3147 { 2920 {
3148 make_visible (op); 2921 make_visible (op);
2922
3149 if (op->type == PLAYER) 2923 if (op->type == PLAYER)
3150 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 2924 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3151 } 2925 }
3152 else if (op->type == PLAYER && skop) 2926 else if (op->type == PLAYER && skop)
3153 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 2927 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3206 * object op. This function works fine for monsters, 2980 * object op. This function works fine for monsters,
3207 * but we dont worry if the object isnt the top one in 2981 * but we dont worry if the object isnt the top one in
3208 * a pile (say a coin under a table would return "viewable" 2982 * a pile (say a coin under a table would return "viewable"
3209 * by this routine). Another question, should we be 2983 * by this routine). Another question, should we be
3210 * concerned with the direction the player is looking 2984 * concerned with the direction the player is looking
3211 * in? Realistically, most of use cant see stuff behind 2985 * in? Realistically, most of us can't see stuff behind
3212 * our backs...on the other hand, does the "facing" direction 2986 * our backs...on the other hand, does the "facing" direction
3213 * imply the way your head, or body is facing? Its possible 2987 * imply the way your head, or body is facing? It's possible
3214 * for them to differ. Sigh, this fctn could get a bit more complex. 2988 * for them to differ. Sigh, this fctn could get a bit more complex.
3215 * -b.t. 2989 * -b.t.
3216 * This function is now map tiling safe. 2990 * This function is now map tiling safe.
3217 */ 2991 */
3218
3219int 2992int
3220player_can_view (object *pl, object *op) 2993player_can_view (object *pl, object *op)
3221{ 2994{
3222 rv_vector rv; 2995 rv_vector rv;
3223 int dx, dy; 2996 int dx, dy;
… …
3235 3008
3236 get_rangevector (pl, op, &rv, 0x1); 3009 get_rangevector (pl, op, &rv, 0x1);
3237 3010
3238 /* starting with the 'head' part, lets loop 3011 /* starting with the 'head' part, lets loop
3239 * through the object and find if it has any 3012 * through the object and find if it has any
3240 * part that is in the los array but isnt on 3013 * part that is in the los array but isn't on
3241 * a blocked los square. 3014 * a blocked los square.
3242 * we use the archetype to figure out offsets. 3015 * we use the archetype to figure out offsets.
3243 */ 3016 */
3244 while (op) 3017 while (op)
3245 { 3018 {
3246 dx = rv.distance_x + op->arch->clone.x; 3019 dx = rv.distance_x + op->arch->x;
3247 dy = rv.distance_y + op->arch->clone.y; 3020 dy = rv.distance_y + op->arch->y;
3248 3021
3249 /* only the viewable area the player sees is updated by LOS 3022 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3250 * code, so we need to restrict ourselves to that range of values
3251 * for any meaningful values.
3252 */
3253 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3254 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3255 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3256 return 1; 3023 return 1;
3024
3257 op = op->more; 3025 op = op->more;
3258 } 3026 }
3259 return 0;
3260}
3261 3027
3262/* routine for both players and monsters. We call this when
3263 * there is a possibility for our action distrubing our hiding
3264 * place or invisiblity spell. Artefact invisiblity is not
3265 * effected by this. If we arent invisible to begin with, we
3266 * return 0.
3267 */
3268int
3269action_makes_visible (object *op)
3270{
3271
3272 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3273 {
3274 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3275 return 0;
3276
3277 if (op->contr && op->contr->tmp_invis == 0)
3278 return 0;
3279
3280 /* If monsters, they should become visible */
3281 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3282 {
3283 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3284 return 1;
3285 }
3286 }
3287 return 0; 3028 return 0;
3288} 3029}
3289 3030
3290/* op_on_battleground - checks if the given object op (usually 3031/* op_on_battleground - checks if the given object op (usually
3291 * a player) is standing on a valid battleground-tile, 3032 * a player) is standing on a valid battleground-tile,
… …
3296 * Default is to do the same as before, so only people wanting to have different points need worry about this 3037 * Default is to do the same as before, so only people wanting to have different points need worry about this
3297 */ 3038 */
3298int 3039int
3299op_on_battleground (object *op, int *x, int *y) 3040op_on_battleground (object *op, int *x, int *y)
3300{ 3041{
3301 object *tmp;
3302
3303 /* A battleground-tile needs the following attributes to be valid: 3042 /* A battleground-tile needs the following attributes to be valid:
3304 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3043 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3305 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3044 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3306 * and the exit-coordinates sp/hp must both be > 0. 3045 * and the exit-coordinates sp/hp must both be > 0.
3307 * => The intention here is to prevent abuse of the battleground- 3046 * => The intention here is to prevent abuse of the battleground-
3308 * feature (like pickable or hidden battleground tiles). */ 3047 * feature (like pickable or hidden battleground tiles). */
3309 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3048 for (object *tmp = op->below; tmp; tmp = tmp->below)
3310 { 3049 {
3311 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3050 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3312 { 3051 {
3313 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3052 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3314 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3053 && tmp->type == BATTLEGROUND
3054 && tmp->name == shstr_battleground
3055 && EXIT_X (tmp) && EXIT_Y (tmp))
3315 { 3056 {
3316 /*before we assign the exit, check if this is a teambattle */ 3057 /* before we assign the exit, check if this is a teambattle */
3317 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3058 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3318 {
3319 object *invtmp;
3320
3321 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3059 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3060 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3322 { 3061 {
3323 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))
3324 {
3325 if (x != NULL && y != NULL) 3062 if (x && y)
3326 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3063 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3064
3327 return 1; 3065 return 1;
3328 }
3329 } 3066 }
3330 } 3067
3331 if (x != NULL && y != NULL) 3068 if (x && y)
3332 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3069 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3070
3333 return 1; 3071 return 1;
3334 } 3072 }
3335 } 3073 }
3336 } 3074 }
3075
3337 /* If we got here, did not find a battleground */ 3076 /* If we got here, did not find a battleground */
3338 return 0; 3077 return 0;
3339} 3078}
3340 3079
3341/* 3080/*
… …
3357 char buf[MAX_BUF]; /* tmp. string buffer */ 3096 char buf[MAX_BUF]; /* tmp. string buffer */
3358 int i = 0, j = 0; 3097 int i = 0, j = 0;
3359 3098
3360 /* get the appropriate treasurelist */ 3099 /* get the appropriate treasurelist */
3361 if (atnr == ATNR_FIRE) 3100 if (atnr == ATNR_FIRE)
3362 trlist = treasurelist::find ("dragon_ability_fire"); 3101 trlist = treasurelist::find (shstr_dragon_ability_fire);
3363 else if (atnr == ATNR_COLD) 3102 else if (atnr == ATNR_COLD)
3364 trlist = treasurelist::find ("dragon_ability_cold"); 3103 trlist = treasurelist::find (shstr_dragon_ability_cold);
3365 else if (atnr == ATNR_ELECTRICITY) 3104 else if (atnr == ATNR_ELECTRICITY)
3366 trlist = treasurelist::find ("dragon_ability_elec"); 3105 trlist = treasurelist::find (shstr_dragon_ability_elec);
3367 else if (atnr == ATNR_POISON) 3106 else if (atnr == ATNR_POISON)
3368 trlist = treasurelist::find ("dragon_ability_poison"); 3107 trlist = treasurelist::find (shstr_dragon_ability_poison);
3369 3108
3370 if (trlist == NULL || who->type != PLAYER) 3109 if (trlist == NULL || who->type != PLAYER)
3371 return; 3110 return;
3372 3111
3373 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3112 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3377 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3116 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3378 return; 3117 return;
3379 } 3118 }
3380 3119
3381 /* everything seems okay - now bring on the gift: */ 3120 /* everything seems okay - now bring on the gift: */
3382 item = &(tr->item->clone); 3121 item = tr->item;
3383 3122
3384 if (item->type == SPELL) 3123 if (item->type == SPELL)
3385 { 3124 {
3386 if (check_spell_known (who, item->name)) 3125 if (check_spell_known (who, item->name))
3387 return; 3126 return;
… …
3446 { 3185 {
3447 /* forces in the treasurelist can alter the player's stats */ 3186 /* forces in the treasurelist can alter the player's stats */
3448 object *skin; 3187 object *skin;
3449 3188
3450 /* first get the dragon skin force */ 3189 /* first get the dragon skin force */
3451 shstr_cmp dragon_skin_force ("dragon_skin_force");
3452 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3190 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3453 ; 3191 ;
3454 3192
3455 if (!skin) 3193 if (!skin)
3456 return; 3194 return;
3457 3195
… …
3490 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3228 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3491 } 3229 }
3492 else 3230 else
3493 { 3231 {
3494 /* generate misc. treasure */ 3232 /* generate misc. treasure */
3495 tmp = arch_to_object (tr->item); 3233 tmp = tr->item->instance ();
3496 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3234 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3497 tmp = insert_ob_in_ob (tmp, who); 3235 who->insert (tmp);
3498 if (who->type == PLAYER)
3499 esrv_send_item (who, tmp);
3500 } 3236 }
3501} 3237}
3502 3238
3503/** 3239//-GPL
3504 * Unready an object for a player. This function does nothing if the object was
3505 * not readied.
3506 */
3507void
3508player_unready_range_ob (player *pl, object *ob)
3509{
3510 if (pl->ob->current_weapon == ob)
3511 pl->ob->current_weapon = 0;
3512
3513 if (pl->combat_ob == ob)
3514 pl->combat_ob = 0;
3515
3516 if (pl->ranged_ob == ob)
3517 pl->ranged_ob = 0;
3518}
3519 3240
3520sint8 3241sint8
3521player::visibility_at (maptile *map, int x, int y) const 3242player::darkness_at (maptile *map, int x, int y) const
3522{ 3243{
3523 if (!ns) 3244 if (!ns)
3524 return 0; 3245 return LOS_BLOCKED;
3525 3246
3526 int dx, dy; 3247 int dx, dy;
3527 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3248 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3528 return 0; 3249 return LOS_BLOCKED;
3529 3250
3530 x += dx - ns->current_x + ns->mapx / 2; 3251 x += dx - ns->current_x;
3531 y += dy - ns->current_y + ns->mapy / 2; 3252 y += dy - ns->current_y;
3532 3253
3533 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3534 return 0;
3535
3536 return 100 - blocked_los [x][y]; 3254 return blocked_los (x, y);
3537} 3255}
3256
3257void
3258player::infobox (const char *title, const char *msg, int color)
3259{
3260 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3261}
3262
3263void
3264player::statusmsg (const char *msg, int color)
3265{
3266 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3267}
3268
3269void
3270player::failmsg (const char *msg, int color)
3271{
3272 play_sound (sound_find ("generic_failure"));
3273 statusmsg (msg, color);
3274}
3275

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines