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.88 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC

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

Diff Legend

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