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.37 by root, Thu Dec 14 02:37:37 2006 UTC vs.
Revision 1.295 by root, Thu Nov 17 04:49:22 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 (client_socket * 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 712
1067 treasurelist *tl = find_treasurelist ("starting_wealth"); 713 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
1068 if (tl) 714 if (tl)
1069 create_treasure (tl, op, 0, 0, 0); 715 create_treasure (tl, ob, 0, 0, 0);
1070 716
1071 INVOKE_PLAYER (BIRTH, op->contr); 717 INVOKE_PLAYER (BIRTH, ob->contr);
1072 INVOKE_PLAYER (LOGIN, op->contr);
1073 718
1074 op->contr->state = ST_PLAYING; 719 ob->contr->ns->state = ST_PLAYING;
1075 720
1076 if (op->msg) 721 if (ob->msg)
1077 op->msg = NULL; 722 ob->msg = 0;
1078 723
1079 /* We create this now because some of the unique maps will need it
1080 * to save here.
1081 */
1082 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
1083 make_path_to_file (buf);
1084
1085#ifdef AUTOSAVE
1086 op->contr->last_save_tick = pticks;
1087#endif
1088 start_info (op); 724 start_info (ob);
1089 CLEAR_FLAG (op, FLAG_WIZ); 725 ob->clr_flag (FLAG_WIZ);
1090 give_initial_items (op, op->randomitems); 726 give_initial_items (ob, ob->randomitems);
1091 link_player_skills (op);
1092 esrv_send_inventory (op, op); 727 esrv_send_inventory (ob, ob);
1093 fix_player (op); 728 ob->update_stats ();
1094 729
1095 /* This moves the player to a different start map, if there 730 /* This moves the player to a different start map, if there
1096 * is one for this race 731 * is one for this race
1097 */ 732 */
1098 if (*first_map_ext_path) 733 if (*first_map_ext_path)
1099 { 734 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
1100 object *tmp;
1101 char mapname[MAX_BUF];
1102
1103 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);
1104 tmp = object::create ();
1105 EXIT_PATH (tmp) = mapname;
1106 EXIT_X (tmp) = op->x;
1107 EXIT_Y (tmp) = op->y;
1108 enter_exit (op, tmp); /* we don't really care if it succeeded;
1109 * if the map isn't there, then stay on the
1110 * default initial map */
1111 tmp->destroy ();
1112 }
1113 else 735 else
1114 {
1115 LOG (llevDebug, "first_map_ext_path not set\n"); 736 LOG (llevDebug, "first_map_ext_path not set\n");
1116 } 737}
1117 return 0;
1118 }
1119 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{
1120 /* Following actually changes the race - this is the default command 761 /* Following actually changes the race - this is the default command
1121 * if we don't match with one of the options above. 762 * if we don't match with one of the options above.
1122 */ 763 */
1123 764
1124 tmp_loop = 0; 765 do
1125 while (!tmp_loop)
1126 { 766 {
1127 shstr name = op->name; 767 shstr name = ob->name;
1128 int x = op->x, y = op->y; 768 int x = ob->x, y = ob->y;
1129 769
1130 remove_statbonus (op); 770 ob->remove_statbonus ();
1131 op->remove (); 771 ob->remove ();
1132 op->arch = get_player_archetype (op->arch); 772 ob->arch = get_player_archetype (ob->arch);
1133 op->arch->clone.copy_to (op); 773 ob->arch->copy_to (ob);
1134 op->instantiate (); 774 ob->instantiate ();
1135 op->stats = op->contr->orig_stats; 775 ob->stats = ob->contr->orig_stats;
1136 op->name = op->name_pl = name; 776 ob->name = ob->name_pl = name;
1137 op->x = x; 777 ob->x = x;
1138 op->y = y; 778 ob->y = y;
1139 SET_ANIMATION (op, 2); /* So player faces south */ 779 SET_ANIMATION (ob, 2); /* So player faces south */
1140 insert_ob_in_map (op, op->map, op, 0); 780 insert_ob_in_map (ob, ob->map, ob, 0);
1141 assign (op->contr->title, op->arch->clone.name); 781 assign (ob->contr->title, ob->arch->object::name);
1142 add_statbonus (op); 782 ob->add_statbonus ();
1143 tmp_loop = allowed_class (op);
1144 } 783 }
784 while (!allowed_class (ob));
1145 785
1146 update_object (op, UP_OBJ_FACE); 786 update_object (ob, UP_OBJ_FACE);
1147 esrv_update_item (UPD_FACE, op, op); 787 esrv_update_item (UPD_FACE, ob, ob);
1148 fix_player (op); 788 ob->update_stats ();
1149 op->stats.hp = op->stats.maxhp; 789 ob->stats.hp = ob->stats.maxhp;
1150 op->stats.sp = op->stats.maxsp; 790 ob->stats.sp = ob->stats.maxsp;
1151 op->stats.grace = 0; 791 ob->stats.grace = 0;
1152
1153 if (op->msg)
1154 new_draw_info (NDI_BLUE, 0, op, op->msg);
1155
1156 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1157 return 0;
1158} 792}
1159 793
1160int 794static void
1161key_confirm_quit (object *op, char key)
1162{
1163 char buf[MAX_BUF];
1164
1165 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1166 {
1167 op->contr->state = ST_PLAYING;
1168 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1169 return 1;
1170 }
1171
1172 INVOKE_PLAYER (LOGOUT, op->contr);
1173 INVOKE_PLAYER (QUIT, op->contr);
1174
1175 terminate_all_pets (op);
1176 leave_map (op);
1177 op->direction = 0;
1178 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1179
1180 strcpy (op->contr->killer, "quit");
1181 check_score (op);
1182 op->contr->party = NULL;
1183 if (settings.set_title == TRUE)
1184 op->contr->own_title[0] = '\0';
1185
1186 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1187 {
1188 maptile *mp, *next;
1189
1190 /* We need to hunt for any per player unique maps in memory and
1191 * get rid of them. The trailing slash in the path is intentional,
1192 * so that players named 'Ab' won't match against players 'Abe' pathname
1193 */
1194 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1195 for (mp = first_map; mp != NULL; mp = next)
1196 {
1197 next = mp->next;
1198 if (!strncmp (mp->path, buf, strlen (buf)))
1199 delete_map (mp);
1200 }
1201
1202 delete_character (op->name, 1);
1203 }
1204
1205 play_again (op);
1206 return 1;
1207}
1208
1209void
1210flee_player (object *op) 795flee_player (object *op)
1211{ 796{
1212 int dir, diff; 797 int dir, diff;
1213 rv_vector rv; 798 rv_vector rv;
1214 799
1215 if (op->stats.hp < 0) 800 if (op->stats.hp < 0)
1216 { 801 {
1217 LOG (llevDebug, "Fleeing player is dead.\n"); 802 LOG (llevDebug, "Fleeing player is dead.\n");
1218 CLEAR_FLAG (op, FLAG_SCARED); 803 op->clr_flag (FLAG_SCARED);
1219 return; 804 return;
1220 } 805 }
1221 806
1222 if (op->enemy == NULL) 807 if (!op->enemy)
1223 { 808 {
1224 LOG (llevDebug, "Fleeing player had no enemy.\n"); 809 LOG (llevDebug, "Fleeing player had no enemy.\n");
1225 CLEAR_FLAG (op, FLAG_SCARED); 810 op->clr_flag (FLAG_SCARED);
1226 return; 811 return;
1227 } 812 }
1228 813
1229 /* 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))
1230 * op->enemy_count, it is possible that something destroys the
1231 * actual enemy, and the object is recycled.
1232 */
1233 if (op->enemy->map == NULL)
1234 { 815 {
1235 CLEAR_FLAG (op, FLAG_SCARED);
1236 op->enemy = NULL; 816 op->enemy = NULL;
817 op->clr_flag (FLAG_SCARED);
1237 return; 818 return;
1238 } 819 }
1239 820
1240 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
1241 {
1242 op->enemy = NULL;
1243 CLEAR_FLAG (op, FLAG_SCARED);
1244 return;
1245 }
1246 get_rangevector (op, op->enemy, &rv, 0); 821 get_rangevector (op, op->enemy, &rv, 0);
1247 822
1248 dir = absdir (4 + rv.direction); 823 dir = absdir (4 + rv.direction);
1249 for (diff = 0; diff < 3; diff++) 824 for (diff = 0; diff < 3; diff++)
1250 { 825 {
1251 int m = 1 - (RANDOM () & 2); 826 int m = 1 - rndm (2) * 2;
1252 827
1253 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))))
1254 {
1255 return; 829 return;
1256 }
1257 } 830 }
831
1258 /* Cornered, get rid of scared */ 832 /* Cornered, get rid of scared */
1259 CLEAR_FLAG (op, FLAG_SCARED); 833 op->clr_flag (FLAG_SCARED);
1260 op->enemy = NULL; 834 op->enemy = NULL;
1261} 835}
1262 836
1263
1264/* 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.
1265 * 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
1266 * stop. 839 * stop.
1267 */ 840 */
1268int 841int
1269check_pick (object *op) 842check_pick (object *op)
1270{ 843{
1271 object *tmp, *next; 844 object *tmp, *next;
1272 int stop = 0; 845 int stop = 0;
1273 int j, k, wvratio; 846 int wvratio;
1274 char putstring[128], tmpstr[16];
1275 847
1276 /* if you're flying, you cna't pick up anything */ 848 /* if you're flying, you can't pick up anything */
1277 if (op->move_type & MOVE_FLYING) 849 if (op->move_type & MOVE_FLYING)
1278 return 1; 850 return 1;
1279 851
1280 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)
1281 856
1282 /* 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
1283 * destroyed */ 858 * destroyed */
1284 while (next && !next->destroyed ()) 859 while (next && !next->destroyed ())
1285 { 860 {
1286 tmp = next; 861 tmp = next;
1287 next = tmp->below; 862 next = tmp->below;
1288 863
864 if (cnt <= 0)
865 {
866 op->failmsg ("Couldn't pickup all items at once.");
867 return 0;
868 }
869
1289 if (op->destroyed ()) 870 if (op->destroyed ())
1290 return 0; 871 return 0;
1291 872
1292 if (!can_pick (op, tmp)) 873 if (!can_pick (op, tmp))
1293 continue; 874 continue;
1294 875
1295 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 876 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1296 { 877 {
1297 if (item_matched_string (op, tmp, op->contr->search_str)) 878 if (item_matched_string (op, tmp, op->contr->search_str))
1298 pick_up (op, tmp); 879 CHK_PICK_PICKUP;
880
1299 continue; 881 continue;
1300 } 882 }
1301 883
1302 /* 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? */
1303 if (!(op->contr->mode & PU_NEWMODE)) 944 if (op->contr->mode & PU_FOOD)
945 if (tmp->type == FOOD)
1304 { 946 {
1305 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)
1306 { 1010 {
1307 case 0: 1011 CHK_PICK_PICKUP;
1308 return 1; /* don't pick up */ 1012 continue;
1309 case 1:
1310 pick_up (op, tmp);
1311 return 1;
1312 case 2:
1313 pick_up (op, tmp);
1314 return 0;
1315 case 3:
1316 return 0; /* stop before pickup */
1317 case 4:
1318 pick_up (op, tmp);
1319 break;
1320 case 5:
1321 pick_up (op, tmp);
1322 stop = 1;
1323 break;
1324 case 6:
1325 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1326 pick_up (op, tmp);
1327 break;
1328
1329 case 7:
1330 if (tmp->type == MONEY || tmp->type == GEM)
1331 pick_up (op, tmp);
1332 break;
1333
1334 default:
1335 /* use value density */
1336 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1337 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1338 pick_up (op, tmp);
1339 } 1013 }
1340 } 1014 }
1341 else 1015
1342 { /* old model */ 1016 /* rings & amulets - talismans seems to be typed AMULET */
1343 /* NEW pickup handling */
1344 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)
1345 { 1022 {
1346 /* some debugging code to figure out item information */ 1023 CHK_PICK_PICKUP;
1347 if (tmp->name != NULL)
1348 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1349 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1350 else
1351 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1352 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1353 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1354
1355 sprintf (putstring, "...flags: ");
1356 for (k = 0; k < 4; k++)
1357 {
1358 for (j = 0; j < 32; j++)
1359 {
1360 if ((tmp->flags[k] >> j) & 0x01)
1361 {
1362 sprintf (tmpstr, "%d ", k * 32 + j);
1363 strcat (putstring, tmpstr);
1364 }
1365 }
1366 }
1367 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1368
1369#if 0
1370 /* print the flags too */
1371 for (k = 0; k < 4; k++)
1372 {
1373 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1374 for (j = 0; j < 32; j++)
1375 {
1376 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1377 if (!((j + 1) % 4))
1378 fprintf (stderr, " ");
1379 }
1380 fprintf (stderr, " [%d]\n", k * 32);
1381 }
1382#endif
1383 }
1384 /* philosophy:
1385 * It's easy to grab an item type from a pile, as long as it's
1386 * generic. This takes no game-time. For more detailed pickups
1387 * and selections, select-items shoul dbe used. This is a
1388 * grab-as-you-run type mode that's really useful for arrows for
1389 * example.
1390 * The drawback: right now it has no frontend, so you need to
1391 * stick the bits you want into a calculator in hex mode and then
1392 * convert to decimal and then 'pickup <#>
1393 */
1394
1395 /* the first two modes are exclusive: if NOTHING we return, if
1396 * STOP then we stop. All the rest are applied sequentially,
1397 * meaning if any test passes, the item gets picked up. */
1398
1399 /* if mode is set to pick nothing up, return */
1400
1401 if (op->contr->mode & PU_NOTHING)
1402 return 1;
1403
1404 /* if mode is set to stop when encountering objects, return */
1405 /* take STOP before INHIBIT since it doesn't actually pick
1406 * anything up */
1407
1408 if (op->contr->mode & PU_STOP)
1409 return 0;
1410
1411 /* useful for going into stores and not losing your settings... */
1412 /* and for battles wher you don't want to get loaded down while
1413 * fighting */
1414 if (op->contr->mode & PU_INHIBIT)
1415 return 1;
1416
1417 /* prevent us from turning into auto-thieves :) */
1418 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1419 continue; 1024 continue;
1025 }
1420 1026
1421 /* ignore known cursed objects */ 1027 /* we don't forget dragon food */
1422 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;
1423 continue; 1032 continue;
1033 }
1424 1034
1425 /* all food and drink if desired */ 1035 /* bows and arrows. Bows are good for selling! */
1426 /* 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
1427 if (op->contr->mode & PU_FOOD) 1072 if (op->contr->mode & PU_BOOTS)
1428 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"))
1429 { 1106 {
1430 pick_up (op, tmp); 1107 CHK_PICK_PICKUP;
1431 continue; 1108 continue;
1432 } 1109 }
1110 }
1433 1111
1112 /* misc stuff that's useful */
1434 if (op->contr->mode & PU_DRINK) 1113 if (op->contr->mode & PU_KEY)
1435 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1114 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1436 { 1115 {
1437 pick_up (op, tmp); 1116 CHK_PICK_PICKUP;
1438 continue; 1117 continue;
1439 } 1118 }
1440 1119
1120 /* any of the last 4 bits set means we use the ratio for value
1121 * pickups */
1441 if (op->contr->mode & PU_POTION) 1122 if (op->contr->mode & PU_RATIO)
1442 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
1443 { 1127 */
1444 pick_up (op, tmp);
1445 continue;
1446 }
1447
1448 /* spellbooks, skillscrolls and normal books/scrolls */
1449 if (op->contr->mode & PU_SPELLBOOK)
1450 if (tmp->type == SPELLBOOK)
1451 {
1452 pick_up (op, tmp);
1453 continue;
1454 }
1455
1456 if (op->contr->mode & PU_SKILLSCROLL)
1457 if (tmp->type == SKILLSCROLL)
1458 {
1459 pick_up (op, tmp);
1460 continue;
1461 }
1462
1463 if (op->contr->mode & PU_READABLES)
1464 if (tmp->type == BOOK || tmp->type == SCROLL)
1465 {
1466 pick_up (op, tmp);
1467 continue;
1468 }
1469
1470 /* wands/staves/rods/horns */
1471 if (op->contr->mode & PU_MAGIC_DEVICE)
1472 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1473 {
1474 pick_up (op, tmp);
1475 continue;
1476 }
1477
1478 /* pick up all magical items */
1479 if (op->contr->mode & PU_MAGICAL) 1128 wvratio = op->contr->mode & PU_RATIO;
1480 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)
1481 {
1482 pick_up (op, tmp);
1483 continue;
1484 }
1485
1486 if (op->contr->mode & PU_VALUABLES)
1487 { 1130 {
1488 if (tmp->type == MONEY || tmp->type == GEM) 1131#if 0
1132 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1133 if (tmp->name != NULL)
1489 { 1134 {
1490 pick_up (op, tmp); 1135 fprintf (stderr, "%s", tmp->name);
1491 continue;
1492 } 1136 }
1493 }
1494
1495 /* rings & amulets - talismans seems to be typed AMULET */
1496 if (op->contr->mode & PU_JEWELS)
1497 if (tmp->type == RING || tmp->type == AMULET)
1498 {
1499 pick_up (op, tmp);
1500 continue;
1501 }
1502
1503 /* we don't forget dragon food */
1504 if (op->contr->mode & PU_FLESH)
1505 if (tmp->type == FLESH)
1506 {
1507 pick_up (op, tmp);
1508 continue;
1509 }
1510
1511 /* bows and arrows. Bows are good for selling! */
1512 if (op->contr->mode & PU_BOW)
1513 if (tmp->type == BOW)
1514 {
1515 pick_up (op, tmp);
1516 continue;
1517 }
1518
1519 if (op->contr->mode & PU_ARROW)
1520 if (tmp->type == ARROW)
1521 {
1522 pick_up (op, tmp);
1523 continue;
1524 }
1525
1526 /* all kinds of armor etc. */
1527 if (op->contr->mode & PU_ARMOUR)
1528 if (tmp->type == ARMOUR)
1529 {
1530 pick_up (op, tmp);
1531 continue;
1532 }
1533
1534 if (op->contr->mode & PU_HELMET)
1535 if (tmp->type == HELMET)
1536 {
1537 pick_up (op, tmp);
1538 continue;
1539 }
1540
1541 if (op->contr->mode & PU_SHIELD)
1542 if (tmp->type == SHIELD)
1543 {
1544 pick_up (op, tmp);
1545 continue;
1546 }
1547
1548 if (op->contr->mode & PU_BOOTS)
1549 if (tmp->type == BOOTS)
1550 {
1551 pick_up (op, tmp);
1552 continue;
1553 }
1554
1555 if (op->contr->mode & PU_GLOVES)
1556 if (tmp->type == GLOVES)
1557 {
1558 pick_up (op, tmp);
1559 continue;
1560 }
1561
1562 if (op->contr->mode & PU_CLOAK)
1563 if (tmp->type == CLOAK)
1564 {
1565 pick_up (op, tmp);
1566 continue;
1567 }
1568
1569 /* hoping to catch throwing daggers here */
1570 if (op->contr->mode & PU_MISSILEWEAPON)
1571 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1572 {
1573 pick_up (op, tmp);
1574 continue;
1575 }
1576
1577 /* careful: chairs and tables are weapons! */
1578 if (op->contr->mode & PU_ALLWEAPON)
1579 {
1580 if (tmp->type == WEAPON && tmp->name != NULL)
1581 {
1582 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&
1583 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
1584 {
1585 pick_up (op, tmp);
1586 continue;
1587 }
1588 }
1589
1590 if (tmp->type == WEAPON && tmp->name == NULL)
1591 {
1592 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
1593 {
1594 pick_up (op, tmp);
1595 continue;
1596 }
1597 }
1598 }
1599
1600 /* misc stuff that's useful */
1601 if (op->contr->mode & PU_KEY)
1602 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1603 {
1604 pick_up (op, tmp);
1605 continue;
1606 }
1607
1608 /* any of the last 4 bits set means we use the ratio for value
1609 * pickups */
1610 if (op->contr->mode & PU_RATIO)
1611 {
1612 /* use value density to decide what else to grab */
1613 /* >=7 was >= op->contr->mode */
1614 /* >=7 is the old standard setting. Now we take the last 4 bits
1615 * and multiply them by 5, giving 0..15*5== 5..75 */
1616 wvratio = (op->contr->mode & PU_RATIO) * 5;
1617 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1618 {
1619 pick_up (op, tmp);
1620#if 0
1621 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1622 if (tmp->name != NULL)
1623 {
1624 fprintf (stderr, "%s", tmp->name);
1625 }
1626 else 1137 else
1627 fprintf (stderr, "%s", tmp->arch->name); 1138 fprintf (stderr, "%s", tmp->arch->archname);
1628 fprintf (stderr, ",%d] = ", tmp->type); 1139 fprintf (stderr, ",%d] = ", tmp->type);
1629 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))));
1630#endif 1141#endif
1142 CHK_PICK_PICKUP;
1631 continue; 1143 continue;
1632 }
1633 } 1144 }
1634 } /* the new pickup model */ 1145 } /* the new pickup model */
1635 } 1146 }
1636 1147
1637 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;
1638} 1184}
1639 1185
1640/* 1186/*
1641 * Find an arrow in the inventory and after that 1187 * Find an arrow in the inventory and after that
1642 * in the right type container (quiver). Pointer to the 1188 * in the right type container (quiver). Pointer to the
1643 * found object is returned. 1189 * found object is returned.
1644 */ 1190 */
1645object * 1191static object *
1646find_arrow (object *op, const char *type) 1192find_arrow (object *op, const char *type)
1647{ 1193{
1648 object *tmp = NULL;
1649
1650 for (op = op->inv; op; op = op->below) 1194 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1651 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1652 tmp = find_arrow (op, type);
1653 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);
1654 return op; 1203 return arrow;
1204 }
1205
1655 return tmp; 1206 return 0;
1656} 1207}
1657 1208
1658/* 1209/*
1659 * 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
1660 * 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
1661 * 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
1662 * 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.
1663 */ 1214 */
1664 1215static object *
1665object *
1666find_better_arrow (object *op, object *target, const char *type, int *better) 1216find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1667{ 1217{
1668 object *tmp = NULL, *arrow, *ntmp; 1218 object *tmp = NULL, *arrow, *ntmp;
1669 int attacknum, attacktype, betterby = 0, i; 1219 int attacknum, attacktype, betterby = 0, i;
1670 1220
1671 if (!type) 1221 if (!type)
1672 return NULL; 1222 return NULL;
1673 1223
1674 for (arrow = op->inv; arrow; arrow = arrow->below) 1224 for (arrow = op->inv; arrow; arrow = arrow->below)
1675 { 1225 {
1676 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1226 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1677 { 1227 {
1678 i = 0; 1228 i = 0;
1679 ntmp = find_better_arrow (arrow, target, type, &i); 1229 ntmp = find_better_arrow (arrow, target, type, &i);
1230
1680 if (i > betterby) 1231 if (i > betterby)
1681 { 1232 {
1682 tmp = ntmp; 1233 tmp = ntmp;
1683 betterby = i; 1234 betterby = i;
1684 } 1235 }
1685 } 1236 }
1686 else if (arrow->type == ARROW && arrow->race == type) 1237 else if (arrow->type == ARROW && arrow->race == type)
1687 { 1238 {
1688 /* allways prefer assasination/slaying */ 1239 /* allways prefer assasination/slaying */
1689 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1240 if (target->race && arrow->slaying.contains (target->race))
1690 { 1241 {
1691 if (arrow->attacktype & AT_DEATH) 1242 if (arrow->attacktype & AT_DEATH)
1692 { 1243 {
1693 *better = 100; 1244 *better = 100;
1694 return arrow; 1245 return arrow;
… …
1702 else 1253 else
1703 { 1254 {
1704 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1255 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1705 { 1256 {
1706 attacktype = 1 << attacknum; 1257 attacktype = 1 << attacknum;
1707 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1258 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1708 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)
1709 { 1260 {
1710 tmp = arrow; 1261 tmp = arrow;
1711 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;
1712 } 1263 }
1713 } 1264 }
1265
1714 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1266 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1715 { 1267 {
1716 tmp = arrow; 1268 tmp = arrow;
1717 betterby = 2 + arrow->magic + arrow->stats.dam; 1269 betterby = 2 + arrow->magic + arrow->stats.dam;
1718 } 1270 }
1271
1719 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1272 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1720 { 1273 {
1721 tmp = arrow; 1274 tmp = arrow;
1722 betterby = 1 + arrow->magic + arrow->stats.dam; 1275 betterby = 1 + arrow->magic + arrow->stats.dam;
1723 } 1276 }
1724 } 1277 }
1725 } 1278 }
1726 } 1279 }
1280
1727 if (tmp == NULL && arrow == NULL) 1281 if (tmp == NULL && arrow == NULL)
1728 return find_arrow (op, type); 1282 return find_arrow (op, type);
1729 1283
1730 *better = betterby; 1284 *better = betterby;
1731 return tmp; 1285 return tmp;
… …
1735 * find_better_arrow to find a decent arrow to use. 1289 * find_better_arrow to find a decent arrow to use.
1736 * op = the shooter 1290 * op = the shooter
1737 * type = bow->race 1291 * type = bow->race
1738 * dir = fire direction 1292 * dir = fire direction
1739 */ 1293 */
1740 1294static object *
1741object *
1742pick_arrow_target (object *op, const char *type, int dir) 1295pick_arrow_target (object *op, shstr_cmp type, int dir)
1743{ 1296{
1744 object *tmp = NULL; 1297 object *tmp = NULL;
1745 maptile *m; 1298 maptile *m;
1746 int i, mflags, found, number; 1299 int i, mflags, found, number;
1747 sint16 x, y; 1300 sint16 x, y;
… …
1762 for (i = 0, found = 0; i < 20; i++) 1315 for (i = 0, found = 0; i < 20; i++)
1763 { 1316 {
1764 x += freearr_x[dir]; 1317 x += freearr_x[dir];
1765 y += freearr_y[dir]; 1318 y += freearr_y[dir];
1766 mflags = get_map_flags (m, &m, x, y, &x, &y); 1319 mflags = get_map_flags (m, &m, x, y, &x, &y);
1320
1767 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1321 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1768 { 1322 {
1769 tmp = NULL; 1323 tmp = 0;
1770 break; 1324 break;
1771 } 1325 }
1772 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)
1773 { 1327 {
1774 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1328 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1775 * perhaps a bad assumption. 1329 * perhaps a bad assumption.
1776 */ 1330 */
1777 tmp = NULL; 1331 tmp = 0;
1778 break; 1332 break;
1779 } 1333 }
1334
1780 if (mflags & P_IS_ALIVE) 1335 if (mflags & P_IS_ALIVE)
1781 {
1782 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)
1783 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1337 if (tmp->flag [FLAG_ALIVE])
1784 {
1785 found++;
1786 break;
1787 }
1788 if (found)
1789 break; 1338 break;
1790 }
1791 } 1339 }
1792 if (tmp == NULL) 1340
1341 if (!tmp)
1793 return find_arrow (op, type); 1342 return find_arrow (op, type);
1794 1343
1795 if (tmp->head) 1344 if (tmp->head)
1796 tmp = tmp->head; 1345 tmp = tmp->head;
1797 1346
… …
1810 */ 1359 */
1811int 1360int
1812fire_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)
1813{ 1362{
1814 object *left, *bow; 1363 object *left, *bow;
1815 int bowspeed, mflags; 1364 int mflags;
1816 maptile *m; 1365 maptile *m;
1817 1366
1818 if (!dir) 1367 if (!dir)
1819 { 1368 {
1820 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!");
1821 return 0; 1370 return 0;
1822 } 1371 }
1823 if (op->type == PLAYER) 1372
1824 bow = op->contr->ranges[range_bow]; 1373 if (op->contr)
1374 bow = op->current_weapon;
1825 else 1375 else
1826 { 1376 {
1827 for (bow = op->inv; bow; bow = bow->below) 1377 for (bow = op->inv; bow; bow = bow->below)
1828 /* 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
1829 * 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.
… …
1834 if (!bow) 1384 if (!bow)
1835 { 1385 {
1836 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1386 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1837 return 0; 1387 return 0;
1838 } 1388 }
1389
1390 // optimisation: move object to top so we will find it quickly again
1391 splay (bow);
1839 } 1392 }
1393
1840 if (!bow->race || !bow->skill) 1394 if (!bow->race || !bow->skill)
1841 { 1395 {
1842 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);
1843 return 0; 1397 return 0;
1844 } 1398 }
1845
1846 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1847
1848 /* penalize ROF for bestarrow */
1849 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1850 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1851 if (bowspeed < 1)
1852 bowspeed = 1;
1853 1399
1854 if (arrow == NULL) 1400 if (arrow == NULL)
1855 { 1401 {
1856 if ((arrow = find_arrow (op, bow->race)) == NULL) 1402 if ((arrow = find_arrow (op, bow->race)) == NULL)
1857 { 1403 {
1858 if (op->type == PLAYER) 1404 if (op->type == PLAYER)
1859 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);
1860 /* 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 */
1861 else 1407 else
1862 CLEAR_FLAG (op, FLAG_READY_BOW); 1408 op->clr_flag (FLAG_READY_BOW);
1409
1863 return 0; 1410 return 0;
1864 } 1411 }
1865 } 1412 }
1413
1866 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1414 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1867 if (mflags & P_OUT_OF_MAP) 1415 if (mflags & P_OUT_OF_MAP)
1868 {
1869 return 0; 1416 return 0;
1870 } 1417
1871 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1418 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1872 { 1419 {
1873 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.");
1874 return 0; 1421 return 0;
1875 } 1422 }
1876 1423
1877 /* this should not happen, but sometimes does */ 1424 /* this should not happen, but sometimes does */
1878 if (arrow->nrof == 0) 1425 if (arrow->nrof == 0)
1879 { 1426 {
1427 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1880 arrow->destroy (); 1428 arrow->destroy ();
1881 return 0; 1429 return 0;
1882 } 1430 }
1883 1431
1884 left = arrow; /* these are arrows left to the player */ 1432 left = arrow; /* these are arrows left to the player */
1885 arrow = get_split_ob (arrow, 1); 1433 arrow = arrow->split ();
1886 if (arrow == NULL) 1434 if (!arrow)
1887 { 1435 {
1888 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);
1889 return 0; 1437 return 0;
1890 } 1438 }
1439
1891 arrow->set_owner (op); 1440 arrow->set_owner (op);
1892 arrow->skill = bow->skill; 1441 arrow->skill = bow->skill;
1893
1894 arrow->direction = dir; 1442 arrow->direction = dir;
1895 arrow->x = sx; 1443
1896 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;
1897 1475
1898 if (op->type == PLAYER) 1476 if (op->type == PLAYER)
1899 { 1477 {
1900 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1901 fix_player (op);
1902 }
1903
1904 SET_ANIMATION (arrow, arrow->direction);
1905 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1906 arrow->stats.hp = arrow->stats.dam;
1907 arrow->stats.grace = arrow->attacktype;
1908 if (arrow->slaying != NULL)
1909 arrow->spellarg = strdup_local (arrow->slaying);
1910
1911 /* Note that this was different for monsters - they got their level
1912 * added to the damage. I think the strength bonus is more proper.
1913 */
1914
1915 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1916
1917 /* update the speed */
1918 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1919 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1920
1921 if (arrow->speed < 1.0)
1922 arrow->speed = 1.0;
1923 update_ob_speed (arrow);
1924 arrow->speed_left = 0;
1925
1926 if (op->type == PLAYER)
1927 {
1928 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1929 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1930 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1931
1932 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;
1933 } 1485 }
1934 else 1486 else
1935 { 1487 {
1936 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1937 arrow->level = op->level; 1488 arrow->level = op->level;
1938 } 1489 arrow->stats.wc -= bow->magic;
1939 1490
1940 if (arrow->attacktype == AT_PHYSICAL) 1491 if (!arrow->slaying)
1492 arrow->slaying = bow->slaying;
1493
1941 arrow->attacktype |= bow->attacktype; 1494 arrow->attacktype |= bow->attacktype;
1495 }
1942 1496
1943 if (bow->slaying != NULL) 1497 wc -= arrow->level;
1944 arrow->slaying = bow->slaying; 1498 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1945 1499
1946 arrow->map = m; 1500 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1947 arrow->move_type = MOVE_FLY_LOW; 1501 arrow->move_type = MOVE_FLY_LOW;
1948 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1502 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1949 1503
1950 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1504 op->play_sound (sound_find ("fire_arrow"));
1951 insert_ob_in_map (arrow, m, op, 0); 1505 m->insert (arrow, sx, sy, op);
1952 1506
1953 if (!arrow->destroyed ()) 1507 if (!arrow->destroyed ())
1954 move_arrow (arrow); 1508 move_arrow (arrow);
1955
1956 if (op->type == PLAYER)
1957 {
1958 if (left->destroyed ())
1959 esrv_del_item (op->contr, left->count);
1960 else
1961 esrv_send_item (op, left);
1962 }
1963 1509
1964 return 1; 1510 return 1;
1965} 1511}
1966 1512
1967/* Special fire code for players - this takes into 1513/* Special fire code for players - this takes into
… …
1969 * but monsters can't. Putting that code here 1515 * but monsters can't. Putting that code here
1970 * makes the fire_bow code much cleaner. 1516 * makes the fire_bow code much cleaner.
1971 * this function should only be called if 'op' is a player, 1517 * this function should only be called if 'op' is a player,
1972 * hence the function name. 1518 * hence the function name.
1973 */ 1519 */
1974int 1520static int
1975player_fire_bow (object *op, int dir) 1521player_fire_bow (object *op, int dir)
1976{ 1522{
1977 int ret = 0, wcmod = 0; 1523 int ret;
1978 1524
1979 if (op->contr->bowtype == bow_bestarrow) 1525 if (op->contr->bowtype == bow_bestarrow)
1980 { 1526 {
1981 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1527 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1982 } 1528 }
1983 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1529 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1984 { 1530 {
1985 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1531 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1986 wcmod = -1;
1987 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1532 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1988 } 1533 }
1989 else if (op->contr->bowtype == bow_threewide) 1534 else if (op->contr->bowtype == bow_threewide)
1990 { 1535 {
1991 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1536 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1992 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1537 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1993 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)]);
1994 } 1539 }
1995 else if (op->contr->bowtype == bow_spreadshot) 1540 else if (op->contr->bowtype == bow_spreadshot)
1996 { 1541 {
1997 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1542 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1998 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1543 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1999 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);
2000
2001 } 1545 }
2002 else 1546 else
2003 { 1547 {
2004 /* Simple case */ 1548 /* Simple case */
2005 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1549 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
2006 } 1550 }
1551
2007 return ret; 1552 return ret;
2008} 1553}
2009
2010 1554
2011/* Fires a misc (wand/rod/horn) object in 'dir'. 1555/* Fires a misc (wand/rod/horn) object in 'dir'.
2012 * Broken apart from 'fire' to keep it more readable. 1556 * Broken apart from 'fire' to keep it more readable.
2013 */ 1557 */
2014void 1558static void
2015fire_misc_object (object *op, int dir) 1559fire_misc_object (object *op, int dir)
2016{ 1560{
2017 object *item; 1561 object *item = op->contr->ranged_ob;
2018 1562
2019 if (!op->contr->ranges[range_misc]) 1563 if (!item)
2020 { 1564 {
2021 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1565 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
2022 return; 1566 return;
2023 } 1567 }
2024 1568
2025 item = op->contr->ranges[range_misc];
2026 if (!item->inv) 1569 if (!item->inv)
2027 { 1570 {
2028 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1571 LOG (llevError, "Object %s lacks a spell\n", &item->name);
2029 return; 1572 return;
2030 } 1573 }
1574
1575 if (!op->apply (item))
1576 return;
1577
2031 if (item->type == WAND) 1578 if (item->type == WAND)
2032 { 1579 {
2033 if (item->stats.food <= 0) 1580 if (item->stats.food <= 0)
2034 { 1581 {
2035 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1582 op->contr->play_sound (sound_find ("wand_poof"));
2036 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1583 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1584
2037 return; 1585 return;
2038 } 1586 }
2039 } 1587 }
2040 else if (item->type == ROD || item->type == HORN) 1588 else if (item->type == ROD || item->type == HORN)
2041 { 1589 {
2042 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1590 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1591
1592 // using the maximum of the rods charge allows at least one spell cast
1593 // for a rod or horn, this fixes some broken rods.
1594 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
2043 { 1595 {
2044 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1596 op->contr->play_sound (sound_find ("wand_poof"));
1597
2045 if (item->type == ROD) 1598 if (item->type == ROD)
2046 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1599 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
2047 else 1600 else
2048 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1601 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1602
2049 return; 1603 return;
2050 } 1604 }
2051 } 1605 }
2052 1606
2053 if (cast_spell (op, item, dir, item->inv, NULL)) 1607 if (cast_spell (op, item, dir, item->inv, NULL))
2054 { 1608 {
2055 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1609 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1610
2056 if (item->type == WAND) 1611 if (item->type == WAND)
2057 { 1612 {
2058 if (!(--item->stats.food)) 1613 if (!(--item->stats.food))
2059 { 1614 {
2060 object *tmp;
2061
2062 if (item->arch) 1615 if (item->arch)
2063 { 1616 {
2064 CLEAR_FLAG (item, FLAG_ANIMATE); 1617 item->clr_flag (FLAG_ANIMATE);
2065 item->face = item->arch->clone.face; 1618 item->face = item->arch->face;
2066 item->speed = 0; 1619 item->set_speed (0);
2067 update_ob_speed (item);
2068 } 1620 }
2069 if ((tmp = is_player_inv (item))) 1621
1622 if (object *pl = item->visible_to ())
2070 esrv_update_item (UPD_ANIM, tmp, item); 1623 esrv_update_item (UPD_ANIM, pl, item);
2071 } 1624 }
2072 } 1625 }
2073 else if (item->type == ROD || item->type == HORN) 1626 else if (item->type == ROD || item->type == HORN)
2074 {
2075 drain_rod_charge (item); 1627 drain_rod_charge (item);
2076 }
2077 } 1628 }
2078} 1629}
2079 1630
2080/* Received a fire command for the player - go and do it. 1631/* Received a fire command for the player - go and do it.
2081 */ 1632 */
2082void 1633bool
2083fire (object *op, int dir) 1634fire (object *who, int dir)
2084{ 1635{
2085 int spellcost = 0; 1636 int spellcost = 0;
2086 1637
1638 player *pl = who->contr;
1639
1640 if (pl->golem)
1641 {
1642 control_golem (who->contr->golem, dir);
1643 return false;
1644 }
1645
1646 object *ob = pl->ranged_ob;
1647
1648 if (!ob)
1649 return false;
1650
1651 if (who->speed_left > 0.f)
1652 --who->speed_left;
1653 else
1654 return false;
1655
1656 if (!who->apply (ob))
1657 return false;
1658
2087 /* check for loss of invisiblity/hide */ 1659 /* check for loss of invisiblity/hide */
2088 if (action_makes_visible (op)) 1660 if (action_makes_visible (who))
2089 make_visible (op); 1661 make_visible (who);
2090 1662
2091 switch (op->contr->shoottype) 1663 switch (ob->type)
2092 { 1664 {
2093 case range_none: 1665 case BOW:
2094 return;
2095
2096 case range_bow:
2097 player_fire_bow (op, dir); 1666 player_fire_bow (who, dir);
2098 return; 1667 break;
2099 1668
2100 case range_magic: /* Casting spells */ 1669 case SPELL:
2101 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1670 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
2102 return; 1671 break;
2103 1672
2104 case range_misc: 1673 case BUILDER:
2105 fire_misc_object (op, dir);
2106 return;
2107
2108 case range_golem: /* Control summoned monsters from scrolls */
2109 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2110 {
2111 op->contr->ranges[range_golem] = 0;
2112 op->contr->shoottype = range_none;
2113 }
2114 else
2115 control_golem (op->contr->ranges[range_golem], dir);
2116 return;
2117
2118 case range_skill:
2119 if (!op->chosen_skill)
2120 {
2121 if (op->type == PLAYER)
2122 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
2123 return;
2124 }
2125 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
2126 return;
2127 case range_builder:
2128 apply_map_builder (op, dir); 1674 apply_map_builder (who, dir);
2129 return; 1675 break;
1676
1677 case SKILL:
1678 do_skill (who, who, ob, dir, 0);
1679 break;
1680
1681 case RANGED:
1682 do_skill (who, ob, who->chosen_skill, dir, 0);
1683 break;
1684
2130 default: 1685 default:
2131 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1686 fire_misc_object (who, dir);
2132 return; 1687 break;
2133 } 1688 }
2134}
2135 1689
1690 return true;
1691}
2136 1692
2137 1693static object *
2138/* find_key
2139 * We try to find a key for the door as passed. If we find a key
2140 * and successfully use it, we return the key, otherwise NULL
2141 * This function merges both normal and locked door, since the logic
2142 * for both is the same - just the specific key is different.
2143 * pl is the player,
2144 * inv is the objects inventory to searched
2145 * door is the door we are trying to match against.
2146 * This function can be called recursively to search containers.
2147 */
2148
2149object *
2150find_key (object *pl, object *container, object *door) 1694find_key_ (object *pl, object *container, object *door)
2151{ 1695{
2152 object *tmp, *key; 1696 object *tmp, *key;
2153 1697
2154 /* Should not happen, but sanity checking is never bad */ 1698 /* Should not happen, but sanity checking is never bad */
2155 if (container->inv == NULL) 1699 if (!container->inv)
2156 return NULL; 1700 return 0;
2157 1701
2158 /* First, lets try to find a key in the top level inventory */ 1702 /* First, lets try to find a key in the top level inventory */
2159 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1703 for (tmp = container->inv; tmp; tmp = tmp->below)
2160 { 1704 {
2161 if (door->type == DOOR && tmp->type == KEY) 1705 if (door->type == DOOR && tmp->type == KEY)
2162 break; 1706 break;
1707
2163 /* For sanity, we should really check door type, but other stuff 1708 /* For sanity, we should really check door type, but other stuff
2164 * (like containers) can be locked with special keys 1709 * (like containers) can be locked with special keys
2165 */ 1710 */
2166 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1711 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2167 break; 1712 break;
2168 } 1713 }
1714
2169 /* No key found - lets search inventories now */ 1715 /* No key found - lets search inventories now */
2170 /* If we find and use a key in an inventory, return at that time. 1716 /* If we find and use a key in an inventory, return at that time.
2171 * otherwise, if we search all the inventories and still don't find 1717 * otherwise, if we search all the inventories and still don't find
2172 * a key, return 1718 * a key, return
2173 */ 1719 */
2174 if (!tmp) 1720 if (!tmp)
2175 { 1721 {
2176 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1722 for (tmp = container->inv; tmp; tmp = tmp->below)
2177 {
2178 /* No reason to search empty containers */ 1723 /* No reason to search empty containers */
2179 if (tmp->type == CONTAINER && tmp->inv) 1724 if (tmp->type == CONTAINER && tmp->inv)
2180 {
2181 if ((key = find_key (pl, tmp, door)) != NULL) 1725 if ((key = find_key_ (pl, tmp, door)))
2182 return key; 1726 return key;
2183 } 1727
2184 }
2185 if (!tmp) 1728 if (!tmp)
2186 return NULL; 1729 return 0;
2187 } 1730 }
1731
2188 /* We get down here if we have found a key. Now if its in a container, 1732 /* We get down here if we have found a key. Now if its in a container,
2189 * see if we actually want to use it 1733 * see if we actually want to use it
2190 */ 1734 */
2191 if (pl != container) 1735 if (pl != container)
2192 { 1736 {
2193 /* Only let players use keys in containers */ 1737 /* Only let players use keys in containers */
2194 if (!pl->contr) 1738 if (!pl->contr)
2195 return NULL; 1739 return 0;
1740
2196 /* cases where this fails: 1741 /* cases where this fails:
2197 * If we only search the player inventory, return now since we 1742 * If we only search the player inventory, return now since we
2198 * are not in the players inventory. 1743 * are not in the players inventory.
2199 * If the container is not active, return now since only active 1744 * If the container is not active, return now since only active
2200 * containers can be used. 1745 * containers can be used.
… …
2204 * inv must have been an container and must have been active. 1749 * inv must have been an container and must have been active.
2205 * 1750 *
2206 * Change the color so that the message doesn't disappear with 1751 * Change the color so that the message doesn't disappear with
2207 * all the others. 1752 * all the others.
2208 */ 1753 */
2209 if (pl->contr->usekeys == key_inventory || 1754 if (pl->contr->usekeys == key_inventory
2210 !QUERY_FLAG (container, FLAG_APPLIED) || 1755 || !container->flag [FLAG_APPLIED]
2211 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1756 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
2212 { 1757 {
2213 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1758 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2214 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1759 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2215 return NULL; 1760 return NULL;
2216 } 1761 }
2217 } 1762 }
1763
2218 return tmp; 1764 return tmp;
1765}
1766
1767/* find_key
1768 * We try to find a key for the door as passed. If we find a key
1769 * and successfully use it, we return the key, otherwise NULL
1770 * This function merges both normal and locked door, since the logic
1771 * for both is the same - just the specific key is different.
1772 * pl is the player,
1773 * inv is the objects inventory to searched
1774 * door is the door we are trying to match against.
1775 * This function can be called recursively to search containers.
1776 */
1777object *
1778find_key (object *pl, object *container, object *door)
1779{
1780 if (door->slaying && is_match_expr (door->slaying))
1781 {
1782 // for match expressions, we try to find the key by applying the match
1783 // to the op itself, which is supposed to find the "key", instead
1784 // of searching through containers ourselves.
1785
1786 return match_one (door->slaying, container, door, pl, pl);
1787 }
1788 else
1789 return find_key_ (pl, container, door);
2219} 1790}
2220 1791
2221/* moved door processing out of move_player_attack. 1792/* moved door processing out of move_player_attack.
2222 * returns 1 if player has opened the door with a key 1793 * returns 1 if player has opened the door with a key
2223 * such that the caller should not do anything more, 1794 * such that the caller should not do anything more,
2224 * 0 otherwise 1795 * 0 otherwise
2225 */ 1796 */
2226static int 1797static int
2227player_attack_door (object *op, object *door) 1798player_attack_door (object *op, object *door)
2228{ 1799{
2229
2230 /* If its a door, try to find a use a key. If we do destroy the door, 1800 /* If its a door, try to find a key. If we do destroy the door,
2231 * might as well return immediately as there is nothing more to do - 1801 * might as well return immediately as there is nothing more to do -
2232 * otherwise, we fall through to the rest of the code. 1802 * otherwise, we fall through to the rest of the code.
2233 */ 1803 */
2234 object *key = find_key (op, op, door); 1804 object *key = find_key (op, op, door);
2235 1805
2236 /* IF we found a key, do some extra work */ 1806 /* If we found a key, do some extra work */
2237 if (key) 1807 if (key)
2238 { 1808 {
2239 object *container = key->env; 1809 object *container = key->env;
2240 1810
2241 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2242 if (action_makes_visible (op)) 1811 if (action_makes_visible (op))
2243 make_visible (op); 1812 make_visible (op);
1813
2244 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1814 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2245 spring_trap (door->inv, op); 1815 spring_trap (door->inv, op);
1816
2246 if (door->type == DOOR) 1817 if (door->type == DOOR)
2247 {
2248 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1818 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2249 }
2250 else if (door->type == LOCKED_DOOR) 1819 else if (door->type == LOCKED_DOOR)
2251 { 1820 {
2252 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1821 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2253 remove_door2 (door); /* remove door without violence ;-) */ 1822 remove_door2 (door); /* remove door without violence ;-) */
2254 } 1823 }
1824
2255 /* Do this after we print the message */ 1825 /* Do this after we print the message */
2256 decrease_ob (key); /* Use up one of the keys */ 1826 key->decrease (); /* Use up one of the keys */
2257 /* Need to update the weight the container the key was in */ 1827
2258 if (container != op)
2259 esrv_update_item (UPD_WEIGHT, op, container);
2260 return 1; /* Nothing more to do below */ 1828 return 1; /* Nothing more to do below */
2261 } 1829 }
2262 else if (door->type == LOCKED_DOOR) 1830 else if (door->type == LOCKED_DOOR)
2263 { 1831 {
2264 /* Might as well return now - no other way to open this */ 1832 /* Might as well return now - no other way to open this */
2265 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1833 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2266 return 1; 1834 return 1;
2267 } 1835 }
1836
2268 return 0; 1837 return 0;
2269} 1838}
2270 1839
2271/* This function is just part of a breakup from move_player. 1840/* This function is just part of a breakup from move_player.
2272 * It should keep the code cleaner. 1841 * It should keep the code cleaner.
2273 * When this is called, the players direction has been updated 1842 * When this is called, the players direction has been updated
2274 * (taking into account confusion.) The player is also actually 1843 * (taking into account confusion.) The player is also actually
2275 * going to try and move (not fire weapons). 1844 * going to try and move (not fire weapons).
2276 */ 1845 */
2277 1846bool
2278void
2279move_player_attack (object *op, int dir) 1847move_player_attack (object *op, int dir)
2280{ 1848{
2281 object *tmp, *mon; 1849 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
2282 sint16 nx, ny; 1850 {
2283 int on_battleground; 1851 --op->speed_left;
2284 maptile *m; 1852 return true;
1853 }
2285 1854
2286 nx = freearr_x[dir] + op->x; 1855 sint16 nx = freearr_x[dir] + op->x;
2287 ny = freearr_y[dir] + op->y; 1856 sint16 ny = freearr_y[dir] + op->y;
2288 1857
2289 on_battleground = op_on_battleground (op, NULL, NULL); 1858 if (out_of_map (op->map, nx, ny))
1859 return false;
2290 1860
2291 /* If braced, or can't move to the square, and it is not out of the 1861 /* If braced, or can't move to the square, and it is not out of the
2292 * map, attack it. Note order of if statement is important - don't 1862 * map, attack it. Note order of if statement is important - don't
2293 * want to be calling move_ob if braced, because move_ob will move the 1863 * want to be calling move_ob if braced, because move_ob will move the
2294 * player. This is a pretty nasty hack, because if we could 1864 * player. This is a pretty nasty hack, because if we could
2295 * move to some space, it then means that if we are braced, we should 1865 * move to some space, it then means that if we are braced, we should
2296 * do nothing at all. As it is, if we are braced, we go through 1866 * do nothing at all. As it is, if we are braced, we go through
2297 * quite a bit of processing. However, it probably is less than what 1867 * quite a bit of processing. However, it probably is less than what
2298 * move_ob uses. 1868 * move_ob uses.
2299 */ 1869 */
2300 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 1870 maptile *m = op->map->xy_find (nx, ny);
1871
1872 /* Go through all the objects, and find ones of interest. Only stop if
1873 * we find a monster - that is something we know we want to attack.
1874 * if its a door or barrel (can roll) see if there may be monsters
1875 * on the space
1876 */
1877 object *mon;
1878 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
1879 {
1880 if ((mon->flag [FLAG_ALIVE]
1881 || mon->type == LOCKED_DOOR
1882 || mon->flag [FLAG_CAN_ROLL])
1883 && mon != op)
1884 break;
2301 { 1885 }
2302 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 1886
1887 /* no monster == player tries to move into a wall or so */
1888 if (!mon)
1889 {
1890 for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
1891 if (op->move_type & ob->move_block)
2303 { 1892 {
2304 m = get_map_from_coord (op->map, &nx, &ny); 1893 if (ob->move_block == MOVE_ALL)
2305 if (!m) 1894 move_into_wall (op, ob);
2306 return; /* Don't think this should happen */ 1895 else
1896 {
1897 if (op->contr->ns->bumpmsg)
1898 {
1899 op->play_sound (sound_find ("blocked_move"));
1900
1901 op->statusmsg (ob->invisible
1902 ? "Something blocks you."
1903 : format ("Something blocks you from entering the %s.", query_name (ob))
1904 );
1905 }
1906 }
1907
1908 break;
1909 }
1910
1911 return false;
1912 }
1913
1914 mon = mon->head_ ();
1915
1916 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
1917 if (op->contr->weapon_sp_left > 0.f)
1918 if (player_attack_door (op, mon))
1919 {
1920 --op->contr->weapon_sp_left;
1921 return true;
1922 }
1923
1924 /* The following deals with possibly attacking peaceful
1925 * or friendly creatures. Basically, all players are considered
1926 * unaggressive. If the moving player has peaceful set, then the
1927 * object should be pushed instead of attacked. It is assumed that
1928 * if you are braced, you will not attack friends accidently,
1929 * and thus will not push them.
1930 */
1931
1932 /* If the creature is a pet, push it even if the player is not
1933 * peaceful. Our assumption is the creature is a pet if the
1934 * player owns it and it is either friendly or unagressive.
1935 */
1936 if (op->type == PLAYER
1937 && ((mon->owner && mon->owner->contr
1938 && same_party (mon->owner->contr->party, op->contr->party))
1939 || mon->owner == op)
1940 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1941 {
1942 /* If we're braced, we don't want to switch places with it */
1943 if (op->contr->braced)
1944 return false;
1945
1946 if (op->speed_left > 0.f)
1947 {
1948 --op->speed_left;
1949
1950 op->play_sound (sound_find ("push_player"));
1951 push_ob (mon, dir, op);
1952
1953 if (action_makes_visible (op))
1954 make_visible (op);
1955
1956 return true;
2307 } 1957 }
2308 else 1958 else
2309 m = op->map;
2310
2311 if ((tmp = get_map_ob (m, nx, ny)) == NULL)
2312 {
2313 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2314 return; 1959 return false;
2315 } 1960 }
2316 1961
2317 mon = NULL; 1962 bool on_battleground = op_on_battleground (op, 0, 0);
2318 /* Go through all the objects, and find ones of interest. Only stop if
2319 * we find a monster - that is something we know we want to attack.
2320 * if its a door or barrel (can roll) see if there may be monsters
2321 * on the space
2322 */
2323 while (tmp != NULL)
2324 {
2325 if (tmp == op)
2326 {
2327 tmp = tmp->above;
2328 continue;
2329 }
2330 1963
2331 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2332 {
2333 mon = tmp;
2334 break;
2335 }
2336
2337 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2338 mon = tmp;
2339
2340 tmp = tmp->above;
2341 }
2342
2343 if (mon == NULL) /* This happens anytime the player tries to move */
2344 return; /* into a wall */
2345
2346 if (mon->head != NULL)
2347 mon = mon->head;
2348
2349 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2350 if (player_attack_door (op, mon))
2351 return;
2352
2353 /* The following deals with possibly attacking peaceful
2354 * or frienddly creatures. Basically, all players are considered
2355 * unaggressive. If the moving player has peaceful set, then the
2356 * object should be pushed instead of attacked. It is assumed that
2357 * if you are braced, you will not attack friends accidently,
2358 * and thus will not push them.
2359 */
2360
2361 /* If the creature is a pet, push it even if the player is not
2362 * peaceful. Our assumption is the creature is a pet if the
2363 * player owns it and it is either friendly or unagressive.
2364 */
2365 if ((op->type == PLAYER)
2366#if COZY_SERVER
2367 &&
2368 ((mon->owner && mon->owner->contr
2369 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
2370#else
2371 && mon->owner == op
2372#endif
2373 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2374 {
2375 /* If we're braced, we don't want to switch places with it */
2376 if (op->contr->braced)
2377 return;
2378 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2379 (void) push_ob (mon, dir, op);
2380 if (op->contr->tmp_invis || op->hide)
2381 make_visible (op);
2382 return;
2383 }
2384
2385 /* in certain circumstances, you shouldn't attack friendly 1964 /* in certain circumstances, you shouldn't attack friendly
2386 * creatures. Note that if you are braced, you can't push 1965 * creatures. Note that if you are braced, you can't push
2387 * someone, but put it inside this loop so that you won't 1966 * someone, but put it inside this loop so that you won't
2388 * attack them either. 1967 * attack them either.
2389 */ 1968 */
2390 if ((mon->type == PLAYER || mon->enemy != op) && 1969 if ((mon->type == PLAYER || mon->enemy != op)
2391 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 1970 && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2392#ifdef PROHIBIT_PLAYERKILL 1971 && ((op->contr->peaceful
2393 (op->contr->peaceful 1972 || (mon->type == PLAYER && mon->contr->peaceful))
2394 || (mon->type == PLAYER 1973 && !on_battleground))
2395 && mon->contr-> 1974 {
2396 peaceful)) && 1975 if (op->speed_left > 0.f)
2397#else
2398 op->contr->peaceful &&
2399#endif
2400 !on_battleground))
2401 { 1976 {
1977 --op->speed_left;
1978
2402 if (!op->contr->braced) 1979 if (!op->contr->braced)
2403 { 1980 {
2404 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 1981 op->play_sound (sound_find ("push_player"));
2405 (void) push_ob (mon, dir, op); 1982 push_ob (mon, dir, op);
2406 } 1983 }
2407 else 1984 else
2408 { 1985 op->statusmsg ("You withhold your attack");
2409 new_draw_info (0, 0, op, "You withhold your attack"); 1986
2410 }
2411 if (op->contr->tmp_invis || op->hide) 1987 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2412 make_visible (op); 1988 make_visible (op);
2413 }
2414 1989
1990 return true;
1991 }
1992 }
2415 /* If the object is a boulder or other rollable object, then 1993 /* If the object is a boulder or other rollable object, then
2416 * roll it if not braced. You can't roll it if you are braced. 1994 * roll it if not braced. You can't roll it if you are braced.
2417 */ 1995 */
2418 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1996 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1997 {
1998 if (op->speed_left > 0.f)
2419 { 1999 {
2000 --op->speed_left;
2001
2420 recursive_roll (mon, dir, op); 2002 recursive_roll (mon, dir, op);
2421 if (action_makes_visible (op)) 2003 if (action_makes_visible (op))
2422 make_visible (op); 2004 make_visible (op);
2423 }
2424 2005
2006 return true;
2007 }
2008 }
2425 /* Any generic living creature. Including things like doors. 2009 /* Any generic living creature. Including things like doors.
2426 * Way it works is like this: First, it must have some hit points 2010 * Way it works is like this: First, it must have some hit points
2427 * and be living. Then, it must be one of the following: 2011 * and be living. Then, it must be one of the following:
2428 * 1) Not a player, 2) A player, but of a different party. Note 2012 * 1) Not a player, 2) A player, but of a different party. Note
2429 * that party_number -1 is no party, so attacks can still happen. 2013 * that party_number -1 is no party, so attacks can still happen.
2430 */ 2014 */
2431
2432 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2015 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2433 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2016 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2434 { 2017 {
2435 2018 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2436 /* If the player hasn't hit something this tick, and does
2437 * so, give them speed boost based on weapon speed. Doing
2438 * it here is better than process_players2, which basically
2439 * incurred a 1 tick offset.
2440 */
2441 if (!op->contr->has_hit)
2442 { 2019 {
2443 op->speed_left += op->speed / op->contr->weapon_sp; 2020 --op->contr->weapon_sp_left;
2444 2021
2445 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2446 }
2447
2448 skill_attack (mon, op, 0, NULL, NULL); 2022 skill_attack (mon, op, 0, 0, 0);
2449 2023
2450 /* If attacking another player, that player gets automatic
2451 * hitback, and doesn't loose luck either.
2452 * Disable hitback on the battleground or if the target is
2453 * the wiz.
2454 */
2455 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2456 {
2457 short luck = mon->stats.luck;
2458
2459 mon->contr->has_hit = 1;
2460 skill_attack (op, mon, 0, NULL, NULL);
2461 mon->stats.luck = luck;
2462 }
2463 if (action_makes_visible (op)) 2024 if (action_makes_visible (op))
2464 make_visible (op); 2025 make_visible (op);
2465 }
2466 } /* if player should attack something */
2467}
2468 2026
2469int 2027 return true;
2028 }
2029 }
2030
2031 return false;
2032}
2033
2034bool
2470move_player (object *op, int dir) 2035move_player (object *op, int dir)
2471{ 2036{
2472 int pick; 2037 if (!op->map || op->map->state != MAP_ACTIVE)
2473
2474 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)
2475 return 0; 2038 return 0;
2476 2039
2477 /* Sanity check: make sure dir is valid */ 2040 /* Sanity check: make sure dir is valid */
2478 if ((dir < 0) || (dir >= 9)) 2041 if (dir < 0 || dir > 8)
2479 { 2042 {
2480 LOG (llevError, "move_player: invalid direction %d\n", dir); 2043 LOG (llevError, "move_player: invalid direction %d\n", dir);
2481 return 0; 2044 return 0;
2482 } 2045 }
2483 2046
2484 /* peterm: added following line */ 2047 /* peterm: added following line */
2485 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2048 if (op->flag [FLAG_CONFUSED] && dir)
2486 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2049 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2487 2050
2488 op->facing = dir; 2051 op->facing = dir;
2489 2052
2490 if (op->hide) 2053 if (op->flag [FLAG_HIDDEN])
2491 do_hidden_move (op); 2054 do_hidden_move (op);
2492 2055
2056 bool retval;
2057 int pick = 0;
2058
2493 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2059 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2494 /*nop */ ; 2060 retval = RESULT_INT (0);
2495 else if (op->contr->fire_on) 2061 else if (op->contr->fire_on)
2496 fire (op, dir); 2062 retval = fire (op, dir);
2497 else 2063 else
2498 { 2064 {
2499 move_player_attack (op, dir); 2065 retval = move_player_attack (op, dir);
2500 pick = check_pick (op); 2066 pick = check_pick (op);
2501 } 2067 }
2502 2068
2503 /* Add special check for newcs players and fire on - this way, the 2069 /* Add special check for newcs players and fire on - this way, the
2504 * server can handle repeat firing. 2070 * server can handle repeat firing.
2505 */ 2071 */
2506 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2072 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2507 {
2508 op->direction = dir; 2073 op->direction = dir;
2509 }
2510 else 2074 else
2511 {
2512 op->direction = 0; 2075 op->direction = 0;
2513 } 2076
2514 /* Update how the player looks. Use the facing, so direction may 2077 /* Update how the player looks. Use the facing, so direction may
2515 * get reset to zero. This allows for full animation capabilities 2078 * get reset to zero. This allows for full animation capabilities
2516 * for players. 2079 * for players.
2517 */ 2080 */
2518 animate_object (op, op->facing); 2081 animate_object (op, op->facing);
2519 return 0; 2082
2083 return retval;
2520} 2084}
2521 2085
2522/* This is similar to handle_player, below, but is only used by the 2086/* This is similar to handle_player, below, but is only used by the
2523 * new client/server stuff. 2087 * new client/server stuff.
2524 * This is sort of special, in that the new client/server actually uses 2088 * This is sort of special, in that the new client/server actually uses
2525 * the new speed values for commands. 2089 * the new speed values for commands.
2526 * 2090 *
2527 * Returns true if there are more actions we can do. 2091 * Returns true if there are more actions we can do. Should not do
2092 * many actions in a row, as that would be too unfair to other
2093 * players.
2528 */ 2094 */
2529int 2095bool
2530handle_newcs_player (object *op) 2096handle_newcs_player (object *op)
2531{ 2097{
2532 if (op->contr->hidden) 2098 if (op->flag [FLAG_SCARED])
2533 {
2534 op->invisible = 1000;
2535 /* the socket code flashes the player visible/invisible
2536 * depending on the value of invisible, so we need to
2537 * alternate it here for it to work correctly.
2538 */
2539 if (pticks & 2)
2540 op->invisible--;
2541 } 2099 {
2542 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2100 if (op->speed_left > 0.f)
2543 {
2544 op->invisible--;
2545 if (!op->invisible)
2546 {
2547 make_visible (op);
2548 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2549 } 2101 {
2550 }
2551
2552 if (QUERY_FLAG (op, FLAG_SCARED))
2553 {
2554 flee_player (op);
2555 /* If player is still scared, that is his action for this tick */
2556 if (QUERY_FLAG (op, FLAG_SCARED))
2557 {
2558 op->speed_left--; 2102 --op->speed_left;
2103 flee_player (op);
2104
2559 return 0; 2105 return true;
2560 } 2106 }
2107 else
2108 return false;
2561 } 2109 }
2562
2563 /* I've been seeing crashes where the golem has been destroyed, but
2564 * the player object still points to the defunct golem. The code that
2565 * destroys the golem looks correct, and it doesn't always happen, so
2566 * put this in a a workaround to clean up the golem pointer.
2567 */
2568 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2569 op->contr->ranges[range_golem] = 0;
2570 2110
2571 /* call this here - we also will call this in do_ericserver, but 2111 /* call this here - we also will call this in do_ericserver, but
2572 * the players time has been increased when doericserver has been 2112 * the players time has been increased when doericserver has been
2573 * called, so we recheck it here. 2113 * called, so we recheck it here.
2574 */ 2114 */
2575 HandleClient (&op->contr->socket, op->contr); 2115 if (op->contr->ns->handle_command ())
2576 if (op->speed_left < 0) 2116 return true;
2117
2118 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2119 return move_player (op, op->direction);
2120
2121 return false;
2122}
2123
2124static int
2125save_life (object *op)
2126{
2127 if (!op->flag [FLAG_LIFESAVE])
2577 return 0; 2128 return 0;
2578 2129
2579 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2580 {
2581 /* All move commands take 1 tick, at least for now */
2582 op->speed_left--;
2583
2584 /* Instead of all the stuff below, let move_player take care
2585 * of it. Also, some of the skill stuff is only put in
2586 * there, as well as the confusion stuff.
2587 */
2588 move_player (op, op->direction);
2589 if (op->speed_left > 0)
2590 return 1;
2591 else
2592 return 0;
2593 }
2594 return 0;
2595}
2596
2597int
2598save_life (object *op)
2599{
2600 object *tmp;
2601
2602 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2603 return 0;
2604
2605 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2130 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2606 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2131 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2607 { 2132 {
2608 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2133 op->play_sound (sound_find ("ob_evaporate"));
2609 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2134 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2610 2135
2611 if (op->contr)
2612 esrv_del_item (op->contr, tmp->count);
2613
2614 tmp->destroy (); 2136 tmp->destroy ();
2615 CLEAR_FLAG (op, FLAG_LIFESAVE); 2137 op->clr_flag (FLAG_LIFESAVE);
2616 2138
2617 if (op->stats.hp < 0) 2139 if (op->stats.hp < 0)
2618 op->stats.hp = op->stats.maxhp; 2140 op->stats.hp = op->stats.maxhp;
2619 2141
2620 if (op->stats.food < 0) 2142 if (op->stats.food < 0)
2621 op->stats.food = 999; 2143 op->stats.food = MAX_FOOD;
2622 2144
2623 fix_player (op); 2145 op->update_stats ();
2624 return 1; 2146 return 1;
2625 } 2147 }
2148
2626 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2149 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2627 CLEAR_FLAG (op, FLAG_LIFESAVE); 2150 op->clr_flag (FLAG_LIFESAVE);
2628 enter_player_savebed (op); /* bring him home. */ 2151 enter_player_savebed (op); /* bring him home. */
2629 return 0; 2152 return 0;
2630} 2153}
2631 2154
2632/* This goes throws the inventory and removes unpaid objects, and puts them 2155/* This goes throws the inventory and removes unpaid objects, and puts them
2633 * back in the map (location and map determined by values of env). This 2156 * back in the map (location and map determined by values of env). This
2634 * function will descend into containers. op is the object to start the search 2157 * function will descend into containers. op is the object to start the search
2635 * from. 2158 * from.
2636 */ 2159 */
2160static void
2161drop_unpaid_items (object *op, object *env)
2162{
2163 while (op)
2164 {
2165 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2166
2167 if (op->flag [FLAG_UNPAID])
2168 op->insert_at (env);
2169 else if (op->inv)
2170 drop_unpaid_items (op->inv, env);
2171
2172 op = next;
2173 }
2174}
2175
2637void 2176void
2638remove_unpaid_objects (object *op, object *env) 2177object::drop_unpaid_items ()
2639{ 2178{
2640 object *next; 2179 if (!flag [FLAG_REMOVED])
2641 2180 ::drop_unpaid_items (inv, this);
2642 while (op)
2643 {
2644 next = op->below; /* Make sure we have a good value, in case
2645 * we remove object 'op'
2646 */
2647 if (QUERY_FLAG (op, FLAG_UNPAID))
2648 {
2649 op->remove ();
2650 op->x = env->x;
2651 op->y = env->y;
2652 if (env->type == PLAYER)
2653 esrv_del_item (env->contr, op->count);
2654 insert_ob_in_map (op, env->map, NULL, 0);
2655 }
2656 else if (op->inv)
2657 remove_unpaid_objects (op->inv, env);
2658 op = next;
2659 }
2660} 2181}
2661
2662
2663/*
2664 * Returns pointer a static string containing gravestone text
2665 * Moved from apply.c to player.c - player.c is what
2666 * actually uses this function. player.c may not be quite the
2667 * best, a misc file for object actions is probably better,
2668 * but there isn't one in the server directory.
2669 */
2670char *
2671gravestone_text (object *op)
2672{
2673 static char buf2[MAX_BUF];
2674 char buf[MAX_BUF];
2675 time_t now = time (NULL);
2676
2677 strcpy (buf2, " R.I.P.\n\n");
2678 if (op->type == PLAYER)
2679 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2680 else
2681 sprintf (buf, "%s\n", &op->name);
2682 strncat (buf2, " ", 20 - strlen (buf) / 2);
2683 strcat (buf2, buf);
2684 if (op->type == PLAYER)
2685 sprintf (buf, "who was in level %d when killed\n", op->level);
2686 else
2687 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2688 strncat (buf2, " ", 20 - strlen (buf) / 2);
2689 strcat (buf2, buf);
2690 if (op->type == PLAYER)
2691 {
2692 sprintf (buf, "by %s.\n\n", op->contr->killer);
2693 strncat (buf2, " ", 21 - strlen (buf) / 2);
2694 strcat (buf2, buf);
2695 }
2696 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2697 strncat (buf2, " ", 20 - strlen (buf) / 2);
2698 strcat (buf2, buf);
2699 return buf2;
2700}
2701
2702
2703 2182
2704void 2183void
2705do_some_living (object *op) 2184do_some_living (object *op)
2706{ 2185{
2707 int last_food = op->stats.food; 2186 int last_food = op->stats.food;
2708 int gen_hp, gen_sp, gen_grace; 2187 int gen_hp, gen_sp, gen_grace;
2709 int over_hp, over_sp, over_grace;
2710 int i;
2711 int rate_hp = 1200; 2188 int rate_hp = 1200;
2712 int rate_sp = 2500; 2189 int rate_sp = 2500;
2713 int rate_grace = 2000; 2190 int rate_grace = 2000;
2714 const int max_hp = 1; 2191 const int max_hp = 1;
2715 const int max_sp = 1; 2192 const int max_sp = 1;
2716 const int max_grace = 1; 2193 const int max_grace = 1;
2717 2194
2718 if (op->contr->outputs_sync) 2195#if 0
2719 { 2196 if (op->contr->hidden)
2720 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2721 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2722 flush_output_element (op, &op->contr->outputs[i]);
2723 } 2197 {
2198 op->invisible = 1000;
2199 /* the socket code flashes the player visible/invisible
2200 * depending on the value of invisible, so we need to
2201 * alternate it here for it to work correctly.
2202 */
2203 if (server_tick & 2)
2204 op->invisible--;
2205 }
2206 else
2207#endif
2208 if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2209 {
2210 if (!op->invisible--)
2211 {
2212 make_visible (op);
2213 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2214 }
2215 }
2724 2216
2725 if (op->contr->state == ST_PLAYING) 2217 if (op->contr->ns->state == ST_PLAYING)
2726 { 2218 {
2727
2728 /* these next three if clauses make it possible to SLOW DOWN 2219 /* these next three if clauses make it possible to SLOW DOWN
2729 hp/grace/spellpoint regeneration. */ 2220 hp/grace/spellpoint regeneration. */
2730 if (op->contr->gen_hp >= 0) 2221 if (op->contr->gen_hp >= 0)
2731 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2222 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2732 else 2223 else
2733 { 2224 {
2734 gen_hp = op->stats.maxhp; 2225 gen_hp = op->stats.maxhp;
2735 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2226 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2736 } 2227 }
2228
2737 if (op->contr->gen_sp >= 0) 2229 if (op->contr->gen_sp >= 0)
2738 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2230 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2739 else 2231 else
2740 { 2232 {
2741 gen_sp = op->stats.maxsp; 2233 gen_sp = op->stats.maxsp;
2742 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2234 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2743 } 2235 }
2236
2744 if (op->contr->gen_grace >= 0) 2237 if (op->contr->gen_grace >= 0)
2745 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2238 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2746 else 2239 else
2747 { 2240 {
2748 gen_grace = op->stats.maxgrace; 2241 gen_grace = op->stats.maxgrace;
2749 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2242 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2750 } 2243 }
2751 2244
2752 /* Regenerate Spell Points */
2753 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2754 {
2755 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2756 if (op->stats.sp < op->stats.maxsp)
2757 {
2758 op->stats.sp++;
2759 /* dms do not consume food */
2760 if (!QUERY_FLAG (op, FLAG_WIZ))
2761 {
2762 op->stats.food--;
2763 if (op->contr->digestion < 0)
2764 op->stats.food += op->contr->digestion;
2765 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2766 op->stats.food = last_food;
2767 }
2768 }
2769 if (max_sp > 1)
2770 {
2771 over_sp = (gen_sp + 10) / rate_sp;
2772 if (over_sp > 0)
2773 {
2774 if (op->stats.sp < op->stats.maxsp)
2775 {
2776 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2777 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2778 op->stats.sp--;
2779 if (op->stats.sp > op->stats.maxsp)
2780 op->stats.sp = op->stats.maxsp;
2781 }
2782 op->last_sp = 0;
2783 }
2784 else
2785 {
2786 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2787 }
2788 }
2789 else
2790 {
2791 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2792 }
2793 }
2794
2795 /* Regenerate Grace */ 2245 /* Regenerate Grace */
2796 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2246 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2797 if (--op->last_grace < 0) 2247 if (--op->last_grace < 0)
2798 { 2248 {
2799 if (op->stats.grace < op->stats.maxgrace / 2) 2249 if (op->stats.grace < op->stats.maxgrace / 2)
2800 op->stats.grace++; /* no penalty in food for regaining grace */ 2250 op->stats.grace++; /* no penalty in food for regaining grace */
2251
2252 int temp = gen_grace < 20 ? 30 : gen_grace + 10;
2253
2801 if (max_grace > 1) 2254 if (max_grace > 1)
2802 { 2255 {
2803 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2256 int over_grace = temp / rate_grace;
2257
2804 if (over_grace > 0) 2258 if (over_grace > 0)
2805 { 2259 {
2806 op->stats.sp += over_grace 2260 op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2807 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2808 op->last_grace = 0; 2261 op->last_grace = 0;
2809 } 2262 }
2810 else 2263 else
2811 { 2264 op->last_grace = rate_grace / temp;
2812 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2813 }
2814 } 2265 }
2815 else 2266 else
2267 op->last_grace = rate_grace / temp;
2268
2269 /* wearing stuff doesn't detract from grace generation. */
2270 }
2271
2272 if (op->stats.food > 0)
2273 {
2274 /* Regenerate Spell Points */
2275 if (!op->contr->golem && --op->last_sp < 0)
2816 { 2276 {
2817 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2277 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2818 }
2819 /* wearing stuff doesn't detract from grace generation. */
2820 }
2821 2278
2822 /* Regenerate Hit Points */
2823 if (--op->last_heal < 0)
2824 {
2825 if (op->stats.hp < op->stats.maxhp) 2279 if (op->stats.sp < op->stats.maxsp)
2826 {
2827 op->stats.hp++;
2828 /* dms do not consume food */
2829 if (!QUERY_FLAG (op, FLAG_WIZ))
2830 { 2280 {
2281 op->stats.sp++;
2282
2283 /* dms do not consume food */
2284 if (!op->flag [FLAG_WIZ])
2285 {
2831 op->stats.food--; 2286 op->stats.food--;
2287
2832 if (op->contr->digestion < 0) 2288 if (op->contr->digestion < 0)
2833 op->stats.food += op->contr->digestion; 2289 op->stats.food += op->contr->digestion;
2834 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2290 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2835 op->stats.food = last_food; 2291 op->stats.food = last_food;
2292 }
2836 } 2293 }
2837 } 2294
2838 if (max_hp > 1) 2295 if (max_sp > 1)
2839 {
2840 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2841 if (over_hp > 0)
2842 { 2296 {
2843 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2297 int over_sp = (gen_sp + 10) / rate_sp;
2298 if (over_sp > 0)
2299 {
2300 if (op->stats.sp < op->stats.maxsp)
2301 {
2302 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2303
2304 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2305 op->stats.sp--;
2306
2307 if (op->stats.sp > op->stats.maxsp)
2308 op->stats.sp = op->stats.maxsp;
2309 }
2310
2844 op->last_heal = 0; 2311 op->last_sp = 0;
2312 }
2313 else
2314 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2845 } 2315 }
2846 else 2316 else
2317 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2318 }
2319
2320 /* Regenerate Hit Points */
2321 if (--op->last_heal < 0)
2322 {
2323 if (op->stats.hp < op->stats.maxhp)
2847 { 2324 {
2848 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2325 op->stats.hp++;
2326
2327 /* dms do not consume food */
2328 if (!op->flag [FLAG_WIZ])
2329 {
2330 op->stats.food--;
2331
2332 if (op->contr->digestion < 0)
2333 op->stats.food += op->contr->digestion;
2334 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2335 op->stats.food = last_food;
2336 }
2849 } 2337 }
2338
2339 int temp = gen_hp < 20 ? 30 : gen_hp + 10;
2340
2341 if (max_hp > 1)
2342 {
2343 int over_hp = temp / rate_hp;
2344
2345 if (over_hp > 0)
2346 {
2347 op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2348 op->last_heal = 0;
2349 }
2350 else
2351 op->last_heal = rate_hp / temp;
2850 } 2352 }
2851 else 2353 else
2852 { 2354 op->last_heal = rate_hp / temp;
2853 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2854 } 2355 }
2855 } 2356 }
2856 2357
2857 /* Digestion */ 2358 /* Digestion */
2858 if (--op->last_eat < 0) 2359 if (--op->last_eat < 0)
2859 { 2360 {
2860#ifdef COZY_SERVER 2361 int bonus = max (0, op->contr->digestion),
2861 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2362 penalty = max (0, -op->contr->digestion);
2862 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2863#else
2864 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2865#endif
2866 2363
2867 if (op->contr->gen_hp > 0)
2868 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2364 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2869 else 2365
2870 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2871 /* dms do not consume food */ 2366 /* dms do not consume food */
2872 if (!QUERY_FLAG (op, FLAG_WIZ)) 2367 if (!op->flag [FLAG_WIZ])
2873 op->stats.food--; 2368 op->stats.food--;
2874 } 2369 }
2875 }
2876 2370
2877 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2371 if (op->stats.food < 0 && op->stats.hp >= 0)
2878 { 2372 {
2879 object *tmp, *flesh = NULL; 2373 object *flesh = 0;
2880 2374
2881 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2375 for_inv_removable (op, tmp)
2882 {
2883 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2884 { 2376 {
2377 if (tmp->flag [FLAG_UNPAID])
2378 continue;
2379
2885 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2380 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2886 { 2381 {
2887 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2382 op->statusmsg ("You blindly grab for a bite of food. "
2383 "H<To prevent you from starving, you ate some random item from your backpack.>");
2888 manual_apply (op, tmp, 0); 2384 op->apply (tmp);
2385
2889 if (op->stats.food >= 0 || op->stats.hp < 0) 2386 if (op->stats.food >= 0 || op->stats.hp < 0)
2890 break; 2387 break;
2891 } 2388 }
2892 else if (tmp->type == FLESH) 2389 else if (tmp->type == FLESH)
2893 flesh = tmp; 2390 flesh = tmp;
2894 } /* End if paid for object */ 2391 }
2895 } /* end of for loop */ 2392
2896 /* If player is still starving, it means they don't have any food, so 2393 /* If player is still starving, it means they don't have any food, so
2897 * eat flesh instead. 2394 * eat flesh instead.
2898 */ 2395 */
2899 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2396 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2397 {
2398 op->statusmsg ("You blindly grab for a bite of food. "
2399 "H<To prevent you from starving, you ate some random item from your backpack.>");
2400 op->apply (flesh);
2401 }
2402
2403 // If player is still starving, alert him!
2404 if (op->stats.food < 0)
2405 op->failmsg ("You are starving! "
2406 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2900 { 2407 }
2901 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2408
2902 manual_apply (op, flesh, 0); 2409 if (op->stats.food < 0)
2903 } 2410 {
2904 } /* end if player is starving */ 2411 op->stats.hp += op->stats.food;
2412 op->stats.food = 0;
2905 2413
2906 while (op->stats.food < 0 && op->stats.hp > 0) 2414 if (op->stats.hp < 0)
2907 op->stats.food++, op->stats.hp--; 2415 {
2416 op->contr->killer = archetype::get ("killer_starvation");
2417 op->contr->killer->destroy ();
2418 }
2419 }
2908 2420
2909 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2421 /* killer should be set here already */
2422 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2910 kill_player (op); 2423 kill_player (op);
2424 }
2911} 2425}
2912
2913
2914 2426
2915/* If the player should die (lack of hp, food, etc), we call this. 2427/* If the player should die (lack of hp, food, etc), we call this.
2916 * op is the player in jeopardy. If the player can not be saved (not 2428 * op is the player in jeopardy. If the player can not be saved (not
2917 * permadeath, no lifesave), this will take care of removing the player 2429 * permadeath, no lifesave), this will take care of removing the player
2918 * file. 2430 * file.
2919 */ 2431 */
2920void 2432void
2921kill_player (object *op) 2433kill_player (object *op)
2922{ 2434{
2923 char buf[MAX_BUF];
2924 int x, y; 2435 int x, y;
2925
2926 //int i;
2927 maptile *map; /* this is for resurrection */ 2436 maptile *map; /* this is for resurrection */
2928
2929 /* int z;
2930 int num_stats_lose;
2931 int lost_a_stat;
2932 int lose_this_stat;
2933 int this_stat; */
2934 int will_kill_again; 2437 int will_kill_again;
2935 archetype *at; 2438 archetype *at;
2936 object *tmp; 2439 object *tmp;
2937 2440
2938 if (save_life (op)) 2441 if (save_life (op))
2939 return; 2442 return;
2940 2443
2444 dynbuf_text deathtab;
2445
2446 /* restore player */
2447 at = archetype::find (shstr_poisoning);
2448 if (object *tmp = present_arch_in_ob (at, op))
2449 {
2450 tmp->destroy ();
2451 deathtab << "Your body feels cleansed...\r";
2452 }
2453
2454 at = archetype::find (shstr_confusion);
2455 if (object *tmp = present_arch_in_ob (at, op))
2456 {
2457 tmp->destroy ();
2458 deathtab << "Your mind feels clearer...\r";
2459 }
2460
2461 cure_disease (op, 0, 0); /* remove any disease */
2462
2463 max_it (op->stats.hp , op->stats.maxhp);
2464 max_it (op->stats.sp , op->stats.maxsp);
2465 max_it (op->stats.grace, op->stats.maxgrace);
2466 max_it (op->stats.food , 200);
2467
2468 // remove all spell effects that are active
2469 // to avoid long-term effects such as word-of-recall
2470 for (object *item = op->inv; item; )
2471 {
2472 object *next = item->below;
2473
2474 if (item->type == SPELL_EFFECT && item->active)
2475 item->destroy ();
2476
2477 item = next;
2478 }
2941 2479
2942 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2480 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2943 * in cities ONLY!!! It is very important that this doesn't get abused. 2481 * in cities ONLY!!! It is very important that this doesn't get abused.
2944 * Look at op_on_battleground() for more info --AndreasV 2482 * Look at op_on_battleground() for more info --AndreasV
2945 */ 2483 */
2946 if (op_on_battleground (op, &x, &y)) 2484 if (op_on_battleground (op, &x, &y))
2947 { 2485 {
2948 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2486 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2949 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2950
2951 /* restore player */
2952 at = archetype::find ("poisoning");
2953 tmp = present_arch_in_ob (at, op);
2954 if (tmp)
2955 {
2956 tmp->destroy ();
2957 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2958 }
2959
2960 at = archetype::find ("confusion");
2961 tmp = present_arch_in_ob (at, op);
2962 if (tmp)
2963 {
2964 tmp->destroy ();
2965 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2966 }
2967
2968 cure_disease (op, 0); /* remove any disease */
2969 op->stats.hp = op->stats.maxhp;
2970 if (op->stats.food <= 0)
2971 op->stats.food = 999;
2972 2487
2973 /* create a bodypart-trophy to make the winner happy */ 2488 /* create a bodypart-trophy to make the winner happy */
2974 tmp = arch_to_object (archetype::find ("finger")); 2489 object *tmp = archetype::find (shstr_finger)->instance ();
2975 if (tmp != NULL) 2490
2976 { 2491 tmp->name = format ("%s's finger" , &op->name);
2977 sprintf (buf, "%s's finger", &op->name); 2492 tmp->name_pl = format ("%s's fingers", &op->name);
2978 tmp->name = buf; 2493 tmp->msg = format (
2979 sprintf (buf, " This finger has been cut off %s\n" 2494 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2980 " the %s, when he was defeated at\n level %d by %s.\n", 2495 &op->name, op->contr->title,
2981 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2496 (int)op->level,
2982 tmp->msg = buf; 2497 op->contr->killer_name ()
2498 );
2983 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2499 tmp->value = 0, tmp->type = 0;
2984 tmp->materialname = NULL; 2500 tmp->material = name_to_material (shstr_organic);
2985 tmp->x = op->x, tmp->y = op->y; 2501 tmp->insert_at (op, tmp);
2986 insert_ob_in_map (tmp, op->map, op, 0);
2987 }
2988 2502
2989 /* teleport defeated player to new destination */ 2503 /* teleport defeated player to new destination */
2990 transfer_ob (op, x, y, 0, NULL); 2504 transfer_ob (op, x, y, 0, NULL);
2991 op->contr->braced = 0; 2505 op->contr->braced = 0;
2506
2507 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2992 return; 2508 return;
2993 } 2509 }
2994 2510
2511 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2512 deathtab << "T<YOU HAVE DIED>\n\n";
2513
2995 INVOKE_PLAYER (DEATH, op->contr); 2514 INVOKE_PLAYER (DEATH, op->contr);
2996 2515
2997 command_kill_pets (op, 0); 2516 command_kill_pets (op, 0);
2998 2517
2999 if (op->stats.food < 0) 2518 op->contr->play_sound (sound_find ("player_dies"));
2519
2520 /* save the map location for corpse, gravestone */
2521 x = op->x;
2522 y = op->y;
2523 map = op->map;
2524
2525 /* NOT_PERMADEATH code. This basically brings the character back to
2526 * life if they are dead - it takes some exp and a random stat.
2527 * See the config.h file for a little more in depth detail about this.
2528 */
2529
2530 /* Basically two ways to go - remove a stat permanently, or just
2531 * make it depletion. This bunch of code deals with that aspect
2532 * of death.
2533 */
2534#ifndef COZY_SERVER
2535 if (settings.balanced_stat_loss)
3000 { 2536 {
3001 if (op->contr->explore) 2537 /* If stat loss is permanent, lose one stat only. */
3002 { 2538 /* Lower level chars don't lose as many stats because they suffer
3003 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are"); 2539 more if they do. */
3004 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so..."); 2540 /* Higher level characters can afford things such as potions of
3005 op->stats.food = 999; 2541 restoration, or better, stat potions. So we slug them that
3006 return; 2542 little bit harder. */
3007 } 2543 /* GD */
3008 sprintf (buf, "%s starved to death.", &op->name); 2544 if (settings.stat_loss_on_death)
3009 strcpy (op->contr->killer, "starvation"); 2545 num_stats_lose = 1;
2546 else
2547 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3010 } 2548 }
3011 else 2549 else
3012 { 2550 num_stats_lose = 1;
3013 if (op->contr->explore) 2551
3014 { 2552 lost_a_stat = 0;
3015 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are"); 2553
3016 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so..."); 2554 for (z = 0; z < num_stats_lose; z++)
3017 op->stats.hp = op->stats.maxhp;
3018 return;
3019 }
3020 sprintf (buf, "%s died.", &op->name);
3021 } 2555 {
3022 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2556 i = rndm (NUM_STATS);
3023 2557
3024 /* save the map location for corpse, gravestone */
3025 x = op->x;
3026 y = op->y;
3027 map = op->map;
3028
3029
3030 if (settings.not_permadeth == TRUE)
3031 {
3032 /* NOT_PERMADEATH code. This basically brings the character back to
3033 * life if they are dead - it takes some exp and a random stat.
3034 * See the config.h file for a little more in depth detail about this.
3035 */
3036
3037 /* Basically two ways to go - remove a stat permanently, or just
3038 * make it depletion. This bunch of code deals with that aspect
3039 * of death.
3040 */
3041#ifndef COZY_SERVER
3042 if (settings.balanced_stat_loss)
3043 {
3044 /* If stat loss is permanent, lose one stat only. */
3045 /* Lower level chars don't lose as many stats because they suffer
3046 more if they do. */
3047 /* Higher level characters can afford things such as potions of
3048 restoration, or better, stat potions. So we slug them that
3049 little bit harder. */
3050 /* GD */
3051 if (settings.stat_loss_on_death) 2558 if (settings.stat_loss_on_death)
3052 num_stats_lose = 1; 2559 {
3053 else 2560 /* Pick a random stat and take a point off it. Tell the player
3054 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2561 * what he lost.
2562 */
2563 change_attr_value (&(op->stats), i, -1);
2564 check_stat_bounds (&(op->stats));
2565 change_attr_value (&(op->contr->orig_stats), i, -1);
2566 check_stat_bounds (&(op->contr->orig_stats));
2567 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2568 lost_a_stat = 1;
3055 } 2569 }
3056 else 2570 else
3057 { 2571 {
3058 num_stats_lose = 1; 2572 /* deplete a stat */
3059 } 2573 archetype *deparch = archetype::find (shstr_depletion);
3060 lost_a_stat = 0; 2574 object *dep;
3061 2575
3062 for (z = 0; z < num_stats_lose; z++) 2576 dep = present_arch_in_ob (deparch, op);
3063 { 2577 if (!dep)
3064 i = RANDOM () % NUM_STATS;
3065
3066 if (settings.stat_loss_on_death)
3067 { 2578 {
3068 /* Pick a random stat and take a point off it. Tell the player 2579 dep = deparch->instance ();
3069 * what he lost. 2580 insert_ob_in_ob (dep, op);
3070 */
3071 change_attr_value (&(op->stats), i, -1);
3072 check_stat_bounds (&(op->stats));
3073 change_attr_value (&(op->contr->orig_stats), i, -1);
3074 check_stat_bounds (&(op->contr->orig_stats));
3075 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3076 lost_a_stat = 1;
3077 } 2581 }
3078 else 2582 lose_this_stat = 1;
2583 if (settings.balanced_stat_loss)
3079 { 2584 {
3080 /* deplete a stat */ 2585 /* GD */
3081 archetype *deparch = archetype::find ("depletion"); 2586 /* Get the stat that we're about to deplete. */
3082 object *dep; 2587 this_stat = get_attr_value (&(dep->stats), i);
3083 2588 if (this_stat < 0)
3084 dep = present_arch_in_ob (deparch, op);
3085 if (!dep)
3086 { 2589 {
3087 dep = arch_to_object (deparch); 2590 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3088 insert_ob_in_ob (dep, op); 2591 int keep_chance = this_stat * this_stat;
3089 } 2592
3090 lose_this_stat = 1; 2593 /* Yes, I am paranoid. Sue me. */
3091 if (settings.balanced_stat_loss)
3092 {
3093 /* GD */
3094 /* Get the stat that we're about to deplete. */
3095 this_stat = get_attr_value (&(dep->stats), i);
3096 if (this_stat < 0) 2594 if (keep_chance < 1)
2595 keep_chance = 1;
2596
2597 /* There is a maximum depletion total per level. */
2598 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3097 { 2599 {
3098 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3099 int keep_chance = this_stat * this_stat;
3100
3101 /* Yes, I am paranoid. Sue me. */
3102 if (keep_chance < 1)
3103 keep_chance = 1;
3104
3105 /* There is a maximum depletion total per level. */
3106 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3107 {
3108 lose_this_stat = 0; 2600 lose_this_stat = 0;
3109 /* Take loss chance vs keep chance to see if we 2601 /* Take loss chance vs keep chance to see if we
3110 retain the stat. */ 2602 retain the stat. */
3111 }
3112 else
3113 {
3114 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3115 lose_this_stat = 0;
3116 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3117 this_stat, keep_chance, loss_chance,
3118 lose_this_stat?"LOSE":"KEEP"); */
3119 }
3120 } 2603 }
3121 }
3122
3123 if (lose_this_stat)
3124 {
3125 this_stat = get_attr_value (&(dep->stats), i);
3126 /* We could try to do something clever like find another
3127 * stat to reduce if this fails. But chances are, if
3128 * stats have been depleted to -50, all are pretty low
3129 * and should be roughly the same, so it shouldn't make a
3130 * difference.
3131 */ 2604 else
3132 if (this_stat >= -50)
3133 { 2605 {
3134 change_attr_value (&(dep->stats), i, -1); 2606 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3135 SET_FLAG (dep, FLAG_APPLIED);
3136 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3137 fix_player (op);
3138 lost_a_stat = 1; 2607 lose_this_stat = 0;
2608 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2609 this_stat, keep_chance, loss_chance,
2610 lose_this_stat?"LOSE":"KEEP"); */
3139 } 2611 }
3140 } 2612 }
3141 } 2613 }
2614
2615 if (lose_this_stat)
2616 {
2617 this_stat = get_attr_value (&dep->stats, i);
2618 /* We could try to do something clever like find another
2619 * stat to reduce if this fails. But chances are, if
2620 * stats have been depleted to -50, all are pretty low
2621 * and should be roughly the same, so it shouldn't make a
2622 * difference.
2623 */
2624 if (this_stat >= -50)
2625 {
2626 change_attr_value (&(dep->stats), i, -1);
2627 dep->set_flag (FLAG_APPLIED);
2628 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2629 op->update_stats ();
2630 lost_a_stat = 1;
2631 }
3142 } 2632 }
2633 }
2634 }
2635
3143 /* If no stat lost, tell the player. */ 2636 /* If no stat lost, tell the player. */
3144 if (!lost_a_stat) 2637 if (!lost_a_stat)
3145 { 2638 {
3146 /* determine_god() seems to not work sometimes... why is this? 2639 /* determine_god() seems to not work sometimes... why is this?
3147 Should I be using something else? GD */ 2640 Should I be using something else? GD */
3148 const char *god = determine_god (op); 2641 shstr_tmp god = determine_god (op);
3149 2642
3150 if (god && (strcmp (god, "none"))) 2643 if (god != shstr_none)
3151 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2644 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
3152 else 2645 else
3153 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2646 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
3154 } 2647 }
3155#else 2648#else
3156 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2649 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
3157#endif 2650#endif
3158 2651
3159 /* Put a gravestone up where the character 'almost' died. List the 2652 /* Put a gravestone up where the character 'almost' died. List the
3160 * exp loss on the stone. 2653 * exp loss on the stone.
3161 */ 2654 */
3162 tmp = arch_to_object (archetype::find ("gravestone")); 2655 tmp = archetype::find (shstr_gravestone)->instance ();
3163 sprintf (buf, "%s's gravestone", &op->name); 2656 tmp->name = format ("%s's gravestone", &op->name);
3164 tmp->name = buf; 2657 tmp->name_pl = format ("%s's gravestones", &op->name);
3165 sprintf (buf, "%s's gravestones", &op->name); 2658 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
3166 tmp->name_pl = buf; 2659 &op->name, op->contr->title, op->contr->killer_name ());
3167 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);
3168 tmp->msg = buf;
3169 tmp->x = op->x, tmp->y = op->y; 2660 tmp->x = op->x, tmp->y = op->y;
3170 insert_ob_in_map (tmp, op->map, NULL, 0); 2661 insert_ob_in_map (tmp, op->map, NULL, 0);
3171 2662
3172 /**************************************/ 2663 /**************************************/
3173 /* */ 2664 /* */
3174 /* Subtract the experience points, */ 2665 /* Subtract the experience points, */
3175 /* if we died cause of food, give us */
3176 /* food, and reset HP's... */
3177 /* */ 2666 /* */
3178 /**************************************/ 2667 /**************************************/
3179 2668
3180 /* remove any poisoning and confusion the character may be suffering. */
3181 /* restore player */
3182 at = archetype::find ("poisoning");
3183 tmp = present_arch_in_ob (at, op);
3184
3185 if (tmp)
3186 {
3187 tmp->destroy ();
3188 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3189 }
3190
3191 at = archetype::find ("confusion");
3192 tmp = present_arch_in_ob (at, op);
3193 if (tmp)
3194 {
3195 tmp->destroy ();
3196 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3197 }
3198
3199 cure_disease (op, 0); /* remove any disease */
3200
3201 /*add_exp(op, (op->stats.exp * -0.20)); */ 2669 /*add_exp(op, (op->stats.exp * -0.20)); */
3202 apply_death_exp_penalty (op); 2670 apply_death_exp_penalty (op);
3203 if (op->stats.food < 100)
3204 op->stats.food = 900;
3205 op->stats.hp = op->stats.maxhp;
3206 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3207 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3208 2671
3209 /* 2672 /*
3210 * Check to see if the player is in a shop. IF so, then check to see if 2673 * Check to see if the player has any unpaid items. If so, remove them
3211 * the player has any unpaid items. If so, remove them and put them back 2674 * and put them back in the map.
3212 * in the map. 2675 */
3213 */ 2676 op->drop_unpaid_items ();
3214 2677
3215 if (is_in_shop (op))
3216 remove_unpaid_objects (op->inv, op);
3217
3218 /****************************************/ 2678 /****************************************/
3219 /* */ 2679 /* */
3220 /* Move player to his current respawn- */ 2680 /* Move player to his current respawn- */
3221 /* position (usually last savebed) */ 2681 /* position (usually last savebed) */
3222 /* */ 2682 /* */
3223 /****************************************/ 2683 /****************************************/
3224 2684
3225 enter_player_savebed (op); 2685 enter_player_savebed (op);
3226 2686
3227 /* Save the player before inserting the force to reduce
3228 * chance of abuse.
3229 */
3230 op->contr->braced = 0; 2687 op->contr->braced = 0;
3231 save_player (op, 1);
3232 2688
3233 /* it is possible that the player has blown something up 2689 /* it is possible that the player has blown something up
3234 * at his savebed location, and that can have long lasting 2690 * at his savebed location, and that can have long lasting
3235 * spell effects. So first see if there is a spell effect 2691 * spell effects. So first see if there is a spell effect
3236 * on the space that might harm the player. 2692 * on the space that might harm the player.
3237 */ 2693 */
3238 will_kill_again = 0; 2694 will_kill_again = 0;
3239 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 2695 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3240 if (tmp->type == SPELL_EFFECT) 2696 if (tmp->type == SPELL_EFFECT)
3241 will_kill_again |= tmp->attacktype; 2697 will_kill_again |= tmp->attacktype;
3242 2698
3243 if (will_kill_again) 2699 if (will_kill_again)
3244 { 2700 {
3245 object *force; 2701 object *force;
3246 int at; 2702 int at;
3247 2703
3248 force = get_archetype (FORCE_NAME); 2704 force = archetype::get (FORCE_NAME);
3249 /* 50 ticks should be enough time for the spell to abate */ 2705 /* 50 ticks should be enough time for the spell to abate */
3250 force->speed = 0.1;
3251 force->speed_left = -5.0; 2706 force->speed_left = -5.f;
3252 SET_FLAG (force, FLAG_APPLIED); 2707 force->set_speed (0.1f);
2708 force->set_flag (FLAG_APPLIED);
2709
3253 for (at = 0; at < NROFATTACKS; at++) 2710 for (at = 0; at < NROFATTACKS; at++)
3254 if (will_kill_again & (1 << at)) 2711 if (will_kill_again & (1 << at))
3255 force->resist[at] = 100; 2712 force->resist[at] = 100;
3256 2713
3257 insert_ob_in_ob (force, op); 2714 insert_ob_in_ob (force, op);
3258 fix_player (op); 2715 op->update_stats ();
3259
3260 }
3261
3262 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3263 return;
3264 } /* NOT_PERMADETH */
3265 else
3266 { 2716 }
3267 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3268 * should probably be embedded in an else statement.
3269 */
3270 2717
3271 op->contr->party = NULL; 2718 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
3272 if (settings.set_title == TRUE)
3273 op->contr->own_title[0] = '\0';
3274 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3275 check_score (op);
3276
3277 if (op->contr->ranges[range_golem])
3278 {
3279 remove_friendly_object (op->contr->ranges[range_golem]);
3280 op->contr->ranges[range_golem]->destroy ();
3281 op->contr->ranges[range_golem] = 0;
3282 }
3283
3284 loot_object (op); /* Remove some of the items for good */
3285 op->remove ();
3286 op->direction = 0;
3287
3288 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3289 {
3290 delete_character (op->name, 0);
3291 if (settings.resurrection == TRUE)
3292 {
3293 /* save playerfile sans equipment when player dies
3294 ** then save it as player.pl.dead so that future resurrection
3295 ** type spells will work on them nicely
3296 */
3297 delete_character (op->name, 0);
3298 op->stats.hp = op->stats.maxhp;
3299 op->stats.food = 999;
3300
3301 /* set the location of where the person will reappear when */
3302 /* maybe resurrection code should fix map also */
3303 strcpy (op->contr->maplevel, settings.emergency_mapname);
3304 if (op->map != NULL)
3305 op->map = NULL;
3306 op->x = settings.emergency_x;
3307 op->y = settings.emergency_y;
3308 save_player (op, 0);
3309 op->map = map;
3310 /* please see resurrection.c: peterm */
3311 dead_player (op);
3312 }
3313 else
3314 delete_character (op->name, 1);
3315 }
3316
3317 play_again (op);
3318
3319 /* peterm: added to create a corpse at deathsite. */
3320 tmp = arch_to_object (archetype::find ("corpse_pl"));
3321 sprintf (buf, "%s", &op->name);
3322 tmp->name = tmp->name_pl = buf;
3323 tmp->level = op->level;
3324 tmp->x = x;
3325 tmp->y = y;
3326 tmp->msg = gravestone_text (op);
3327 SET_FLAG (tmp, FLAG_UNIQUE);
3328 insert_ob_in_map (tmp, map, NULL, 0);
3329 }
3330} 2719}
3331 2720
3332 2721static void
3333void
3334loot_object (object *op) 2722loot_object (object *op)
3335{ /* Grab and destroy some treasure */ 2723{ /* Grab and destroy some treasure */
3336 object *tmp, *tmp2, *next; 2724 object *tmp, *next;
3337 2725
3338 if (op->container) 2726 op->close_container (); /* close open sack first */
3339 { /* close open sack first */
3340 esrv_apply_container (op, op->container);
3341 }
3342 2727
3343 for (tmp = op->inv; tmp != NULL; tmp = next) 2728 for (tmp = op->inv; tmp; tmp = next)
3344 { 2729 {
3345 next = tmp->below; 2730 next = tmp->below;
3346 if (tmp->type == EXPERIENCE || tmp->invisible) 2731
2732 if (tmp->invisible)
3347 continue; 2733 continue;
2734
3348 tmp->remove (); 2735 tmp->remove ();
3349 tmp->x = op->x, tmp->y = op->y; 2736 tmp->x = op->x, tmp->y = op->y;
2737
3350 if (tmp->type == CONTAINER) 2738 if (tmp->type == CONTAINER)
3351 { /* empty container to ground */ 2739 loot_object (tmp); /* empty container to ground */
3352 loot_object (tmp); 2740
3353 } 2741 if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
3354 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))
3355 { 2742 {
3356 if (tmp->nrof > 1) 2743 if (tmp->nrof > 1)
3357 { 2744 {
3358 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2745 tmp->decrease (rndm (1, tmp->nrof - 1));
3359 tmp2->destroy ();
3360 insert_ob_in_map (tmp, op->map, NULL, 0); 2746 insert_ob_in_map (tmp, op->map, NULL, 0);
3361 } 2747 }
3362 else 2748 else
3363 tmp->destroy (); 2749 tmp->destroy ();
3364 } 2750 }
… …
3370/* 2756/*
3371 * fix_weight(): Check recursively the weight of all players, and fix 2757 * fix_weight(): Check recursively the weight of all players, and fix
3372 * what needs to be fixed. Refresh windows and fix speed if anything 2758 * what needs to be fixed. Refresh windows and fix speed if anything
3373 * was changed. 2759 * was changed.
3374 */ 2760 */
3375
3376void 2761void
3377fix_weight (void) 2762fix_weight ()
3378{ 2763{
3379 player *pl; 2764 for_all_players (pl)
3380
3381 for (pl = first_player; pl != NULL; pl = pl->next)
3382 { 2765 {
3383 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2766 weight_t old = pl->ob->carrying;
3384 2767
3385 if (old == sum) 2768 pl->ob->update_weight ();
3386 continue; 2769
3387 fix_player (pl->ob); 2770 if (old != pl->ob->carrying)
2771 {
2772 pl->ob->update_stats ();
3388 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2773 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2774 }
3389 } 2775 }
3390} 2776}
3391 2777
3392void 2778void
3393fix_luck (void) 2779fix_luck ()
3394{ 2780{
3395 player *pl; 2781 for_all_players (pl)
3396
3397 for (pl = first_player; pl != NULL; pl = pl->next)
3398 if (!pl->ob->contr->state) 2782 if (!pl->ob->contr->ns->state)
3399 change_luck (pl->ob, 0); 2783 pl->ob->change_luck (0);
3400} 2784}
3401
3402 2785
3403/* cast_dust() - handles op throwing objects of type 'DUST'. 2786/* cast_dust() - handles op throwing objects of type 'DUST'.
3404 * This is much simpler in the new spell code - we basically 2787 * This is much simpler in the new spell code - we basically
3405 * just treat this as any other spell casting object. 2788 * just treat this as any other spell casting object.
3406 */ 2789 */
3407
3408void 2790void
3409cast_dust (object *op, object *throw_ob, int dir) 2791cast_dust (object *op, object *throw_ob, int dir)
3410{ 2792{
3411 object *skop, *spob; 2793 object *skop, *spob;
3412 2794
… …
3439} 2821}
3440 2822
3441void 2823void
3442make_visible (object *op) 2824make_visible (object *op)
3443{ 2825{
3444 op->hide = 0; 2826 op->flag [FLAG_HIDDEN] = 0;
3445 op->invisible = 0; 2827 op->invisible = 0;
2828
3446 if (op->type == PLAYER) 2829 if (op->type == PLAYER)
3447 { 2830 {
3448 op->contr->tmp_invis = 0; 2831 op->contr->tmp_invis = 0;
3449 op->contr->invis_race = 0; 2832 op->contr->invis_race = 0;
3450 } 2833 }
2834
3451 update_object (op, UP_OBJ_FACE); 2835 update_object (op, UP_OBJ_CHANGE);
3452} 2836}
3453 2837
3454int 2838int
3455is_true_undead (object *op) 2839is_true_undead (object *op)
3456{ 2840{
3457 object *tmp = NULL; 2841 if (op->arch->flag [FLAG_UNDEAD])
3458
3459 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3460 return 1; 2842 return 1;
3461 2843
3462 if (op->type == PLAYER)
3463 for (tmp = op->inv; tmp; tmp = tmp->below)
3464 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3465 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3466 return 1;
3467 return 0; 2844 return 0;
3468} 2845}
3469 2846
3470/* look at the surrounding terrain to determine 2847/* look at the surrounding terrain to determine
3471 * the hideability of this object. Positive levels 2848 * the hideability of this object. Positive levels
3472 * indicate greater hideability. 2849 * indicate greater hideability.
3473 */ 2850 */
3474
3475int 2851int
3476hideability (object *ob) 2852hideability (object *ob)
3477{ 2853{
3478 int i, level = 0, mflag; 2854 int i, level = 0, mflag;
3479 sint16 x, y; 2855 sint16 x, y;
3480 2856
3481 if (!ob || !ob->map) 2857 if (!ob || !ob->map)
3482 return 0; 2858 return 0;
3483 2859
3484 /* so, on normal lighted maps, its hard to hide */ 2860 /* so, on normal lighted maps, its hard to hide */
3485 level = ob->map->darkness - 2; 2861 level = ob->map->darklevel () - 2;
3486 2862
3487 /* this also picks up whether the object is glowing. 2863 /* this also picks up whether the object is glowing.
3488 * If you carry a light on a non-dark map, its not 2864 * If you carry a light on a non-dark map, its not
3489 * as bad as carrying a light on a pitch dark map */ 2865 * as bad as carrying a light on a pitch dark map */
3490 if (has_carried_lights (ob)) 2866 if (ob->has_carried_lights ())
3491 level = -(10 + (2 * ob->map->darkness)); 2867 level = -(10 + (2 * ob->map->darklevel ()));
3492 2868
3493 /* scan through all nearby squares for terrain to hide in */ 2869 /* scan through all nearby squares for terrain to hide in */
3494 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2870 for (i = 0, x = ob->x, y = ob->y;
2871 i <= SIZEOFFREE1;
2872 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3495 { 2873 {
3496 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2874 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3497 if (mflag & P_OUT_OF_MAP) 2875 if (mflag & P_OUT_OF_MAP)
3498 {
3499 continue; 2876 continue;
3500 } 2877
3501 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2878 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3502 level += 2; 2879 level += 2;
3503 else /* open terrain! */ 2880 else /* open terrain! */
3504 level -= 1; 2881 level -= 1;
3505 } 2882 }
… …
3513/* For Hidden creatures - a chance of becoming 'unhidden' 2890/* For Hidden creatures - a chance of becoming 'unhidden'
3514 * every time they move - as we subtract off 'invisibility' 2891 * every time they move - as we subtract off 'invisibility'
3515 * AND, for players, if they move into a ridiculously unhideable 2892 * AND, for players, if they move into a ridiculously unhideable
3516 * spot (surrounded by clear terrain in broad daylight). -b.t. 2893 * spot (surrounded by clear terrain in broad daylight). -b.t.
3517 */ 2894 */
3518
3519void 2895void
3520do_hidden_move (object *op) 2896do_hidden_move (object *op)
3521{ 2897{
3522 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2898 int hide = 0;
3523 object *skop;
3524 2899
3525 if (!op || !op->map) 2900 if (!op || !op->map)
3526 return; 2901 return;
3527 2902
3528 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 2903 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
2904 int num = random_roll (0, 19, op, PREFER_LOW);
3529 2905
3530 /* its *extremely* hard to run and sneak/hide at the same time! */ 2906 /* its *extremely* hard to run and sneak/hide at the same time! */
3531 if (op->type == PLAYER && op->contr->run_on) 2907 if (op->type == PLAYER && op->contr->run_on)
3532 {
3533 if (!skop || num >= skop->level) 2908 if (!skop || num >= skop->level)
3534 { 2909 {
3535 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 2910 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3536 make_visible (op); 2911 make_visible (op);
3537 return; 2912 return;
3538 } 2913 }
3539 else 2914 else
3540 num += 20; 2915 num += 20;
3541 } 2916
3542 num += op->map->difficulty; 2917 num += op->map->difficulty;
3543 hide = hideability (op); /* modify by terrain hidden level */ 2918 hide = hideability (op); /* modify by terrain hidden level */
3544 num -= hide; 2919 num -= hide;
2920
3545 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 2921 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3546 { 2922 {
3547 make_visible (op); 2923 make_visible (op);
2924
3548 if (op->type == PLAYER) 2925 if (op->type == PLAYER)
3549 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 2926 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3550 } 2927 }
3551 else if (op->type == PLAYER && skop) 2928 else if (op->type == PLAYER && skop)
3552 {
3553 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 2929 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3554 }
3555} 2930}
3556 2931
3557/* determine if who is standing near a hostile creature. */ 2932/* determine if who is standing near a hostile creature. */
3558 2933
3559int 2934int
… …
3569 2944
3570 if (who->type == PLAYER) 2945 if (who->type == PLAYER)
3571 player = 1; 2946 player = 1;
3572 2947
3573 else 2948 else
3574 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2949 friendly = who->flag [FLAG_FRIENDLY];
3575 2950
3576 /* search adjacent squares */ 2951 /* search adjacent squares */
3577 for (i = 1; i < 9; i++) 2952 for (i = 1; i < 9; i++)
3578 { 2953 {
3579 x = who->x + freearr_x[i]; 2954 x = who->x + freearr_x[i];
… …
3586 if (mflags & P_OUT_OF_MAP) 2961 if (mflags & P_OUT_OF_MAP)
3587 continue; 2962 continue;
3588 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 2963 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3589 continue; 2964 continue;
3590 2965
3591 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 2966 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3592 { 2967 {
3593 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 2968 if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3594 return 1; 2969 return 1;
3595 else if (tmp->type == PLAYER) 2970 else if (tmp->type == PLAYER)
3596 {
3597 /*don't let a hidden DM prevent you from hiding */
3598 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3599 return 1; 2971 return 1;
3600 }
3601 } 2972 }
3602 } 2973 }
3603 return 0; 2974 return 0;
3604} 2975}
3605 2976
3606/* check the player los field for viewability of the 2977/* check the player los field for viewability of the
3607 * object op. This function works fine for monsters, 2978 * object op. This function works fine for monsters,
3608 * but we dont worry if the object isnt the top one in 2979 * but we dont worry if the object isnt the top one in
3609 * a pile (say a coin under a table would return "viewable" 2980 * a pile (say a coin under a table would return "viewable"
3610 * by this routine). Another question, should we be 2981 * by this routine). Another question, should we be
3611 * concerned with the direction the player is looking 2982 * concerned with the direction the player is looking
3612 * in? Realistically, most of use cant see stuff behind 2983 * in? Realistically, most of us can't see stuff behind
3613 * our backs...on the other hand, does the "facing" direction 2984 * our backs...on the other hand, does the "facing" direction
3614 * imply the way your head, or body is facing? Its possible 2985 * imply the way your head, or body is facing? It's possible
3615 * for them to differ. Sigh, this fctn could get a bit more complex. 2986 * for them to differ. Sigh, this fctn could get a bit more complex.
3616 * -b.t. 2987 * -b.t.
3617 * This function is now map tiling safe. 2988 * This function is now map tiling safe.
3618 */ 2989 */
3619
3620int 2990int
3621player_can_view (object *pl, object *op) 2991player_can_view (object *pl, object *op)
3622{ 2992{
3623 rv_vector rv; 2993 rv_vector rv;
3624 int dx, dy; 2994 int dx, dy;
… …
3626 if (pl->type != PLAYER) 2996 if (pl->type != PLAYER)
3627 { 2997 {
3628 LOG (llevError, "player_can_view() called for non-player object\n"); 2998 LOG (llevError, "player_can_view() called for non-player object\n");
3629 return -1; 2999 return -1;
3630 } 3000 }
3001
3631 if (!pl || !op) 3002 if (!pl || !op)
3632 return 0; 3003 return 0;
3633 3004
3634 if (op->head)
3635 {
3636 op = op->head; 3005 op = op->head_ ();
3637 } 3006
3638 get_rangevector (pl, op, &rv, 0x1); 3007 get_rangevector (pl, op, &rv, 0x1);
3639 3008
3640 /* starting with the 'head' part, lets loop 3009 /* starting with the 'head' part, lets loop
3641 * through the object and find if it has any 3010 * through the object and find if it has any
3642 * part that is in the los array but isnt on 3011 * part that is in the los array but isn't on
3643 * a blocked los square. 3012 * a blocked los square.
3644 * we use the archetype to figure out offsets. 3013 * we use the archetype to figure out offsets.
3645 */ 3014 */
3646 while (op) 3015 while (op)
3647 { 3016 {
3648 dx = rv.distance_x + op->arch->clone.x; 3017 dx = rv.distance_x + op->arch->x;
3649 dy = rv.distance_y + op->arch->clone.y; 3018 dy = rv.distance_y + op->arch->y;
3650 3019
3651 /* only the viewable area the player sees is updated by LOS 3020 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3652 * code, so we need to restrict ourselves to that range of values
3653 * for any meaningful values.
3654 */
3655 if (FABS (dx) <= (pl->contr->socket.mapx / 2) &&
3656 FABS (dy) <= (pl->contr->socket.mapy / 2) &&
3657 !pl->contr->blocked_los[dx + (pl->contr->socket.mapx / 2)][dy + (pl->contr->socket.mapy / 2)])
3658 return 1; 3021 return 1;
3022
3659 op = op->more; 3023 op = op->more;
3660 } 3024 }
3661 return 0;
3662}
3663 3025
3664/* routine for both players and monsters. We call this when
3665 * there is a possibility for our action distrubing our hiding
3666 * place or invisiblity spell. Artefact invisiblity is not
3667 * effected by this. If we arent invisible to begin with, we
3668 * return 0.
3669 */
3670int
3671action_makes_visible (object *op)
3672{
3673
3674 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3675 {
3676 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3677 return 0;
3678
3679 if (op->contr && op->contr->tmp_invis == 0)
3680 return 0;
3681
3682 /* If monsters, they should become visible */
3683 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3684 {
3685 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3686 return 1;
3687 }
3688 }
3689 return 0; 3026 return 0;
3690} 3027}
3691 3028
3692/* op_on_battleground - checks if the given object op (usually 3029/* op_on_battleground - checks if the given object op (usually
3693 * a player) is standing on a valid battleground-tile, 3030 * a player) is standing on a valid battleground-tile,
… …
3698 * Default is to do the same as before, so only people wanting to have different points need worry about this 3035 * Default is to do the same as before, so only people wanting to have different points need worry about this
3699 */ 3036 */
3700int 3037int
3701op_on_battleground (object *op, int *x, int *y) 3038op_on_battleground (object *op, int *x, int *y)
3702{ 3039{
3703 object *tmp;
3704
3705 /* A battleground-tile needs the following attributes to be valid: 3040 /* A battleground-tile needs the following attributes to be valid:
3706 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3041 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3707 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3042 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3708 * and the exit-coordinates sp/hp must both be > 0. 3043 * and the exit-coordinates sp/hp must both be > 0.
3709 * => The intention here is to prevent abuse of the battleground- 3044 * => The intention here is to prevent abuse of the battleground-
3710 * feature (like pickable or hidden battleground tiles). */ 3045 * feature (like pickable or hidden battleground tiles). */
3711 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3046 for (object *tmp = op->below; tmp; tmp = tmp->below)
3712 { 3047 {
3713 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3048 if (tmp->flag [FLAG_IS_FLOOR])
3714 { 3049 {
3715 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3050 if (tmp->flag [FLAG_NO_PICK]
3716 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3051 && tmp->type == BATTLEGROUND
3052 && tmp->name == shstr_battleground
3053 && EXIT_X (tmp) && EXIT_Y (tmp))
3717 { 3054 {
3718 /*before we assign the exit, check if this is a teambattle */ 3055 /* before we assign the exit, check if this is a teambattle */
3719 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3056 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3720 {
3721 object *invtmp;
3722
3723 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3057 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3058 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3724 { 3059 {
3725 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))
3726 {
3727 if (x != NULL && y != NULL) 3060 if (x && y)
3728 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3061 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3062
3729 return 1; 3063 return 1;
3730 }
3731 } 3064 }
3732 } 3065
3733 if (x != NULL && y != NULL) 3066 if (x && y)
3734 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3067 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3068
3735 return 1; 3069 return 1;
3736 } 3070 }
3737 } 3071 }
3738 } 3072 }
3073
3739 /* If we got here, did not find a battleground */ 3074 /* If we got here, did not find a battleground */
3740 return 0; 3075 return 0;
3741} 3076}
3742 3077
3743/* 3078/*
… …
3759 char buf[MAX_BUF]; /* tmp. string buffer */ 3094 char buf[MAX_BUF]; /* tmp. string buffer */
3760 int i = 0, j = 0; 3095 int i = 0, j = 0;
3761 3096
3762 /* get the appropriate treasurelist */ 3097 /* get the appropriate treasurelist */
3763 if (atnr == ATNR_FIRE) 3098 if (atnr == ATNR_FIRE)
3764 trlist = find_treasurelist ("dragon_ability_fire"); 3099 trlist = treasurelist::find (shstr_dragon_ability_fire);
3765 else if (atnr == ATNR_COLD) 3100 else if (atnr == ATNR_COLD)
3766 trlist = find_treasurelist ("dragon_ability_cold"); 3101 trlist = treasurelist::find (shstr_dragon_ability_cold);
3767 else if (atnr == ATNR_ELECTRICITY) 3102 else if (atnr == ATNR_ELECTRICITY)
3768 trlist = find_treasurelist ("dragon_ability_elec"); 3103 trlist = treasurelist::find (shstr_dragon_ability_elec);
3769 else if (atnr == ATNR_POISON) 3104 else if (atnr == ATNR_POISON)
3770 trlist = find_treasurelist ("dragon_ability_poison"); 3105 trlist = treasurelist::find (shstr_dragon_ability_poison);
3771 3106
3772 if (trlist == NULL || who->type != PLAYER) 3107 if (trlist == NULL || who->type != PLAYER)
3773 return; 3108 return;
3774 3109
3775 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3110 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3776 3111
3777 if (tr == NULL || tr->item == NULL) 3112 if (!tr || !tr->item)
3778 { 3113 {
3779 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3114 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3780 return; 3115 return;
3781 } 3116 }
3782 3117
3783 /* everything seems okay - now bring on the gift: */ 3118 /* everything seems okay - now bring on the gift: */
3784 item = &(tr->item->clone); 3119 item = tr->item;
3785 3120
3786 if (item->type == SPELL) 3121 if (item->type == SPELL)
3787 { 3122 {
3788 if (check_spell_known (who, item->name)) 3123 if (check_spell_known (who, item->name))
3789 return; 3124 return;
… …
3848 { 3183 {
3849 /* forces in the treasurelist can alter the player's stats */ 3184 /* forces in the treasurelist can alter the player's stats */
3850 object *skin; 3185 object *skin;
3851 3186
3852 /* first get the dragon skin force */ 3187 /* first get the dragon skin force */
3853 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3188 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3189 ;
3190
3854 if (skin == NULL) 3191 if (!skin)
3855 return; 3192 return;
3856 3193
3857 /* adding new spellpath attunements */ 3194 /* adding new spellpath attunements */
3858 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3195 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3859 { 3196 {
… …
3870 else 3207 else
3871 j = 1; 3208 j = 1;
3872 strcat (buf, spellpathnames[i]); 3209 strcat (buf, spellpathnames[i]);
3873 } 3210 }
3874 } 3211 }
3212
3875 strcat (buf, "."); 3213 strcat (buf, ".");
3876 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3214 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3877 } 3215 }
3878 3216
3879 /* evtl. adding flags: */ 3217 /* evtl. adding flags: */
3880 if (QUERY_FLAG (item, FLAG_XRAYS)) 3218 if (item->flag [FLAG_XRAYS])
3881 SET_FLAG (skin, FLAG_XRAYS); 3219 skin->set_flag (FLAG_XRAYS);
3882 if (QUERY_FLAG (item, FLAG_STEALTH)) 3220 if (item->flag [FLAG_STEALTH])
3883 SET_FLAG (skin, FLAG_STEALTH); 3221 skin->set_flag (FLAG_STEALTH);
3884 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3222 if (item->flag [FLAG_SEE_IN_DARK])
3885 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3223 skin->set_flag (FLAG_SEE_IN_DARK);
3886 3224
3887 /* print message if there is one */ 3225 /* print message if there is one */
3888 if (item->msg != NULL) 3226 if (item->msg != NULL)
3889 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3227 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3890 } 3228 }
3891 else 3229 else
3892 { 3230 {
3893 /* generate misc. treasure */ 3231 /* generate misc. treasure */
3894 tmp = arch_to_object (tr->item); 3232 tmp = tr->item->instance ();
3895 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3233 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3896 tmp = insert_ob_in_ob (tmp, who); 3234 who->insert (tmp);
3897 if (who->type == PLAYER)
3898 esrv_send_item (who, tmp);
3899 } 3235 }
3900} 3236}
3901 3237
3902/** 3238//-GPL
3903 * Unready an object for a player. This function does nothing if the object was 3239
3904 * not readied. 3240sint8
3905 */ 3241player::darkness_at (maptile *map, int x, int y) const
3242{
3243 if (!ns)
3244 return LOS_BLOCKED;
3245
3246 int dx, dy;
3247 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3248 return LOS_BLOCKED;
3249
3250 x += dx - ns->current_x;
3251 y += dy - ns->current_y;
3252
3253 return blocked_los (x, y);
3254}
3255
3906void 3256void
3907player_unready_range_ob (player *pl, object *ob) 3257player::infobox (const char *title, const char *msg, int color)
3908{ 3258{
3909 rangetype i; 3259 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3910
3911 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3912 {
3913 if (pl->ranges[i] == ob)
3914 {
3915 pl->ranges[i] = NULL;
3916 if (pl->shoottype == i)
3917 {
3918 pl->shoottype = range_none;
3919 }
3920 }
3921 }
3922} 3260}
3261
3262void
3263player::statusmsg (const char *msg, int color)
3264{
3265 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3266}
3267
3268void
3269player::failmsg (const char *msg, int color)
3270{
3271 play_sound (sound_find ("generic_failure"));
3272 statusmsg (msg, color);
3273}
3274
3275void
3276object::failmsgf (const char *format, ...)
3277{
3278 if (!contr)
3279 return;
3280
3281 va_list ap;
3282 va_start (ap, format);
3283 contr->failmsg (vformat (format, ap));
3284 va_end (ap);
3285}
3286
3287void
3288player::failmsgf (const char *format, ...)
3289{
3290 va_list ap;
3291 va_start (ap, format);
3292 failmsg (vformat (format, ap));
3293 va_end (ap);
3294}
3295

Diff Legend

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