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

Diff Legend

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