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.152 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.267 by root, Wed Apr 7 18:35:56 2010 UTC

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

Diff Legend

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