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

Diff Legend

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