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.99 by root, Thu Jan 18 19:42:10 2007 UTC vs.
Revision 1.260 by root, Fri Apr 2 03:41:25 2010 UTC

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

Diff Legend

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