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.133 by root, Sat May 12 22:04:20 2007 UTC vs.
Revision 1.246 by root, Wed Nov 11 04:45:23 2009 UTC

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

Diff Legend

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