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.82 by elmex, Wed Jan 3 02:30:52 2007 UTC vs.
Revision 1.228 by elmex, Sun Jan 18 17:50:19 2009 UTC

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

Diff Legend

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