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.210 by root, Fri Nov 6 13:03:34 2009 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.
… …
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, price_in;
913 866
914 if (item->flag [FLAG_UNPAID]) 867 if (item->flag [FLAG_UNPAID])
… …
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 = -FABS (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->speed) && trap->owner != victim)
1410 hit_with_arrow (trap, victim);
1411 break;
1412
1413 case SPELL_EFFECT:
1414 apply_spell_effect (trap, victim);
1415 break;
1416
1417 case TRAPDOOR:
1398 { 1418 {
1419 int max, sound_was_played;
1420 object *ab, *ab_next;
1421
1399 if (!trap->stats.maxsp) 1422 if (!trap->value)
1400 trap->stats.maxsp = 2; 1423 {
1424 int tot;
1401 1425
1402 /* Is this correct? From the docs, it doesn't look like it 1426 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1403 * should be divided by trap->speed 1427 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1428 tot += ab->head_ ()->total_weight ();
1429
1430 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1431 break;
1432
1433 SET_ANIMATION (trap, trap->value);
1434 update_object (trap, UP_OBJ_FACE);
1435 }
1436
1437 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
1438 {
1439 /* need to set this up, since if we do transfer the object,
1440 * ab->above would be bogus
1404 */ 1441 */
1405 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed); 1442 ab_next = ab->above;
1406 1443
1407 /* Just put in some sanity check. I think there is a bug in the 1444 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1408 * above with some objects have zero speed, and thus the player 1445 {
1409 * getting permanently paralyzed. 1446 if (!sound_was_played)
1447 {
1448 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1449 sound_was_played = 1;
1450 }
1451
1452 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1453 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1454 }
1410 */ 1455 }
1411 if (victim->speed_left < -50.f) 1456 break;
1412 victim->speed_left = -50.f;
1413 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1414 } 1457 }
1415 goto leave;
1416 1458
1417 case SPINNER: 1459 case CONVERTER:
1418 if (victim->direction) 1460 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 { 1461 {
1470 int tot; 1462 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1471 1463 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 } 1464 }
1482 1465
1483 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next) 1466 break;
1467
1468 case TRIGGER_BUTTON:
1469 case TRIGGER_PEDESTAL:
1470 case TRIGGER_ALTAR:
1471 check_trigger (trap, victim, originator);
1472 break;
1473
1474 case DEEP_SWAMP:
1475 walk_on_deep_swamp (trap, victim);
1476 break;
1477
1478 case CHECK_INV:
1479 check_inv (victim, trap);
1480 break;
1481
1482 case HOLE:
1483 move_apply_hole (trap, victim);
1484 break;
1485
1486 case EXIT:
1487 if (victim->type == PLAYER && EXIT_PATH (trap))
1484 { 1488 {
1485 /* need to set this up, since if we do transfer the object, 1489 /* Basically, don't show exits leading to random maps the
1486 * ab->above would be bogus 1490 * players output.
1487 */ 1491 */
1488 ab_next = ab->above; 1492 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1493 victim->statusmsg (trap->msg, NDI_NAVY);
1489 1494
1490 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1495 trap->play_sound (trap->sound);
1491 { 1496 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 } 1497 }
1502 goto leave; 1498 break;
1503 }
1504 1499
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: 1500 case ENCOUNTER:
1547 /* may be some leftovers on this */ 1501 /* may be some leftovers on this */
1548 goto leave; 1502 break;
1549 1503
1550 case SHOP_MAT: 1504 case SHOP_MAT:
1551 apply_shop_mat (trap, victim); 1505 apply_shop_mat (trap, victim);
1552 goto leave; 1506 break;
1553 1507
1554 /* Drop a certain amount of gold, and have one item identified */ 1508 /* Drop a certain amount of gold, and have one item identified */
1555 case IDENTIFY_ALTAR: 1509 case IDENTIFY_ALTAR:
1556 apply_id_altar (victim, trap, originator); 1510 apply_id_altar (victim, trap, originator);
1557 goto leave; 1511 break;
1558 1512
1559 case SIGN: 1513 case SIGN:
1560 if (victim->type != PLAYER && trap->stats.food > 0) 1514 if (victim->type != PLAYER && trap->stats.food > 0)
1561 goto leave; /* monsters musn't apply magic_mouths with counters */ 1515 break; /* monsters musn't apply magic_mouths with counters */
1562 1516
1563 apply_sign (victim, trap, 1); 1517 apply_sign (victim, trap, 1);
1564 goto leave; 1518 break;
1565 1519
1566 case CONTAINER: 1520 case CONTAINER:
1567 apply_container (victim, trap); 1521 apply_container (victim, trap);
1568 goto leave; 1522 break;
1569 1523
1570 case RUNE: 1524 case RUNE:
1571 case TRAP: 1525 case TRAP:
1572 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1526 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1573 spring_trap (trap, victim); 1527 spring_trap (trap, victim);
1574 goto leave; 1528 break;
1575 1529
1576 default: 1530 default:
1577 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1531 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1578 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type); 1532 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1579 goto leave; 1533 break;
1580 } 1534 }
1581 1535
1582leave:
1583 recursion_depth--; 1536 recursion_depth--;
1584} 1537}
1585 1538
1586/** 1539/**
1587 * Handles reading a regular (ie not containing a spell) book. 1540 * Handles reading a regular (ie not containing a spell) book.
… …
1598 return; 1551 return;
1599 } 1552 }
1600 1553
1601 if (!tmp->msg) 1554 if (!tmp->msg)
1602 { 1555 {
1603 op->failmsg (format ("You open the %s and find it empty.", &tmp->name)); 1556 op->failmsg (format ("The %s contains nothing but meaningless gibberish. H<There is nothing interesting to read here.>", &tmp->name));
1604 return; 1557 return;
1605 } 1558 }
1606 1559
1607 /* need a literacy skill to read stuff! */ 1560 /* need a literacy skill to read stuff! */
1608 skill_ob = find_skill_by_name (op, tmp->skill); 1561 skill_ob = find_skill_by_name (op, tmp->skill);
… …
1626 1579
1627 readable_message_type *msgType = get_readable_message_type (tmp); 1580 readable_message_type *msgType = get_readable_message_type (tmp);
1628 1581
1629 if (player *pl = op->contr) 1582 if (player *pl = op->contr)
1630 if (client *ns = pl->ns) 1583 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)); 1584 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 1585
1639 /* gain xp from reading */ 1586 /* gain xp from reading */
1640 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1587 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1641 { /* only if not read before */ 1588 { /* only if not read before */
1642 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1589 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1650 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp); 1597 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1651 } 1598 }
1652 1599
1653 change_exp (op, exp_gain, skill_ob->skill, 0); 1600 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 */ 1601 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1602 }
1603}
1604
1605/**
1606 * op made some mistake with a scroll, this takes care of punishment.
1607 * scroll_failure()- hacked directly from spell_failure
1608 */
1609static void
1610scroll_failure (object *op, int failure, int power)
1611{
1612 if (abs (failure / 4) > power)
1613 power = abs (failure / 4); /* set minimum effect */
1614
1615 if (failure <= -1 && failure > -15)
1616 { /* wonder */
1617 object *tmp;
1618
1619 op->failmsg ("Your spell warps!");
1620 tmp = get_archetype (SPELL_WONDER);
1621 cast_wonder (op, op, 0, tmp);
1622 tmp->destroy ();
1623 }
1624 else if (failure <= -15 && failure > -35)
1625 { /* drain mana */
1626 op->failmsg ("Your mana is drained!");
1627 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
1628 if (op->stats.sp < 0)
1629 op->stats.sp = 0;
1630 }
1631 else if (settings.spell_failure_effects == TRUE)
1632 {
1633 if (failure <= -35 && failure > -60)
1634 { /* confusion */
1635 op->failmsg ("The magic recoils on you!");
1636 confuse_player (op, op, power);
1637 }
1638 else if (failure <= -60 && failure > -70)
1639 { /* paralysis */
1640 op->failmsg ("The magic recoils and paralyzes you!");
1641 paralyze_player (op, op, power);
1642 }
1643 else if (failure <= -70 && failure > -80)
1644 { /* blind */
1645 op->failmsg ("The magic recoils on you!");
1646 blind_player (op, op, power);
1647 }
1648 else if (failure <= -80)
1649 { /* blast the immediate area */
1650 object *tmp = get_archetype (LOOSE_MANA);
1651 cast_magic_storm (op, tmp, power);
1652 op->failmsg ("You unleash uncontrolled mana!");
1653 tmp->destroy ();
1654 }
1655 } 1655 }
1656} 1656}
1657 1657
1658/** 1658/**
1659 * Handles the applying of a skill scroll, calling learn_skill straight. 1659 * Handles the applying of a skill scroll, calling learn_skill straight.
… …
1796 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1796 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!"); 1797 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1798 return; 1798 return;
1799 } 1799 }
1800 1800
1801 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1801 int learn_level = sqrtf (spell->level) * 1.5f;
1802 if (skop->level < learn_level)
1802 { 1803 {
1803 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill)); 1804 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1805 &tmp->skill, learn_level));
1804 return; 1806 return;
1805 } 1807 }
1806 1808
1807 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1809 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1808 1810
… …
1965 if (op->destroyed () || tmp->destroyed ()) 1967 if (op->destroyed () || tmp->destroyed ())
1966 break; 1968 break;
1967 } 1969 }
1968 1970
1969 if (!tmp->destroyed () && !tmp->inv) 1971 if (!tmp->destroyed () && !tmp->inv)
1970 tmp->decrease (); 1972 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} 1973}
2048 1974
2049/** 1975/**
2050 * A dragon is eating some flesh. If the flesh contains resistances, 1976 * A dragon is eating some flesh. If the flesh contains resistances,
2051 * there is a chance for the dragon's skin to get improved. 1977 * there is a chance for the dragon's skin to get improved.
… …
2054 * object *op the object (dragon player) eating the flesh 1980 * object *op the object (dragon player) eating the flesh
2055 * object *meal the flesh item, getting chewed in dragon's mouth 1981 * object *meal the flesh item, getting chewed in dragon's mouth
2056 * return: 1982 * return:
2057 * int 1 if eating successful, 0 if it doesn't work 1983 * int 1 if eating successful, 0 if it doesn't work
2058 */ 1984 */
2059int 1985static int
2060dragon_eat_flesh (object *op, object *meal) 1986dragon_eat_flesh (object *op, object *meal)
2061{ 1987{
2062 object *skin = NULL; /* pointer to dragon skin force */ 1988 object *skin = NULL; /* pointer to dragon skin force */
2063 object *abil = NULL; /* pointer to dragon ability force */ 1989 object *abil = NULL; /* pointer to dragon ability force */
2064 object *tmp = NULL; /* tmp. object */ 1990 object *tmp = NULL; /* tmp. object */
… …
2170 op->statusmsg (buf); 2096 op->statusmsg (buf);
2171 2097
2172 /* now choose a winner if we have any */ 2098 /* now choose a winner if we have any */
2173 i = -1; 2099 i = -1;
2174 if (winners > 0) 2100 if (winners > 0)
2175 i = atnr_winner[RANDOM () % winners]; 2101 i = atnr_winner [rndm (winners)];
2176 2102
2177 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2103 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2178 { 2104 {
2179 /* resistance increased! */ 2105 /* resistance increased! */
2180 skin->resist[i]++; 2106 skin->resist[i]++;
… …
2202 abil->last_eat = 0; 2128 abil->last_eat = 0;
2203 } 2129 }
2204 } 2130 }
2205 2131
2206 return 1; 2132 return 1;
2133}
2134
2135/**
2136 * op eats food.
2137 * If player, takes care of messages and dragon special food.
2138 */
2139static void
2140apply_food (object *op, object *tmp)
2141{
2142 int capacity_remaining;
2143
2144 if (op->type != PLAYER)
2145 op->stats.hp = op->stats.maxhp;
2146 else
2147 {
2148 /* check if this is a dragon (player), eating some flesh */
2149 if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp))
2150 ;
2151 else
2152 {
2153 /* usual case - no dragon meal: */
2154 if (op->stats.food + tmp->stats.food > 999)
2155 {
2156 if (tmp->type == FOOD || tmp->type == FLESH)
2157 op->failmsg ("You feel full, but what a waste of food!");
2158 else
2159 op->statusmsg ("Most of the drink goes down your face not your throat!");
2160 }
2161
2162 tmp->play_sound (
2163 tmp->sound
2164 ? tmp->sound
2165 : tmp->type == DRINK
2166 ? sound_find ("eat_drink")
2167 : sound_find ("eat_food")
2168 );
2169
2170 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2171 {
2172 const char *buf;
2173
2174 if (!is_dragon_pl (op))
2175 {
2176 /* eating message for normal players */
2177 if (tmp->type == DRINK)
2178 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2179 else
2180 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2181 }
2182 else
2183 /* eating message for dragon players */
2184 buf = format ("The %s tasted terrible!", &tmp->name);
2185
2186 op->statusmsg (buf);
2187
2188 capacity_remaining = 999 - op->stats.food;
2189 op->stats.food += tmp->stats.food;
2190 if (capacity_remaining < tmp->stats.food)
2191 op->stats.hp += capacity_remaining / 50;
2192 else
2193 op->stats.hp += tmp->stats.food / 50;
2194
2195 if (op->stats.hp > op->stats.maxhp)
2196 op->stats.hp = op->stats.maxhp;
2197 if (op->stats.food > 999)
2198 op->stats.food = 999;
2199 }
2200
2201 /* special food hack -b.t. */
2202 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2203 eat_special_food (op, tmp);
2204 }
2205 }
2206
2207 handle_apply_yield (tmp);
2208 tmp->decrease ();
2207} 2209}
2208 2210
2209/** 2211/**
2210 * Handles applying an improve armor scroll. 2212 * Handles applying an improve armor scroll.
2211 * Does some sanity checks, then calls improve_armour. 2213 * Does some sanity checks, then calls improve_armour.
… …
2276 * 2278 *
2277 * Note: a owner in a 2 way exit is saved as the owner's name 2279 * 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 2280 * 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). 2281 * survive in the swapping (in fact the whole exit doesn't survive).
2280 */ 2282 */
2281int 2283static int
2282is_legal_2ways_exit (object *op, object *exit) 2284is_legal_2ways_exit (object *op, object *exit)
2283{ 2285{
2284 if (exit->stats.exp != 1) 2286 if (exit->stats.exp != 1)
2285 return 1; /*This is not a 2 way, so it is legal */ 2287 return 1; /*This is not a 2 way, so it is legal */
2286 2288
… …
2352 return 1; 2354 return 1;
2353 } 2355 }
2354 } 2356 }
2355 2357
2356 return 0; 2358 return 0;
2359}
2360
2361/**
2362 * This function will try to apply a lighter and in case no lighter
2363 * is specified it will try to find a lighter in the players inventory,
2364 * and inform him about this requirement.
2365 *
2366 * who - the player
2367 * op - the item we want to light
2368 * lighter - the lighter or 0 if a lighter has yet to be found
2369 */
2370static object *
2371auto_apply_lighter (object *who, object *op, object *lighter)
2372{
2373 if (lighter == 0)
2374 {
2375 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2376 {
2377 if (tmp->type == LIGHTER)
2378 {
2379 lighter = tmp;
2380 break;
2381 }
2382 }
2383
2384 if (!lighter)
2385 {
2386 who->failmsg (format (
2387 "You can't light up the %s with your bare hands! "
2388 "H<You need a lighter in your inventory, for example a flint and steel.>",
2389 &op->name));
2390 return 0;
2391 }
2392 }
2393
2394 // last_eat == 0 means the lighter is not being used up!
2395 if (lighter->last_eat && lighter->stats.food)
2396 {
2397 /* lighter gets used up */
2398 lighter = lighter->split ();
2399 lighter->stats.food--;
2400 who->insert (lighter);
2401 }
2402 else if (lighter->last_eat)
2403 {
2404 /* no charges left in lighter */
2405 who->failmsg (format (
2406 "You attempt to light the %s with a used up %s.",
2407 &op->name, &lighter->name));
2408 return 0;
2409 }
2410
2411 return lighter;
2412}
2413
2414/**
2415 * Designed primarily to light torches/lanterns/etc.
2416 * Also burns up burnable material too. First object in the inventory is
2417 * the selected object to "burn". -b.t.
2418 */
2419static void
2420apply_lighter (object *who, object *lighter)
2421{
2422 object *item;
2423 int is_player_env = 0;
2424
2425 item = find_marked_object (who);
2426 if (item)
2427 {
2428 if (!auto_apply_lighter (who, item, lighter))
2429 return;
2430
2431 /* Perhaps we should split what we are trying to light on fire?
2432 * I can't see many times when you would want to light multiple
2433 * objects at once.
2434 */
2435
2436 save_throw_object (item, AT_FIRE, who);
2437
2438 if (item->destroyed ()
2439 || ((item->type == LAMP || item->type == TORCH)
2440 && item->glow_radius > 0))
2441 who->statusmsg (format (
2442 "You light the %s with the %s.",
2443 &item->name, &lighter->name));
2444 else
2445 who->failmsg (format (
2446 "You attempt to light the %s with the %s and fail.",
2447 &item->name, &lighter->name));
2448 }
2449 else
2450 who->failmsg ("You need to mark a lightable object.");
2451}
2452
2453/**
2454 * This function generates a cursed effect for cursed lamps and torches.
2455 */
2456static void
2457player_apply_lamp_cursed_effect (object *who, object *op)
2458{
2459 if (op->level)
2460 {
2461 who->failmsg (format (
2462 "The %s was cursed, it explodes in a big fireball!",
2463 &op->name));
2464 create_exploding_ball_at (who, op->level);
2465 }
2466 else
2467 {
2468 who->failmsg (format (
2469 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2470 &op->name));
2471 }
2472
2473 op->destroy ();
2474}
2475
2476/**
2477 * Apply for players and lamps
2478 *
2479 * who - the player
2480 * op - the lamp
2481 */
2482static void
2483player_apply_lamp (object *who, object *op)
2484{
2485 bool switch_on = op->glow_radius ? false : true;
2486
2487 if (switch_on)
2488 {
2489 object *lighter = 0;
2490
2491 if (op->flag [FLAG_IS_LIGHTABLE]
2492 && !(lighter = auto_apply_lighter (who, op, 0)))
2493 return;
2494
2495 if (op->stats.food < 1)
2496 {
2497 if (op->type == LAMP)
2498 who->failmsg (format (
2499 "The %s is out of fuel! "
2500 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2501 &op->name));
2502 else
2503 who->failmsg (format (
2504 "The %s is burnt out! "
2505 "H<Torches and similar items burn out and become worthless.>",
2506 &op->name));
2507 return;
2508 }
2509
2510 if (op->flag [FLAG_CURSED])
2511 {
2512 player_apply_lamp_cursed_effect (who, op);
2513 return;
2514 }
2515
2516 if (lighter)
2517 who->statusmsg (format (
2518 "You light up the %s with the %s.", &op->name, &lighter->name));
2519 else
2520 who->statusmsg (format ("You light up the %s.", &op->name));
2521 }
2522 else
2523 {
2524 if (op->flag [FLAG_CURSED])
2525 {
2526 player_apply_lamp_cursed_effect (who, op);
2527 return;
2528 }
2529
2530 if (op->type == TORCH)
2531 {
2532 if (!op->flag [FLAG_IS_LIGHTABLE])
2533 {
2534 who->statusmsg (format (
2535 "You put out the %s. "
2536 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2537 &op->name, &op->name));
2538 }
2539 else
2540 who->statusmsg (format (
2541 "You put out the %s."
2542 "H<Torches wear out if you put them out.>",
2543 &op->name));
2544 }
2545 else
2546 who->statusmsg (format ("You turn off the %s.", &op->name));
2547 }
2548
2549 apply_lamp (op, switch_on);
2550}
2551
2552void get_animation_from_arch (object *op, arch_ptr a)
2553{
2554 op->animation_id = a->animation_id;
2555 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2556 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2557 op->anim_speed = a->anim_speed;
2558 op->last_anim = 0;
2559 op->state = 0;
2560 op->face = a->face;
2561
2562 if (NUM_ANIMATIONS(op) > 1)
2563 {
2564 SET_ANIMATION(op, 0);
2565 animate_object (op, op->direction);
2566 }
2567 else
2568 update_object (op, UP_OBJ_FACE);
2569}
2570
2571/**
2572 * Apply for LAMPs and TORCHes.
2573 *
2574 * op - the lamp
2575 * switch_on - a flag which says whether the lamp should be switched on or off
2576 */
2577void apply_lamp (object *op, bool switch_on)
2578{
2579 op->set_glow_radius (switch_on ? op->range : 0);
2580 op->set_speed (switch_on ? op->arch->speed : 0);
2581
2582 // torches wear out if you put them out
2583 if (op->type == TORCH && !switch_on)
2584 {
2585 if (op->flag [FLAG_IS_LIGHTABLE])
2586 {
2587 op->stats.food -= (double) op->arch->stats.food / 15;
2588 if (op->stats.food < 0)
2589 op->stats.food = 0;
2590 }
2591 else
2592 op->stats.food = 0;
2593 }
2594
2595 // lamps and torched get worthless when used up
2596 if (op->stats.food <= 0)
2597 op->value = 0;
2598
2599 // FIXME: This is a hack to make the more sane torches and lamps
2600 // still animated ;-/
2601 if (op->other_arch)
2602 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2603
2604 if (object *pl = op->visible_to ())
2605 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2606}
2607
2608/**
2609 * This handles items of type 'transformer'.
2610 * Basically those items, used with a marked item, transform both items into something
2611 * else.
2612 * "Transformer" item has food decreased by 1, removed if 0 (0 at start means illimited)..
2613 * Change information is contained in the 'slaying' field of the marked item.
2614 * The format is as follow: transformer:[number ]yield[;transformer:...].
2615 * This way an item can be transformed in many things, and/or many objects.
2616 * The 'slaying' field for transformer is used as verb for the action.
2617 */
2618static void
2619apply_item_transformer (object *pl, object *transformer)
2620{
2621 object *marked;
2622 object *new_item;
2623 char *find;
2624 char *separator;
2625 int yield;
2626 char got[MAX_BUF];
2627 int len;
2628
2629 if (!pl || !transformer)
2630 return;
2631
2632 marked = find_marked_object (pl);
2633
2634 if (!marked)
2635 {
2636 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
2637 return;
2638 }
2639
2640 if (!marked->slaying)
2641 {
2642 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2643 return;
2644 }
2645
2646 /* check whether they are compatible or not */
2647 find = strstr (&marked->slaying, transformer->arch->archname);
2648 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
2649 {
2650 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2651 return;
2652 }
2653
2654 find += strlen (transformer->arch->archname) + 1;
2655 /* Item can be used, now find how many and what it yields */
2656 if (isdigit (*(find)))
2657 {
2658 yield = atoi (find);
2659 if (yield < 1)
2660 {
2661 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
2662 yield = 1;
2663 }
2664 }
2665 else
2666 yield = 1;
2667
2668 while (isdigit (*find))
2669 find++;
2670
2671 while (*find == ' ')
2672 find++;
2673
2674 memset (got, 0, MAX_BUF);
2675
2676 if ((separator = strchr (find, ';')) != NULL)
2677 len = separator - find;
2678 else
2679 len = strlen (find);
2680
2681 if (len > MAX_BUF - 1)
2682 len = MAX_BUF - 1;
2683
2684 strcpy (got, find);
2685 got[len] = '\0';
2686
2687 /* Now create new item, remove used ones when required. */
2688 new_item = get_archetype (got);
2689 if (!new_item)
2690 {
2691 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
2692 return;
2693 }
2694
2695 new_item->nrof = yield;
2696
2697 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
2698
2699 pl->insert (new_item);
2700 /* Eat up one item */
2701 marked->decrease ();
2702
2703 /* Eat one transformer if needed */
2704 if (transformer->stats.food)
2705 if (--transformer->stats.food == 0)
2706 transformer->decrease ();
2357} 2707}
2358 2708
2359/** 2709/**
2360 * Main apply handler. 2710 * Main apply handler.
2361 * 2711 *
… …
2364 * Return value: 2714 * Return value:
2365 * 0: player or monster can't apply objects of that type 2715 * 0: player or monster can't apply objects of that type
2366 * 1: has been applied, or there was an error applying the object 2716 * 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 2717 * 2: objects of that type can't be applied if not in inventory
2368 * 2718 *
2369 * op is the object that is causing object to be applied, tmp is the object 2719 * who is the object that is causing object to be applied, op is the object
2370 * being applied. 2720 * being applied.
2371 * 2721 *
2372 * aflag is special (always apply/unapply) flags. Nothing is done with 2722 * aflag is special (always apply/unapply) flags. Nothing is done with
2373 * them in this function - they are passed to apply_special 2723 * them in this function - they are passed to apply_special
2374 */ 2724 */
2375int 2725int
2376manual_apply (object *op, object *tmp, int aflag) 2726manual_apply (object *who, object *op, int aflag)
2377{ 2727{
2378 tmp = tmp->head_ (); 2728 op = op->head_ ();
2379 2729
2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2730 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2381 { 2731 {
2382 if (op->type == PLAYER) 2732 if (who->type == PLAYER)
2383 { 2733 {
2734 examine (who, op);
2384 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2735 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2385 return 1; 2736 return 1;
2386 } 2737 }
2387 else 2738 else
2388 return 0; /* monsters just skip unpaid items */ 2739 return 0; /* monsters just skip unpaid items */
2389 } 2740 }
2390 2741
2391 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2742 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2392 return RESULT_INT (0); 2743 return RESULT_INT (0);
2393 2744
2394 switch (tmp->type) 2745 switch (op->type)
2395 { 2746 {
2396 case CF_HANDLE: 2747 case T_HANDLE:
2397 op->play_sound (sound_find ("turn_handle")); 2748 who->play_sound (sound_find ("turn_handle"));
2398 op->statusmsg ("You turn the handle."); 2749 who->statusmsg ("You turn the handle.");
2399 tmp->value = tmp->value ? 0 : 1; 2750 op->value = op->value ? 0 : 1;
2400 SET_ANIMATION (tmp, tmp->value); 2751 SET_ANIMATION (op, op->value);
2401 update_object (tmp, UP_OBJ_FACE); 2752 update_object (op, UP_OBJ_FACE);
2402 push_button (tmp); 2753 push_button (op, who);
2403 return 1; 2754 return 1;
2404 2755
2405 case TRIGGER: 2756 case TRIGGER:
2406 if (check_trigger (tmp, op)) 2757 if (check_trigger (op, who, who))
2407 { 2758 {
2408 op->statusmsg ("You turn the handle."); 2759 who->statusmsg ("You turn the handle.");
2409 op->play_sound (sound_find ("turn_handle")); 2760 who->play_sound (sound_find ("turn_handle"));
2410 } 2761 }
2411 else 2762 else
2412 op->failmsg ("The handle doesn't move."); 2763 who->failmsg ("The handle doesn't move.");
2413 2764
2414 return 1; 2765 return 1;
2415 2766
2416 case EXIT: 2767 case EXIT:
2417 if (op->type != PLAYER) 2768 if (who->type != PLAYER)
2418 return 0; 2769 return 0;
2419 2770
2420 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2771 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2421 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2772 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 2773 else
2423 { 2774 {
2424 /* Don't display messages for random maps. */ 2775 /* Don't display messages for random maps. */
2425 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2776 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2426 op->statusmsg (tmp->msg, NDI_NAVY); 2777 who->statusmsg (op->msg, NDI_NAVY);
2427 2778
2428 op->enter_exit (tmp); 2779 who->enter_exit (op);
2429 } 2780 }
2430 2781
2431 return 1; 2782 return 1;
2432 2783
2433 case INSCRIBABLE: 2784 case INSCRIBABLE:
2434 op->statusmsg (tmp->msg); 2785 who->statusmsg (op->msg);
2435 // maybe show a spell menu to chose from or something like that 2786 // maybe show a spell menu to chose from or something like that
2436 return 1; 2787 return 1;
2437 2788
2438 case SIGN: 2789 case SIGN:
2439 apply_sign (op, tmp, 0); 2790 apply_sign (who, op, 0);
2440 return 1; 2791 return 1;
2441 2792
2442 case BOOK: 2793 case BOOK:
2443 if (op->type == PLAYER) 2794 if (who->type == PLAYER)
2444 { 2795 {
2445 apply_book (op, tmp); 2796 apply_book (who, op);
2446 return 1; 2797 return 1;
2447 } 2798 }
2448 else 2799 else
2449 return 0; 2800 return 0;
2450 2801
2451 case SKILLSCROLL: 2802 case SKILLSCROLL:
2452 if (op->type == PLAYER) 2803 if (who->type == PLAYER)
2453 { 2804 {
2454 apply_skillscroll (op, tmp); 2805 apply_skillscroll (who, op);
2455 return 1; 2806 return 1;
2456 } 2807 }
2457 else 2808 else
2458 return 0; 2809 return 0;
2459 2810
2460 case SPELLBOOK: 2811 case SPELLBOOK:
2461 if (op->type == PLAYER) 2812 if (who->type == PLAYER)
2462 { 2813 {
2463 apply_spellbook (op, tmp); 2814 apply_spellbook (who, op);
2464 return 1; 2815 return 1;
2465 } 2816 }
2466 else 2817 else
2467 return 0; 2818 return 0;
2468 2819
2469 case SCROLL: 2820 case SCROLL:
2470 apply_scroll (op, tmp, 0); 2821 apply_scroll (who, op, 0);
2471 return 1; 2822 return 1;
2472 2823
2473 case POTION: 2824 case POTION:
2474 apply_potion (op, tmp); 2825 apply_potion (who, op);
2475 return 1; 2826 return 1;
2476 2827
2477 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2828 /* Eneq(@csd.uu.se): Handle apply on containers. */
2478 //TODO: remove, as it is unsed? 2829 //TODO: remove, as it is unsed?
2479 case CLOSE_CON: 2830 case CLOSE_CON:
2480 apply_container (op, tmp->env); 2831 apply_container (who, op->env);
2481 return 1; 2832 return 1;
2482 2833
2483 case CONTAINER: 2834 case CONTAINER:
2484 apply_container (op, tmp); 2835 apply_container (who, op);
2485 return 1; 2836 return 1;
2486 2837
2487 case TREASURE: 2838 case TREASURE:
2488 if (op->type == PLAYER) 2839 if (who->type == PLAYER)
2489 { 2840 {
2490 apply_treasure (op, tmp); 2841 apply_treasure (who, op);
2491 return 1; 2842 return 1;
2492 } 2843 }
2493 else 2844 else
2494 return 0; 2845 return 0;
2846
2847 case LAMP:
2848 case TORCH:
2849 player_apply_lamp (who, op);
2850 return 1;
2495 2851
2496 case WEAPON: 2852 case WEAPON:
2497 case ARMOUR: 2853 case ARMOUR:
2498 case BOOTS: 2854 case BOOTS:
2499 case GLOVES: 2855 case GLOVES:
… …
2507 case WAND: 2863 case WAND:
2508 case ROD: 2864 case ROD:
2509 case HORN: 2865 case HORN:
2510 case SKILL: 2866 case SKILL:
2511 case BOW: 2867 case BOW:
2512 case LAMP:
2513 case BUILDER: 2868 case BUILDER:
2514 case SKILL_TOOL: 2869 case SKILL_TOOL:
2515 if (tmp->env != op) 2870 if (op->env != who)
2516 return 2; /* not in inventory */ 2871 return 2; /* not in inventory */
2517 2872
2518 apply_special (op, tmp, aflag); 2873 apply_special (who, op, aflag);
2519 return 1; 2874 return 1;
2520 2875
2521 case DRINK: 2876 case DRINK:
2522 case FOOD: 2877 case FOOD:
2523 case FLESH: 2878 case FLESH:
2524 apply_food (op, tmp); 2879 apply_food (who, op);
2525 return 1; 2880 return 1;
2526 2881
2527 case POISON: 2882 case POISON:
2528 apply_poison (op, tmp); 2883 apply_poison (who, op);
2529 return 1; 2884 return 1;
2530 2885
2531 case SAVEBED: 2886 case SAVEBED:
2532 return 1; 2887 return 1;
2533 2888
2534 case ARMOUR_IMPROVER: 2889 case ARMOUR_IMPROVER:
2535 if (op->type == PLAYER) 2890 if (who->type == PLAYER)
2536 { 2891 {
2537 apply_armour_improver (op, tmp); 2892 apply_armour_improver (who, op);
2538 return 1; 2893 return 1;
2539 } 2894 }
2540 else 2895 else
2541 return 0; 2896 return 0;
2542 2897
2543 case WEAPON_IMPROVER: 2898 case WEAPON_IMPROVER:
2544 check_improve_weapon (op, tmp); 2899 check_improve_weapon (who, op);
2545 return 1; 2900 return 1;
2546 2901
2547 case CLOCK: 2902 case CLOCK:
2548 if (op->type == PLAYER) 2903 if (who->type == PLAYER)
2549 { 2904 {
2550 char buf[MAX_BUF]; 2905 char buf[MAX_BUF];
2551 timeofday_t tod; 2906 timeofday_t tod;
2552 2907
2553 get_tod (&tod); 2908 get_tod (&tod);
2554 op->play_sound (sound_find ("sound_clock")); 2909 who->play_sound (sound_find ("sound_clock"));
2555 op->statusmsg (format ( 2910 who->statusmsg (format (
2556 "It is %d minute%s past %d o'clock %s", 2911 "It is %d minute%s past %d o'clock %s",
2557 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2912 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2558 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2913 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2559 )); 2914 ));
2560 return 1; 2915 return 1;
2561 } 2916 }
2562 else 2917 else
2563 return 0; 2918 return 0;
2564 2919
2565 case MENU: 2920 case MENU:
2566 if (op->type == PLAYER) 2921 if (who->type == PLAYER)
2567 { 2922 {
2568 shop_listing (tmp, op); 2923 shop_listing (op, who);
2569 return 1; 2924 return 1;
2570 } 2925 }
2571 else 2926 else
2572 return 0; 2927 return 0;
2573 2928
2574 case POWER_CRYSTAL: 2929 case POWER_CRYSTAL:
2575 apply_power_crystal (op, tmp); /* see egoitem.c */ 2930 apply_power_crystal (who, op); /* see egoitem.c */
2576 return 1; 2931 return 1;
2577 2932
2578 case LIGHTER: /* for lighting torches/lanterns/etc */ 2933 case LIGHTER: /* for lighting torches/lanterns/etc */
2579 if (op->type == PLAYER) 2934 if (who->type == PLAYER)
2580 { 2935 {
2581 apply_lighter (op, tmp); 2936 apply_lighter (who, op);
2582 return 1; 2937 return 1;
2583 } 2938 }
2584 else 2939 else
2585 return 0; 2940 return 0;
2586 2941
2587 case ITEM_TRANSFORMER: 2942 case ITEM_TRANSFORMER:
2588 apply_item_transformer (op, tmp); 2943 apply_item_transformer (who, op);
2589 return 1; 2944 return 1;
2590 2945
2591 default: 2946 default:
2592 return 0; 2947 return 0;
2593 } 2948 }
… …
2645 * we don't use a corrupt pointer for the next object, so we get the 3000 * 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 3001 * 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 3002 * problem if player_apply() has a bug in that it uses the object but does
2648 * not return a proper value. 3003 * not return a proper value.
2649 */ 3004 */
2650 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next) 3005 for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next)
2651 { 3006 {
2652 next = tmp->below; 3007 next = tmp->below;
2653 3008
2654 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3009 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2655 floors++; 3010 floors++;
… …
2660 * person moving on it, also activate. Added code to make it 3015 * person moving on it, also activate. Added code to make it
2661 * so that at least one of players movement types be that which 3016 * so that at least one of players movement types be that which
2662 * the item needs. 3017 * the item needs.
2663 */ 3018 */
2664 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 3019 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2665 {
2666 if (player_apply (pl, tmp, 0, 1) == 1) 3020 if (player_apply (pl, tmp, 0, 1) == 1)
2667 return; 3021 return;
2668 } 3022
2669 if (floors >= 2) 3023 if (floors >= 2)
2670 return; /* process at most two floor objects */ 3024 return; /* process at most two floor objects */
2671 } 3025 }
2672} 3026}
2673 3027
… …
2746 case CLOAK: 3100 case CLOAK:
2747 who->statusmsg (format ("You unwear %s.", query_name (op))); 3101 who->statusmsg (format ("You unwear %s.", query_name (op)));
2748 change_abil (who, op); 3102 change_abil (who, op);
2749 break; 3103 break;
2750 3104
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: 3105 case BOW:
2784 case WAND: 3106 case WAND:
2785 case ROD: 3107 case ROD:
2786 case HORN: 3108 case HORN:
2787 if (player *pl = who->contr) 3109 if (player *pl = who->contr)
… …
2866#define CANNOT_REMOVE_CURSED \ 3188#define CANNOT_REMOVE_CURSED \
2867 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \ 3189 "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, " \ 3190 "Praying over an altar, scrolls of remove curse/damnation, " \
2869 "priests or even other players might help.>" 3191 "priests or even other players might help.>"
2870 3192
2871int 3193static int
2872unapply_for_ob (object *who, object *op, int aflags) 3194unapply_for_ob (object *who, object *op, int aflags)
2873{ 3195{
2874 if (op->is_range ()) 3196 if (op->is_range ())
2875 for (object *tmp = who->inv; tmp; tmp = tmp->below) 3197 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2876 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ()) 3198 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
… …
3194 * skill so that the dam and wc get updated 3516 * skill so that the dam and wc get updated
3195 */ 3517 */
3196 who->change_skill (skop); 3518 who->change_skill (skop);
3197 } 3519 }
3198 3520
3199 if (who->type == PLAYER 3521 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 { 3522 {
3203 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3523 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3204 return 1; 3524 return 1;
3205 } 3525 }
3206 3526
… …
3214 return RESULT_INT (0); 3534 return RESULT_INT (0);
3215 3535
3216 switch (op->type) 3536 switch (op->type)
3217 { 3537 {
3218 case WEAPON: 3538 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 3539 //TODO: this obviously fails for players using a shorter prefix
3230 // i.e. "R" can use Ragnarok's sword. 3540 // i.e. "R" can use Ragnarok's sword.
3231 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3541 if (op->level && !op->name.starts_with (who->name))
3232 { 3542 {
3233 /* if the weapon does not have the name as the character, can't use it. */ 3543 /* 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) */ 3544 /* (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.>"); 3545 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3236 3546
… …
3270 case AMULET: 3580 case AMULET:
3271 SET_FLAG (op, FLAG_APPLIED); 3581 SET_FLAG (op, FLAG_APPLIED);
3272 who->statusmsg (format ("You wear %s.", query_name (op))); 3582 who->statusmsg (format ("You wear %s.", query_name (op)));
3273 change_abil (who, op); 3583 change_abil (who, op);
3274 break; 3584 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 3585
3316 case SKILL_TOOL: 3586 case SKILL_TOOL:
3317 // applying a skill tool also readies the skill 3587 // applying a skill tool also readies the skill
3318 SET_FLAG (op, FLAG_APPLIED); 3588 SET_FLAG (op, FLAG_APPLIED);
3319 3589
… …
3399 } 3669 }
3400 3670
3401 break; 3671 break;
3402 3672
3403 case BOW: 3673 case BOW:
3404 if (!check_weapon_power (who, op->last_eat)) 3674 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 { 3675 {
3416 who->failmsg ("The weapon does not recognize you as its owner. " 3676 who->failmsg ("The weapon does not recognize you as its owner. "
3417 "H<Its name indicates that it belongs to somebody else.>"); 3677 "H<Its name indicates that it belongs to somebody else.>");
3418 if (tmp) 3678 if (tmp)
3419 insert_ob_in_ob (tmp, who); 3679 insert_ob_in_ob (tmp, who);
… …
3493 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3753 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3494 if (who->type == PLAYER) 3754 if (who->type == PLAYER)
3495 { 3755 {
3496 who->failmsg ( 3756 who->failmsg (
3497 "Oops, it feels deadly cold! " 3757 "Oops, it feels deadly cold! "
3498 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3758 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3499 ); 3759 );
3500 SET_FLAG (op, FLAG_KNOWN_CURSED); 3760 SET_FLAG (op, FLAG_KNOWN_CURSED);
3501 } 3761 }
3502 3762
3503 if (object *pl = op->visible_to ()) 3763 if (object *pl = op->visible_to ())
3504 esrv_send_item (pl, op); 3764 esrv_send_item (pl, op);
3505 3765
3506 return 0; 3766 return 0;
3507} 3767}
3508 3768
3509int 3769static int
3510monster_apply_special (object *who, object *op, int aflags) 3770monster_apply_special (object *who, object *op, int aflags)
3511{ 3771{
3512 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3772 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3513 return 1; 3773 return 1;
3514 3774
… …
3572 /* If we generated an object and put it in this object inventory, 3832 /* 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 3833 * move it to the parent object as the current object is about
3574 * to disappear. An example of this item is the random_* stuff 3834 * to disappear. An example of this item is the random_* stuff
3575 * that is put inside other objects. 3835 * that is put inside other objects.
3576 */ 3836 */
3577 for (tmp = op->inv; tmp; tmp = tmp2)
3578 {
3579 tmp2 = tmp->below;
3580 tmp->remove ();
3581
3582 if (op->env) 3837 if (op->env)
3583 insert_ob_in_ob (tmp, op->env); 3838 while (op->inv)
3584 else 3839 op->env->insert (op->inv);
3585 tmp->destroy ();
3586 }
3587 3840
3588 op->destroy (); 3841 op->destroy ();
3589 break; 3842 break;
3590 } 3843 }
3591 3844
… …
3690 } 3943 }
3691 3944
3692 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3945 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3693 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 3946 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3694 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3947 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3695 check_trigger (tmp, tmp->above); 3948 check_trigger (tmp, tmp->above, tmp->above);
3696} 3949}
3697 3950
3698/** 3951/**
3699 * Handles player eating food that temporarily changes status (resistances, stats). 3952 * Handles player eating food that temporarily changes status (resistances, stats).
3700 * This used to call cast_change_attr(), but 3953 * This used to call cast_change_attr(), but
… …
3705eat_special_food (object *who, object *food) 3958eat_special_food (object *who, object *food)
3706{ 3959{
3707 object *force; 3960 object *force;
3708 int i, did_one = 0; 3961 int i, did_one = 0;
3709 3962
3710 force = get_archetype (FORCE_NAME); 3963 char buf[64];
3964 snprintf (buf, sizeof(buf), "sp_food_%s", &food->title);
3965 shstr key (buf);
3711 3966
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 */ 3967 /* bigger morsel of food = longer effect time */
3733 force->duration = food->stats.food / 5; 3968 int duration = TIME2TICK (food->stats.food);
3734 SET_FLAG (force, FLAG_APPLIED); 3969
3735 change_abil (who, force); 3970 if (force = who->force_find (key))
3736 insert_ob_in_ob (force, who); 3971 {
3972 if (duration > abs (force->speed_left / force->speed))
3973 {
3974 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));
3975 force->force_set_timer (duration);
3976 }
3977 else
3978 new_draw_info (NDI_UNIQUE, 0, who, "It had no additional effect.");
3979
3980 return;
3737 } 3981 }
3738 else 3982 else
3983 {
3984 force = who->force_add (key, duration);
3985 force->name = key;
3986
3987 /* check if the food affects a stat */
3988 for (i = 0; i < NUM_STATS; i++)
3989 if (sint8 k = food->stats.stat (i))
3990 {
3991 force->stats.stat (i) = k;
3992 did_one = 1;
3993 }
3994
3995 /* check if we can protect the eater */
3996 for (i = 0; i < NROFATTACKS; i++)
3997 {
3998 if (food->resist[i] > 0)
3999 {
4000 force->resist[i] = food->resist[i];
4001 did_one = 1;
4002 }
4003 }
4004
4005 if (did_one)
4006 {
4007 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));
4008
4009 /* make the force take effect and report effects to user */
4010 change_abil (who, force);
4011 }
4012 else
3739 force->destroy (); 4013 force->destroy ();
4014 }
3740 4015
3741 /* check for hp, sp change */ 4016 /* check for hp, sp change */
3742 if (food->stats.hp != 0) 4017 if (food->stats.hp != 0)
3743 { 4018 {
3744 if (QUERY_FLAG (food, FLAG_CURSED)) 4019 if (QUERY_FLAG (food, FLAG_CURSED))
… …
3774 /* place limit on max sp from food? */ 4049 /* place limit on max sp from food? */
3775 } 4050 }
3776 } 4051 }
3777 4052
3778 who->update_stats (); 4053 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} 4054}
3886 4055
3887void 4056void
3888apply_changes_to_player (object *pl, object *change) 4057apply_changes_to_player (object *pl, object *change)
3889{ 4058{
… …
3937 } 4106 }
3938 4107
3939 /* insert the randomitems from the change's treasurelist into 4108 /* insert the randomitems from the change's treasurelist into
3940 * the player ref: player.c 4109 * the player ref: player.c
3941 */ 4110 */
3942 if (change->randomitems != NULL) 4111 if (change->randomitems)
3943 give_initial_items (pl, change->randomitems); 4112 give_initial_items (pl, change->randomitems);
3944 4113
3945 /* set up the face, for some races. */ 4114 /* set up the face, for some races. */
3946 4115
3947 /* first, look for the force object banning 4116 /* first, look for the force object banning
3948 * changing the face. Certain races never change face with class. 4117 * changing the face. Certain races never change face with class.
3949 */ 4118 */
3950 for (walk = pl->inv; walk != NULL; walk = walk->below) 4119 for (walk = pl->inv; walk; walk = walk->below)
3951 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4120 if (walk->name == shstr_NOCLASSFACECHANGE)
3952 flag_change_face = 0; 4121 flag_change_face = 0;
3953 4122
3954 if (flag_change_face) 4123 if (flag_change_face)
3955 { 4124 {
3956 pl->face = change->face; 4125 pl->face = change->face;
… …
3958 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE]; 4127 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3959 } 4128 }
3960 4129
3961 /* check the special case of can't use weapons */ 4130 /* check the special case of can't use weapons */
3962 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4131 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3963 if (!strcmp (change->name, "monk")) 4132 if (change->name == shstr_monk)
3964 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4133 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
3965 4134
3966 break; 4135 break;
3967 } 4136 }
3968 } 4137 }
3969} 4138}
3970 4139
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