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

Diff Legend

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