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

Diff Legend

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