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.266 by root, Tue Apr 6 23:34:57 2010 UTC

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

Diff Legend

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