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

Diff Legend

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