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