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