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

Diff Legend

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