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.136 by root, Wed May 16 11:10:01 2007 UTC vs.
Revision 1.298 by root, Sun Jan 29 03:59:15 2017 UTC

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

Diff Legend

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