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.94 by root, Mon Jan 8 14:29:05 2007 UTC vs.
Revision 1.235 by root, Wed Nov 4 17:24:00 2009 UTC

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

Diff Legend

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