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.60 by root, Sat Dec 23 09:41:55 2006 UTC vs.
Revision 1.263 by root, Sat Apr 3 22:30:21 2010 UTC

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

Diff Legend

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