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.59 by root, Sat Dec 23 07:36:35 2006 UTC vs.
Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC

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

Diff Legend

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