ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.145 by root, Mon Apr 21 07:01:40 2008 UTC vs.
Revision 1.201 by root, Mon Oct 12 14:00:58 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <cmath> 25#include <cmath>
… …
53 * subtype 5: arch or race 54 * subtype 5: arch or race
54 * subtype 7: all three 55 * subtype 7: all three
55 */ 56 */
56 if (op->subtype) 57 if (op->subtype)
57 { 58 {
58 arch_flag = (op->subtype & 1); 59 arch_flag = op->subtype & 1;
59 name_flag = (op->subtype & 2); 60 name_flag = op->subtype & 2;
60 race_flag = (op->subtype & 4); 61 race_flag = op->subtype & 4;
61 } 62 }
62 else 63 else
63 { 64 {
64 arch_flag = 1; 65 arch_flag = 1;
65 name_flag = 1; 66 name_flag = 1;
… …
92 * Return value: 1 if money was destroyed, 0 if not. 93 * Return value: 1 if money was destroyed, 0 if not.
93 */ 94 */
94static int 95static int
95apply_id_altar (object *money, object *altar, object *pl) 96apply_id_altar (object *money, object *altar, object *pl)
96{ 97{
97 dynbuf_text buf; 98 dynbuf_text &buf = msg_dynbuf; buf.clear ();
98 99
99 if (!pl || pl->type != PLAYER) 100 if (!pl || pl->type != PLAYER)
100 return 0; 101 return 0;
101 102
102 /* Check for MONEY type is a special hack - it prevents 'nothing needs 103 /* Check for MONEY type is a special hack - it prevents 'nothing needs
103 * identifying' from being printed out more than it needs to be. 104 * identifying' from being printed out more than it needs to be.
104 */ 105 */
105 if (!check_altar_sacrifice (altar, money) || money->type != MONEY) 106 if (!check_altar_sacrifice (altar, money, pl) || money->type != MONEY)
106 return 0; 107 return 0;
107 108
108 /* if the player has a marked item, identify that if it needs to be 109 /* if the player has a marked item, identify that if it needs to be
109 * identified. If it doesn't, then go through the player inventory. 110 * identified. If it doesn't, then go through the player inventory.
110 */ 111 */
111 if (object *marked = find_marked_object (pl)) 112 if (object *marked = find_marked_object (pl))
112 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked)) 113 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
113 { 114 {
114 if (operate_altar (altar, &money)) 115 if (operate_altar (altar, &money, pl))
115 { 116 {
116 identify (marked); 117 identify (marked);
117 118
118 buf.printf ("You have %s.\n\n", long_desc (marked, pl)); 119 buf.printf ("You have %s.\r", long_desc (marked, pl));
119 if (marked->msg) 120 if (marked->msg)
120 buf << "The item has a story:\n\n" << marked->msg << "\n\n"; 121 buf << "The item has a story:\r" << marked->msg << "\n\n";
121 122
122 return !money; 123 return !money;
123 } 124 }
124 } 125 }
125 126
126 for (object *id = pl->inv; id; id = id->below) 127 for (object *id = pl->inv; id; id = id->below)
127 { 128 {
128 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id)) 129 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
129 { 130 {
130 if (operate_altar (altar, &money)) 131 if (operate_altar (altar, &money, pl))
131 { 132 {
132 identify (id); 133 identify (id);
133 134
134 buf.printf ("You have %s.\n\n", long_desc (id, pl)); 135 buf.printf ("You have %s.\r", long_desc (id, pl));
135 if (id->msg) 136 if (id->msg)
136 buf << "The item has a story:\n\n" << id->msg << "\n\n"; 137 buf << "The item has a story:\r" << id->msg << "\n\n";
137 138
138 /* If no more money, might as well quit now */ 139 /* If no more money, might as well quit now */
139 if (!money || !check_altar_sacrifice (altar, money)) 140 if (!money || !check_altar_sacrifice (altar, money))
140 break; 141 break;
141 } 142 }
… …
160 * matching item. 161 * matching item.
161 **/ 162 **/
162void 163void
163handle_apply_yield (object *tmp) 164handle_apply_yield (object *tmp)
164{ 165{
165 const char *yield; 166 if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
166 167 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167 yield = get_ob_key_value (tmp, "on_use_yield");
168 if (yield != NULL)
169 {
170 object *drop = get_archetype (yield);
171
172 if (tmp->env)
173 {
174 drop = insert_ob_in_ob (drop, tmp->env);
175 if (tmp->env->type == PLAYER)
176 esrv_send_item (tmp->env, drop);
177 }
178 else
179 {
180 drop->x = tmp->x;
181 drop->y = tmp->y;
182 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
183 }
184 }
185} 168}
186 169
187/** 170/**
188 * Handles applying a potion. 171 * Handles applying a potion.
189 */ 172 */
… …
226 if (!(at = archetype::find (ARCH_DEPLETION))) 209 if (!(at = archetype::find (ARCH_DEPLETION)))
227 { 210 {
228 LOG (llevError, "Could not find archetype depletion\n"); 211 LOG (llevError, "Could not find archetype depletion\n");
229 return 0; 212 return 0;
230 } 213 }
214
231 depl = present_arch_in_ob (at, op); 215 depl = present_arch_in_ob (at, op);
232 216
233 if (depl) 217 if (depl)
234 { 218 {
235 for (i = 0; i < NUM_STATS; i++) 219 for (i = 0; i < NUM_STATS; i++)
… …
332 */ 316 */
333 if (tmp->inv) 317 if (tmp->inv)
334 { 318 {
335 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 319 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
336 { 320 {
337 object *fball;
338
339 op->failmsg ("Yech! Your lungs are on fire!"); 321 op->failmsg ("Yech! Your lungs are on fire!");
340 322 create_exploding_ball_at (op, op->level);
341 /* Explodes a fireball centered at player */
342 fball = get_archetype (EXPLODING_FIREBALL);
343 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
344 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
345 fball->x = op->x;
346 fball->y = op->y;
347 insert_ob_in_map (fball, op->map, NULL, 0);
348 } 323 }
349 else 324 else
350 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 325 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
351 326
352 tmp->decrease (); 327 tmp->decrease ();
… …
395 } 370 }
396 371
397 /* Only thing left are the stat potions */ 372 /* Only thing left are the stat potions */
398 if (op->type == PLAYER) 373 if (op->type == PLAYER)
399 { /* only for players */ 374 { /* only for players */
400 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 375 if ((QUERY_FLAG (tmp, FLAG_CURSED)
376 || QUERY_FLAG (tmp, FLAG_DAMNED))
377 && tmp->value != 0)
401 CLEAR_FLAG (tmp, FLAG_APPLIED); 378 CLEAR_FLAG (tmp, FLAG_APPLIED);
402 else 379 else
403 SET_FLAG (tmp, FLAG_APPLIED); 380 SET_FLAG (tmp, FLAG_APPLIED);
404 381
405 if (!change_abil (op, tmp)) 382 if (!change_abil (op, tmp))
… …
411 * stat will not be raised by them. fix_player just clears 388 * stat will not be raised by them. fix_player just clears
412 * up all the stats. 389 * up all the stats.
413 */ 390 */
414 CLEAR_FLAG (tmp, FLAG_APPLIED); 391 CLEAR_FLAG (tmp, FLAG_APPLIED);
415 op->update_stats (); 392 op->update_stats ();
416 op->decrease (); 393 tmp->decrease ();
417 return 1; 394 return 1;
418} 395}
419 396
420/**************************************************************************** 397/****************************************************************************
421 * Weapon improvement code follows 398 * Weapon improvement code follows
422 ****************************************************************************/ 399 ****************************************************************************/
423 400
424/** 401/**
402 * This function just checks whether who can handle equipping an item
403 * with item_power.
404 */
405
406bool
407check_item_power (object *who, int item_power)
408{
409 if (who->type == PLAYER
410 && item_power
411 && item_power + who->contr->item_power > settings.item_power_factor * who->level)
412 return false;
413 else
414 return true;
415}
416
417/**
425 * This returns the sum of nrof of item (arch name). 418 * This returns the sum of nrof of item (arch name).
426 */ 419 */
427static int 420static int
428check_item (object *op, const char *item) 421check_item (object *op, shstr_cmp item)
429{ 422{
430 int count = 0; 423 int count = 0;
431 424
432 if (!item) 425 if (!item)
433 return 0; 426 return 0;
434 427
435 for (op = op->below; op; op = op->below) 428 for (op = op->below; op; op = op->below)
436 {
437 if (strcmp (op->arch->archname, item) == 0) 429 if (op->arch->archname == item)
438 {
439 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 430 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
440 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 431 && /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
441 {
442 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
443 count++;
444 else
445 count += op->nrof; 432 count += op->number_of ();
446 }
447 }
448 }
449 433
450 return count; 434 return count;
451} 435}
452 436
453/** 437/**
… …
455 * op is typically the player, which is only 439 * op is typically the player, which is only
456 * really used to determine what space to look at. 440 * really used to determine what space to look at.
457 * Modified to only eat 'nrof' of objects. 441 * Modified to only eat 'nrof' of objects.
458 */ 442 */
459static void 443static void
460eat_item (object *op, const char *item, uint32 nrof) 444eat_item (object *op, shstr_cmp item, uint32 nrof)
461{ 445{
462 object *prev; 446 object *prev;
463 447
464 prev = op; 448 prev = op;
465 op = op->below; 449 op = op->below;
466 450
467 while (op) 451 while (op)
468 { 452 {
469 if (strcmp (op->arch->archname, item) == 0) 453 if (op->arch->archname == item)
470 { 454 {
471 if (op->nrof >= nrof) 455 if (op->nrof >= nrof)
472 { 456 {
473 op->decrease (nrof); 457 op->decrease (nrof);
474 return; 458 return;
… …
483 } 467 }
484 468
485 prev = op; 469 prev = op;
486 op = op->below; 470 op = op->below;
487 } 471 }
488}
489
490/**
491 * This checks to see of the player (who) is sufficient level to use a weapon
492 * with improvs improvements (typically last_eat). We take an int here
493 * instead of the object so that the improvement code can pass along the
494 * increased value to see if the object is usuable.
495 * we return 1 (true) if the player can use the weapon.
496 */
497static int
498check_weapon_power (const object *who, int improvs)
499{
500/* Old code is below (commented out). Basically, since weapons are the only
501 * object players really have any control to improve, it's a bit harsh to
502 * require high level in some combat skill, so we just use overall level.
503 */
504#if 1
505 if (((who->level / 5) + 5) >= improvs)
506 return 1;
507 else
508 return 0;
509
510#else
511 int level = 0;
512
513 /* The skill system hands out wc and dam bonuses to fighters
514 * more generously than the old system (see fix_player). Thus
515 * we need to curtail the power of player enchanted weapons.
516 * I changed this to 1 improvement per "fighter" level/5 -b.t.
517 * Note: Nothing should break by allowing this ratio to be different or
518 * using normal level - it is just a matter of play balance.
519 */
520 if (who->type == PLAYER)
521 {
522 object *wc_obj = NULL;
523
524 for (wc_obj = who->inv; wc_obj; wc_obj = wc_obj->below)
525 if (wc_obj->type == SKILL && IS_COMBAT_SKILL (wc_obj->subtype) && wc_obj->level > level)
526 level = wc_obj->level;
527
528 if (!level)
529 {
530 LOG (llevError, "Error: Player: %s lacks wc experience object\n", who->name);
531 level = who->level;
532 }
533 }
534 else
535 level = who->level;
536
537 return (improvs <= ((level / 5) + 5));
538#endif
539} 472}
540 473
541/** 474/**
542 * Returns how many items of type improver->slaying there are under op. 475 * Returns how many items of type improver->slaying there are under op.
543 * Will display a message if none found, and 1 if improver->slaying is NULL. 476 * Will display a message if none found, and 1 if improver->slaying is NULL.
… …
625 weapon->stats.exp || /* speed */ 558 weapon->stats.exp || /* speed */
626 weapon->stats.ac) /* AC - only taifu's I think */ 559 weapon->stats.ac) /* AC - only taifu's I think */
627 { 560 {
628 op->failmsg ("You cannot prepare magic weapons. " 561 op->failmsg ("You cannot prepare magic weapons. "
629 "H<A weapon is considered magical if it changes regeneration, " 562 "H<A weapon is considered magical if it changes regeneration, "
630 "speed or ac.>"); 563 "speed or ac, or has other protections.>");
631 return 0; 564 return 0;
632 } 565 }
633 566
634 sacrifice_count = check_sacrifice (op, improver); 567 sacrifice_count = check_sacrifice (op, improver);
635 if (sacrifice_count <= 0) 568 if (sacrifice_count <= 0)
… …
650 slot at once! */ 583 slot at once! */
651 improver->decrease (); 584 improver->decrease ();
652 weapon->last_eat = 0; 585 weapon->last_eat = 0;
653 return 1; 586 return 1;
654} 587}
655
656 588
657/** 589/**
658 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 590 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
659 * This is the new improve weapon code. 591 * This is the new improve weapon code.
660 * Returns 0 if it was not able to work for some reason. 592 * Returns 0 if it was not able to work for some reason.
… …
673 if (improver->stats.sp == IMPROVE_PREPARE) 605 if (improver->stats.sp == IMPROVE_PREPARE)
674 return prepare_weapon (op, improver, weapon); 606 return prepare_weapon (op, improver, weapon);
675 607
676 if (weapon->level == 0) 608 if (weapon->level == 0)
677 { 609 {
678 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>"); 610 op->failmsg (
611 "This weapon has not been prepared."
612 " H<You first have to prepare a weapon with a prepare weapon scroll.>");
679 return 0; 613 return 0;
680 } 614 }
681 615
682 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 616 if (weapon->last_eat >= weapon->level // improvements used up
617 || weapon->item_power >= 100) // or item_power >= arbitrary limit of 100
683 { 618 {
684 op->failmsg ("This weapon cannot be improved any more."); 619 op->failmsg ("This weapon cannot be improved any more.");
685 return 0; 620 return 0;
686 } 621 }
687 622
688 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 623 if (QUERY_FLAG (weapon, FLAG_APPLIED)
624 && !check_item_power (op, weapon->item_power + 1))
689 { 625 {
690 op->failmsg ("Improving the weapon will make it too " 626 op->failmsg ("Improving the weapon will make it too "
691 "powerful for you to use. Unready it if you " 627 "powerful for you to use. Unready it if you "
692 "really want to improve it."); 628 "really want to improve it.");
693 return 0; 629 return 0;
… …
721 weapon->last_eat++; 657 weapon->last_eat++;
722 weapon->item_power++; 658 weapon->item_power++;
723 improver->decrease (); 659 improver->decrease ();
724 return 1; 660 return 1;
725 } 661 }
662
726 if (improver->stats.sp == IMPROVE_ENCHANT) 663 if (improver->stats.sp == IMPROVE_ENCHANT)
727 { 664 {
728 weapon->magic++; 665 weapon->magic++;
729 weapon->last_eat++; 666 weapon->last_eat++;
730 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 667 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
… …
785 op->failmsg ("Something blocks the magic of the scroll!"); 722 op->failmsg ("Something blocks the magic of the scroll!");
786 return 0; 723 return 0;
787 } 724 }
788 725
789 otmp = find_marked_object (op); 726 otmp = find_marked_object (op);
727
790 if (!otmp) 728 if (!otmp)
791 { 729 {
792 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>"); 730 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
793 return 0; 731 return 0;
794 } 732 }
… …
898 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 836 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
899 837
900 if (op->type == PLAYER) 838 if (op->type == PLAYER)
901 { 839 {
902 esrv_send_item (op, armour); 840 esrv_send_item (op, armour);
841
903 if (QUERY_FLAG (armour, FLAG_APPLIED)) 842 if (QUERY_FLAG (armour, FLAG_APPLIED))
904 op->update_stats (); 843 op->update_stats ();
905 } 844 }
906 845
907 improver->decrease (); 846 improver->decrease ();
908 847
909 if (tmp) 848 if (tmp)
910 { 849 op->insert (tmp);
911 insert_ob_in_ob (tmp, op);
912 esrv_send_item (op, tmp);
913 }
914 850
915 return 1; 851 return 1;
916} 852}
917 853
918/* 854/*
… …
922 * Takes one type of items and makes another. 858 * Takes one type of items and makes another.
923 * converter is the object that is doing the conversion. 859 * converter is the object that is doing the conversion.
924 * item is the object that triggered the converter - if it is not 860 * item is the object that triggered the converter - if it is not
925 * what the converter wants, this will not do anything. 861 * what the converter wants, this will not do anything.
926 */ 862 */
927static int 863int
928convert_item (object *item, object *converter) 864convert_item (object *item, object *converter)
929{ 865{
930 sint64 nr, price_in; 866 sint64 nr, price_in;
931 867
932 if (item->flag [FLAG_UNPAID]) 868 if (item->flag [FLAG_UNPAID])
… …
990 ob_to_copy = converter->inv; 926 ob_to_copy = converter->inv;
991 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++) 927 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
992 if (rndm (0, i) == 0) 928 if (rndm (0, i) == 0)
993 ob_to_copy = ob; 929 ob_to_copy = ob;
994 930
995 item = object_create_clone (ob_to_copy); 931 item = ob_to_copy->deep_clone ();
996 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 932 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
997 unflag_inv (item, FLAG_IS_A_TEMPLATE); 933 unflag_inv (item, FLAG_IS_A_TEMPLATE);
998 } 934 }
999 else 935 else
1000 { 936 {
… …
1013 item->nrof = give; 949 item->nrof = give;
1014 950
1015 if (nr) 951 if (nr)
1016 item->nrof *= nr; 952 item->nrof *= nr;
1017 953
1018 if (is_in_shop (converter)) 954 if (converter->flag [FLAG_PRECIOUS])
1019 SET_FLAG (item, FLAG_UNPAID); 955 SET_FLAG (item, FLAG_UNPAID);
956
957 if (is_in_shop (converter))
958 {
959 // converters on shop floors don't work anymore, bug lets check for it
960 // and report in case someone still does it.
961 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
962 converter->debug_desc ());
963 SET_FLAG (item, FLAG_UNPAID);
964 }
1020 else if (price_in < sint64 (item->nrof) * item->value) 965 else if (price_in < sint64 (item->nrof) * item->value)
1021 { 966 {
1022 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 967 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1023 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 968 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1024 /** 969 /**
1025 * elmex: we are going to let the game continue, as the mapcreator 970 * elmex: we are going to let the game continue, as the mapcreator
1026 * hopefully had something in mind when doing this. 971 * hopefully had something in mind when doing this.
1027 */ 972 */
1028 } 973 }
1029 974
1030 SET_FLAG (item, FLAG_IDENTIFIED); 975 // elmex: only identify if we need to, for example so that generated money doesn't
976 // get an 'identified' flag so easily.
977 if (need_identify (item))
978 identify (item);
979
1031 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 980 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1032 return 1; 981 return 1;
1033} 982}
1034 983
1035/** 984/**
… …
1112{ 1061{
1113 /* Only players can make sacrifices on spell casting altars. */ 1062 /* Only players can make sacrifices on spell casting altars. */
1114 if (altar->inv && (!originator || originator->type != PLAYER)) 1063 if (altar->inv && (!originator || originator->type != PLAYER))
1115 return 0; 1064 return 0;
1116 1065
1117 if (operate_altar (altar, &sacrifice)) 1066 if (operate_altar (altar, &sacrifice, originator))
1118 { 1067 {
1119 /* Simple check. Unfortunately, it means you can't cast magic bullet 1068 /* Simple check. Unfortunately, it means you can't cast magic bullet
1120 * with an altar. We call it a Potion - altars are stationary - it 1069 * with an altar. We call it a Potion - altars are stationary - it
1121 * is up to map designers to use them properly. 1070 * is up to map designers to use them properly.
1122 */ 1071 */
… …
1131/* push_button (altar);*/ 1080/* push_button (altar);*/
1132 } 1081 }
1133 else 1082 else
1134 { 1083 {
1135 altar->value = 1; /* works only once */ 1084 altar->value = 1; /* works only once */
1136 push_button (altar); 1085 push_button (altar, originator);
1137 } 1086 }
1138 1087
1139 return !sacrifice; 1088 return !sacrifice;
1140 } 1089 }
1141 else 1090 else
… …
1158 1107
1159 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1108 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1160 1109
1161 bool has_unpaid = false; 1110 bool has_unpaid = false;
1162 1111
1163 // quite inefficient to do this here twice, but the api doesn'T lend itself to 1112 // quite inefficient to do this here twice, but the api doesn't lend itself to
1164 // a quick and small change :( 1113 // a quick and small change :(
1165 for (object::depth_iterator item = op->begin (); item != op->end (); ++item) 1114 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1166 if (item->flag [FLAG_UNPAID]) 1115 if (item->flag [FLAG_UNPAID])
1167 { 1116 {
1168 has_unpaid = true; 1117 has_unpaid = true;
1169 break; 1118 break;
1170 } 1119 }
1171 1120
1172 if (op->type != PLAYER) 1121 if (!op->is_player ())
1173 { 1122 {
1174 /* Remove all the unpaid objects that may be carried here. 1123 /* Remove all the unpaid objects that may be carried here.
1175 * This could be pets or monsters that are somehow in 1124 * This could be pets or monsters that are somehow in
1176 * the shop. 1125 * the shop.
1177 */ 1126 */
… …
1181 1130
1182 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1131 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1183 { 1132 {
1184 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1133 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1185 1134
1135 if (i >= 0)
1186 tmp->remove (); 1136 tmp->move (i);
1187
1188 if (i == -1)
1189 i = 0;
1190
1191 tmp->map = op->map;
1192 tmp->x = op->x + freearr_x[i];
1193 tmp->y = op->y + freearr_y[i];
1194 insert_ob_in_map (tmp, op->map, op, 0);
1195 } 1137 }
1196 } 1138 }
1197 1139
1198 /* Don't teleport things like spell effects */ 1140 /* Don't teleport things like spell effects */
1199 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1141 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1210 if (i != -1) 1152 if (i != -1)
1211 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1153 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1212 1154
1213 return 0; 1155 return 0;
1214 } 1156 }
1157
1215 /* Removed code that checked for multipart objects - it appears that 1158 /* Removed code that checked for multipart objects - it appears that
1216 * the teleport function should be able to handle this just fine. 1159 * the teleport function should be able to handle this just fine.
1217 */ 1160 */
1218 rv = teleport (shop_mat, SHOP_MAT, op); 1161 rv = teleport (shop_mat, SHOP_MAT, op);
1219 } 1162 }
… …
1274 * Handles applying a sign. 1217 * Handles applying a sign.
1275 */ 1218 */
1276static void 1219static void
1277apply_sign (object *op, object *sign, int autoapply) 1220apply_sign (object *op, object *sign, int autoapply)
1278{ 1221{
1279 readable_message_type *msgType; 1222 if (!op->is_player())
1223 return;
1224
1225 if (sign->has_dialogue ())
1226 {
1227 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1228 return;
1229 }
1280 1230
1281 if (!sign->msg) 1231 if (!sign->msg)
1282 { 1232 {
1283 op->statusmsg ("Nothing is written on it."); 1233 op->contr->infobox (MSG_CHANNEL ("examine"),
1234 format ("T<%s>\n\n Nothing %sis written on it.",
1235 &sign->name,
1236 sign->name == sign->arch->name ? "" : "else "));
1284 return; 1237 return;
1285 } 1238 }
1286 1239
1287 if (sign->stats.food) 1240 if (sign->stats.food)
1288 { 1241 {
1289 if (sign->last_eat >= sign->stats.food) 1242 if (sign->last_eat >= sign->stats.food)
1290 { 1243 {
1291 if (!sign->move_on) 1244 if (!sign->move_on)
1292 op->statusmsg ("You cannot read it anymore."); 1245 op->failmsg ("You cannot read it anymore.");
1293 1246
1294 return; 1247 return;
1295 } 1248 }
1296 1249
1297 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1250 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1315 if (sign->sound) 1268 if (sign->sound)
1316 ns->play_sound (sign->sound); 1269 ns->play_sound (sign->sound);
1317 else if (autoapply) 1270 else if (autoapply)
1318 ns->play_sound (sound_find ("msg_voice")); 1271 ns->play_sound (sound_find ("msg_voice"));
1319 1272
1320 if (ns->can_msg)
1321 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1273 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1322 else
1323 {
1324 msgType = get_readable_message_type (sign);
1325 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1326 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1327 }
1328 } 1274 }
1275}
1276
1277static void
1278move_apply_hole (object *trap, object *victim)
1279{
1280 /* Hole not open? */
1281 if (trap->stats.wc > 0)
1282 return;
1283
1284 /* Is this a multipart monster and not the head? If so, return.
1285 * Processing will happen if the head runs into the pit
1286 */
1287 if (victim->head)
1288 return;
1289
1290 // now find all possible locations and randomly pick one
1291 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1292 trap->range >= 3 ? SIZEOFFREE3 + 1
1293 : trap->range >= 2 ? SIZEOFFREE2 + 1
1294 : trap->range >= 1 ? SIZEOFFREE1 + 1
1295 : SIZEOFFREE0 + 1);
1296
1297 if (dir < 0)
1298 return;
1299
1300 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1301 victim->statusmsg ("You fall through the hole!", NDI_RED);
1302
1303 transfer_ob (victim,
1304 EXIT_X (trap) + freearr_x[dir],
1305 EXIT_Y (trap) + freearr_y[dir],
1306 0, victim);
1329} 1307}
1330 1308
1331/** 1309/**
1332 * 'victim' moves onto 'trap' 1310 * 'victim' moves onto 'trap'
1333 * 'victim' leaves 'trap' 1311 * 'victim' leaves 'trap'
… …
1364 1342
1365 recursion_depth++; 1343 recursion_depth++;
1366 if (trap->head) 1344 if (trap->head)
1367 trap = trap->head; 1345 trap = trap->head;
1368 1346
1369 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1347 if (!INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
1370 goto leave;
1371
1372 switch (trap->type) 1348 switch (trap->type)
1373 { 1349 {
1374 case PLAYERMOVER: 1350 case PLAYERMOVER:
1375 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim)) 1351 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim))
1352 {
1353 if (!trap->stats.maxsp)
1354 trap->stats.maxsp = 2;
1355
1356 /* Is this correct? From the docs, it doesn't look like it
1357 * should be divided by trap->speed
1358 */
1359 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed);
1360
1361 /* Just put in some sanity check. I think there is a bug in the
1362 * above with some objects have zero speed, and thus the player
1363 * getting permanently paralyzed.
1364 */
1365 if (victim->speed_left < -50.f)
1366 victim->speed_left = -50.f;
1367 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1368 }
1369 break;
1370
1371 case SPINNER:
1372 if (victim->direction)
1373 {
1374 victim->direction = absdir (victim->direction - trap->stats.sp);
1375 update_turn_face (victim);
1376 }
1377 break;
1378
1379 case DIRECTOR:
1380 if (victim->direction && !should_director_abort (trap, victim))
1381 {
1382 victim->direction = trap->stats.sp;
1383 update_turn_face (victim);
1384 }
1385 break;
1386
1387 case BUTTON:
1388 case PEDESTAL:
1389 update_button (trap, originator);
1390 break;
1391
1392 case ALTAR:
1393 /* sacrifice victim on trap */
1394 apply_altar (trap, victim, originator);
1395 break;
1396
1397 case THROWN_OBJ:
1398 if (trap->inv == NULL)
1399 break;
1400 /* fallthrough */
1401
1402 case ARROW:
1403 /* bad bug: monster throw a object, make a step forwards, step on object ,
1404 * trigger this here and get hit by own missile - and will be own enemy.
1405 * Victim then is his own enemy and will start to kill herself (this is
1406 * removed) but we have not synced victim and his missile. To avoid senseless
1407 * action, we avoid hits here
1408 */
1409 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1410 hit_with_arrow (trap, victim);
1411 break;
1412
1413 case SPELL_EFFECT:
1414 apply_spell_effect (trap, victim);
1415 break;
1416
1417 case TRAPDOOR:
1376 { 1418 {
1419 int max, sound_was_played;
1420 object *ab, *ab_next;
1421
1377 if (!trap->stats.maxsp) 1422 if (!trap->value)
1378 trap->stats.maxsp = 2; 1423 {
1424 int tot;
1379 1425
1380 /* Is this correct? From the docs, it doesn't look like it 1426 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1381 * should be divided by trap->speed 1427 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1428 tot += ab->head_ ()->total_weight ();
1429
1430 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1431 break;
1432
1433 SET_ANIMATION (trap, trap->value);
1434 update_object (trap, UP_OBJ_FACE);
1435 }
1436
1437 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
1438 {
1439 /* need to set this up, since if we do transfer the object,
1440 * ab->above would be bogus
1382 */ 1441 */
1383 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed); 1442 ab_next = ab->above;
1384 1443
1385 /* Just put in some sanity check. I think there is a bug in the 1444 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1386 * above with some objects have zero speed, and thus the player 1445 {
1387 * getting permanently paralyzed. 1446 if (!sound_was_played)
1447 {
1448 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1449 sound_was_played = 1;
1450 }
1451
1452 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1453 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1454 }
1388 */ 1455 }
1389 if (victim->speed_left < -50.f) 1456 break;
1390 victim->speed_left = -50.f;
1391 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1392 } 1457 }
1393 goto leave;
1394 1458
1395 case SPINNER: 1459 case CONVERTER:
1396 if (victim->direction) 1460 if (convert_item (victim, trap) < 0)
1397 {
1398 victim->direction = absdir (victim->direction - trap->stats.sp);
1399 update_turn_face (victim);
1400 }
1401 goto leave;
1402
1403 case DIRECTOR:
1404 if (victim->direction && !should_director_abort (trap, victim))
1405 {
1406 victim->direction = trap->stats.sp;
1407 update_turn_face (victim);
1408 }
1409 goto leave;
1410
1411 case BUTTON:
1412 case PEDESTAL:
1413 update_button (trap);
1414 goto leave;
1415
1416 case ALTAR:
1417 /* sacrifice victim on trap */
1418 apply_altar (trap, victim, originator);
1419 goto leave;
1420
1421 case THROWN_OBJ:
1422 if (trap->inv == NULL)
1423 goto leave;
1424 /* fallthrough */
1425
1426 case ARROW:
1427 /* bad bug: monster throw a object, make a step forwards, step on object ,
1428 * trigger this here and get hit by own missile - and will be own enemy.
1429 * Victim then is his own enemy and will start to kill herself (this is
1430 * removed) but we have not synced victim and his missile. To avoid senseless
1431 * action, we avoid hits here
1432 */
1433 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1434 hit_with_arrow (trap, victim);
1435 goto leave;
1436
1437 case SPELL_EFFECT:
1438 apply_spell_effect (trap, victim);
1439 goto leave;
1440
1441 case TRAPDOOR:
1442 {
1443 int max, sound_was_played;
1444 object *ab, *ab_next;
1445
1446 if (!trap->value)
1447 { 1461 {
1448 int tot; 1462 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1449 1463 archetype::get (shstr_burnout)->insert_at (trap, trap);
1450 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1451 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1452 tot += ab->head_ ()->total_weight ();
1453
1454 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1455 goto leave;
1456
1457 SET_ANIMATION (trap, trap->value);
1458 update_object (trap, UP_OBJ_FACE);
1459 } 1464 }
1460 1465
1461 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next) 1466 break;
1467
1468 case TRIGGER_BUTTON:
1469 case TRIGGER_PEDESTAL:
1470 case TRIGGER_ALTAR:
1471 check_trigger (trap, victim, originator);
1472 break;
1473
1474 case DEEP_SWAMP:
1475 walk_on_deep_swamp (trap, victim);
1476 break;
1477
1478 case CHECK_INV:
1479 check_inv (victim, trap);
1480 break;
1481
1482 case HOLE:
1483 move_apply_hole (trap, victim);
1484 break;
1485
1486 case EXIT:
1487 if (victim->type == PLAYER && EXIT_PATH (trap))
1462 { 1488 {
1463 /* need to set this up, since if we do transfer the object, 1489 /* Basically, don't show exits leading to random maps the
1464 * ab->above would be bogus 1490 * players output.
1465 */ 1491 */
1466 ab_next = ab->above; 1492 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1493 victim->statusmsg (trap->msg, NDI_NAVY);
1467 1494
1468 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1495 trap->play_sound (trap->sound);
1469 { 1496 victim->enter_exit (trap);
1470 if (!sound_was_played)
1471 {
1472 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1473 sound_was_played = 1;
1474 }
1475
1476 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1477 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1478 }
1479 } 1497 }
1480 goto leave; 1498 break;
1481 }
1482 1499
1483 case CONVERTER:
1484 if (convert_item (victim, trap) < 0)
1485 {
1486 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1487 get_archetype ("burnout")->insert_at (trap, trap);
1488 }
1489
1490 goto leave;
1491
1492 case TRIGGER_BUTTON:
1493 case TRIGGER_PEDESTAL:
1494 case TRIGGER_ALTAR:
1495 check_trigger (trap, victim);
1496 goto leave;
1497
1498 case DEEP_SWAMP:
1499 walk_on_deep_swamp (trap, victim);
1500 goto leave;
1501
1502 case CHECK_INV:
1503 check_inv (victim, trap);
1504 goto leave;
1505
1506 case HOLE:
1507 /* Hole not open? */
1508 if (trap->stats.wc > 0)
1509 goto leave;
1510
1511 /* Is this a multipart monster and not the head? If so, return.
1512 * Processing will happen if the head runs into the pit
1513 */
1514 if (victim->head)
1515 goto leave;
1516
1517 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1518 victim->statusmsg ("You fall through the hole!", NDI_RED);
1519 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1520 goto leave;
1521
1522 case EXIT:
1523 if (victim->type == PLAYER && EXIT_PATH (trap))
1524 {
1525 /* Basically, don't show exits leading to random maps the
1526 * players output.
1527 */
1528 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1529 victim->statusmsg (trap->msg, NDI_NAVY);
1530
1531 trap->play_sound (trap->sound);
1532 victim->enter_exit (trap);
1533 }
1534 goto leave;
1535
1536 case ENCOUNTER: 1500 case ENCOUNTER:
1537 /* may be some leftovers on this */ 1501 /* may be some leftovers on this */
1538 goto leave; 1502 break;
1539 1503
1540 case SHOP_MAT: 1504 case SHOP_MAT:
1541 apply_shop_mat (trap, victim); 1505 apply_shop_mat (trap, victim);
1542 goto leave; 1506 break;
1543 1507
1544 /* Drop a certain amount of gold, and have one item identified */ 1508 /* Drop a certain amount of gold, and have one item identified */
1545 case IDENTIFY_ALTAR: 1509 case IDENTIFY_ALTAR:
1546 apply_id_altar (victim, trap, originator); 1510 apply_id_altar (victim, trap, originator);
1547 goto leave; 1511 break;
1548 1512
1549 case SIGN: 1513 case SIGN:
1550 if (victim->type != PLAYER && trap->stats.food > 0) 1514 if (victim->type != PLAYER && trap->stats.food > 0)
1551 goto leave; /* monsters musn't apply magic_mouths with counters */ 1515 break; /* monsters musn't apply magic_mouths with counters */
1552 1516
1553 apply_sign (victim, trap, 1); 1517 apply_sign (victim, trap, 1);
1554 goto leave; 1518 break;
1555 1519
1556 case CONTAINER: 1520 case CONTAINER:
1557 apply_container (victim, trap); 1521 apply_container (victim, trap);
1558 goto leave; 1522 break;
1559 1523
1560 case RUNE: 1524 case RUNE:
1561 case TRAP: 1525 case TRAP:
1562 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1526 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1563 spring_trap (trap, victim); 1527 spring_trap (trap, victim);
1564 goto leave; 1528 break;
1565 1529
1566 default: 1530 default:
1567 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1531 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1568 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type); 1532 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1569 goto leave; 1533 break;
1570 } 1534 }
1571 1535
1572leave:
1573 recursion_depth--; 1536 recursion_depth--;
1574} 1537}
1575 1538
1576/** 1539/**
1577 * Handles reading a regular (ie not containing a spell) book. 1540 * Handles reading a regular (ie not containing a spell) book.
… …
1616 1579
1617 readable_message_type *msgType = get_readable_message_type (tmp); 1580 readable_message_type *msgType = get_readable_message_type (tmp);
1618 1581
1619 if (player *pl = op->contr) 1582 if (player *pl = op->contr)
1620 if (client *ns = pl->ns) 1583 if (client *ns = pl->ns)
1621 if (ns->can_msg)
1622 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); 1584 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1623 else
1624 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1625 msgType->message_type, msgType->message_subtype,
1626 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1627 long_desc (tmp, op), &tmp->msg);
1628 1585
1629 /* gain xp from reading */ 1586 /* gain xp from reading */
1630 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1587 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1631 { /* only if not read before */ 1588 { /* only if not read before */
1632 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1589 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1634 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1591 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1635 { 1592 {
1636 /*exp_gain *= 2; because they just identified it too */ 1593 /*exp_gain *= 2; because they just identified it too */
1637 SET_FLAG (tmp, FLAG_IDENTIFIED); 1594 SET_FLAG (tmp, FLAG_IDENTIFIED);
1638 1595
1639 /* If in a container, update how it looks */ 1596 if (object *pl = tmp->visible_to ())
1640 if (tmp->env)
1641 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1597 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1642 else
1643 op->contr->ns->floorbox_update ();
1644 } 1598 }
1645 1599
1646 change_exp (op, exp_gain, skill_ob->skill, 0); 1600 change_exp (op, exp_gain, skill_ob->skill, 0);
1647 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1601 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1648 } 1602 }
… …
1789 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1743 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1790 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!"); 1744 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1791 return; 1745 return;
1792 } 1746 }
1793 1747
1794 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1748 int learn_level = sqrtf (spell->level) * 1.5f;
1749 if (skop->level < learn_level)
1795 { 1750 {
1796 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill)); 1751 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1752 &tmp->skill, learn_level));
1797 return; 1753 return;
1798 } 1754 }
1799 1755
1800 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1756 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1801 1757
1802 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1758 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1803 {
1804 identify (tmp); 1759 identify (tmp);
1805
1806 if (tmp->env)
1807 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1808 else
1809 op->contr->ns->floorbox_update ();
1810 }
1811 1760
1812 /* I removed the check for special_prayer_mark here - it didn't make 1761 /* I removed the check for special_prayer_mark here - it didn't make
1813 * a lot of sense - special prayers are not found in spellbooks, and 1762 * a lot of sense - special prayers are not found in spellbooks, and
1814 * if the player doesn't know the spell, doesn't make a lot of sense that 1763 * if the player doesn't know the spell, doesn't make a lot of sense that
1815 * they would have a special prayer mark. 1764 * they would have a special prayer mark.
… …
1965 if (op->destroyed () || tmp->destroyed ()) 1914 if (op->destroyed () || tmp->destroyed ())
1966 break; 1915 break;
1967 } 1916 }
1968 1917
1969 if (!tmp->destroyed () && !tmp->inv) 1918 if (!tmp->destroyed () && !tmp->inv)
1970 tmp->decrease (); 1919 tmp->decrease (true);
1971} 1920}
1972 1921
1973/** 1922/**
1974 * op eats food. 1923 * op eats food.
1975 * If player, takes care of messages and dragon special food. 1924 * If player, takes care of messages and dragon special food.
… …
2170 op->statusmsg (buf); 2119 op->statusmsg (buf);
2171 2120
2172 /* now choose a winner if we have any */ 2121 /* now choose a winner if we have any */
2173 i = -1; 2122 i = -1;
2174 if (winners > 0) 2123 if (winners > 0)
2175 i = atnr_winner[RANDOM () % winners]; 2124 i = atnr_winner [rndm (winners)];
2176 2125
2177 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2126 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2178 { 2127 {
2179 /* resistance increased! */ 2128 /* resistance increased! */
2180 skin->resist[i]++; 2129 skin->resist[i]++;
… …
2239 2188
2240 op->statusmsg ("Applying armour enchantment."); 2189 op->statusmsg ("Applying armour enchantment.");
2241 improve_armour (op, tmp, armor); 2190 improve_armour (op, tmp, armor);
2242} 2191}
2243 2192
2244extern void 2193void
2245apply_poison (object *op, object *tmp) 2194apply_poison (object *op, object *tmp)
2246{ 2195{
2196 // need to do it now when it is still on the map
2197 handle_apply_yield (tmp);
2198
2199 object *poison = tmp->split (1);
2200
2247 if (op->type == PLAYER) 2201 if (op->type == PLAYER)
2248 { 2202 {
2249 op->contr->play_sound (sound_find ("drink_poison")); 2203 op->contr->play_sound (sound_find ("drink_poison"));
2250 op->failmsg ("Yech! That tasted poisonous!"); 2204 op->failmsg ("Yech! That tasted poisonous!");
2251 strcpy (op->contr->killer, "poisonous booze"); 2205 op->contr->killer = poison;
2252 } 2206 }
2253 2207
2254 if (tmp->stats.hp > 0) 2208 if (poison->stats.hp > 0)
2255 { 2209 {
2256 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2210 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2257 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2211 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2258 } 2212 }
2259 2213
2260 op->stats.food -= op->stats.food / 4; 2214 op->stats.food -= op->stats.food / 4;
2261 handle_apply_yield (tmp); 2215 poison->destroy ();
2262 tmp->decrease ();
2263} 2216}
2264 2217
2265/** 2218/**
2266 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2219 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2267 * A valid 2 way exit means: 2220 * A valid 2 way exit means:
… …
2351 2304
2352 return 0; 2305 return 0;
2353} 2306}
2354 2307
2355/** 2308/**
2309 * This function will try to apply a lighter and in case no lighter
2310 * is specified it will try to find a lighter in the players inventory,
2311 * and inform him about this requirement.
2312 *
2313 * who - the player
2314 * op - the item we want to light
2315 * lighter - the lighter or 0 if a lighter has yet to be found
2316 */
2317static object *
2318auto_apply_lighter (object *who, object *op, object *lighter)
2319{
2320 if (lighter == 0)
2321 {
2322 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2323 {
2324 if (tmp->type == LIGHTER)
2325 {
2326 lighter = tmp;
2327 break;
2328 }
2329 }
2330
2331 if (!lighter)
2332 {
2333 who->failmsg (format (
2334 "You can't light up the %s with your bare hands! "
2335 "H<You need a lighter in your inventory, for example a flint and steel.>",
2336 &op->name));
2337 return 0;
2338 }
2339 }
2340
2341 // last_eat == 0 means the lighter is not being used up!
2342 if (lighter->last_eat && lighter->stats.food)
2343 {
2344 /* lighter gets used up */
2345 lighter = lighter->split ();
2346 lighter->stats.food--;
2347 who->insert (lighter);
2348 }
2349 else if (lighter->last_eat)
2350 {
2351 /* no charges left in lighter */
2352 who->failmsg (format (
2353 "You attempt to light the %s with a used up %s.",
2354 &op->name, &lighter->name));
2355 return 0;
2356 }
2357
2358 return lighter;
2359}
2360
2361/**
2362 * Designed primarily to light torches/lanterns/etc.
2363 * Also burns up burnable material too. First object in the inventory is
2364 * the selected object to "burn". -b.t.
2365 */
2366void
2367apply_lighter (object *who, object *lighter)
2368{
2369 object *item;
2370 int is_player_env = 0;
2371
2372 item = find_marked_object (who);
2373 if (item)
2374 {
2375 if (!auto_apply_lighter (who, item, lighter))
2376 return;
2377
2378 /* Perhaps we should split what we are trying to light on fire?
2379 * I can't see many times when you would want to light multiple
2380 * objects at once.
2381 */
2382
2383 save_throw_object (item, AT_FIRE, who);
2384
2385 if (item->destroyed ()
2386 || ((item->type == LAMP || item->type == TORCH)
2387 && item->glow_radius > 0))
2388 who->statusmsg (format (
2389 "You light the %s with the %s.",
2390 &item->name, &lighter->name));
2391 else
2392 who->failmsg (format (
2393 "You attempt to light the %s with the %s and fail.",
2394 &item->name, &lighter->name));
2395 }
2396 else
2397 who->failmsg ("You need to mark a lightable object.");
2398}
2399
2400/**
2401 * This function generates a cursed effect for cursed lamps and torches.
2402 */
2403void player_apply_lamp_cursed_effect (object *who, object *op)
2404{
2405 if (op->level)
2406 {
2407 who->failmsg (format (
2408 "The %s was cursed, it explodes in a big fireball!",
2409 &op->name));
2410 create_exploding_ball_at (who, op->level);
2411 }
2412 else
2413 {
2414 who->failmsg (format (
2415 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2416 &op->name));
2417 }
2418
2419 op->destroy ();
2420}
2421
2422/**
2423 * Apply for players and lamps
2424 *
2425 * who - the player
2426 * op - the lamp
2427 */
2428void player_apply_lamp (object *who, object *op)
2429{
2430 bool switch_on = op->glow_radius ? false : true;
2431
2432 if (switch_on)
2433 {
2434 object *lighter = 0;
2435
2436 if (op->flag [FLAG_IS_LIGHTABLE]
2437 && !(lighter = auto_apply_lighter (who, op, 0)))
2438 return;
2439
2440 if (op->stats.food < 1)
2441 {
2442 if (op->type == LAMP)
2443 who->failmsg (format (
2444 "The %s is out of fuel! "
2445 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2446 &op->name));
2447 else
2448 who->failmsg (format (
2449 "The %s is burnt out! "
2450 "H<Torches and similar items burn out and become worthless.>",
2451 &op->name));
2452 return;
2453 }
2454
2455 if (op->flag [FLAG_CURSED])
2456 {
2457 player_apply_lamp_cursed_effect (who, op);
2458 return;
2459 }
2460
2461 if (lighter)
2462 who->statusmsg (format (
2463 "You light up the %s with the %s.", &op->name, &lighter->name));
2464 else
2465 who->statusmsg (format ("You light up the %s.", &op->name));
2466 }
2467 else
2468 {
2469 if (op->flag [FLAG_CURSED])
2470 {
2471 player_apply_lamp_cursed_effect (who, op);
2472 return;
2473 }
2474
2475 if (op->type == TORCH)
2476 {
2477 if (!op->flag [FLAG_IS_LIGHTABLE])
2478 {
2479 who->statusmsg (format (
2480 "You put out the %s. "
2481 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2482 &op->name, &op->name));
2483 }
2484 else
2485 who->statusmsg (format (
2486 "You put out the %s."
2487 "H<Torches wear out if you put them out.>",
2488 &op->name));
2489 }
2490 else
2491 who->statusmsg (format ("You turn off the %s.", &op->name));
2492 }
2493
2494 apply_lamp (op, switch_on);
2495}
2496
2497void get_animation_from_arch (object *op, arch_ptr a)
2498{
2499 op->animation_id = a->animation_id;
2500 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2501 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2502 op->anim_speed = a->anim_speed;
2503 op->last_anim = 0;
2504 op->state = 0;
2505 op->face = a->face;
2506
2507 if (NUM_ANIMATIONS(op) > 1)
2508 {
2509 SET_ANIMATION(op, 0);
2510 animate_object (op, op->direction);
2511 }
2512 else
2513 update_object (op, UP_OBJ_FACE);
2514}
2515
2516/**
2517 * Apply for LAMPs and TORCHes.
2518 *
2519 * op - the lamp
2520 * switch_on - a flag which says whether the lamp should be switched on or off
2521 */
2522void apply_lamp (object *op, bool switch_on)
2523{
2524 op->set_glow_radius (switch_on ? op->range : 0);
2525 op->set_speed (switch_on ? op->arch->speed : 0);
2526
2527 // torches wear out if you put them out
2528 if (op->type == TORCH && !switch_on)
2529 {
2530 if (op->flag [FLAG_IS_LIGHTABLE])
2531 {
2532 op->stats.food -= (double) op->arch->stats.food / 15;
2533 if (op->stats.food < 0)
2534 op->stats.food = 0;
2535 }
2536 else
2537 op->stats.food = 0;
2538 }
2539
2540 // lamps and torched get worthless when used up
2541 if (op->stats.food <= 0)
2542 op->value = 0;
2543
2544 // FIXME: This is a hack to make the more sane torches and lamps
2545 // still animated ;-/
2546 if (op->other_arch)
2547 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2548
2549 if (object *pl = op->visible_to ())
2550 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2551}
2552
2553/**
2356 * Main apply handler. 2554 * Main apply handler.
2357 * 2555 *
2358 * Checks for unpaid items before applying. 2556 * Checks for unpaid items before applying.
2359 * 2557 *
2360 * Return value: 2558 * Return value:
2361 * 0: player or monster can't apply objects of that type 2559 * 0: player or monster can't apply objects of that type
2362 * 1: has been applied, or there was an error applying the object 2560 * 1: has been applied, or there was an error applying the object
2363 * 2: objects of that type can't be applied if not in inventory 2561 * 2: objects of that type can't be applied if not in inventory
2364 * 2562 *
2365 * op is the object that is causing object to be applied, tmp is the object 2563 * who is the object that is causing object to be applied, op is the object
2366 * being applied. 2564 * being applied.
2367 * 2565 *
2368 * aflag is special (always apply/unapply) flags. Nothing is done with 2566 * aflag is special (always apply/unapply) flags. Nothing is done with
2369 * them in this function - they are passed to apply_special 2567 * them in this function - they are passed to apply_special
2370 */ 2568 */
2371int 2569int
2372manual_apply (object *op, object *tmp, int aflag) 2570manual_apply (object *who, object *op, int aflag)
2373{ 2571{
2374 if (tmp->head) 2572 op = op->head_ ();
2375 tmp = tmp->head;
2376 2573
2377 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2574 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2378 { 2575 {
2379 if (op->type == PLAYER) 2576 if (who->type == PLAYER)
2380 { 2577 {
2578 examine (who, op);
2381 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2579 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2382 return 1; 2580 return 1;
2383 } 2581 }
2384 else 2582 else
2385 return 0; /* monsters just skip unpaid items */ 2583 return 0; /* monsters just skip unpaid items */
2386 } 2584 }
2387 2585
2388 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2586 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2389 return RESULT_INT (0); 2587 return RESULT_INT (0);
2390 2588
2391 switch (tmp->type) 2589 switch (op->type)
2392 { 2590 {
2393 case CF_HANDLE: 2591 case CF_HANDLE:
2394 op->play_sound (sound_find ("turn_handle")); 2592 who->play_sound (sound_find ("turn_handle"));
2395 op->statusmsg ("You turn the handle."); 2593 who->statusmsg ("You turn the handle.");
2396 tmp->value = tmp->value ? 0 : 1; 2594 op->value = op->value ? 0 : 1;
2397 SET_ANIMATION (tmp, tmp->value); 2595 SET_ANIMATION (op, op->value);
2398 update_object (tmp, UP_OBJ_FACE); 2596 update_object (op, UP_OBJ_FACE);
2399 push_button (tmp); 2597 push_button (op, who);
2400 return 1; 2598 return 1;
2401 2599
2402 case TRIGGER: 2600 case TRIGGER:
2403 if (check_trigger (tmp, op)) 2601 if (check_trigger (op, who, who))
2404 { 2602 {
2405 op->statusmsg ("You turn the handle."); 2603 who->statusmsg ("You turn the handle.");
2406 op->play_sound (sound_find ("turn_handle")); 2604 who->play_sound (sound_find ("turn_handle"));
2407 } 2605 }
2408 else 2606 else
2409 op->failmsg ("The handle doesn't move."); 2607 who->failmsg ("The handle doesn't move.");
2410 2608
2411 return 1; 2609 return 1;
2412 2610
2413 case EXIT: 2611 case EXIT:
2414 if (op->type != PLAYER) 2612 if (who->type != PLAYER)
2415 return 0; 2613 return 0;
2416 2614
2417 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2615 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2418 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2616 who->failmsg (format ("The %s is closed. H<And will stay closed, until somebody fires up the map editor and adds it.>", query_name (op)));
2419 else 2617 else
2420 { 2618 {
2421 /* Don't display messages for random maps. */ 2619 /* Don't display messages for random maps. */
2422 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2620 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2423 op->statusmsg (tmp->msg, NDI_NAVY); 2621 who->statusmsg (op->msg, NDI_NAVY);
2424 2622
2425 op->enter_exit (tmp); 2623 who->enter_exit (op);
2426 } 2624 }
2427 2625
2428 return 1; 2626 return 1;
2429 2627
2430 case INSCRIBABLE: 2628 case INSCRIBABLE:
2431 op->statusmsg (tmp->msg); 2629 who->statusmsg (op->msg);
2432 // maybe show a spell menu to chose from or something like that 2630 // maybe show a spell menu to chose from or something like that
2433 return 1; 2631 return 1;
2434 2632
2435 case SIGN: 2633 case SIGN:
2436 apply_sign (op, tmp, 0); 2634 apply_sign (who, op, 0);
2437 return 1; 2635 return 1;
2438 2636
2439 case BOOK: 2637 case BOOK:
2440 if (op->type == PLAYER) 2638 if (who->type == PLAYER)
2441 { 2639 {
2442 apply_book (op, tmp); 2640 apply_book (who, op);
2443 return 1; 2641 return 1;
2444 } 2642 }
2445 else 2643 else
2446 return 0; 2644 return 0;
2447 2645
2448 case SKILLSCROLL: 2646 case SKILLSCROLL:
2449 if (op->type == PLAYER) 2647 if (who->type == PLAYER)
2450 { 2648 {
2451 apply_skillscroll (op, tmp); 2649 apply_skillscroll (who, op);
2452 return 1; 2650 return 1;
2453 } 2651 }
2454 else 2652 else
2455 return 0; 2653 return 0;
2456 2654
2457 case SPELLBOOK: 2655 case SPELLBOOK:
2458 if (op->type == PLAYER) 2656 if (who->type == PLAYER)
2459 { 2657 {
2460 apply_spellbook (op, tmp); 2658 apply_spellbook (who, op);
2461 return 1; 2659 return 1;
2462 } 2660 }
2463 else 2661 else
2464 return 0; 2662 return 0;
2465 2663
2466 case SCROLL: 2664 case SCROLL:
2467 apply_scroll (op, tmp, 0); 2665 apply_scroll (who, op, 0);
2468 return 1; 2666 return 1;
2469 2667
2470 case POTION: 2668 case POTION:
2471 apply_potion (op, tmp); 2669 apply_potion (who, op);
2472 return 1; 2670 return 1;
2473 2671
2474 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2672 /* Eneq(@csd.uu.se): Handle apply on containers. */
2475 //TODO: remove, as it is unsed? 2673 //TODO: remove, as it is unsed?
2476 case CLOSE_CON: 2674 case CLOSE_CON:
2477 apply_container (op, tmp->env); 2675 apply_container (who, op->env);
2478 return 1; 2676 return 1;
2479 2677
2480 case CONTAINER: 2678 case CONTAINER:
2481 apply_container (op, tmp); 2679 apply_container (who, op);
2482 return 1; 2680 return 1;
2483 2681
2484 case TREASURE: 2682 case TREASURE:
2485 if (op->type == PLAYER) 2683 if (who->type == PLAYER)
2486 { 2684 {
2487 apply_treasure (op, tmp); 2685 apply_treasure (who, op);
2488 return 1; 2686 return 1;
2489 } 2687 }
2490 else 2688 else
2491 return 0; 2689 return 0;
2690
2691 case LAMP:
2692 case TORCH:
2693 player_apply_lamp (who, op);
2694 return 1;
2492 2695
2493 case WEAPON: 2696 case WEAPON:
2494 case ARMOUR: 2697 case ARMOUR:
2495 case BOOTS: 2698 case BOOTS:
2496 case GLOVES: 2699 case GLOVES:
… …
2504 case WAND: 2707 case WAND:
2505 case ROD: 2708 case ROD:
2506 case HORN: 2709 case HORN:
2507 case SKILL: 2710 case SKILL:
2508 case BOW: 2711 case BOW:
2509 case LAMP:
2510 case BUILDER: 2712 case BUILDER:
2511 case SKILL_TOOL: 2713 case SKILL_TOOL:
2512 if (tmp->env != op) 2714 if (op->env != who)
2513 return 2; /* not in inventory */ 2715 return 2; /* not in inventory */
2514 2716
2515 apply_special (op, tmp, aflag); 2717 apply_special (who, op, aflag);
2516 return 1; 2718 return 1;
2517 2719
2518 case DRINK: 2720 case DRINK:
2519 case FOOD: 2721 case FOOD:
2520 case FLESH: 2722 case FLESH:
2521 apply_food (op, tmp); 2723 apply_food (who, op);
2522 return 1; 2724 return 1;
2523 2725
2524 case POISON: 2726 case POISON:
2525 apply_poison (op, tmp); 2727 apply_poison (who, op);
2526 return 1; 2728 return 1;
2527 2729
2528 case SAVEBED: 2730 case SAVEBED:
2529 return 1; 2731 return 1;
2530 2732
2531 case ARMOUR_IMPROVER: 2733 case ARMOUR_IMPROVER:
2532 if (op->type == PLAYER) 2734 if (who->type == PLAYER)
2533 { 2735 {
2534 apply_armour_improver (op, tmp); 2736 apply_armour_improver (who, op);
2535 return 1; 2737 return 1;
2536 } 2738 }
2537 else 2739 else
2538 return 0; 2740 return 0;
2539 2741
2540 case WEAPON_IMPROVER: 2742 case WEAPON_IMPROVER:
2541 check_improve_weapon (op, tmp); 2743 check_improve_weapon (who, op);
2542 return 1; 2744 return 1;
2543 2745
2544 case CLOCK: 2746 case CLOCK:
2545 if (op->type == PLAYER) 2747 if (who->type == PLAYER)
2546 { 2748 {
2547 char buf[MAX_BUF]; 2749 char buf[MAX_BUF];
2548 timeofday_t tod; 2750 timeofday_t tod;
2549 2751
2550 get_tod (&tod); 2752 get_tod (&tod);
2551 op->play_sound (sound_find ("sound_clock")); 2753 who->play_sound (sound_find ("sound_clock"));
2552 op->statusmsg (format ( 2754 who->statusmsg (format (
2553 "It is %d minute%s past %d o'clock %s", 2755 "It is %d minute%s past %d o'clock %s",
2554 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2756 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2555 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2757 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2556 )); 2758 ));
2557 return 1; 2759 return 1;
2558 } 2760 }
2559 else 2761 else
2560 return 0; 2762 return 0;
2561 2763
2562 case MENU: 2764 case MENU:
2563 if (op->type == PLAYER) 2765 if (who->type == PLAYER)
2564 { 2766 {
2565 shop_listing (tmp, op); 2767 shop_listing (op, who);
2566 return 1; 2768 return 1;
2567 } 2769 }
2568 else 2770 else
2569 return 0; 2771 return 0;
2570 2772
2571 case POWER_CRYSTAL: 2773 case POWER_CRYSTAL:
2572 apply_power_crystal (op, tmp); /* see egoitem.c */ 2774 apply_power_crystal (who, op); /* see egoitem.c */
2573 return 1; 2775 return 1;
2574 2776
2575 case LIGHTER: /* for lighting torches/lanterns/etc */ 2777 case LIGHTER: /* for lighting torches/lanterns/etc */
2576 if (op->type == PLAYER) 2778 if (who->type == PLAYER)
2577 { 2779 {
2578 apply_lighter (op, tmp); 2780 apply_lighter (who, op);
2579 return 1; 2781 return 1;
2580 } 2782 }
2581 else 2783 else
2582 return 0; 2784 return 0;
2583 2785
2584 case ITEM_TRANSFORMER: 2786 case ITEM_TRANSFORMER:
2585 apply_item_transformer (op, tmp); 2787 apply_item_transformer (who, op);
2586 return 1; 2788 return 1;
2587 2789
2588 default: 2790 default:
2589 return 0; 2791 return 0;
2590 } 2792 }
2591} 2793}
2592
2593 2794
2594/* quiet suppresses the "don't know how to apply" and "you must get it first" 2795/* quiet suppresses the "don't know how to apply" and "you must get it first"
2595 * messages as needed by player_apply_below(). But there can still be 2796 * messages as needed by player_apply_below(). But there can still be
2596 * "but you are floating high above the ground" messages. 2797 * "but you are floating high above the ground" messages.
2597 * 2798 *
2598 * Same return value as apply() function. 2799 * Same return value as apply() function.
2599 */ 2800 */
2600int 2801int
2601player_apply (object *pl, object *op, int aflag, int quiet) 2802player_apply (object *pl, object *op, int aflag, int quiet)
2602{ 2803{
2603 int tmp;
2604
2605 if (op->env && (pl->move_type & MOVE_FLYING)) 2804 if (!op->env && (pl->move_type & MOVE_FLYING))
2606 { 2805 {
2607 /* player is flying and applying object not in inventory */ 2806 /* player is flying and applying object not in inventory */
2608 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2807 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2609 { 2808 {
2610 pl->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2809 pl->failmsg ("But you are floating high above the ground! "
2810 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2811 "or waiting till the levitation effect wears off.>");
2611 return 0; 2812 return 0;
2612 } 2813 }
2613 } 2814 }
2614 2815
2615 pl->contr->last_used = op; 2816 pl->contr->last_used = op;
2616 2817
2617 tmp = manual_apply (pl, op, aflag); 2818 int tmp = manual_apply (pl, op, aflag);
2819
2618 if (!quiet) 2820 if (!quiet)
2619 { 2821 {
2620 if (tmp == 0) 2822 if (tmp == 0)
2621 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2823 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2622 else if (tmp == 2) 2824 else if (tmp == 2)
… …
2657 * person moving on it, also activate. Added code to make it 2859 * person moving on it, also activate. Added code to make it
2658 * so that at least one of players movement types be that which 2860 * so that at least one of players movement types be that which
2659 * the item needs. 2861 * the item needs.
2660 */ 2862 */
2661 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2863 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2662 {
2663 if (player_apply (pl, tmp, 0, 1) == 1) 2864 if (player_apply (pl, tmp, 0, 1) == 1)
2664 return; 2865 return;
2665 } 2866
2666 if (floors >= 2) 2867 if (floors >= 2)
2667 return; /* process at most two floor objects */ 2868 return; /* process at most two floor objects */
2668 } 2869 }
2669} 2870}
2670 2871
… …
2714 break; 2915 break;
2715 2916
2716 case SKILL: 2917 case SKILL:
2717 if (who->contr) 2918 if (who->contr)
2718 { 2919 {
2920 if (IS_COMBAT_SKILL (op->subtype))
2921 who->change_weapon (who->contr->combat_ob = 0);
2922 else if (IS_RANGED_SKILL (op->subtype))
2923 who->change_weapon (who->contr->ranged_ob = 0);
2924
2719 if (!op->invisible) 2925 if (op->invisible)
2926 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2927 else
2720 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2928 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2721 else
2722 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2723 } 2929 }
2724 2930
2725 change_abil (who, op); 2931 change_abil (who, op);
2726 CLEAR_FLAG (who, FLAG_READY_SKILL); 2932 CLEAR_FLAG (who, FLAG_READY_SKILL);
2727 break; 2933 break;
… …
2738 case CLOAK: 2944 case CLOAK:
2739 who->statusmsg (format ("You unwear %s.", query_name (op))); 2945 who->statusmsg (format ("You unwear %s.", query_name (op)));
2740 change_abil (who, op); 2946 change_abil (who, op);
2741 break; 2947 break;
2742 2948
2743 case LAMP:
2744 {
2745 who->statusmsg (format ("You turn off your %s.", &op->name));
2746
2747 object *tmp2 = arch_to_object (op->other_arch);
2748 tmp2->x = op->x;
2749 tmp2->y = op->y;
2750 tmp2->map = op->map;
2751 tmp2->below = op->below;
2752 tmp2->above = op->above;
2753 tmp2->stats.food = op->stats.food;
2754 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2755
2756 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2757 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2758
2759 if (who->contr)
2760 esrv_del_item (who->contr, op->count);
2761
2762 op->destroy ();
2763 insert_ob_in_ob (tmp2, who);
2764 who->update_stats ();
2765
2766 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2767 {
2768 if (who->contr)
2769 {
2770 who->failmsg ("Oops, it feels deadly cold!");
2771 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2772 }
2773 }
2774
2775 if (who->contr)
2776 esrv_send_item (who, tmp2);
2777 }
2778
2779 return 1; /* otherwise, an attempt to drop causes problems */
2780
2781 case BOW: 2949 case BOW:
2782 case WAND: 2950 case WAND:
2783 case ROD: 2951 case ROD:
2784 case HORN: 2952 case HORN:
2785 if (player *pl = who->contr) 2953 if (player *pl = who->contr)
… …
2812 default: 2980 default:
2813 who->statusmsg (format ("You unapply %s.", query_name (op))); 2981 who->statusmsg (format ("You unapply %s.", query_name (op)));
2814 break; 2982 break;
2815 } 2983 }
2816 2984
2985 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2986 if (object *pl = op->visible_to ())
2987 esrv_send_item (pl, op);
2988
2817 who->update_stats (); 2989 who->update_stats ();
2818
2819 if (!(aflags & AP_NO_MERGE))
2820 {
2821 object *tmp = merge_ob (op, 0);
2822
2823 if (who->contr)
2824 {
2825 if (tmp)
2826 { /* it was merged */
2827 esrv_del_item (who->contr, op->count);
2828 op = tmp;
2829 }
2830
2831 esrv_send_item (who, op);
2832 }
2833 }
2834 2990
2835 return 0; 2991 return 0;
2836} 2992}
2837 2993
2838/** 2994/**
… …
3136 return 1; 3292 return 1;
3137 } 3293 }
3138 3294
3139 return unapply_special (who, op, aflags); 3295 return unapply_special (who, op, aflags);
3140 } 3296 }
3141
3142 if (basic_flag == AP_UNAPPLY) 3297 else if (basic_flag == AP_UNAPPLY)
3143 return 0; 3298 return 0;
3144 3299
3145 // if the item is combat/ranged, wield the relevant slot first 3300 // if the item is combat/ranged, wield the relevant slot first
3146 // to resolve conflicts. 3301 // to resolve conflicts.
3147 if (player *pl = who->contr) 3302 if (player *pl = who->contr)
… …
3205 * skill so that the dam and wc get updated 3360 * skill so that the dam and wc get updated
3206 */ 3361 */
3207 who->change_skill (skop); 3362 who->change_skill (skop);
3208 } 3363 }
3209 3364
3210 if (who->type == PLAYER 3365 if (!check_item_power (who, op->item_power))
3211 && op->item_power
3212 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3213 { 3366 {
3214 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3367 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3215 return 1; 3368 return 1;
3216 } 3369 }
3217 3370
… …
3225 return RESULT_INT (0); 3378 return RESULT_INT (0);
3226 3379
3227 switch (op->type) 3380 switch (op->type)
3228 { 3381 {
3229 case WEAPON: 3382 case WEAPON:
3230 if (!check_weapon_power (who, op->last_eat))
3231 {
3232 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER);
3233
3234 if (tmp)
3235 insert_ob_in_ob (tmp, who);
3236
3237 return 1;
3238 }
3239
3240 //TODO: this obviously fails for players using a shorter prefix 3383 //TODO: this obviously fails for players using a shorter prefix
3241 // i.e. "R" can use Ragnarok's sword. 3384 // i.e. "R" can use Ragnarok's sword.
3242 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3385 if (op->level && !op->name.starts_with (who->name))
3243 { 3386 {
3244 /* if the weapon does not have the name as the character, can't use it. */ 3387 /* if the weapon does not have the name as the character, can't use it. */
3245 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3388 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3246 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3389 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3247 3390
… …
3281 case AMULET: 3424 case AMULET:
3282 SET_FLAG (op, FLAG_APPLIED); 3425 SET_FLAG (op, FLAG_APPLIED);
3283 who->statusmsg (format ("You wear %s.", query_name (op))); 3426 who->statusmsg (format ("You wear %s.", query_name (op)));
3284 change_abil (who, op); 3427 change_abil (who, op);
3285 break; 3428 break;
3286
3287 case LAMP:
3288 if (op->stats.food < 1)
3289 {
3290 who->failmsg (format (
3291 "Your %s is out of fuel! "
3292 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3293 &op->name
3294 ));
3295 return 1;
3296 }
3297
3298 who->statusmsg (format ("You turn on your %s.", &op->name));
3299
3300 tmp2 = arch_to_object (op->other_arch);
3301 tmp2->stats.food = op->stats.food;
3302 SET_FLAG (tmp2, FLAG_APPLIED);
3303
3304 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3305 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3306
3307 insert_ob_in_ob (tmp2, who);
3308
3309 /* Remove the old lantern */
3310 if (who->type == PLAYER)
3311 esrv_del_item (who->contr, op->count);
3312
3313 op->destroy ();
3314
3315 /* insert the portion that was split off */
3316 if (tmp)
3317 {
3318 insert_ob_in_ob (tmp, who);
3319 if (who->type == PLAYER)
3320 esrv_send_item (who, tmp);
3321 }
3322
3323 who->update_stats ();
3324
3325 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3326 if (who->type == PLAYER)
3327 {
3328 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3329 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3330 }
3331
3332 if (who->type == PLAYER)
3333 esrv_send_item (who, tmp2);
3334
3335 return 0;
3336 3429
3337 case SKILL_TOOL: 3430 case SKILL_TOOL:
3338 // applying a skill tool also readies the skill 3431 // applying a skill tool also readies the skill
3339 SET_FLAG (op, FLAG_APPLIED); 3432 SET_FLAG (op, FLAG_APPLIED);
3340 3433
… …
3420 } 3513 }
3421 3514
3422 break; 3515 break;
3423 3516
3424 case BOW: 3517 case BOW:
3425 if (!check_weapon_power (who, op->last_eat)) 3518 if (op->level && !op->name.starts_with (who->name))
3426 {
3427 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3428
3429 if (tmp)
3430 insert_ob_in_ob (tmp, who);
3431
3432 return 1;
3433 }
3434
3435 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3436 { 3519 {
3437 who->failmsg ("The weapon does not recognize you as its owner. " 3520 who->failmsg ("The weapon does not recognize you as its owner. "
3438 "H<Its name indicates that it belongs to somebody else.>"); 3521 "H<Its name indicates that it belongs to somebody else.>");
3439 if (tmp) 3522 if (tmp)
3440 insert_ob_in_ob (tmp, who); 3523 insert_ob_in_ob (tmp, who);
… …
3498 } 3581 }
3499 3582
3500 SET_FLAG (op, FLAG_APPLIED); 3583 SET_FLAG (op, FLAG_APPLIED);
3501 3584
3502 if (tmp) 3585 if (tmp)
3503 tmp = insert_ob_in_ob (tmp, who); 3586 who->insert (tmp);
3504 3587
3505 who->update_stats (); 3588 who->update_stats ();
3506 3589
3507 /* We exclude spell casting objects. The fire code will set the 3590 /* We exclude spell casting objects. The fire code will set the
3508 * been applied flag when they are used - until that point, 3591 * been applied flag when they are used - until that point,
… …
3514 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3597 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3515 if (who->type == PLAYER) 3598 if (who->type == PLAYER)
3516 { 3599 {
3517 who->failmsg ( 3600 who->failmsg (
3518 "Oops, it feels deadly cold! " 3601 "Oops, it feels deadly cold! "
3519 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3602 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3520 ); 3603 );
3521 SET_FLAG (op, FLAG_KNOWN_CURSED); 3604 SET_FLAG (op, FLAG_KNOWN_CURSED);
3522 } 3605 }
3523 3606
3524 if (who->type == PLAYER) 3607 if (object *pl = op->visible_to ())
3525 {
3526 /* if multiple objects were applied, update both slots */
3527 if (tmp)
3528 esrv_send_item (who, tmp);
3529
3530 esrv_send_item (who, op); 3608 esrv_send_item (pl, op);
3531 }
3532 3609
3533 return 0; 3610 return 0;
3534} 3611}
3535 3612
3536int 3613int
… …
3550int 3627int
3551auto_apply (object *op) 3628auto_apply (object *op)
3552{ 3629{
3553 object *tmp = NULL, *tmp2; 3630 object *tmp = NULL, *tmp2;
3554 int i; 3631 int i;
3632
3633 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3555 3634
3556 switch (op->type) 3635 switch (op->type)
3557 { 3636 {
3558 case SHOP_FLOOR: 3637 case SHOP_FLOOR:
3559 if (!op->has_random_items ()) 3638 if (!op->has_random_items ())
… …
3561 3640
3562 do 3641 do
3563 { 3642 {
3564 i = 10; /* let's give it 10 tries */ 3643 i = 10; /* let's give it 10 tries */
3565 while ((tmp = generate_treasure (op->randomitems, 3644 while ((tmp = generate_treasure (op->randomitems,
3566 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3645 op->stats.exp
3646 ? (int) op->stats.exp
3647 : max (op->map->difficulty, 5)))
3648 == NULL && --i);
3649
3567 if (tmp == NULL) 3650 if (tmp == NULL)
3568 return 0; 3651 return 0;
3652
3569 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3653 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3570 { 3654 {
3571 tmp->destroy (); 3655 tmp->destroy ();
3572 tmp = NULL; 3656 tmp = NULL;
3573 } 3657 }
… …
3576 3660
3577 tmp->x = op->x; 3661 tmp->x = op->x;
3578 tmp->y = op->y; 3662 tmp->y = op->y;
3579 SET_FLAG (tmp, FLAG_UNPAID); 3663 SET_FLAG (tmp, FLAG_UNPAID);
3580 insert_ob_in_map (tmp, op->map, NULL, 0); 3664 insert_ob_in_map (tmp, op->map, NULL, 0);
3581 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3582 identify (tmp); 3665 identify (tmp);
3583 break; 3666 break;
3584 3667
3585 case TREASURE: 3668 case TREASURE:
3586 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3669 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3593 /* If we generated an object and put it in this object inventory, 3676 /* If we generated an object and put it in this object inventory,
3594 * move it to the parent object as the current object is about 3677 * move it to the parent object as the current object is about
3595 * to disappear. An example of this item is the random_* stuff 3678 * to disappear. An example of this item is the random_* stuff
3596 * that is put inside other objects. 3679 * that is put inside other objects.
3597 */ 3680 */
3598 for (tmp = op->inv; tmp; tmp = tmp2)
3599 {
3600 tmp2 = tmp->below;
3601 tmp->remove ();
3602
3603 if (op->env) 3681 if (op->env)
3604 insert_ob_in_ob (tmp, op->env); 3682 while (op->inv)
3605 else 3683 op->env->insert (op->inv);
3606 tmp->destroy ();
3607 }
3608 3684
3609 op->destroy (); 3685 op->destroy ();
3610 break; 3686 break;
3611 } 3687 }
3612 return tmp ? 1 : 0; 3688
3689 return !!tmp;
3613} 3690}
3614 3691
3615/** 3692/**
3616 * fix_auto_apply goes through the entire map every time a map 3693 * fix_auto_apply goes through the entire map every time a map
3617 * is loaded or swapped in and performs special actions for 3694 * is loaded or swapped in and performs special actions for
… …
3631 3708
3632 if (tmp->inv) 3709 if (tmp->inv)
3633 { 3710 {
3634 object *invtmp, *invnext; 3711 object *invtmp, *invnext;
3635 3712
3636 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3713 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3637 { 3714 {
3638 invnext = invtmp->below; 3715 invnext = invtmp->below;
3639 3716
3640 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3717 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3641 auto_apply (invtmp); 3718 auto_apply (invtmp);
3642 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3719 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3643 { 3720 {
3644 while ((invtmp->stats.hp--) > 0) 3721 while (invtmp->stats.hp-- > 0)
3645 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3722 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3646 3723
3647 invtmp->randomitems = NULL; 3724 invtmp->randomitems = NULL;
3648 } 3725 }
3649 else if (invtmp && invtmp->arch 3726 else if (invtmp && invtmp->arch
… …
3710 } 3787 }
3711 3788
3712 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3789 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3713 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 3790 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3714 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3791 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3715 check_trigger (tmp, tmp->above); 3792 check_trigger (tmp, tmp->above, tmp->above);
3716} 3793}
3717 3794
3718/** 3795/**
3719 * Handles player eating food that temporarily changes status (resistances, stats). 3796 * Handles player eating food that temporarily changes status (resistances, stats).
3720 * This used to call cast_change_attr(), but 3797 * This used to call cast_change_attr(), but
… …
3725eat_special_food (object *who, object *food) 3802eat_special_food (object *who, object *food)
3726{ 3803{
3727 object *force; 3804 object *force;
3728 int i, did_one = 0; 3805 int i, did_one = 0;
3729 3806
3730 force = get_archetype (FORCE_NAME); 3807 char buf[64];
3808 snprintf (buf, sizeof(buf), "sp_food_%s", &food->title);
3809 shstr key (buf);
3731 3810
3732 for (i = 0; i < NUM_STATS; i++)
3733 if (sint8 k = food->stats.stat (i))
3734 {
3735 force->stats.stat (i) = k;
3736 did_one = 1;
3737 }
3738
3739 /* check if we can protect the eater */
3740 for (i = 0; i < NROFATTACKS; i++)
3741 {
3742 if (food->resist[i] > 0)
3743 {
3744 force->resist[i] = food->resist[i] / 2;
3745 did_one = 1;
3746 }
3747 }
3748
3749 if (did_one)
3750 {
3751 force->set_speed (0.1);
3752 /* bigger morsel of food = longer effect time */ 3811 /* bigger morsel of food = longer effect time */
3753 force->duration = food->stats.food / 5; 3812 int duration = TIME2TICK (food->stats.food);
3754 SET_FLAG (force, FLAG_APPLIED); 3813
3755 change_abil (who, force); 3814 if (force = who->force_find (key))
3756 insert_ob_in_ob (force, who); 3815 {
3816 if (duration > abs (force->speed_left / force->speed))
3817 {
3818 new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration));
3819 force->force_set_timer (duration);
3820 }
3821 else
3822 new_draw_info (NDI_UNIQUE, 0, who, "It had no additional effect.");
3823
3824 return;
3757 } 3825 }
3758 else 3826 else
3827 {
3828 force = who->force_add (key, duration);
3829 force->name = key;
3830
3831 /* check if the food affects a stat */
3832 for (i = 0; i < NUM_STATS; i++)
3833 if (sint8 k = food->stats.stat (i))
3834 {
3835 force->stats.stat (i) = k;
3836 did_one = 1;
3837 }
3838
3839 /* check if we can protect the eater */
3840 for (i = 0; i < NROFATTACKS; i++)
3841 {
3842 if (food->resist[i] > 0)
3843 {
3844 force->resist[i] = food->resist[i];
3845 did_one = 1;
3846 }
3847 }
3848
3849 if (did_one)
3850 {
3851 new_draw_info_format (NDI_UNIQUE, 0, who, "You are suffused with magical force. H<The effect will last for about %.10g seconds.>", TICK2TIME (duration));
3852
3853 /* make the force take effect and report effects to user */
3854 change_abil (who, force);
3855 }
3856 else
3759 force->destroy (); 3857 force->destroy ();
3858 }
3760 3859
3761 /* check for hp, sp change */ 3860 /* check for hp, sp change */
3762 if (food->stats.hp != 0) 3861 if (food->stats.hp != 0)
3763 { 3862 {
3764 if (QUERY_FLAG (food, FLAG_CURSED)) 3863 if (QUERY_FLAG (food, FLAG_CURSED))
3765 { 3864 {
3766 assign (who->contr->killer, food->name); 3865 who->contr->killer = food;
3767 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3866 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3768 who->failmsg ("Eck!...that was poisonous!"); 3867 who->failmsg ("Eck!...that was poisonous!");
3769 } 3868 }
3770 else 3869 else
3771 { 3870 {
… …
3775 who->failmsg ("Eck!...that was poisonous!"); 3874 who->failmsg ("Eck!...that was poisonous!");
3776 3875
3777 who->stats.hp += food->stats.hp; 3876 who->stats.hp += food->stats.hp;
3778 } 3877 }
3779 } 3878 }
3879
3780 if (food->stats.sp != 0) 3880 if (food->stats.sp != 0)
3781 { 3881 {
3782 if (QUERY_FLAG (food, FLAG_CURSED)) 3882 if (QUERY_FLAG (food, FLAG_CURSED))
3783 { 3883 {
3784 who->failmsg ("You are drained of mana!"); 3884 who->failmsg ("You are drained of mana!");
… …
3795 } 3895 }
3796 3896
3797 who->update_stats (); 3897 who->update_stats ();
3798} 3898}
3799 3899
3800/**
3801 * Designed primarily to light torches/lanterns/etc.
3802 * Also burns up burnable material too. First object in the inventory is
3803 * the selected object to "burn". -b.t.
3804 */
3805void
3806apply_lighter (object *who, object *lighter)
3807{
3808 object *item;
3809 int is_player_env = 0;
3810
3811 item = find_marked_object (who);
3812 if (item)
3813 {
3814 if (lighter->last_eat && lighter->stats.food)
3815 { /* lighter gets used up */
3816 /* Split multiple lighters if they're being used up. Otherwise *
3817 * one charge from each would be used up. --DAMN */
3818 if (lighter->nrof > 1)
3819 {
3820 object *oneLighter = lighter->clone ();
3821
3822 lighter->nrof -= 1;
3823 oneLighter->nrof = 1;
3824 oneLighter->stats.food--;
3825 esrv_send_item (who, lighter);
3826 oneLighter = insert_ob_in_ob (oneLighter, who);
3827 esrv_send_item (who, oneLighter);
3828 }
3829 else
3830 lighter->stats.food--;
3831 }
3832 else if (lighter->last_eat)
3833 {
3834 /* no charges left in lighter */
3835 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3836 return;
3837 }
3838
3839 /* Perhaps we should split what we are trying to light on fire?
3840 * I can't see many times when you would want to light multiple
3841 * objects at once.
3842 */
3843
3844 if (who == item->in_player ())
3845 is_player_env = 1;
3846
3847 save_throw_object (item, AT_FIRE, who);
3848
3849 if (item->destroyed ())
3850 {
3851 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3852 /* Need to update the player so that the players glow radius
3853 * gets changed.
3854 */
3855 if (is_player_env)
3856 who->update_stats ();
3857 }
3858 else
3859 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3860 }
3861 else
3862 who->failmsg ("You need to mark a lightable object.");
3863}
3864 3900
3865/** 3901/**
3866 * op made some mistake with a scroll, this takes care of punishment. 3902 * op made some mistake with a scroll, this takes care of punishment.
3867 * scroll_failure()- hacked directly from spell_failure 3903 * scroll_failure()- hacked directly from spell_failure
3868 */ 3904 */
… …
3968 } 4004 }
3969 4005
3970 /* insert the randomitems from the change's treasurelist into 4006 /* insert the randomitems from the change's treasurelist into
3971 * the player ref: player.c 4007 * the player ref: player.c
3972 */ 4008 */
3973 if (change->randomitems != NULL) 4009 if (change->randomitems)
3974 give_initial_items (pl, change->randomitems); 4010 give_initial_items (pl, change->randomitems);
3975 4011
3976 /* set up the face, for some races. */ 4012 /* set up the face, for some races. */
3977 4013
3978 /* first, look for the force object banning 4014 /* first, look for the force object banning
3979 * changing the face. Certain races never change face with class. 4015 * changing the face. Certain races never change face with class.
3980 */ 4016 */
3981 for (walk = pl->inv; walk != NULL; walk = walk->below) 4017 for (walk = pl->inv; walk; walk = walk->below)
3982 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4018 if (walk->name == shstr_NOCLASSFACECHANGE)
3983 flag_change_face = 0; 4019 flag_change_face = 0;
3984 4020
3985 if (flag_change_face) 4021 if (flag_change_face)
3986 { 4022 {
3987 pl->animation_id = GET_ANIM_ID (change);
3988 pl->face = change->face; 4023 pl->face = change->face;
3989 4024 pl->animation_id = change->animation_id;
3990 if (QUERY_FLAG (change, FLAG_ANIMATE)) 4025 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3991 SET_FLAG (pl, FLAG_ANIMATE);
3992 else
3993 CLEAR_FLAG (pl, FLAG_ANIMATE);
3994 } 4026 }
3995 4027
3996 /* check the special case of can't use weapons */ 4028 /* check the special case of can't use weapons */
3997 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4029 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3998 if (!strcmp (change->name, "monk")) 4030 if (change->name == shstr_monk)
3999 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4031 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
4000 4032
4001 break; 4033 break;
4002 } 4034 }
4003 } 4035 }
… …
4040 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4072 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4041 return; 4073 return;
4042 } 4074 }
4043 4075
4044 /* check whether they are compatible or not */ 4076 /* check whether they are compatible or not */
4045 find = strstr (marked->slaying, transformer->arch->archname); 4077 find = strstr (&marked->slaying, transformer->arch->archname);
4046 if (!find || (*(find + strlen (transformer->arch->archname)) != ':')) 4078 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4047 { 4079 {
4048 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4080 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4049 return; 4081 return;
4050 } 4082 }
… …
4092 4124
4093 new_item->nrof = yield; 4125 new_item->nrof = yield;
4094 4126
4095 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4127 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4096 4128
4097 insert_ob_in_ob (new_item, pl); 4129 pl->insert (new_item);
4098 esrv_send_inventory (pl, pl);
4099 /* Eat up one item */ 4130 /* Eat up one item */
4100 marked->decrease (); 4131 marked->decrease ();
4101 4132
4102 /* Eat one transformer if needed */ 4133 /* Eat one transformer if needed */
4103 if (transformer->stats.food) 4134 if (transformer->stats.food)

Diff Legend

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