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

Diff Legend

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