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.169 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.220 by elmex, Mon Mar 15 11:45:37 2010 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 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>
… …
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.\r", long_desc (marked, pl)); 119 buf.printf ("You have %s.\r", long_desc (marked, pl));
119 if (marked->msg) 120 if (marked->msg)
… …
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.\r", long_desc (id, pl)); 135 buf.printf ("You have %s.\r", long_desc (id, pl));
135 if (id->msg) 136 if (id->msg)
… …
160 * matching item. 161 * matching item.
161 **/ 162 **/
162void 163void
163handle_apply_yield (object *tmp) 164handle_apply_yield (object *tmp)
164{ 165{
165 if (shstr yield = tmp->kv (shstr_on_use_yield)) 166 if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR); 167 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167} 168}
168 169
169/** 170/**
170 * Handles applying a potion. 171 * Handles applying a potion.
… …
203 op->update_stats (); 204 op->update_stats ();
204 tmp->decrease (); 205 tmp->decrease ();
205 return 1; 206 return 1;
206 } 207 }
207 208
208 if (!(at = archetype::find (ARCH_DEPLETION))) 209 if (!(at = archetype::find (shstr_depletion)))
209 { 210 {
210 LOG (llevError, "Could not find archetype depletion\n"); 211 LOG (llevError, "Could not find archetype depletion\n");
211 return 0; 212 return 0;
212 } 213 }
213 214
… …
230 } 231 }
231 232
232 /* improvement potion - only for players */ 233 /* improvement potion - only for players */
233 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER)) 234 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
234 { 235 {
235 for (i = 1; i < MIN (11, op->level); i++) 236 for (i = 1; i < min (11, op->level); i++)
236 { 237 {
237 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 238 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
238 { 239 {
239 if (op->contr->levhp[i] != 1) 240 if (op->contr->levhp[i] != 1)
240 { 241 {
… …
275 } 276 }
276 } 277 }
277 } 278 }
278 279
279 /* Just makes checking easier */ 280 /* Just makes checking easier */
280 if (i < MIN (11, op->level)) 281 if (i < min (11, op->level))
281 got_one = 1; 282 got_one = 1;
282 283
283 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 284 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
284 { 285 {
285 if (got_one) 286 if (got_one)
… …
315 */ 316 */
316 if (tmp->inv) 317 if (tmp->inv)
317 { 318 {
318 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 319 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
319 { 320 {
320 object *fball;
321
322 op->failmsg ("Yech! Your lungs are on fire!"); 321 op->failmsg ("Yech! Your lungs are on fire!");
323 322 create_exploding_ball_at (op, op->level);
324 /* Explodes a fireball centered at player */
325 fball = get_archetype (EXPLODING_FIREBALL);
326 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
327 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
328 fball->x = op->x;
329 fball->y = op->y;
330 insert_ob_in_map (fball, op->map, NULL, 0);
331 } 323 }
332 else 324 else
333 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 325 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
334 326
335 tmp->decrease (); 327 tmp->decrease ();
… …
378 } 370 }
379 371
380 /* Only thing left are the stat potions */ 372 /* Only thing left are the stat potions */
381 if (op->type == PLAYER) 373 if (op->type == PLAYER)
382 { /* only for players */ 374 { /* only for players */
383 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)
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 378 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 else 379 else
386 SET_FLAG (tmp, FLAG_APPLIED); 380 SET_FLAG (tmp, FLAG_APPLIED);
387 381
388 if (!change_abil (op, tmp)) 382 if (!change_abil (op, tmp))
… …
403/**************************************************************************** 397/****************************************************************************
404 * Weapon improvement code follows 398 * Weapon improvement code follows
405 ****************************************************************************/ 399 ****************************************************************************/
406 400
407/** 401/**
402 * This function just checks whether who can handle equipping an item
403 * with item_power.
404 */
405static bool
406check_item_power (object *who, int item_power)
407{
408 if (who->type == PLAYER
409 && item_power
410 && item_power + who->contr->item_power > settings.item_power_factor * who->level)
411 return false;
412 else
413 return true;
414}
415
416/**
408 * This returns the sum of nrof of item (arch name). 417 * This returns the sum of nrof of item (arch name).
409 */ 418 */
410static int 419static int
411check_item (object *op, const char *item) 420check_item (object *op, shstr_cmp item)
412{ 421{
413 int count = 0; 422 int count = 0;
414 423
415 if (!item) 424 if (!item)
416 return 0; 425 return 0;
417 426
418 for (op = op->below; op; op = op->below) 427 for (op = op->below; op; op = op->below)
419 {
420 if (strcmp (op->arch->archname, item) == 0) 428 if (op->arch->archname == item)
421 {
422 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 429 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
423 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 430 && /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
424 {
425 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
426 count++;
427 else
428 count += op->nrof; 431 count += op->number_of ();
429 }
430 }
431 }
432 432
433 return count; 433 return count;
434} 434}
435 435
436/** 436/**
… …
438 * op is typically the player, which is only 438 * op is typically the player, which is only
439 * really used to determine what space to look at. 439 * really used to determine what space to look at.
440 * Modified to only eat 'nrof' of objects. 440 * Modified to only eat 'nrof' of objects.
441 */ 441 */
442static void 442static void
443eat_item (object *op, const char *item, uint32 nrof) 443eat_item (object *op, shstr_cmp item, uint32 nrof)
444{ 444{
445 object *prev; 445 object *prev;
446 446
447 prev = op; 447 prev = op;
448 op = op->below; 448 op = op->below;
449 449
450 while (op) 450 while (op)
451 { 451 {
452 if (strcmp (op->arch->archname, item) == 0) 452 if (op->arch->archname == item)
453 { 453 {
454 if (op->nrof >= nrof) 454 if (op->nrof >= nrof)
455 { 455 {
456 op->decrease (nrof); 456 op->decrease (nrof);
457 return; 457 return;
… …
466 } 466 }
467 467
468 prev = op; 468 prev = op;
469 op = op->below; 469 op = op->below;
470 } 470 }
471}
472
473/**
474 * This checks to see of the player (who) is sufficient level to use a weapon
475 * with improvs improvements (typically last_eat). We take an int here
476 * instead of the object so that the improvement code can pass along the
477 * increased value to see if the object is usuable.
478 * we return 1 (true) if the player can use the weapon.
479 */
480static int
481check_weapon_power (const object *who, int improvs)
482{
483/* Old code is below (commented out). Basically, since weapons are the only
484 * object players really have any control to improve, it's a bit harsh to
485 * require high level in some combat skill, so we just use overall level.
486 */
487#if 1
488 if (((who->level / 5) + 5) >= improvs)
489 return 1;
490 else
491 return 0;
492
493#else
494 int level = 0;
495
496 /* The skill system hands out wc and dam bonuses to fighters
497 * more generously than the old system (see fix_player). Thus
498 * we need to curtail the power of player enchanted weapons.
499 * I changed this to 1 improvement per "fighter" level/5 -b.t.
500 * Note: Nothing should break by allowing this ratio to be different or
501 * using normal level - it is just a matter of play balance.
502 */
503 if (who->type == PLAYER)
504 {
505 object *wc_obj = NULL;
506
507 for (wc_obj = who->inv; wc_obj; wc_obj = wc_obj->below)
508 if (wc_obj->type == SKILL && IS_COMBAT_SKILL (wc_obj->subtype) && wc_obj->level > level)
509 level = wc_obj->level;
510
511 if (!level)
512 {
513 LOG (llevError, "Error: Player: %s lacks wc experience object\n", who->name);
514 level = who->level;
515 }
516 }
517 else
518 level = who->level;
519
520 return (improvs <= ((level / 5) + 5));
521#endif
522} 471}
523 472
524/** 473/**
525 * Returns how many items of type improver->slaying there are under op. 474 * Returns how many items of type improver->slaying there are under op.
526 * Will display a message if none found, and 1 if improver->slaying is NULL. 475 * Will display a message if none found, and 1 if improver->slaying is NULL.
… …
582 531
583/** 532/**
584 * This does the prepare weapon scroll. 533 * This does the prepare weapon scroll.
585 * Checks for sacrifice, and so on. 534 * Checks for sacrifice, and so on.
586 */ 535 */
587int 536static int
588prepare_weapon (object *op, object *improver, object *weapon) 537prepare_weapon (object *op, object *improver, object *weapon)
589{ 538{
590 int sacrifice_count, i; 539 int sacrifice_count, i;
591 char buf[MAX_BUF]; 540 char buf[MAX_BUF];
592 541
… …
645 * 594 *
646 * We are hiding extra information about the weapon in the level and 595 * We are hiding extra information about the weapon in the level and
647 * last_eat numbers for an object. Hopefully this won't break anything ?? 596 * last_eat numbers for an object. Hopefully this won't break anything ??
648 * level == max improve last_eat == current improve 597 * level == max improve last_eat == current improve
649 */ 598 */
650int 599static int
651improve_weapon (object *op, object *improver, object *weapon) 600improve_weapon (object *op, object *improver, object *weapon)
652{ 601{
653 int sacrifice_count, sacrifice_needed = 0; 602 int sacrifice_count, sacrifice_needed = 0;
654 603
655 if (improver->stats.sp == IMPROVE_PREPARE) 604 if (improver->stats.sp == IMPROVE_PREPARE)
656 return prepare_weapon (op, improver, weapon); 605 return prepare_weapon (op, improver, weapon);
657 606
658 if (weapon->level == 0) 607 if (weapon->level == 0)
659 { 608 {
660 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>"); 609 op->failmsg (
610 "This weapon has not been prepared."
611 " H<You first have to prepare a weapon with a prepare weapon scroll.>");
661 return 0; 612 return 0;
662 } 613 }
663 614
664 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 615 if (weapon->last_eat >= weapon->level // improvements used up
616 || weapon->item_power >= 100) // or item_power >= arbitrary limit of 100
665 { 617 {
666 op->failmsg ("This weapon cannot be improved any more."); 618 op->failmsg ("This weapon cannot be improved any more.");
667 return 0; 619 return 0;
668 } 620 }
669 621
670 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 622 if (QUERY_FLAG (weapon, FLAG_APPLIED)
623 && !check_item_power (op, weapon->item_power + 1))
671 { 624 {
672 op->failmsg ("Improving the weapon will make it too " 625 op->failmsg ("Improving the weapon will make it too "
673 "powerful for you to use. Unready it if you " 626 "powerful for you to use. Unready it if you "
674 "really want to improve it."); 627 "really want to improve it.");
675 return 0; 628 return 0;
… …
753/** 706/**
754 * Handles the applying of improve/prepare/enchant weapon scroll. 707 * Handles the applying of improve/prepare/enchant weapon scroll.
755 * Checks a few things (not on a non-magic square, marked weapon, ...), 708 * Checks a few things (not on a non-magic square, marked weapon, ...),
756 * then calls improve_weapon to do the dirty work. 709 * then calls improve_weapon to do the dirty work.
757 */ 710 */
758int 711static int
759check_improve_weapon (object *op, object *tmp) 712check_improve_weapon (object *op, object *tmp)
760{ 713{
761 object *otmp; 714 object *otmp;
762 715
763 if (op->type != PLAYER) 716 if (op->type != PLAYER)
… …
810 * the armour value of the piece of equipment exceed either 763 * the armour value of the piece of equipment exceed either
811 * the users level or 90) 764 * the users level or 90)
812 * Modified by MSW for partial resistance. Only support 765 * Modified by MSW for partial resistance. Only support
813 * changing of physical area right now. 766 * changing of physical area right now.
814 */ 767 */
815int 768static int
816improve_armour (object *op, object *improver, object *armour) 769improve_armour (object *op, object *improver, object *armour)
817{ 770{
818 object *tmp; 771 object *tmp;
819 772
820 if (armour->magic >= settings.armor_max_enchant) 773 if (armour->magic >= settings.armor_max_enchant)
… …
904 * Takes one type of items and makes another. 857 * Takes one type of items and makes another.
905 * converter is the object that is doing the conversion. 858 * converter is the object that is doing the conversion.
906 * item is the object that triggered the converter - if it is not 859 * item is the object that triggered the converter - if it is not
907 * what the converter wants, this will not do anything. 860 * what the converter wants, this will not do anything.
908 */ 861 */
909static int 862int
910convert_item (object *item, object *converter) 863convert_item (object *item, object *converter)
911{ 864{
912 sint64 nr, price_in; 865 sint64 nr = 0, price_in;
913 866
914 if (item->flag [FLAG_UNPAID]) 867 if (item->flag [FLAG_UNPAID])
915 return 0; 868 return 0;
916 869
917 shstr conv_from = converter->slaying; 870 shstr conv_from = converter->slaying;
918 archetype *conv_to = converter->other_arch; 871 archetype *conv_to = converter->other_arch;
919 sint64 need = converter->stats.food; 872 sint64 need = converter->stats.food;
920 sint64 give = converter->stats.sp; 873 sint64 give = converter->stats.sp;
921 874
… …
995 item->nrof = give; 948 item->nrof = give;
996 949
997 if (nr) 950 if (nr)
998 item->nrof *= nr; 951 item->nrof *= nr;
999 952
1000 if (is_in_shop (converter)) 953 if (converter->flag [FLAG_PRECIOUS])
1001 SET_FLAG (item, FLAG_UNPAID); 954 SET_FLAG (item, FLAG_UNPAID);
955
956 if (is_in_shop (converter))
957 {
958 // converters on shop floors don't work anymore, bug lets check for it
959 // and report in case someone still does it.
960 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
961 converter->debug_desc ());
962 SET_FLAG (item, FLAG_UNPAID);
963 }
1002 else if (price_in < sint64 (item->nrof) * item->value) 964 else if (price_in < sint64 (item->nrof) * item->value)
1003 { 965 {
1004 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 966 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1005 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 967 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1006 /** 968 /**
… …
1022 * Handle apply on containers. 984 * Handle apply on containers.
1023 * By Eneq(@csd.uu.se). 985 * By Eneq(@csd.uu.se).
1024 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 986 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1025 * added the alchemical cauldron to the code -b.t. 987 * added the alchemical cauldron to the code -b.t.
1026 */ 988 */
1027int 989static int
1028apply_container (object *op, object *sack) 990apply_container (object *op, object *sack)
1029{ 991{
1030 if (op->type != PLAYER || !op->contr->ns) 992 if (op->type != PLAYER || !op->contr->ns)
1031 return 0; /* This might change */ 993 return 0; /* This might change */
1032 994
… …
1045 } 1007 }
1046 1008
1047 // already applied == open on ground, or open in inv, or active in inv 1009 // already applied == open on ground, or open in inv, or active in inv
1048 if (sack->flag [FLAG_APPLIED]) 1010 if (sack->flag [FLAG_APPLIED])
1049 { 1011 {
1050 if (op->container == sack) 1012 if (op->container_ () == sack)
1051 { 1013 {
1052 // open on ground or inv, so close 1014 // open on ground or inv, so close
1053 op->close_container (); 1015 op->close_container ();
1054 return 1; 1016 return 1;
1055 } 1017 }
… …
1098{ 1060{
1099 /* Only players can make sacrifices on spell casting altars. */ 1061 /* Only players can make sacrifices on spell casting altars. */
1100 if (altar->inv && (!originator || originator->type != PLAYER)) 1062 if (altar->inv && (!originator || originator->type != PLAYER))
1101 return 0; 1063 return 0;
1102 1064
1103 if (operate_altar (altar, &sacrifice)) 1065 if (operate_altar (altar, &sacrifice, originator))
1104 { 1066 {
1105 /* Simple check. Unfortunately, it means you can't cast magic bullet 1067 /* Simple check. Unfortunately, it means you can't cast magic bullet
1106 * with an altar. We call it a Potion - altars are stationary - it 1068 * with an altar. We call it a Potion - altars are stationary - it
1107 * is up to map designers to use them properly. 1069 * is up to map designers to use them properly.
1108 */ 1070 */
… …
1117/* push_button (altar);*/ 1079/* push_button (altar);*/
1118 } 1080 }
1119 else 1081 else
1120 { 1082 {
1121 altar->value = 1; /* works only once */ 1083 altar->value = 1; /* works only once */
1122 push_button (altar); 1084 push_button (altar, originator);
1123 } 1085 }
1124 1086
1125 return !sacrifice; 1087 return !sacrifice;
1126 } 1088 }
1127 else 1089 else
… …
1144 1106
1145 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1107 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1146 1108
1147 bool has_unpaid = false; 1109 bool has_unpaid = false;
1148 1110
1149 // quite inefficient to do this here twice, but the api doesn'T lend itself to 1111 // quite inefficient to do this here twice, but the api doesn't lend itself to
1150 // a quick and small change :( 1112 // a quick and small change :(
1151 for (object::depth_iterator item = op->begin (); item != op->end (); ++item) 1113 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1152 if (item->flag [FLAG_UNPAID]) 1114 if (item->flag [FLAG_UNPAID])
1153 { 1115 {
1154 has_unpaid = true; 1116 has_unpaid = true;
1155 break; 1117 break;
1156 } 1118 }
1157 1119
1158 if (op->type != PLAYER) 1120 if (!op->is_player ())
1159 { 1121 {
1160 /* Remove all the unpaid objects that may be carried here. 1122 /* Remove all the unpaid objects that may be carried here.
1161 * This could be pets or monsters that are somehow in 1123 * This could be pets or monsters that are somehow in
1162 * the shop. 1124 * the shop.
1163 */ 1125 */
… …
1167 1129
1168 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1130 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1169 { 1131 {
1170 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1132 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1171 1133
1134 if (i >= 0)
1172 tmp->remove (); 1135 tmp->move (i);
1173
1174 if (i == -1)
1175 i = 0;
1176
1177 tmp->map = op->map;
1178 tmp->x = op->x + freearr_x[i];
1179 tmp->y = op->y + freearr_y[i];
1180 insert_ob_in_map (tmp, op->map, op, 0);
1181 } 1136 }
1182 } 1137 }
1183 1138
1184 /* Don't teleport things like spell effects */ 1139 /* Don't teleport things like spell effects */
1185 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1140 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1196 if (i != -1) 1151 if (i != -1)
1197 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1152 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1198 1153
1199 return 0; 1154 return 0;
1200 } 1155 }
1156
1201 /* Removed code that checked for multipart objects - it appears that 1157 /* Removed code that checked for multipart objects - it appears that
1202 * the teleport function should be able to handle this just fine. 1158 * the teleport function should be able to handle this just fine.
1203 */ 1159 */
1204 rv = teleport (shop_mat, SHOP_MAT, op); 1160 rv = teleport (shop_mat, SHOP_MAT, op);
1205 } 1161 }
… …
1260 * Handles applying a sign. 1216 * Handles applying a sign.
1261 */ 1217 */
1262static void 1218static void
1263apply_sign (object *op, object *sign, int autoapply) 1219apply_sign (object *op, object *sign, int autoapply)
1264{ 1220{
1221 if (!op->is_player())
1222 return;
1223
1265 if (sign->has_dialogue ()) 1224 if (sign->has_dialogue ())
1266 { 1225 {
1267 op->statusmsg (form ("Maybe you should I<talk> to the %s instead?", &sign->name)); 1226 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1268 return; 1227 return;
1269 } 1228 }
1270 1229
1271 if (!sign->msg) 1230 if (!sign->msg)
1272 { 1231 {
1273 op->statusmsg ("Nothing is written on it."); 1232 op->contr->infobox (MSG_CHANNEL ("examine"),
1233 format ("T<%s>\n\n Nothing %sis written on it.",
1234 &sign->name,
1235 sign->name == sign->arch->name ? "" : "else "));
1274 return; 1236 return;
1275 } 1237 }
1276 1238
1277 if (sign->stats.food) 1239 if (sign->stats.food)
1278 { 1240 {
1279 if (sign->last_eat >= sign->stats.food) 1241 if (sign->last_eat >= sign->stats.food)
1280 { 1242 {
1281 if (!sign->move_on) 1243 if (!sign->move_on)
1282 op->statusmsg ("You cannot read it anymore."); 1244 op->failmsg ("You cannot read it anymore.");
1283 1245
1284 return; 1246 return;
1285 } 1247 }
1286 1248
1287 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1249 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1305 if (sign->sound) 1267 if (sign->sound)
1306 ns->play_sound (sign->sound); 1268 ns->play_sound (sign->sound);
1307 else if (autoapply) 1269 else if (autoapply)
1308 ns->play_sound (sound_find ("msg_voice")); 1270 ns->play_sound (sound_find ("msg_voice"));
1309 1271
1310 if (ns->can_msg)
1311 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1272 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1312 else
1313 {
1314 readable_message_type *msgType = get_readable_message_type (sign);
1315 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1316 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1317 }
1318 } 1273 }
1319} 1274}
1320 1275
1321static void 1276static void
1322move_apply_hole (object *trap, object *victim) 1277move_apply_hole (object *trap, object *victim)
… …
1369 return; 1324 return;
1370 1325
1371 /* move_apply() is the most likely candidate for causing unwanted and 1326 /* move_apply() is the most likely candidate for causing unwanted and
1372 * possibly unlimited recursion. 1327 * possibly unlimited recursion.
1373 */ 1328 */
1374 /* The following was changed because it was causing perfeclty correct 1329 /* The following was changed because it was causing perfectly correct
1375 * maps to fail. 1) it's not an error to recurse: 1330 * maps to fail. 1) it's not an error to recurse:
1376 * rune detonates, summoning monster. monster lands on nearby rune. 1331 * rune detonates, summoning monster. monster lands on nearby rune.
1377 * nearby rune detonates. This sort of recursion is expected and 1332 * nearby rune detonates. This sort of recursion is expected and
1378 * proper. This code was causing needless crashes. 1333 * proper. This code was causing needless crashes.
1379 */ 1334 */
… …
1386 1341
1387 recursion_depth++; 1342 recursion_depth++;
1388 if (trap->head) 1343 if (trap->head)
1389 trap = trap->head; 1344 trap = trap->head;
1390 1345
1391 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1346 if (!INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
1392 goto leave;
1393
1394 switch (trap->type) 1347 switch (trap->type)
1395 { 1348 {
1396 case PLAYERMOVER: 1349 case PLAYERMOVER:
1397 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim)) 1350 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim))
1351 {
1352 if (!trap->stats.maxsp)
1353 trap->stats.maxsp = 2;
1354
1355 /* Is this correct? From the docs, it doesn't look like it
1356 * should be divided by trap->speed
1357 */
1358 victim->speed_left = -trap->stats.maxsp * victim->speed / trap->speed;
1359
1360 /* Just put in some sanity check. I think there is a bug in the
1361 * above with some objects have zero speed, and thus the player
1362 * getting permanently paralyzed.
1363 */
1364 if (victim->speed_left < -50.f)
1365 victim->speed_left = -50.f;
1366 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1367 }
1368 break;
1369
1370 case SPINNER:
1371 if (victim->direction)
1372 {
1373 victim->direction = absdir (victim->direction - trap->stats.sp);
1374 update_turn_face (victim);
1375 }
1376 break;
1377
1378 case DIRECTOR:
1379 if (victim->direction && !should_director_abort (trap, victim))
1380 {
1381 victim->direction = trap->stats.sp;
1382 update_turn_face (victim);
1383 }
1384 break;
1385
1386 case BUTTON:
1387 case PEDESTAL:
1388 case T_MATCH:
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->has_active_speed ())
1410 && trap->owner != victim)
1411 hit_with_arrow (trap, victim);
1412 break;
1413
1414 case SPELL_EFFECT:
1415 apply_spell_effect (trap, victim);
1416 break;
1417
1418 case TRAPDOOR:
1398 { 1419 {
1420 int max, sound_was_played;
1421 object *ab, *ab_next;
1422
1399 if (!trap->stats.maxsp) 1423 if (!trap->value)
1400 trap->stats.maxsp = 2; 1424 {
1425 int tot;
1401 1426
1402 /* Is this correct? From the docs, it doesn't look like it 1427 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1403 * should be divided by trap->speed 1428 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1429 tot += ab->head_ ()->total_weight ();
1430
1431 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1432 break;
1433
1434 SET_ANIMATION (trap, trap->value);
1435 update_object (trap, UP_OBJ_FACE);
1436 }
1437
1438 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
1439 {
1440 /* need to set this up, since if we do transfer the object,
1441 * ab->above would be bogus
1404 */ 1442 */
1405 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed); 1443 ab_next = ab->above;
1406 1444
1407 /* Just put in some sanity check. I think there is a bug in the 1445 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1408 * above with some objects have zero speed, and thus the player 1446 {
1409 * getting permanently paralyzed. 1447 if (!sound_was_played)
1448 {
1449 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1450 sound_was_played = 1;
1451 }
1452
1453 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1454 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1455 }
1410 */ 1456 }
1411 if (victim->speed_left < -50.f) 1457 break;
1412 victim->speed_left = -50.f;
1413 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1414 } 1458 }
1415 goto leave;
1416 1459
1417 case SPINNER: 1460 case CONVERTER:
1418 if (victim->direction) 1461 if (convert_item (victim, trap) < 0)
1419 {
1420 victim->direction = absdir (victim->direction - trap->stats.sp);
1421 update_turn_face (victim);
1422 }
1423 goto leave;
1424
1425 case DIRECTOR:
1426 if (victim->direction && !should_director_abort (trap, victim))
1427 {
1428 victim->direction = trap->stats.sp;
1429 update_turn_face (victim);
1430 }
1431 goto leave;
1432
1433 case BUTTON:
1434 case PEDESTAL:
1435 update_button (trap);
1436 goto leave;
1437
1438 case ALTAR:
1439 /* sacrifice victim on trap */
1440 apply_altar (trap, victim, originator);
1441 goto leave;
1442
1443 case THROWN_OBJ:
1444 if (trap->inv == NULL)
1445 goto leave;
1446 /* fallthrough */
1447
1448 case ARROW:
1449 /* bad bug: monster throw a object, make a step forwards, step on object ,
1450 * trigger this here and get hit by own missile - and will be own enemy.
1451 * Victim then is his own enemy and will start to kill herself (this is
1452 * removed) but we have not synced victim and his missile. To avoid senseless
1453 * action, we avoid hits here
1454 */
1455 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1456 hit_with_arrow (trap, victim);
1457 goto leave;
1458
1459 case SPELL_EFFECT:
1460 apply_spell_effect (trap, victim);
1461 goto leave;
1462
1463 case TRAPDOOR:
1464 {
1465 int max, sound_was_played;
1466 object *ab, *ab_next;
1467
1468 if (!trap->value)
1469 { 1462 {
1470 int tot; 1463 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1471 1464 archetype::get (shstr_burnout)->insert_at (trap, trap);
1472 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1473 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1474 tot += ab->head_ ()->total_weight ();
1475
1476 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1477 goto leave;
1478
1479 SET_ANIMATION (trap, trap->value);
1480 update_object (trap, UP_OBJ_FACE);
1481 } 1465 }
1482 1466
1483 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next) 1467 break;
1468
1469 case TRIGGER_BUTTON:
1470 case TRIGGER_PEDESTAL:
1471 case TRIGGER_ALTAR:
1472 check_trigger (trap, victim, originator);
1473 break;
1474
1475 case DEEP_SWAMP:
1476 walk_on_deep_swamp (trap, victim);
1477 break;
1478
1479 case CHECK_INV:
1480 check_inv (victim, trap);
1481 break;
1482
1483 case HOLE:
1484 move_apply_hole (trap, victim);
1485 break;
1486
1487 case EXIT:
1488 if (victim->type == PLAYER && EXIT_PATH (trap))
1484 { 1489 {
1485 /* need to set this up, since if we do transfer the object, 1490 /* Basically, don't show exits leading to random maps the
1486 * ab->above would be bogus 1491 * players output.
1487 */ 1492 */
1488 ab_next = ab->above; 1493 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1494 victim->statusmsg (trap->msg, NDI_NAVY);
1489 1495
1490 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1496 trap->play_sound (trap->sound);
1491 { 1497 victim->enter_exit (trap);
1492 if (!sound_was_played)
1493 {
1494 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1495 sound_was_played = 1;
1496 }
1497
1498 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1499 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1500 }
1501 } 1498 }
1502 goto leave; 1499 break;
1503 }
1504 1500
1505 case CONVERTER:
1506 if (convert_item (victim, trap) < 0)
1507 {
1508 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1509 archetype::get (shstr_burnout)->insert_at (trap, trap);
1510 }
1511
1512 goto leave;
1513
1514 case TRIGGER_BUTTON:
1515 case TRIGGER_PEDESTAL:
1516 case TRIGGER_ALTAR:
1517 check_trigger (trap, victim);
1518 goto leave;
1519
1520 case DEEP_SWAMP:
1521 walk_on_deep_swamp (trap, victim);
1522 goto leave;
1523
1524 case CHECK_INV:
1525 check_inv (victim, trap);
1526 goto leave;
1527
1528 case HOLE:
1529 move_apply_hole (trap, victim);
1530 goto leave;
1531
1532 case EXIT:
1533 if (victim->type == PLAYER && EXIT_PATH (trap))
1534 {
1535 /* Basically, don't show exits leading to random maps the
1536 * players output.
1537 */
1538 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1539 victim->statusmsg (trap->msg, NDI_NAVY);
1540
1541 trap->play_sound (trap->sound);
1542 victim->enter_exit (trap);
1543 }
1544 goto leave;
1545
1546 case ENCOUNTER: 1501 case ENCOUNTER:
1547 /* may be some leftovers on this */ 1502 /* may be some leftovers on this */
1548 goto leave; 1503 break;
1549 1504
1550 case SHOP_MAT: 1505 case SHOP_MAT:
1551 apply_shop_mat (trap, victim); 1506 apply_shop_mat (trap, victim);
1552 goto leave; 1507 break;
1553 1508
1554 /* Drop a certain amount of gold, and have one item identified */ 1509 /* Drop a certain amount of gold, and have one item identified */
1555 case IDENTIFY_ALTAR: 1510 case IDENTIFY_ALTAR:
1556 apply_id_altar (victim, trap, originator); 1511 apply_id_altar (victim, trap, originator);
1557 goto leave; 1512 break;
1558 1513
1559 case SIGN: 1514 case SIGN:
1560 if (victim->type != PLAYER && trap->stats.food > 0) 1515 if (victim->type != PLAYER && trap->stats.food > 0)
1561 goto leave; /* monsters musn't apply magic_mouths with counters */ 1516 break; /* monsters musn't apply magic_mouths with counters */
1562 1517
1563 apply_sign (victim, trap, 1); 1518 apply_sign (victim, trap, 1);
1564 goto leave; 1519 break;
1565 1520
1566 case CONTAINER: 1521 case CONTAINER:
1567 apply_container (victim, trap); 1522 apply_container (victim, trap);
1568 goto leave; 1523 break;
1569 1524
1570 case RUNE: 1525 case RUNE:
1571 case TRAP: 1526 case TRAP:
1572 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1527 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1573 spring_trap (trap, victim); 1528 spring_trap (trap, victim);
1574 goto leave; 1529 break;
1575 1530
1576 default: 1531 default:
1577 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1532 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1578 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type); 1533 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1579 goto leave; 1534 break;
1580 } 1535 }
1581 1536
1582leave:
1583 recursion_depth--; 1537 recursion_depth--;
1584} 1538}
1585 1539
1586/** 1540/**
1587 * Handles reading a regular (ie not containing a spell) book. 1541 * Handles reading a regular (ie not containing a spell) book.
… …
1598 return; 1552 return;
1599 } 1553 }
1600 1554
1601 if (!tmp->msg) 1555 if (!tmp->msg)
1602 { 1556 {
1603 op->failmsg (format ("You open the %s and find it empty.", &tmp->name)); 1557 op->failmsg (format ("The %s contains nothing but meaningless gibberish. H<There is nothing interesting to read here.>", &tmp->name));
1604 return; 1558 return;
1605 } 1559 }
1606 1560
1607 /* need a literacy skill to read stuff! */ 1561 /* need a literacy skill to read stuff! */
1608 skill_ob = find_skill_by_name (op, tmp->skill); 1562 skill_ob = find_skill_by_name (op, tmp->skill);
… …
1626 1580
1627 readable_message_type *msgType = get_readable_message_type (tmp); 1581 readable_message_type *msgType = get_readable_message_type (tmp);
1628 1582
1629 if (player *pl = op->contr) 1583 if (player *pl = op->contr)
1630 if (client *ns = pl->ns) 1584 if (client *ns = pl->ns)
1631 if (ns->can_msg)
1632 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); 1585 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1633 else
1634 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1635 msgType->message_type, msgType->message_subtype,
1636 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1637 long_desc (tmp, op), &tmp->msg);
1638 1586
1639 /* gain xp from reading */ 1587 /* gain xp from reading */
1640 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1588 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1641 { /* only if not read before */ 1589 { /* only if not read before */
1642 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1590 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1650 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp); 1598 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1651 } 1599 }
1652 1600
1653 change_exp (op, exp_gain, skill_ob->skill, 0); 1601 change_exp (op, exp_gain, skill_ob->skill, 0);
1654 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1602 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1603 }
1604}
1605
1606/**
1607 * op made some mistake with a scroll, this takes care of punishment.
1608 * scroll_failure()- hacked directly from spell_failure
1609 */
1610static void
1611scroll_failure (object *op, int failure, int power)
1612{
1613 if (abs (failure / 4) > power)
1614 power = abs (failure / 4); /* set minimum effect */
1615
1616 if (failure <= -1 && failure > -15)
1617 { /* wonder */
1618 object *tmp;
1619
1620 op->failmsg ("Your spell warps!");
1621 tmp = get_archetype (SPELL_WONDER);
1622 cast_wonder (op, op, 0, tmp);
1623 tmp->destroy ();
1624 }
1625 else if (failure <= -15 && failure > -35)
1626 { /* drain mana */
1627 op->failmsg ("Your mana is drained!");
1628 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
1629 if (op->stats.sp < 0)
1630 op->stats.sp = 0;
1631 }
1632 else if (settings.spell_failure_effects == TRUE)
1633 {
1634 if (failure <= -35 && failure > -60)
1635 { /* confusion */
1636 op->failmsg ("The magic recoils on you!");
1637 confuse_player (op, op, power);
1638 }
1639 else if (failure <= -60 && failure > -70)
1640 { /* paralysis */
1641 op->failmsg ("The magic recoils and paralyzes you!");
1642 paralyze_player (op, op, power);
1643 }
1644 else if (failure <= -70 && failure > -80)
1645 { /* blind */
1646 op->failmsg ("The magic recoils on you!");
1647 blind_player (op, op, power);
1648 }
1649 else if (failure <= -80)
1650 { /* blast the immediate area */
1651 object *tmp = get_archetype (LOOSE_MANA);
1652 cast_magic_storm (op, tmp, power);
1653 op->failmsg ("You unleash uncontrolled mana!");
1654 tmp->destroy ();
1655 }
1655 } 1656 }
1656} 1657}
1657 1658
1658/** 1659/**
1659 * Handles the applying of a skill scroll, calling learn_skill straight. 1660 * Handles the applying of a skill scroll, calling learn_skill straight.
… …
1765 * instead of having their spell stored in stats.sp. These are 1766 * instead of having their spell stored in stats.sp. These are
1766 * legacy spellbooks 1767 * legacy spellbooks
1767 */ 1768 */
1768 if (tmp->slaying) 1769 if (tmp->slaying)
1769 { 1770 {
1770 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1771 spell = find_archetype_by_object_name (tmp->slaying)->instance ();
1772
1771 if (!spell) 1773 if (!spell)
1772 { 1774 {
1773 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying)); 1775 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1774 return; 1776 return;
1775 } 1777 }
… …
1796 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1798 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1797 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!"); 1799 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1798 return; 1800 return;
1799 } 1801 }
1800 1802
1801 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1803 int learn_level = sqrtf (spell->level) * 1.5f;
1804 if (skop->level < learn_level)
1802 { 1805 {
1803 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill)); 1806 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1807 &tmp->skill, learn_level));
1804 return; 1808 return;
1805 } 1809 }
1806 1810
1807 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1811 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1808 1812
… …
1850 * literacy rate very useful! -b.t. 1854 * literacy rate very useful! -b.t.
1851 */ 1855 */
1852 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1856 if (QUERY_FLAG (op, FLAG_CONFUSED))
1853 { 1857 {
1854 op->failmsg ("In your confused state you flub the wording of the text!"); 1858 op->failmsg ("In your confused state you flub the wording of the text!");
1855 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1859 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), max (spell->stats.sp, spell->stats.grace));
1856 } 1860 }
1857 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1861 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
1858 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1862 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
1859 { 1863 {
1860 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN); 1864 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
… …
1965 if (op->destroyed () || tmp->destroyed ()) 1969 if (op->destroyed () || tmp->destroyed ())
1966 break; 1970 break;
1967 } 1971 }
1968 1972
1969 if (!tmp->destroyed () && !tmp->inv) 1973 if (!tmp->destroyed () && !tmp->inv)
1970 tmp->decrease (); 1974 tmp->decrease (true);
1971}
1972
1973/**
1974 * op eats food.
1975 * If player, takes care of messages and dragon special food.
1976 */
1977static void
1978apply_food (object *op, object *tmp)
1979{
1980 int capacity_remaining;
1981
1982 if (op->type != PLAYER)
1983 op->stats.hp = op->stats.maxhp;
1984 else
1985 {
1986 /* check if this is a dragon (player), eating some flesh */
1987 if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp))
1988 ;
1989 else
1990 {
1991 /* usual case - no dragon meal: */
1992 if (op->stats.food + tmp->stats.food > 999)
1993 {
1994 if (tmp->type == FOOD || tmp->type == FLESH)
1995 op->failmsg ("You feel full, but what a waste of food!");
1996 else
1997 op->statusmsg ("Most of the drink goes down your face not your throat!");
1998 }
1999
2000 tmp->play_sound (
2001 tmp->sound
2002 ? tmp->sound
2003 : tmp->type == DRINK
2004 ? sound_find ("eat_drink")
2005 : sound_find ("eat_food")
2006 );
2007
2008 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2009 {
2010 const char *buf;
2011
2012 if (!is_dragon_pl (op))
2013 {
2014 /* eating message for normal players */
2015 if (tmp->type == DRINK)
2016 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2017 else
2018 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2019 }
2020 else
2021 /* eating message for dragon players */
2022 buf = format ("The %s tasted terrible!", &tmp->name);
2023
2024 op->statusmsg (buf);
2025
2026 capacity_remaining = 999 - op->stats.food;
2027 op->stats.food += tmp->stats.food;
2028 if (capacity_remaining < tmp->stats.food)
2029 op->stats.hp += capacity_remaining / 50;
2030 else
2031 op->stats.hp += tmp->stats.food / 50;
2032
2033 if (op->stats.hp > op->stats.maxhp)
2034 op->stats.hp = op->stats.maxhp;
2035 if (op->stats.food > 999)
2036 op->stats.food = 999;
2037 }
2038
2039 /* special food hack -b.t. */
2040 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2041 eat_special_food (op, tmp);
2042 }
2043 }
2044
2045 handle_apply_yield (tmp);
2046 tmp->decrease ();
2047} 1975}
2048 1976
2049/** 1977/**
2050 * A dragon is eating some flesh. If the flesh contains resistances, 1978 * A dragon is eating some flesh. If the flesh contains resistances,
2051 * there is a chance for the dragon's skin to get improved. 1979 * there is a chance for the dragon's skin to get improved.
… …
2054 * object *op the object (dragon player) eating the flesh 1982 * object *op the object (dragon player) eating the flesh
2055 * object *meal the flesh item, getting chewed in dragon's mouth 1983 * object *meal the flesh item, getting chewed in dragon's mouth
2056 * return: 1984 * return:
2057 * int 1 if eating successful, 0 if it doesn't work 1985 * int 1 if eating successful, 0 if it doesn't work
2058 */ 1986 */
2059int 1987static int
2060dragon_eat_flesh (object *op, object *meal) 1988dragon_eat_flesh (object *op, object *meal)
2061{ 1989{
2062 object *skin = NULL; /* pointer to dragon skin force */ 1990 object *skin = NULL; /* pointer to dragon skin force */
2063 object *abil = NULL; /* pointer to dragon ability force */ 1991 object *abil = NULL; /* pointer to dragon ability force */
2064 object *tmp = NULL; /* tmp. object */ 1992 object *tmp = NULL; /* tmp. object */
… …
2070 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 1998 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
2071 int winners = 0; /* number of winners */ 1999 int winners = 0; /* number of winners */
2072 int i; /* index */ 2000 int i; /* index */
2073 2001
2074 /* let's make sure and doublecheck the parameters */ 2002 /* let's make sure and doublecheck the parameters */
2075 if (meal->type != FLESH || !is_dragon_pl (op)) 2003 if (meal->type != FLESH || !op->is_dragon ())
2076 return 0; 2004 return 0;
2077 2005
2078 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2006 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2079 from the player's inventory */ 2007 from the player's inventory */
2080 for (tmp = op->inv; tmp; tmp = tmp->below) 2008 for (tmp = op->inv; tmp; tmp = tmp->below)
… …
2096 op->stats.hp += meal->stats.food / 50; 2024 op->stats.hp += meal->stats.food / 50;
2097 2025
2098 if (op->stats.hp > op->stats.maxhp) 2026 if (op->stats.hp > op->stats.maxhp)
2099 op->stats.hp = op->stats.maxhp; 2027 op->stats.hp = op->stats.maxhp;
2100 2028
2101 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2029 op->stats.food = min (999, op->stats.food + meal->stats.food);
2102 2030
2103 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */ 2031 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */
2104 2032
2105 /* on to the interesting part: chances for adding resistance */ 2033 /* on to the interesting part: chances for adding resistance */
2106 for (i = 0; i < NROFATTACKS; i++) 2034 for (i = 0; i < NROFATTACKS; i++)
… …
2116 2044
2117 /* monster bonus increases with level, because high-level 2045 /* monster bonus increases with level, because high-level
2118 flesh is too rare */ 2046 flesh is too rare */
2119 mbonus = op->level * 20. / ((double) settings.max_level); 2047 mbonus = op->level * 20. / ((double) settings.max_level);
2120 2048
2121 chance = (((double) MIN (op->level + bonus, meal->level + bonus + mbonus)) * 100. / 2049 chance = (((double)min (op->level + bonus, meal->level + bonus + mbonus)) * 100. /
2122 ((double) settings.max_level)) - skin->resist[i]; 2050 ((double)settings.max_level)) - skin->resist[i];
2123 2051
2124 if (chance >= 0.) 2052 if (chance >= 0.)
2125 chance += 1.; 2053 chance += 1.;
2126 else 2054 else
2127 chance = (chance < -12) ? 0. : 1. / pow (2., -chance); 2055 chance = (chance < -12) ? 0. : 1. / pow (2., -chance);
2128 2056
2129 /* chance is proportional to amount of resistance (max. 50) */ 2057 /* chance is proportional to amount of resistance (max. 50) */
2130 chance *= ((double) (MIN (meal->resist[i], 50))) / 50.; 2058 chance *= ((double)(min (meal->resist[i], 50))) / 50.;
2131 2059
2132 /* doubled chance for resistance of ability-focus */ 2060 /* doubled chance for resistance of ability-focus */
2133 if (i == abil->stats.exp) 2061 if (i == abil->stats.exp)
2134 chance = MIN (100., chance * 2.); 2062 chance = min (100., chance * 2.);
2135 2063
2136 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2064 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2137 if (rndm (10000) < (unsigned int) (chance * 100)) 2065 if (rndm (10000) < (unsigned int)(chance * 100))
2138 { 2066 {
2139 atnr_winner[winners] = i; 2067 atnr_winner[winners] = i;
2140 winners++; 2068 winners++;
2141 } 2069 }
2142 2070
… …
2170 op->statusmsg (buf); 2098 op->statusmsg (buf);
2171 2099
2172 /* now choose a winner if we have any */ 2100 /* now choose a winner if we have any */
2173 i = -1; 2101 i = -1;
2174 if (winners > 0) 2102 if (winners > 0)
2175 i = atnr_winner[RANDOM () % winners]; 2103 i = atnr_winner [rndm (winners)];
2176 2104
2177 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2105 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2178 { 2106 {
2179 /* resistance increased! */ 2107 /* resistance increased! */
2180 skin->resist[i]++; 2108 skin->resist[i]++;
… …
2202 abil->last_eat = 0; 2130 abil->last_eat = 0;
2203 } 2131 }
2204 } 2132 }
2205 2133
2206 return 1; 2134 return 1;
2135}
2136
2137/**
2138 * op eats food.
2139 * If player, takes care of messages and dragon special food.
2140 */
2141static void
2142apply_food (object *op, object *tmp)
2143{
2144 int capacity_remaining;
2145
2146 if (op->type != PLAYER)
2147 op->stats.hp = op->stats.maxhp;
2148 else
2149 {
2150 /* check if this is a dragon (player), eating some flesh */
2151 if (tmp->type == FLESH && op->is_dragon () && dragon_eat_flesh (op, tmp))
2152 ;
2153 else
2154 {
2155 /* usual case - no dragon meal: */
2156 if (op->stats.food + tmp->stats.food > 999)
2157 {
2158 if (tmp->type == FOOD || tmp->type == FLESH)
2159 op->failmsg ("You feel full, but what a waste of food!");
2160 else
2161 op->statusmsg ("Most of the drink goes down your face not your throat!");
2162 }
2163
2164 tmp->play_sound (
2165 tmp->sound
2166 ? tmp->sound
2167 : tmp->type == DRINK
2168 ? sound_find ("eat_drink")
2169 : sound_find ("eat_food")
2170 );
2171
2172 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2173 {
2174 const char *buf;
2175
2176 if (!op->is_dragon ())
2177 {
2178 /* eating message for normal players */
2179 if (tmp->type == DRINK)
2180 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2181 else
2182 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2183 }
2184 else
2185 /* eating message for dragon players */
2186 buf = format ("The %s tasted terrible!", &tmp->name);
2187
2188 op->statusmsg (buf);
2189
2190 capacity_remaining = 999 - op->stats.food;
2191 op->stats.food += tmp->stats.food;
2192 if (capacity_remaining < tmp->stats.food)
2193 op->stats.hp += capacity_remaining / 50;
2194 else
2195 op->stats.hp += tmp->stats.food / 50;
2196
2197 if (op->stats.hp > op->stats.maxhp)
2198 op->stats.hp = op->stats.maxhp;
2199 if (op->stats.food > 999)
2200 op->stats.food = 999;
2201 }
2202
2203 /* special food hack -b.t. */
2204 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2205 eat_special_food (op, tmp);
2206 }
2207 }
2208
2209 handle_apply_yield (tmp);
2210 tmp->decrease ();
2207} 2211}
2208 2212
2209/** 2213/**
2210 * Handles applying an improve armor scroll. 2214 * Handles applying an improve armor scroll.
2211 * Does some sanity checks, then calls improve_armour. 2215 * Does some sanity checks, then calls improve_armour.
… …
2276 * 2280 *
2277 * Note: a owner in a 2 way exit is saved as the owner's name 2281 * Note: a owner in a 2 way exit is saved as the owner's name
2278 * in the field exit->name cause the field exit->owner doesn't 2282 * in the field exit->name cause the field exit->owner doesn't
2279 * survive in the swapping (in fact the whole exit doesn't survive). 2283 * survive in the swapping (in fact the whole exit doesn't survive).
2280 */ 2284 */
2281int 2285static int
2282is_legal_2ways_exit (object *op, object *exit) 2286is_legal_2ways_exit (object *op, object *exit)
2283{ 2287{
2284 if (exit->stats.exp != 1) 2288 if (exit->stats.exp != 1)
2285 return 1; /*This is not a 2 way, so it is legal */ 2289 return 1; /*This is not a 2 way, so it is legal */
2286 2290
… …
2352 return 1; 2356 return 1;
2353 } 2357 }
2354 } 2358 }
2355 2359
2356 return 0; 2360 return 0;
2361}
2362
2363/**
2364 * This function will try to apply a lighter and in case no lighter
2365 * is specified it will try to find a lighter in the players inventory,
2366 * and inform him about this requirement.
2367 *
2368 * who - the player
2369 * op - the item we want to light
2370 * lighter - the lighter or 0 if a lighter has yet to be found
2371 */
2372static object *
2373auto_apply_lighter (object *who, object *op, object *lighter)
2374{
2375 if (lighter == 0)
2376 {
2377 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2378 {
2379 if (tmp->type == LIGHTER)
2380 {
2381 lighter = tmp;
2382 break;
2383 }
2384 }
2385
2386 if (!lighter)
2387 {
2388 who->failmsg (format (
2389 "You can't light up the %s with your bare hands! "
2390 "H<You need a lighter in your inventory, for example a flint and steel.>",
2391 &op->name));
2392 return 0;
2393 }
2394 }
2395
2396 // last_eat == 0 means the lighter is not being used up!
2397 if (lighter->last_eat && lighter->stats.food)
2398 {
2399 /* lighter gets used up */
2400 lighter = lighter->split ();
2401 lighter->stats.food--;
2402 who->insert (lighter);
2403 }
2404 else if (lighter->last_eat)
2405 {
2406 /* no charges left in lighter */
2407 who->failmsg (format (
2408 "You attempt to light the %s with a used up %s.",
2409 &op->name, &lighter->name));
2410 return 0;
2411 }
2412
2413 return lighter;
2414}
2415
2416/**
2417 * Designed primarily to light torches/lanterns/etc.
2418 * Also burns up burnable material too. First object in the inventory is
2419 * the selected object to "burn". -b.t.
2420 */
2421static void
2422apply_lighter (object *who, object *lighter)
2423{
2424 object *item;
2425 int is_player_env = 0;
2426
2427 item = find_marked_object (who);
2428 if (item)
2429 {
2430 if (!auto_apply_lighter (who, item, lighter))
2431 return;
2432
2433 /* Perhaps we should split what we are trying to light on fire?
2434 * I can't see many times when you would want to light multiple
2435 * objects at once.
2436 */
2437
2438 save_throw_object (item, AT_FIRE, who);
2439
2440 if (item->destroyed ()
2441 || ((item->type == LAMP || item->type == TORCH)
2442 && item->glow_radius > 0))
2443 who->statusmsg (format (
2444 "You light the %s with the %s.",
2445 &item->name, &lighter->name));
2446 else
2447 who->failmsg (format (
2448 "You attempt to light the %s with the %s and fail.",
2449 &item->name, &lighter->name));
2450 }
2451 else
2452 who->failmsg ("You need to mark a lightable object.");
2453}
2454
2455/**
2456 * This function generates a cursed effect for cursed lamps and torches.
2457 */
2458static void
2459player_apply_lamp_cursed_effect (object *who, object *op)
2460{
2461 if (op->level)
2462 {
2463 who->failmsg (format (
2464 "The %s was cursed, it explodes in a big fireball!",
2465 &op->name));
2466 create_exploding_ball_at (who, op->level);
2467 }
2468 else
2469 {
2470 who->failmsg (format (
2471 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2472 &op->name));
2473 }
2474
2475 op->destroy ();
2476}
2477
2478/**
2479 * Apply for players and lamps
2480 *
2481 * who - the player
2482 * op - the lamp
2483 */
2484static void
2485player_apply_lamp (object *who, object *op)
2486{
2487 bool switch_on = op->glow_radius ? false : true;
2488
2489 if (switch_on)
2490 {
2491 object *lighter = 0;
2492
2493 if (op->flag [FLAG_IS_LIGHTABLE]
2494 && !(lighter = auto_apply_lighter (who, op, 0)))
2495 return;
2496
2497 if (op->stats.food < 1)
2498 {
2499 if (op->type == LAMP)
2500 who->failmsg (format (
2501 "The %s is out of fuel! "
2502 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2503 &op->name));
2504 else
2505 who->failmsg (format (
2506 "The %s is burnt out! "
2507 "H<Torches and similar items burn out and become worthless.>",
2508 &op->name));
2509 return;
2510 }
2511
2512 if (op->flag [FLAG_CURSED])
2513 {
2514 player_apply_lamp_cursed_effect (who, op);
2515 return;
2516 }
2517
2518 if (lighter)
2519 who->statusmsg (format (
2520 "You light up the %s with the %s.", &op->name, &lighter->name));
2521 else
2522 who->statusmsg (format ("You light up the %s.", &op->name));
2523 }
2524 else
2525 {
2526 if (op->flag [FLAG_CURSED])
2527 {
2528 player_apply_lamp_cursed_effect (who, op);
2529 return;
2530 }
2531
2532 if (op->type == TORCH)
2533 {
2534 if (!op->flag [FLAG_IS_LIGHTABLE])
2535 {
2536 who->statusmsg (format (
2537 "You put out the %s. "
2538 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2539 &op->name, &op->name));
2540 }
2541 else
2542 who->statusmsg (format (
2543 "You put out the %s."
2544 "H<Torches wear out if you put them out.>",
2545 &op->name));
2546 }
2547 else
2548 who->statusmsg (format ("You turn off the %s.", &op->name));
2549 }
2550
2551 apply_lamp (op, switch_on);
2552}
2553
2554void get_animation_from_arch (object *op, arch_ptr a)
2555{
2556 op->animation_id = a->animation_id;
2557 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2558 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2559 op->anim_speed = a->anim_speed;
2560 op->last_anim = 0;
2561 op->state = 0;
2562 op->face = a->face;
2563
2564 if (NUM_ANIMATIONS(op) > 1)
2565 {
2566 SET_ANIMATION(op, 0);
2567 animate_object (op, op->direction);
2568 }
2569 else
2570 update_object (op, UP_OBJ_FACE);
2571}
2572
2573/**
2574 * Apply for LAMPs and TORCHes.
2575 *
2576 * op - the lamp
2577 * switch_on - a flag which says whether the lamp should be switched on or off
2578 */
2579void apply_lamp (object *op, bool switch_on)
2580{
2581 op->set_glow_radius (switch_on ? op->range : 0);
2582 op->set_speed (switch_on ? op->arch->speed : 0);
2583
2584 // torches wear out if you put them out
2585 if (op->type == TORCH && !switch_on)
2586 {
2587 if (op->flag [FLAG_IS_LIGHTABLE])
2588 {
2589 op->stats.food -= (double) op->arch->stats.food / 15;
2590 if (op->stats.food < 0)
2591 op->stats.food = 0;
2592 }
2593 else
2594 op->stats.food = 0;
2595 }
2596
2597 // lamps and torched get worthless when used up
2598 if (op->stats.food <= 0)
2599 op->value = 0;
2600
2601 // FIXME: This is a hack to make the more sane torches and lamps
2602 // still animated ;-/
2603 if (op->other_arch)
2604 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2605
2606 if (object *pl = op->visible_to ())
2607 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2608}
2609
2610/**
2611 * This handles items of type 'transformer'.
2612 * Basically those items, used with a marked item, transform both items into something
2613 * else.
2614 * "Transformer" item has food decreased by 1, removed if 0 (0 at start means illimited)..
2615 * Change information is contained in the 'slaying' field of the marked item.
2616 * The format is as follow: transformer:[number ]yield[;transformer:...].
2617 * This way an item can be transformed in many things, and/or many objects.
2618 * The 'slaying' field for transformer is used as verb for the action.
2619 */
2620static void
2621apply_item_transformer (object *pl, object *transformer)
2622{
2623 object *marked;
2624 object *new_item;
2625 const char *find;
2626 char *separator;
2627 int yield;
2628 char got[MAX_BUF];
2629 int len;
2630
2631 if (!pl || !transformer)
2632 return;
2633
2634 marked = find_marked_object (pl);
2635
2636 if (!marked)
2637 {
2638 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
2639 return;
2640 }
2641
2642 if (!marked->slaying)
2643 {
2644 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2645 return;
2646 }
2647
2648 /* check whether they are compatible or not */
2649 find = strstr (&marked->slaying, transformer->arch->archname);
2650 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
2651 {
2652 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2653 return;
2654 }
2655
2656 find += strlen (transformer->arch->archname) + 1;
2657 /* Item can be used, now find how many and what it yields */
2658 if (isdigit (*(find)))
2659 {
2660 yield = atoi (find);
2661 if (yield < 1)
2662 {
2663 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
2664 yield = 1;
2665 }
2666 }
2667 else
2668 yield = 1;
2669
2670 while (isdigit (*find))
2671 find++;
2672
2673 while (*find == ' ')
2674 find++;
2675
2676 memset (got, 0, MAX_BUF);
2677
2678 if ((separator = (char *) strchr (find, ';')))
2679 len = separator - find;
2680 else
2681 len = strlen (find);
2682
2683 min_it (len, MAX_BUF - 1);
2684
2685 strcpy (got, find);
2686 got[len] = '\0';
2687
2688 /* Now create new item, remove used ones when required. */
2689 new_item = get_archetype (got);
2690 if (!new_item)
2691 {
2692 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
2693 return;
2694 }
2695
2696 new_item->nrof = yield;
2697
2698 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
2699
2700 pl->insert (new_item);
2701 /* Eat up one item */
2702 marked->decrease ();
2703
2704 /* Eat one transformer if needed */
2705 if (transformer->stats.food)
2706 if (--transformer->stats.food == 0)
2707 transformer->decrease ();
2357} 2708}
2358 2709
2359/** 2710/**
2360 * Main apply handler. 2711 * Main apply handler.
2361 * 2712 *
… …
2364 * Return value: 2715 * Return value:
2365 * 0: player or monster can't apply objects of that type 2716 * 0: player or monster can't apply objects of that type
2366 * 1: has been applied, or there was an error applying the object 2717 * 1: has been applied, or there was an error applying the object
2367 * 2: objects of that type can't be applied if not in inventory 2718 * 2: objects of that type can't be applied if not in inventory
2368 * 2719 *
2369 * op is the object that is causing object to be applied, tmp is the object 2720 * who is the object that is causing object to be applied, op is the object
2370 * being applied. 2721 * being applied.
2371 * 2722 *
2372 * aflag is special (always apply/unapply) flags. Nothing is done with 2723 * aflag is special (always apply/unapply) flags. Nothing is done with
2373 * them in this function - they are passed to apply_special 2724 * them in this function - they are passed to apply_special
2374 */ 2725 */
2375int 2726int
2376manual_apply (object *op, object *tmp, int aflag) 2727manual_apply (object *who, object *op, int aflag)
2377{ 2728{
2378 tmp = tmp->head_ (); 2729 op = op->head_ ();
2379 2730
2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2731 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2381 { 2732 {
2382 if (op->type == PLAYER) 2733 if (who->type == PLAYER)
2383 { 2734 {
2735 examine (who, op);
2384 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2736 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2385 return 1; 2737 return 1;
2386 } 2738 }
2387 else 2739 else
2388 return 0; /* monsters just skip unpaid items */ 2740 return 0; /* monsters just skip unpaid items */
2389 } 2741 }
2390 2742
2391 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2743 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2392 return RESULT_INT (0); 2744 return RESULT_INT (0);
2393 2745
2394 switch (tmp->type) 2746 switch (op->type)
2395 { 2747 {
2396 case CF_HANDLE: 2748 case T_HANDLE:
2397 op->play_sound (sound_find ("turn_handle")); 2749 who->play_sound (sound_find ("turn_handle"));
2398 op->statusmsg ("You turn the handle."); 2750 who->statusmsg ("You turn the handle.");
2399 tmp->value = tmp->value ? 0 : 1; 2751 op->value = op->value ? 0 : 1;
2400 SET_ANIMATION (tmp, tmp->value); 2752 SET_ANIMATION (op, op->value);
2401 update_object (tmp, UP_OBJ_FACE); 2753 update_object (op, UP_OBJ_FACE);
2402 push_button (tmp); 2754 push_button (op, who);
2403 return 1; 2755 return 1;
2404 2756
2405 case TRIGGER: 2757 case TRIGGER:
2406 if (check_trigger (tmp, op)) 2758 if (check_trigger (op, who, who))
2407 { 2759 {
2408 op->statusmsg ("You turn the handle."); 2760 who->statusmsg ("You turn the handle.");
2409 op->play_sound (sound_find ("turn_handle")); 2761 who->play_sound (sound_find ("turn_handle"));
2410 } 2762 }
2411 else 2763 else
2412 op->failmsg ("The handle doesn't move."); 2764 who->failmsg ("The handle doesn't move.");
2413 2765
2414 return 1; 2766 return 1;
2415 2767
2416 case EXIT: 2768 case EXIT:
2417 if (op->type != PLAYER) 2769 if (who->type != PLAYER)
2418 return 0; 2770 return 0;
2419 2771
2420 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2772 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2421 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2773 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)));
2422 else 2774 else
2423 { 2775 {
2424 /* Don't display messages for random maps. */ 2776 /* Don't display messages for random maps. */
2425 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2777 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2426 op->statusmsg (tmp->msg, NDI_NAVY); 2778 who->statusmsg (op->msg, NDI_NAVY);
2427 2779
2428 op->enter_exit (tmp); 2780 who->enter_exit (op);
2429 } 2781 }
2430 2782
2431 return 1; 2783 return 1;
2432 2784
2433 case INSCRIBABLE: 2785 case INSCRIBABLE:
2434 op->statusmsg (tmp->msg); 2786 who->statusmsg (op->msg);
2435 // maybe show a spell menu to chose from or something like that 2787 // maybe show a spell menu to chose from or something like that
2436 return 1; 2788 return 1;
2437 2789
2438 case SIGN: 2790 case SIGN:
2439 apply_sign (op, tmp, 0); 2791 apply_sign (who, op, 0);
2440 return 1; 2792 return 1;
2441 2793
2442 case BOOK: 2794 case BOOK:
2443 if (op->type == PLAYER) 2795 if (who->type == PLAYER)
2444 { 2796 {
2445 apply_book (op, tmp); 2797 apply_book (who, op);
2446 return 1; 2798 return 1;
2447 } 2799 }
2448 else 2800 else
2449 return 0; 2801 return 0;
2450 2802
2451 case SKILLSCROLL: 2803 case SKILLSCROLL:
2452 if (op->type == PLAYER) 2804 if (who->type == PLAYER)
2453 { 2805 {
2454 apply_skillscroll (op, tmp); 2806 apply_skillscroll (who, op);
2455 return 1; 2807 return 1;
2456 } 2808 }
2457 else 2809 else
2458 return 0; 2810 return 0;
2459 2811
2460 case SPELLBOOK: 2812 case SPELLBOOK:
2461 if (op->type == PLAYER) 2813 if (who->type == PLAYER)
2462 { 2814 {
2463 apply_spellbook (op, tmp); 2815 apply_spellbook (who, op);
2464 return 1; 2816 return 1;
2465 } 2817 }
2466 else 2818 else
2467 return 0; 2819 return 0;
2468 2820
2469 case SCROLL: 2821 case SCROLL:
2470 apply_scroll (op, tmp, 0); 2822 apply_scroll (who, op, 0);
2471 return 1; 2823 return 1;
2472 2824
2473 case POTION: 2825 case POTION:
2474 apply_potion (op, tmp); 2826 apply_potion (who, op);
2475 return 1; 2827 return 1;
2476 2828
2477 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2829 /* Eneq(@csd.uu.se): Handle apply on containers. */
2478 //TODO: remove, as it is unsed? 2830 //TODO: remove, as it is unsed?
2479 case CLOSE_CON: 2831 case CLOSE_CON:
2480 apply_container (op, tmp->env); 2832 apply_container (who, op->env);
2481 return 1; 2833 return 1;
2482 2834
2483 case CONTAINER: 2835 case CONTAINER:
2484 apply_container (op, tmp); 2836 apply_container (who, op);
2485 return 1; 2837 return 1;
2486 2838
2487 case TREASURE: 2839 case TREASURE:
2488 if (op->type == PLAYER) 2840 if (who->type == PLAYER)
2489 { 2841 {
2490 apply_treasure (op, tmp); 2842 apply_treasure (who, op);
2491 return 1; 2843 return 1;
2492 } 2844 }
2493 else 2845 else
2494 return 0; 2846 return 0;
2847
2848 case LAMP:
2849 case TORCH:
2850 player_apply_lamp (who, op);
2851 return 1;
2495 2852
2496 case WEAPON: 2853 case WEAPON:
2497 case ARMOUR: 2854 case ARMOUR:
2498 case BOOTS: 2855 case BOOTS:
2499 case GLOVES: 2856 case GLOVES:
… …
2507 case WAND: 2864 case WAND:
2508 case ROD: 2865 case ROD:
2509 case HORN: 2866 case HORN:
2510 case SKILL: 2867 case SKILL:
2511 case BOW: 2868 case BOW:
2512 case LAMP:
2513 case BUILDER: 2869 case BUILDER:
2514 case SKILL_TOOL: 2870 case SKILL_TOOL:
2515 if (tmp->env != op) 2871 if (op->env != who)
2516 return 2; /* not in inventory */ 2872 return 2; /* not in inventory */
2517 2873
2518 apply_special (op, tmp, aflag); 2874 apply_special (who, op, aflag);
2519 return 1; 2875 return 1;
2520 2876
2521 case DRINK: 2877 case DRINK:
2522 case FOOD: 2878 case FOOD:
2523 case FLESH: 2879 case FLESH:
2524 apply_food (op, tmp); 2880 apply_food (who, op);
2525 return 1; 2881 return 1;
2526 2882
2527 case POISON: 2883 case POISON:
2528 apply_poison (op, tmp); 2884 apply_poison (who, op);
2529 return 1; 2885 return 1;
2530 2886
2531 case SAVEBED: 2887 case SAVEBED:
2532 return 1; 2888 return 1;
2533 2889
2534 case ARMOUR_IMPROVER: 2890 case ARMOUR_IMPROVER:
2535 if (op->type == PLAYER) 2891 if (who->type == PLAYER)
2536 { 2892 {
2537 apply_armour_improver (op, tmp); 2893 apply_armour_improver (who, op);
2538 return 1; 2894 return 1;
2539 } 2895 }
2540 else 2896 else
2541 return 0; 2897 return 0;
2542 2898
2543 case WEAPON_IMPROVER: 2899 case WEAPON_IMPROVER:
2544 check_improve_weapon (op, tmp); 2900 check_improve_weapon (who, op);
2545 return 1; 2901 return 1;
2546 2902
2547 case CLOCK: 2903 case CLOCK:
2548 if (op->type == PLAYER) 2904 if (who->type == PLAYER)
2549 { 2905 {
2550 char buf[MAX_BUF]; 2906 char buf[MAX_BUF];
2551 timeofday_t tod; 2907 timeofday_t tod;
2552 2908
2553 get_tod (&tod); 2909 get_tod (&tod);
2554 op->play_sound (sound_find ("sound_clock")); 2910 who->play_sound (sound_find ("sound_clock"));
2555 op->statusmsg (format ( 2911 who->statusmsg (format (
2556 "It is %d minute%s past %d o'clock %s", 2912 "It is %d minute%s past %d o'clock %s",
2557 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2913 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2558 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2914 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2559 )); 2915 ));
2560 return 1; 2916 return 1;
2561 } 2917 }
2562 else 2918 else
2563 return 0; 2919 return 0;
2564 2920
2565 case MENU: 2921 case MENU:
2566 if (op->type == PLAYER) 2922 if (who->type == PLAYER)
2567 { 2923 {
2568 shop_listing (tmp, op); 2924 shop_listing (op, who);
2569 return 1; 2925 return 1;
2570 } 2926 }
2571 else 2927 else
2572 return 0; 2928 return 0;
2573 2929
2574 case POWER_CRYSTAL: 2930 case POWER_CRYSTAL:
2575 apply_power_crystal (op, tmp); /* see egoitem.c */ 2931 apply_power_crystal (who, op); /* see egoitem.c */
2576 return 1; 2932 return 1;
2577 2933
2578 case LIGHTER: /* for lighting torches/lanterns/etc */ 2934 case LIGHTER: /* for lighting torches/lanterns/etc */
2579 if (op->type == PLAYER) 2935 if (who->type == PLAYER)
2580 { 2936 {
2581 apply_lighter (op, tmp); 2937 apply_lighter (who, op);
2582 return 1; 2938 return 1;
2583 } 2939 }
2584 else 2940 else
2585 return 0; 2941 return 0;
2586 2942
2587 case ITEM_TRANSFORMER: 2943 case ITEM_TRANSFORMER:
2588 apply_item_transformer (op, tmp); 2944 apply_item_transformer (who, op);
2589 return 1; 2945 return 1;
2590 2946
2591 default: 2947 default:
2592 return 0; 2948 return 0;
2593 } 2949 }
… …
2645 * we don't use a corrupt pointer for the next object, so we get the 3001 * we don't use a corrupt pointer for the next object, so we get the
2646 * next object in the stack before applying. This is can only be a 3002 * next object in the stack before applying. This is can only be a
2647 * problem if player_apply() has a bug in that it uses the object but does 3003 * problem if player_apply() has a bug in that it uses the object but does
2648 * not return a proper value. 3004 * not return a proper value.
2649 */ 3005 */
2650 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next) 3006 for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next)
2651 { 3007 {
2652 next = tmp->below; 3008 next = tmp->below;
2653 3009
2654 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3010 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2655 floors++; 3011 floors++;
… …
2660 * person moving on it, also activate. Added code to make it 3016 * person moving on it, also activate. Added code to make it
2661 * so that at least one of players movement types be that which 3017 * so that at least one of players movement types be that which
2662 * the item needs. 3018 * the item needs.
2663 */ 3019 */
2664 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 3020 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2665 {
2666 if (player_apply (pl, tmp, 0, 1) == 1) 3021 if (player_apply (pl, tmp, 0, 1) == 1)
2667 return; 3022 return;
2668 } 3023
2669 if (floors >= 2) 3024 if (floors >= 2)
2670 return; /* process at most two floor objects */ 3025 return; /* process at most two floor objects */
2671 } 3026 }
2672} 3027}
2673 3028
… …
2746 case CLOAK: 3101 case CLOAK:
2747 who->statusmsg (format ("You unwear %s.", query_name (op))); 3102 who->statusmsg (format ("You unwear %s.", query_name (op)));
2748 change_abil (who, op); 3103 change_abil (who, op);
2749 break; 3104 break;
2750 3105
2751 case LAMP:
2752 {
2753 who->statusmsg (format ("You turn off your %s.", &op->name));
2754
2755 object *tmp2 = arch_to_object (op->other_arch);
2756 tmp2->x = op->x;
2757 tmp2->y = op->y;
2758 tmp2->map = op->map;
2759 tmp2->below = op->below;
2760 tmp2->above = op->above;
2761 tmp2->stats.food = op->stats.food;
2762 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2763
2764 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2765 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2766
2767 op->destroy ();
2768 who->insert (tmp2);
2769 who->update_stats ();
2770
2771 if (who->contr)
2772 {
2773 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2774 {
2775 who->failmsg ("Oops, it feels deadly cold!");
2776 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2777 }
2778 }
2779 }
2780
2781 return 1; /* otherwise, an attempt to drop causes problems */
2782
2783 case BOW: 3106 case BOW:
2784 case WAND: 3107 case WAND:
2785 case ROD: 3108 case ROD:
2786 case HORN: 3109 case HORN:
2787 if (player *pl = who->contr) 3110 if (player *pl = who->contr)
… …
2866#define CANNOT_REMOVE_CURSED \ 3189#define CANNOT_REMOVE_CURSED \
2867 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \ 3190 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2868 "Praying over an altar, scrolls of remove curse/damnation, " \ 3191 "Praying over an altar, scrolls of remove curse/damnation, " \
2869 "priests or even other players might help.>" 3192 "priests or even other players might help.>"
2870 3193
2871int 3194static int
2872unapply_for_ob (object *who, object *op, int aflags) 3195unapply_for_ob (object *who, object *op, int aflags)
2873{ 3196{
2874 if (op->is_range ()) 3197 if (op->is_range ())
2875 for (object *tmp = who->inv; tmp; tmp = tmp->below) 3198 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2876 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ()) 3199 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
… …
3194 * skill so that the dam and wc get updated 3517 * skill so that the dam and wc get updated
3195 */ 3518 */
3196 who->change_skill (skop); 3519 who->change_skill (skop);
3197 } 3520 }
3198 3521
3199 if (who->type == PLAYER 3522 if (!check_item_power (who, op->item_power))
3200 && op->item_power
3201 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3202 { 3523 {
3203 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3524 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3204 return 1; 3525 return 1;
3205 } 3526 }
3206 3527
… …
3214 return RESULT_INT (0); 3535 return RESULT_INT (0);
3215 3536
3216 switch (op->type) 3537 switch (op->type)
3217 { 3538 {
3218 case WEAPON: 3539 case WEAPON:
3219 if (!check_weapon_power (who, op->last_eat))
3220 {
3221 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3222
3223 if (tmp)
3224 insert_ob_in_ob (tmp, who);
3225
3226 return 1;
3227 }
3228
3229 //TODO: this obviously fails for players using a shorter prefix 3540 //TODO: this obviously fails for players using a shorter prefix
3230 // i.e. "R" can use Ragnarok's sword. 3541 // i.e. "R" can use Ragnarok's sword.
3231 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3542 if (op->level && !op->name.starts_with (who->name))
3232 { 3543 {
3233 /* if the weapon does not have the name as the character, can't use it. */ 3544 /* if the weapon does not have the name as the character, can't use it. */
3234 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3545 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3235 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3546 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3236 3547
… …
3270 case AMULET: 3581 case AMULET:
3271 SET_FLAG (op, FLAG_APPLIED); 3582 SET_FLAG (op, FLAG_APPLIED);
3272 who->statusmsg (format ("You wear %s.", query_name (op))); 3583 who->statusmsg (format ("You wear %s.", query_name (op)));
3273 change_abil (who, op); 3584 change_abil (who, op);
3274 break; 3585 break;
3275
3276 case LAMP:
3277 if (op->stats.food < 1)
3278 {
3279 who->failmsg (format (
3280 "Your %s is out of fuel! "
3281 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3282 &op->name
3283 ));
3284 return 1;
3285 }
3286
3287 who->statusmsg (format ("You turn on your %s.", &op->name));
3288
3289 tmp2 = arch_to_object (op->other_arch);
3290 tmp2->stats.food = op->stats.food;
3291 SET_FLAG (tmp2, FLAG_APPLIED);
3292
3293 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3294 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3295
3296 who->insert (tmp2);
3297
3298 /* Remove the old lantern */
3299 op->destroy ();
3300
3301 /* insert the portion that was split off */
3302 if (tmp)
3303 who->insert (tmp);
3304
3305 who->update_stats ();
3306
3307 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3308 if (who->type == PLAYER)
3309 {
3310 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3311 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3312 }
3313
3314 return 0;
3315 3586
3316 case SKILL_TOOL: 3587 case SKILL_TOOL:
3317 // applying a skill tool also readies the skill 3588 // applying a skill tool also readies the skill
3318 SET_FLAG (op, FLAG_APPLIED); 3589 SET_FLAG (op, FLAG_APPLIED);
3319 3590
… …
3399 } 3670 }
3400 3671
3401 break; 3672 break;
3402 3673
3403 case BOW: 3674 case BOW:
3404 if (!check_weapon_power (who, op->last_eat)) 3675 if (op->level && !op->name.starts_with (who->name))
3405 {
3406 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3407
3408 if (tmp)
3409 insert_ob_in_ob (tmp, who);
3410
3411 return 1;
3412 }
3413
3414 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3415 { 3676 {
3416 who->failmsg ("The weapon does not recognize you as its owner. " 3677 who->failmsg ("The weapon does not recognize you as its owner. "
3417 "H<Its name indicates that it belongs to somebody else.>"); 3678 "H<Its name indicates that it belongs to somebody else.>");
3418 if (tmp) 3679 if (tmp)
3419 insert_ob_in_ob (tmp, who); 3680 insert_ob_in_ob (tmp, who);
… …
3493 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3754 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3494 if (who->type == PLAYER) 3755 if (who->type == PLAYER)
3495 { 3756 {
3496 who->failmsg ( 3757 who->failmsg (
3497 "Oops, it feels deadly cold! " 3758 "Oops, it feels deadly cold! "
3498 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3759 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3499 ); 3760 );
3500 SET_FLAG (op, FLAG_KNOWN_CURSED); 3761 SET_FLAG (op, FLAG_KNOWN_CURSED);
3501 } 3762 }
3502 3763
3503 if (object *pl = op->visible_to ()) 3764 if (object *pl = op->visible_to ())
3504 esrv_send_item (pl, op); 3765 esrv_send_item (pl, op);
3505 3766
3506 return 0; 3767 return 0;
3507}
3508
3509int
3510monster_apply_special (object *who, object *op, int aflags)
3511{
3512 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3513 return 1;
3514
3515 return apply_special (who, op, aflags);
3516} 3768}
3517 3769
3518/** 3770/**
3519 * Map was just loaded, handle op's initialisation. 3771 * Map was just loaded, handle op's initialisation.
3520 * 3772 *
… …
3572 /* If we generated an object and put it in this object inventory, 3824 /* If we generated an object and put it in this object inventory,
3573 * move it to the parent object as the current object is about 3825 * move it to the parent object as the current object is about
3574 * to disappear. An example of this item is the random_* stuff 3826 * to disappear. An example of this item is the random_* stuff
3575 * that is put inside other objects. 3827 * that is put inside other objects.
3576 */ 3828 */
3577 for (tmp = op->inv; tmp; tmp = tmp2)
3578 {
3579 tmp2 = tmp->below;
3580 tmp->remove ();
3581
3582 if (op->env) 3829 if (op->env)
3583 insert_ob_in_ob (tmp, op->env); 3830 while (op->inv)
3584 else 3831 op->env->insert (op->inv);
3585 tmp->destroy ();
3586 }
3587 3832
3588 op->destroy (); 3833 op->destroy ();
3589 break; 3834 break;
3590 } 3835 }
3591 3836
… …
3634 * treasure again for this object 3879 * treasure again for this object
3635 */ 3880 */
3636 invtmp->randomitems = NULL; 3881 invtmp->randomitems = NULL;
3637 } 3882 }
3638 } 3883 }
3884
3639 /* This is really temporary - the code at the bottom will 3885 /* This is really temporary - the code at the bottom will
3640 * also set randomitems to null. The problem is there are bunches 3886 * also set randomitems to null. The problem is there are bunches
3641 * of maps/players already out there with items that have spells 3887 * of maps/players already out there with items that have spells
3642 * which haven't had the randomitems set to null yet. 3888 * which haven't had the randomitems set to null yet.
3643 * MSW 2004-05-13 3889 * MSW 2004-05-13
… …
3647 * Ryo 2004-08-16 3893 * Ryo 2004-08-16
3648 */ 3894 */
3649 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3895 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3650 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3896 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3651 tmp->randomitems = NULL; 3897 tmp->randomitems = NULL;
3652
3653 } 3898 }
3654 3899
3655 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY)) 3900 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3656 auto_apply (tmp); 3901 auto_apply (tmp);
3657 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ()) 3902 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
… …
3690 } 3935 }
3691 3936
3692 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3937 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3693 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 3938 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3694 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3939 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3695 check_trigger (tmp, tmp->above); 3940 check_trigger (tmp, tmp->above, tmp->above);
3696} 3941}
3697 3942
3698/** 3943/**
3699 * Handles player eating food that temporarily changes status (resistances, stats). 3944 * Handles player eating food that temporarily changes status (resistances, stats).
3700 * This used to call cast_change_attr(), but 3945 * This used to call cast_change_attr(), but
… …
3705eat_special_food (object *who, object *food) 3950eat_special_food (object *who, object *food)
3706{ 3951{
3707 object *force; 3952 object *force;
3708 int i, did_one = 0; 3953 int i, did_one = 0;
3709 3954
3710 force = get_archetype (FORCE_NAME); 3955 char buf[64];
3956 snprintf (buf, sizeof(buf), "sp_food_%s", &food->title);
3957 shstr key (buf);
3711 3958
3712 for (i = 0; i < NUM_STATS; i++)
3713 if (sint8 k = food->stats.stat (i))
3714 {
3715 force->stats.stat (i) = k;
3716 did_one = 1;
3717 }
3718
3719 /* check if we can protect the eater */
3720 for (i = 0; i < NROFATTACKS; i++)
3721 {
3722 if (food->resist[i] > 0)
3723 {
3724 force->resist[i] = food->resist[i] / 2;
3725 did_one = 1;
3726 }
3727 }
3728
3729 if (did_one)
3730 {
3731 force->set_speed (0.1);
3732 /* bigger morsel of food = longer effect time */ 3959 /* bigger morsel of food = longer effect time */
3733 force->duration = food->stats.food / 5; 3960 int duration = TIME2TICK (food->stats.food);
3734 SET_FLAG (force, FLAG_APPLIED); 3961
3735 change_abil (who, force); 3962 if (force = who->force_find (key))
3736 insert_ob_in_ob (force, who); 3963 {
3964 if (duration > fabs (force->speed_left / force->speed))
3965 {
3966 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));
3967 force->force_set_timer (duration);
3968 }
3969 else
3970 new_draw_info (NDI_UNIQUE, 0, who, "It had no additional effect.");
3971
3972 return;
3737 } 3973 }
3738 else 3974 else
3975 {
3976 force = who->force_add (key, duration);
3977 force->name = key;
3978
3979 /* check if the food affects a stat */
3980 for (i = 0; i < NUM_STATS; i++)
3981 if (sint8 k = food->stats.stat (i))
3982 {
3983 force->stats.stat (i) = k;
3984 did_one = 1;
3985 }
3986
3987 /* check if we can protect the eater */
3988 for (i = 0; i < NROFATTACKS; i++)
3989 {
3990 if (food->resist[i] > 0)
3991 {
3992 force->resist[i] = food->resist[i];
3993 did_one = 1;
3994 }
3995 }
3996
3997 if (did_one)
3998 {
3999 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));
4000
4001 /* make the force take effect and report effects to user */
4002 change_abil (who, force);
4003 }
4004 else
3739 force->destroy (); 4005 force->destroy ();
4006 }
3740 4007
3741 /* check for hp, sp change */ 4008 /* check for hp, sp change */
3742 if (food->stats.hp != 0) 4009 if (food->stats.hp != 0)
3743 { 4010 {
3744 if (QUERY_FLAG (food, FLAG_CURSED)) 4011 if (QUERY_FLAG (food, FLAG_CURSED))
… …
3774 /* place limit on max sp from food? */ 4041 /* place limit on max sp from food? */
3775 } 4042 }
3776 } 4043 }
3777 4044
3778 who->update_stats (); 4045 who->update_stats ();
3779}
3780
3781/**
3782 * Designed primarily to light torches/lanterns/etc.
3783 * Also burns up burnable material too. First object in the inventory is
3784 * the selected object to "burn". -b.t.
3785 */
3786void
3787apply_lighter (object *who, object *lighter)
3788{
3789 object *item;
3790 int is_player_env = 0;
3791
3792 item = find_marked_object (who);
3793 if (item)
3794 {
3795 if (lighter->last_eat && lighter->stats.food)
3796 { /* lighter gets used up */
3797 object *oneLighter = lighter->split ();
3798 oneLighter->stats.food--;
3799 who->insert (oneLighter);
3800 }
3801 else if (lighter->last_eat)
3802 {
3803 /* no charges left in lighter */
3804 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3805 return;
3806 }
3807
3808 /* Perhaps we should split what we are trying to light on fire?
3809 * I can't see many times when you would want to light multiple
3810 * objects at once.
3811 */
3812
3813 if (who == item->in_player ())
3814 is_player_env = 1;
3815
3816 save_throw_object (item, AT_FIRE, who);
3817
3818 if (item->destroyed ())
3819 {
3820 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3821 /* Need to update the player so that the players glow radius
3822 * gets changed.
3823 */
3824 if (is_player_env)
3825 who->update_stats ();
3826 }
3827 else
3828 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3829 }
3830 else
3831 who->failmsg ("You need to mark a lightable object.");
3832}
3833
3834/**
3835 * op made some mistake with a scroll, this takes care of punishment.
3836 * scroll_failure()- hacked directly from spell_failure
3837 */
3838void
3839scroll_failure (object *op, int failure, int power)
3840{
3841 if (abs (failure / 4) > power)
3842 power = abs (failure / 4); /* set minimum effect */
3843
3844 if (failure <= -1 && failure > -15)
3845 { /* wonder */
3846 object *tmp;
3847
3848 op->failmsg ("Your spell warps!");
3849 tmp = get_archetype (SPELL_WONDER);
3850 cast_wonder (op, op, 0, tmp);
3851 tmp->destroy ();
3852 }
3853 else if (failure <= -15 && failure > -35)
3854 { /* drain mana */
3855 op->failmsg ("Your mana is drained!");
3856 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
3857 if (op->stats.sp < 0)
3858 op->stats.sp = 0;
3859 }
3860 else if (settings.spell_failure_effects == TRUE)
3861 {
3862 if (failure <= -35 && failure > -60)
3863 { /* confusion */
3864 op->failmsg ("The magic recoils on you!");
3865 confuse_player (op, op, power);
3866 }
3867 else if (failure <= -60 && failure > -70)
3868 { /* paralysis */
3869 op->failmsg ("The magic recoils and paralyzes you!");
3870 paralyze_player (op, op, power);
3871 }
3872 else if (failure <= -70 && failure > -80)
3873 { /* blind */
3874 op->failmsg ("The magic recoils on you!");
3875 blind_player (op, op, power);
3876 }
3877 else if (failure <= -80)
3878 { /* blast the immediate area */
3879 object *tmp = get_archetype (LOOSE_MANA);
3880 cast_magic_storm (op, tmp, power);
3881 op->failmsg ("You unleash uncontrolled mana!");
3882 tmp->destroy ();
3883 }
3884 }
3885} 4046}
3886 4047
3887void 4048void
3888apply_changes_to_player (object *pl, object *change) 4049apply_changes_to_player (object *pl, object *change)
3889{ 4050{
… …
3937 } 4098 }
3938 4099
3939 /* insert the randomitems from the change's treasurelist into 4100 /* insert the randomitems from the change's treasurelist into
3940 * the player ref: player.c 4101 * the player ref: player.c
3941 */ 4102 */
3942 if (change->randomitems != NULL) 4103 if (change->randomitems)
3943 give_initial_items (pl, change->randomitems); 4104 give_initial_items (pl, change->randomitems);
3944 4105
3945 /* set up the face, for some races. */ 4106 /* set up the face, for some races. */
3946 4107
3947 /* first, look for the force object banning 4108 /* first, look for the force object banning
3948 * changing the face. Certain races never change face with class. 4109 * changing the face. Certain races never change face with class.
3949 */ 4110 */
3950 for (walk = pl->inv; walk != NULL; walk = walk->below) 4111 for (walk = pl->inv; walk; walk = walk->below)
3951 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4112 if (walk->name == shstr_NOCLASSFACECHANGE)
3952 flag_change_face = 0; 4113 flag_change_face = 0;
3953 4114
3954 if (flag_change_face) 4115 if (flag_change_face)
3955 { 4116 {
3956 pl->face = change->face; 4117 pl->face = change->face;
… …
3958 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE]; 4119 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3959 } 4120 }
3960 4121
3961 /* check the special case of can't use weapons */ 4122 /* check the special case of can't use weapons */
3962 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4123 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3963 if (!strcmp (change->name, "monk")) 4124 if (change->name == shstr_monk)
3964 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4125 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
3965 4126
3966 break; 4127 break;
3967 } 4128 }
3968 } 4129 }
3969} 4130}
3970 4131
3971/**
3972 * This handles items of type 'transformer'.
3973 * Basically those items, used with a marked item, transform both items into something
3974 * else.
3975 * "Transformer" item has food decreased by 1, removed if 0 (0 at start means illimited)..
3976 * Change information is contained in the 'slaying' field of the marked item.
3977 * The format is as follow: transformer:[number ]yield[;transformer:...].
3978 * This way an item can be transformed in many things, and/or many objects.
3979 * The 'slaying' field for transformer is used as verb for the action.
3980 */
3981void
3982apply_item_transformer (object *pl, object *transformer)
3983{
3984 object *marked;
3985 object *new_item;
3986 char *find;
3987 char *separator;
3988 int yield;
3989 char got[MAX_BUF];
3990 int len;
3991
3992 if (!pl || !transformer)
3993 return;
3994
3995 marked = find_marked_object (pl);
3996
3997 if (!marked)
3998 {
3999 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
4000 return;
4001 }
4002
4003 if (!marked->slaying)
4004 {
4005 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4006 return;
4007 }
4008
4009 /* check whether they are compatible or not */
4010 find = strstr (marked->slaying, transformer->arch->archname);
4011 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4012 {
4013 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4014 return;
4015 }
4016
4017 find += strlen (transformer->arch->archname) + 1;
4018 /* Item can be used, now find how many and what it yields */
4019 if (isdigit (*(find)))
4020 {
4021 yield = atoi (find);
4022 if (yield < 1)
4023 {
4024 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
4025 yield = 1;
4026 }
4027 }
4028 else
4029 yield = 1;
4030
4031 while (isdigit (*find))
4032 find++;
4033
4034 while (*find == ' ')
4035 find++;
4036
4037 memset (got, 0, MAX_BUF);
4038
4039 if ((separator = strchr (find, ';')) != NULL)
4040 len = separator - find;
4041 else
4042 len = strlen (find);
4043
4044 if (len > MAX_BUF - 1)
4045 len = MAX_BUF - 1;
4046
4047 strcpy (got, find);
4048 got[len] = '\0';
4049
4050 /* Now create new item, remove used ones when required. */
4051 new_item = get_archetype (got);
4052 if (!new_item)
4053 {
4054 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
4055 return;
4056 }
4057
4058 new_item->nrof = yield;
4059
4060 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4061
4062 pl->insert (new_item);
4063 /* Eat up one item */
4064 marked->decrease ();
4065
4066 /* Eat one transformer if needed */
4067 if (transformer->stats.food)
4068 if (--transformer->stats.food == 0)
4069 transformer->decrease ();
4070}
4071

Diff Legend

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