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.173 by elmex, Sun Oct 5 14:22:25 2008 UTC vs.
Revision 1.229 by root, Fri Mar 26 20:17:48 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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.
171 */ 172 */
172int 173int
173apply_potion (object *op, object *tmp) 174apply_potion (object *op, object *tmp)
174{ 175{
175 int got_one = 0, i; 176 int got_one = 0, i;
176 object *force = 0, *floor = 0; 177 object *force = 0;
177 178
178 floor = GET_MAP_OB (op->map, op->x, op->y); 179 object *floor = GET_MAP_OB (op->map, op->x, op->y);
179 180
180 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 181 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
181 { 182 {
182 op->failmsg ("Gods prevent you from using this here, it's sacred ground!"); 183 op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
183 184
… …
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
… …
1031 * Handle apply on containers. 984 * Handle apply on containers.
1032 * By Eneq(@csd.uu.se). 985 * By Eneq(@csd.uu.se).
1033 * 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]
1034 * added the alchemical cauldron to the code -b.t. 987 * added the alchemical cauldron to the code -b.t.
1035 */ 988 */
1036int 989static int
1037apply_container (object *op, object *sack) 990apply_container (object *op, object *sack)
1038{ 991{
1039 if (op->type != PLAYER || !op->contr->ns) 992 if (op->type != PLAYER || !op->contr->ns)
1040 return 0; /* This might change */ 993 return 0; /* This might change */
1041 994
… …
1054 } 1007 }
1055 1008
1056 // 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
1057 if (sack->flag [FLAG_APPLIED]) 1010 if (sack->flag [FLAG_APPLIED])
1058 { 1011 {
1059 if (op->container == sack) 1012 if (op->container_ () == sack)
1060 { 1013 {
1061 // open on ground or inv, so close 1014 // open on ground or inv, so close
1062 op->close_container (); 1015 op->close_container ();
1063 return 1; 1016 return 1;
1064 } 1017 }
… …
1107{ 1060{
1108 /* Only players can make sacrifices on spell casting altars. */ 1061 /* Only players can make sacrifices on spell casting altars. */
1109 if (altar->inv && (!originator || originator->type != PLAYER)) 1062 if (altar->inv && (!originator || originator->type != PLAYER))
1110 return 0; 1063 return 0;
1111 1064
1112 if (operate_altar (altar, &sacrifice)) 1065 if (operate_altar (altar, &sacrifice, originator))
1113 { 1066 {
1114 /* Simple check. Unfortunately, it means you can't cast magic bullet 1067 /* Simple check. Unfortunately, it means you can't cast magic bullet
1115 * 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
1116 * is up to map designers to use them properly. 1069 * is up to map designers to use them properly.
1117 */ 1070 */
… …
1126/* push_button (altar);*/ 1079/* push_button (altar);*/
1127 } 1080 }
1128 else 1081 else
1129 { 1082 {
1130 altar->value = 1; /* works only once */ 1083 altar->value = 1; /* works only once */
1131 push_button (altar); 1084 push_button (altar, originator);
1132 } 1085 }
1133 1086
1134 return !sacrifice; 1087 return !sacrifice;
1135 } 1088 }
1136 else 1089 else
… …
1153 1106
1154 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1107 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1155 1108
1156 bool has_unpaid = false; 1109 bool has_unpaid = false;
1157 1110
1158 // 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
1159 // a quick and small change :( 1112 // a quick and small change :(
1160 for (object::depth_iterator item = op->begin (); item != op->end (); ++item) 1113 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1161 if (item->flag [FLAG_UNPAID]) 1114 if (item->flag [FLAG_UNPAID])
1162 { 1115 {
1163 has_unpaid = true; 1116 has_unpaid = true;
1164 break; 1117 break;
1165 } 1118 }
1166 1119
1167 if (op->type != PLAYER) 1120 if (!op->is_player ())
1168 { 1121 {
1169 /* Remove all the unpaid objects that may be carried here. 1122 /* Remove all the unpaid objects that may be carried here.
1170 * This could be pets or monsters that are somehow in 1123 * This could be pets or monsters that are somehow in
1171 * the shop. 1124 * the shop.
1172 */ 1125 */
… …
1176 1129
1177 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1130 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1178 { 1131 {
1179 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);
1180 1133
1134 if (i >= 0)
1181 tmp->remove (); 1135 tmp->move (i);
1182
1183 if (i == -1)
1184 i = 0;
1185
1186 tmp->map = op->map;
1187 tmp->x = op->x + freearr_x[i];
1188 tmp->y = op->y + freearr_y[i];
1189 insert_ob_in_map (tmp, op->map, op, 0);
1190 } 1136 }
1191 } 1137 }
1192 1138
1193 /* Don't teleport things like spell effects */ 1139 /* Don't teleport things like spell effects */
1194 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1140 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1205 if (i != -1) 1151 if (i != -1)
1206 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);
1207 1153
1208 return 0; 1154 return 0;
1209 } 1155 }
1156
1210 /* Removed code that checked for multipart objects - it appears that 1157 /* Removed code that checked for multipart objects - it appears that
1211 * the teleport function should be able to handle this just fine. 1158 * the teleport function should be able to handle this just fine.
1212 */ 1159 */
1213 rv = teleport (shop_mat, SHOP_MAT, op); 1160 rv = teleport (shop_mat, SHOP_MAT, op);
1214 } 1161 }
… …
1269 * Handles applying a sign. 1216 * Handles applying a sign.
1270 */ 1217 */
1271static void 1218static void
1272apply_sign (object *op, object *sign, int autoapply) 1219apply_sign (object *op, object *sign, int autoapply)
1273{ 1220{
1221 if (!op->is_player())
1222 return;
1223
1274 if (sign->has_dialogue ()) 1224 if (sign->has_dialogue ())
1275 { 1225 {
1276 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));
1277 return; 1227 return;
1278 } 1228 }
1279 1229
1280 if (!sign->msg) 1230 if (!sign->msg)
1281 { 1231 {
1282 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 "));
1283 return; 1236 return;
1284 } 1237 }
1285 1238
1286 if (sign->stats.food) 1239 if (sign->stats.food)
1287 { 1240 {
1288 if (sign->last_eat >= sign->stats.food) 1241 if (sign->last_eat >= sign->stats.food)
1289 { 1242 {
1290 if (!sign->move_on) 1243 if (!sign->move_on)
1291 op->statusmsg ("You cannot read it anymore."); 1244 op->failmsg ("You cannot read it anymore.");
1292 1245
1293 return; 1246 return;
1294 } 1247 }
1295 1248
1296 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1249 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1314 if (sign->sound) 1267 if (sign->sound)
1315 ns->play_sound (sign->sound); 1268 ns->play_sound (sign->sound);
1316 else if (autoapply) 1269 else if (autoapply)
1317 ns->play_sound (sound_find ("msg_voice")); 1270 ns->play_sound (sound_find ("msg_voice"));
1318 1271
1319 if (ns->can_msg)
1320 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg)); 1272 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1321 else
1322 {
1323 readable_message_type *msgType = get_readable_message_type (sign);
1324 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1325 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1326 }
1327 } 1273 }
1328} 1274}
1329 1275
1330static void 1276static void
1331move_apply_hole (object *trap, object *victim) 1277move_apply_hole (object *trap, object *victim)
… …
1378 return; 1324 return;
1379 1325
1380 /* move_apply() is the most likely candidate for causing unwanted and 1326 /* move_apply() is the most likely candidate for causing unwanted and
1381 * possibly unlimited recursion. 1327 * possibly unlimited recursion.
1382 */ 1328 */
1383 /* The following was changed because it was causing perfeclty correct 1329 /* The following was changed because it was causing perfectly correct
1384 * maps to fail. 1) it's not an error to recurse: 1330 * maps to fail. 1) it's not an error to recurse:
1385 * rune detonates, summoning monster. monster lands on nearby rune. 1331 * rune detonates, summoning monster. monster lands on nearby rune.
1386 * nearby rune detonates. This sort of recursion is expected and 1332 * nearby rune detonates. This sort of recursion is expected and
1387 * proper. This code was causing needless crashes. 1333 * proper. This code was causing needless crashes.
1388 */ 1334 */
… …
1395 1341
1396 recursion_depth++; 1342 recursion_depth++;
1397 if (trap->head) 1343 if (trap->head)
1398 trap = trap->head; 1344 trap = trap->head;
1399 1345
1400 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)))
1401 goto leave;
1402
1403 switch (trap->type) 1347 switch (trap->type)
1404 { 1348 {
1405 case PLAYERMOVER: 1349 case PLAYERMOVER:
1406 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:
1407 { 1419 {
1420 int max, sound_was_played;
1421 object *ab, *ab_next;
1422
1408 if (!trap->stats.maxsp) 1423 if (!trap->value)
1409 trap->stats.maxsp = 2; 1424 {
1425 int tot;
1410 1426
1411 /* Is this correct? From the docs, it doesn't look like it 1427 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1412 * 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
1413 */ 1442 */
1414 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed); 1443 ab_next = ab->above;
1415 1444
1416 /* 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)
1417 * above with some objects have zero speed, and thus the player 1446 {
1418 * 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 }
1419 */ 1456 }
1420 if (victim->speed_left < -50.f) 1457 break;
1421 victim->speed_left = -50.f;
1422 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1423 } 1458 }
1424 goto leave;
1425 1459
1426 case SPINNER: 1460 case CONVERTER:
1427 if (victim->direction) 1461 if (convert_item (victim, trap) < 0)
1428 {
1429 victim->direction = absdir (victim->direction - trap->stats.sp);
1430 update_turn_face (victim);
1431 }
1432 goto leave;
1433
1434 case DIRECTOR:
1435 if (victim->direction && !should_director_abort (trap, victim))
1436 {
1437 victim->direction = trap->stats.sp;
1438 update_turn_face (victim);
1439 }
1440 goto leave;
1441
1442 case BUTTON:
1443 case PEDESTAL:
1444 update_button (trap);
1445 goto leave;
1446
1447 case ALTAR:
1448 /* sacrifice victim on trap */
1449 apply_altar (trap, victim, originator);
1450 goto leave;
1451
1452 case THROWN_OBJ:
1453 if (trap->inv == NULL)
1454 goto leave;
1455 /* fallthrough */
1456
1457 case ARROW:
1458 /* bad bug: monster throw a object, make a step forwards, step on object ,
1459 * trigger this here and get hit by own missile - and will be own enemy.
1460 * Victim then is his own enemy and will start to kill herself (this is
1461 * removed) but we have not synced victim and his missile. To avoid senseless
1462 * action, we avoid hits here
1463 */
1464 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1465 hit_with_arrow (trap, victim);
1466 goto leave;
1467
1468 case SPELL_EFFECT:
1469 apply_spell_effect (trap, victim);
1470 goto leave;
1471
1472 case TRAPDOOR:
1473 {
1474 int max, sound_was_played;
1475 object *ab, *ab_next;
1476
1477 if (!trap->value)
1478 { 1462 {
1479 int tot; 1463 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1480 1464 archetype::get (shstr_burnout)->insert_at (trap, trap);
1481 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1482 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1483 tot += ab->head_ ()->total_weight ();
1484
1485 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1486 goto leave;
1487
1488 SET_ANIMATION (trap, trap->value);
1489 update_object (trap, UP_OBJ_FACE);
1490 } 1465 }
1491 1466
1492 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))
1493 { 1489 {
1494 /* need to set this up, since if we do transfer the object, 1490 /* Basically, don't show exits leading to random maps the
1495 * ab->above would be bogus 1491 * players output.
1496 */ 1492 */
1497 ab_next = ab->above; 1493 if (trap->msg && EXIT_PATH (trap) != shstr_random_map_exit)
1494 victim->statusmsg (trap->msg, NDI_NAVY);
1498 1495
1499 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1496 trap->play_sound (trap->sound);
1500 { 1497 victim->enter_exit (trap);
1501 if (!sound_was_played)
1502 {
1503 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1504 sound_was_played = 1;
1505 }
1506
1507 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1508 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1509 }
1510 } 1498 }
1511 goto leave; 1499 break;
1512 }
1513 1500
1514 case CONVERTER:
1515 if (convert_item (victim, trap) < 0)
1516 {
1517 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1518 archetype::get (shstr_burnout)->insert_at (trap, trap);
1519 }
1520
1521 goto leave;
1522
1523 case TRIGGER_BUTTON:
1524 case TRIGGER_PEDESTAL:
1525 case TRIGGER_ALTAR:
1526 check_trigger (trap, victim);
1527 goto leave;
1528
1529 case DEEP_SWAMP:
1530 walk_on_deep_swamp (trap, victim);
1531 goto leave;
1532
1533 case CHECK_INV:
1534 check_inv (victim, trap);
1535 goto leave;
1536
1537 case HOLE:
1538 move_apply_hole (trap, victim);
1539 goto leave;
1540
1541 case EXIT:
1542 if (victim->type == PLAYER && EXIT_PATH (trap))
1543 {
1544 /* Basically, don't show exits leading to random maps the
1545 * players output.
1546 */
1547 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1548 victim->statusmsg (trap->msg, NDI_NAVY);
1549
1550 trap->play_sound (trap->sound);
1551 victim->enter_exit (trap);
1552 }
1553 goto leave;
1554
1555 case ENCOUNTER: 1501 case ENCOUNTER:
1556 /* may be some leftovers on this */ 1502 /* may be some leftovers on this */
1557 goto leave; 1503 break;
1558 1504
1559 case SHOP_MAT: 1505 case SHOP_MAT:
1560 apply_shop_mat (trap, victim); 1506 apply_shop_mat (trap, victim);
1561 goto leave; 1507 break;
1562 1508
1563 /* Drop a certain amount of gold, and have one item identified */ 1509 /* Drop a certain amount of gold, and have one item identified */
1564 case IDENTIFY_ALTAR: 1510 case IDENTIFY_ALTAR:
1565 apply_id_altar (victim, trap, originator); 1511 apply_id_altar (victim, trap, originator);
1566 goto leave; 1512 break;
1567 1513
1568 case SIGN: 1514 case SIGN:
1569 if (victim->type != PLAYER && trap->stats.food > 0) 1515 if (victim->type != PLAYER && trap->stats.food > 0)
1570 goto leave; /* monsters musn't apply magic_mouths with counters */ 1516 break; /* monsters musn't apply magic_mouths with counters */
1571 1517
1572 apply_sign (victim, trap, 1); 1518 apply_sign (victim, trap, 1);
1573 goto leave; 1519 break;
1574 1520
1575 case CONTAINER: 1521 case CONTAINER:
1576 apply_container (victim, trap); 1522 apply_container (victim, trap);
1577 goto leave; 1523 break;
1578 1524
1579 case RUNE: 1525 case RUNE:
1580 case TRAP: 1526 case TRAP:
1581 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1527 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1582 spring_trap (trap, victim); 1528 spring_trap (trap, victim);
1583 goto leave; 1529 break;
1584 1530
1585 default: 1531 default:
1586 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 "
1587 "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);
1588 goto leave; 1534 break;
1589 } 1535 }
1590 1536
1591leave:
1592 recursion_depth--; 1537 recursion_depth--;
1593} 1538}
1594 1539
1595/** 1540/**
1596 * Handles reading a regular (ie not containing a spell) book. 1541 * Handles reading a regular (ie not containing a spell) book.
… …
1607 return; 1552 return;
1608 } 1553 }
1609 1554
1610 if (!tmp->msg) 1555 if (!tmp->msg)
1611 { 1556 {
1612 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));
1613 return; 1558 return;
1614 } 1559 }
1615 1560
1616 /* need a literacy skill to read stuff! */ 1561 /* need a literacy skill to read stuff! */
1617 skill_ob = find_skill_by_name (op, tmp->skill); 1562 skill_ob = find_skill_by_name (op, tmp->skill);
… …
1631 : lev_diff < 15 ? "This book is way beyond your comprehension." 1576 : lev_diff < 15 ? "This book is way beyond your comprehension."
1632 : "This book is totally beyond your comprehension."); 1577 : "This book is totally beyond your comprehension.");
1633 return; 1578 return;
1634 } 1579 }
1635 1580
1581 // we currently don't use the message types for anything.
1636 readable_message_type *msgType = get_readable_message_type (tmp); 1582 // readable_message_type *msgType = get_readable_message_type (tmp);
1583
1584 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("apply_book"));
1637 1585
1638 if (player *pl = op->contr) 1586 if (player *pl = op->contr)
1639 if (client *ns = pl->ns) 1587 if (client *ns = pl->ns)
1640 if (ns->can_msg)
1641 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); 1588 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1642 else
1643 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1644 msgType->message_type, msgType->message_subtype,
1645 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1646 long_desc (tmp, op), &tmp->msg);
1647 1589
1648 /* gain xp from reading */ 1590 /* gain xp from reading */
1649 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1591 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1650 { /* only if not read before */ 1592 { /* only if not read before */
1651 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1593 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1659 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp); 1601 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1660 } 1602 }
1661 1603
1662 change_exp (op, exp_gain, skill_ob->skill, 0); 1604 change_exp (op, exp_gain, skill_ob->skill, 0);
1663 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1605 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1606 }
1607}
1608
1609/**
1610 * op made some mistake with a scroll, this takes care of punishment.
1611 * scroll_failure()- hacked directly from spell_failure
1612 */
1613static void
1614scroll_failure (object *op, int failure, int power)
1615{
1616 if (abs (failure / 4) > power)
1617 power = abs (failure / 4); /* set minimum effect */
1618
1619 if (failure <= -1 && failure > -15)
1620 { /* wonder */
1621 object *tmp;
1622
1623 op->failmsg ("Your spell warps!");
1624 tmp = get_archetype (SPELL_WONDER);
1625 cast_wonder (op, op, 0, tmp);
1626 tmp->destroy ();
1627 }
1628 else if (failure <= -15 && failure > -35)
1629 { /* drain mana */
1630 op->failmsg ("Your mana is drained!");
1631 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
1632 if (op->stats.sp < 0)
1633 op->stats.sp = 0;
1634 }
1635 else if (settings.spell_failure_effects == TRUE)
1636 {
1637 if (failure <= -35 && failure > -60)
1638 { /* confusion */
1639 op->failmsg ("The magic recoils on you!");
1640 confuse_player (op, op, power);
1641 }
1642 else if (failure <= -60 && failure > -70)
1643 { /* paralysis */
1644 op->failmsg ("The magic recoils and paralyzes you!");
1645 paralyze_player (op, op, power);
1646 }
1647 else if (failure <= -70 && failure > -80)
1648 { /* blind */
1649 op->failmsg ("The magic recoils on you!");
1650 blind_player (op, op, power);
1651 }
1652 else if (failure <= -80)
1653 { /* blast the immediate area */
1654 object *tmp = get_archetype (LOOSE_MANA);
1655 cast_magic_storm (op, tmp, power);
1656 op->failmsg ("You unleash uncontrolled mana!");
1657 tmp->destroy ();
1658 }
1664 } 1659 }
1665} 1660}
1666 1661
1667/** 1662/**
1668 * Handles the applying of a skill scroll, calling learn_skill straight. 1663 * Handles the applying of a skill scroll, calling learn_skill straight.
… …
1774 * instead of having their spell stored in stats.sp. These are 1769 * instead of having their spell stored in stats.sp. These are
1775 * legacy spellbooks 1770 * legacy spellbooks
1776 */ 1771 */
1777 if (tmp->slaying) 1772 if (tmp->slaying)
1778 { 1773 {
1779 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1774 spell = find_archetype_by_object_name (tmp->slaying)->instance ();
1775
1780 if (!spell) 1776 if (!spell)
1781 { 1777 {
1782 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying)); 1778 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1783 return; 1779 return;
1784 } 1780 }
… …
1805 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1801 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1806 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!"); 1802 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1807 return; 1803 return;
1808 } 1804 }
1809 1805
1810 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1806 int learn_level = sqrtf (spell->level) * 1.5f;
1807 if (skop->level < learn_level)
1811 { 1808 {
1812 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill)); 1809 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1810 &tmp->skill, learn_level));
1813 return; 1811 return;
1814 } 1812 }
1815 1813
1816 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1814 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1817 1815
… …
1859 * literacy rate very useful! -b.t. 1857 * literacy rate very useful! -b.t.
1860 */ 1858 */
1861 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1859 if (QUERY_FLAG (op, FLAG_CONFUSED))
1862 { 1860 {
1863 op->failmsg ("In your confused state you flub the wording of the text!"); 1861 op->failmsg ("In your confused state you flub the wording of the text!");
1864 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1862 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), max (spell->stats.sp, spell->stats.grace));
1865 } 1863 }
1866 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1864 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
1867 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1865 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
1868 { 1866 {
1869 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN); 1867 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
… …
1975 break; 1973 break;
1976 } 1974 }
1977 1975
1978 if (!tmp->destroyed () && !tmp->inv) 1976 if (!tmp->destroyed () && !tmp->inv)
1979 tmp->decrease (true); 1977 tmp->decrease (true);
1980}
1981
1982/**
1983 * op eats food.
1984 * If player, takes care of messages and dragon special food.
1985 */
1986static void
1987apply_food (object *op, object *tmp)
1988{
1989 int capacity_remaining;
1990
1991 if (op->type != PLAYER)
1992 op->stats.hp = op->stats.maxhp;
1993 else
1994 {
1995 /* check if this is a dragon (player), eating some flesh */
1996 if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp))
1997 ;
1998 else
1999 {
2000 /* usual case - no dragon meal: */
2001 if (op->stats.food + tmp->stats.food > 999)
2002 {
2003 if (tmp->type == FOOD || tmp->type == FLESH)
2004 op->failmsg ("You feel full, but what a waste of food!");
2005 else
2006 op->statusmsg ("Most of the drink goes down your face not your throat!");
2007 }
2008
2009 tmp->play_sound (
2010 tmp->sound
2011 ? tmp->sound
2012 : tmp->type == DRINK
2013 ? sound_find ("eat_drink")
2014 : sound_find ("eat_food")
2015 );
2016
2017 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2018 {
2019 const char *buf;
2020
2021 if (!is_dragon_pl (op))
2022 {
2023 /* eating message for normal players */
2024 if (tmp->type == DRINK)
2025 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2026 else
2027 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2028 }
2029 else
2030 /* eating message for dragon players */
2031 buf = format ("The %s tasted terrible!", &tmp->name);
2032
2033 op->statusmsg (buf);
2034
2035 capacity_remaining = 999 - op->stats.food;
2036 op->stats.food += tmp->stats.food;
2037 if (capacity_remaining < tmp->stats.food)
2038 op->stats.hp += capacity_remaining / 50;
2039 else
2040 op->stats.hp += tmp->stats.food / 50;
2041
2042 if (op->stats.hp > op->stats.maxhp)
2043 op->stats.hp = op->stats.maxhp;
2044 if (op->stats.food > 999)
2045 op->stats.food = 999;
2046 }
2047
2048 /* special food hack -b.t. */
2049 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2050 eat_special_food (op, tmp);
2051 }
2052 }
2053
2054 handle_apply_yield (tmp);
2055 tmp->decrease ();
2056} 1978}
2057 1979
2058/** 1980/**
2059 * A dragon is eating some flesh. If the flesh contains resistances, 1981 * A dragon is eating some flesh. If the flesh contains resistances,
2060 * there is a chance for the dragon's skin to get improved. 1982 * there is a chance for the dragon's skin to get improved.
… …
2063 * object *op the object (dragon player) eating the flesh 1985 * object *op the object (dragon player) eating the flesh
2064 * object *meal the flesh item, getting chewed in dragon's mouth 1986 * object *meal the flesh item, getting chewed in dragon's mouth
2065 * return: 1987 * return:
2066 * int 1 if eating successful, 0 if it doesn't work 1988 * int 1 if eating successful, 0 if it doesn't work
2067 */ 1989 */
2068int 1990static int
2069dragon_eat_flesh (object *op, object *meal) 1991dragon_eat_flesh (object *op, object *meal)
2070{ 1992{
2071 object *skin = NULL; /* pointer to dragon skin force */ 1993 object *skin = NULL; /* pointer to dragon skin force */
2072 object *abil = NULL; /* pointer to dragon ability force */ 1994 object *abil = NULL; /* pointer to dragon ability force */
2073 object *tmp = NULL; /* tmp. object */ 1995 object *tmp = NULL; /* tmp. object */
… …
2079 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 2001 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
2080 int winners = 0; /* number of winners */ 2002 int winners = 0; /* number of winners */
2081 int i; /* index */ 2003 int i; /* index */
2082 2004
2083 /* let's make sure and doublecheck the parameters */ 2005 /* let's make sure and doublecheck the parameters */
2084 if (meal->type != FLESH || !is_dragon_pl (op)) 2006 if (meal->type != FLESH || !op->is_dragon ())
2085 return 0; 2007 return 0;
2086 2008
2087 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2009 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2088 from the player's inventory */ 2010 from the player's inventory */
2089 for (tmp = op->inv; tmp; tmp = tmp->below) 2011 for (tmp = op->inv; tmp; tmp = tmp->below)
… …
2105 op->stats.hp += meal->stats.food / 50; 2027 op->stats.hp += meal->stats.food / 50;
2106 2028
2107 if (op->stats.hp > op->stats.maxhp) 2029 if (op->stats.hp > op->stats.maxhp)
2108 op->stats.hp = op->stats.maxhp; 2030 op->stats.hp = op->stats.maxhp;
2109 2031
2110 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2032 op->stats.food = min (999, op->stats.food + meal->stats.food);
2111 2033
2112 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */ 2034 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */
2113 2035
2114 /* on to the interesting part: chances for adding resistance */ 2036 /* on to the interesting part: chances for adding resistance */
2115 for (i = 0; i < NROFATTACKS; i++) 2037 for (i = 0; i < NROFATTACKS; i++)
… …
2125 2047
2126 /* monster bonus increases with level, because high-level 2048 /* monster bonus increases with level, because high-level
2127 flesh is too rare */ 2049 flesh is too rare */
2128 mbonus = op->level * 20. / ((double) settings.max_level); 2050 mbonus = op->level * 20. / ((double) settings.max_level);
2129 2051
2130 chance = (((double) MIN (op->level + bonus, meal->level + bonus + mbonus)) * 100. / 2052 chance = (((double)min (op->level + bonus, meal->level + bonus + mbonus)) * 100. /
2131 ((double) settings.max_level)) - skin->resist[i]; 2053 ((double)settings.max_level)) - skin->resist[i];
2132 2054
2133 if (chance >= 0.) 2055 if (chance >= 0.)
2134 chance += 1.; 2056 chance += 1.;
2135 else 2057 else
2136 chance = (chance < -12) ? 0. : 1. / pow (2., -chance); 2058 chance = (chance < -12) ? 0. : 1. / pow (2., -chance);
2137 2059
2138 /* chance is proportional to amount of resistance (max. 50) */ 2060 /* chance is proportional to amount of resistance (max. 50) */
2139 chance *= ((double) (MIN (meal->resist[i], 50))) / 50.; 2061 chance *= ((double)(min (meal->resist[i], 50))) / 50.;
2140 2062
2141 /* doubled chance for resistance of ability-focus */ 2063 /* doubled chance for resistance of ability-focus */
2142 if (i == abil->stats.exp) 2064 if (i == abil->stats.exp)
2143 chance = MIN (100., chance * 2.); 2065 chance = min (100., chance * 2.);
2144 2066
2145 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2067 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2146 if (rndm (10000) < (unsigned int) (chance * 100)) 2068 if (rndm (10000) < (unsigned int)(chance * 100))
2147 { 2069 {
2148 atnr_winner[winners] = i; 2070 atnr_winner[winners] = i;
2149 winners++; 2071 winners++;
2150 } 2072 }
2151 2073
… …
2179 op->statusmsg (buf); 2101 op->statusmsg (buf);
2180 2102
2181 /* now choose a winner if we have any */ 2103 /* now choose a winner if we have any */
2182 i = -1; 2104 i = -1;
2183 if (winners > 0) 2105 if (winners > 0)
2184 i = atnr_winner[RANDOM () % winners]; 2106 i = atnr_winner [rndm (winners)];
2185 2107
2186 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2108 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2187 { 2109 {
2188 /* resistance increased! */ 2110 /* resistance increased! */
2189 skin->resist[i]++; 2111 skin->resist[i]++;
… …
2214 2136
2215 return 1; 2137 return 1;
2216} 2138}
2217 2139
2218/** 2140/**
2141 * op eats food.
2142 * If player, takes care of messages and dragon special food.
2143 */
2144static void
2145apply_food (object *op, object *tmp)
2146{
2147 int capacity_remaining;
2148
2149 if (op->type != PLAYER)
2150 op->stats.hp = op->stats.maxhp;
2151 else
2152 {
2153 /* check if this is a dragon (player), eating some flesh */
2154 if (tmp->type == FLESH && op->is_dragon () && dragon_eat_flesh (op, tmp))
2155 ;
2156 else
2157 {
2158 /* usual case - no dragon meal: */
2159 if (op->stats.food + tmp->stats.food > 999)
2160 {
2161 if (tmp->type == FOOD || tmp->type == FLESH)
2162 op->failmsg ("You feel full, but what a waste of food!");
2163 else
2164 op->statusmsg ("Most of the drink goes down your face not your throat!");
2165 }
2166
2167 tmp->play_sound (
2168 tmp->sound
2169 ? tmp->sound
2170 : tmp->type == DRINK
2171 ? sound_find ("eat_drink")
2172 : sound_find ("eat_food")
2173 );
2174
2175 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2176 {
2177 const char *buf;
2178
2179 if (!op->is_dragon ())
2180 {
2181 /* eating message for normal players */
2182 if (tmp->type == DRINK)
2183 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2184 else
2185 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2186 }
2187 else
2188 /* eating message for dragon players */
2189 buf = format ("The %s tasted terrible!", &tmp->name);
2190
2191 op->statusmsg (buf);
2192
2193 capacity_remaining = 999 - op->stats.food;
2194 op->stats.food += tmp->stats.food;
2195 if (capacity_remaining < tmp->stats.food)
2196 op->stats.hp += capacity_remaining / 50;
2197 else
2198 op->stats.hp += tmp->stats.food / 50;
2199
2200 if (op->stats.hp > op->stats.maxhp)
2201 op->stats.hp = op->stats.maxhp;
2202 if (op->stats.food > 999)
2203 op->stats.food = 999;
2204 }
2205
2206 /* special food hack -b.t. */
2207 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2208 eat_special_food (op, tmp);
2209 }
2210 }
2211
2212 handle_apply_yield (tmp);
2213 tmp->decrease ();
2214}
2215
2216/**
2219 * Handles applying an improve armor scroll. 2217 * Handles applying an improve armor scroll.
2220 * Does some sanity checks, then calls improve_armour. 2218 * Does some sanity checks, then calls improve_armour.
2221 */ 2219 */
2222static void 2220static void
2223apply_armour_improver (object *op, object *tmp) 2221apply_armour_improver (object *op, object *tmp)
… …
2274 op->stats.food -= op->stats.food / 4; 2272 op->stats.food -= op->stats.food / 4;
2275 poison->destroy (); 2273 poison->destroy ();
2276} 2274}
2277 2275
2278/** 2276/**
2279 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2277 * This function will try to apply a lighter and in case no lighter
2280 * A valid 2 way exit means: 2278 * is specified it will try to find a lighter in the players inventory,
2281 * -You can come back (there is another exit at the other side) 2279 * and inform him about this requirement.
2282 * -You are
2283 * ° the owner of the exit
2284 * ° or in the same party as the owner
2285 * 2280 *
2286 * Note: a owner in a 2 way exit is saved as the owner's name 2281 * who - the player
2287 * in the field exit->name cause the field exit->owner doesn't 2282 * op - the item we want to light
2288 * survive in the swapping (in fact the whole exit doesn't survive). 2283 * lighter - the lighter or 0 if a lighter has yet to be found
2289 */ 2284 */
2290int 2285static object *
2291is_legal_2ways_exit (object *op, object *exit) 2286auto_apply_lighter (object *who, object *op, object *lighter)
2292{ 2287{
2293 if (exit->stats.exp != 1) 2288 if (lighter == 0)
2294 return 1; /*This is not a 2 way, so it is legal */
2295
2296#if 0 //TODO
2297 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2298 return 0; /* This is a reset town portal */
2299#endif
2300
2301 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2302
2303 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2304
2305 if (exitmap)
2306 { 2289 {
2307 exitmap->load_sync (); 2290 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2308
2309 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2310
2311 if (!tmp)
2312 return 0;
2313
2314 for (; tmp; tmp = tmp->above)
2315 { 2291 {
2316 if (tmp->type != EXIT) 2292 if (tmp->type == LIGHTER)
2317 continue; /*Not an exit */
2318
2319 if (!EXIT_PATH (tmp))
2320 continue; /*Not a valid exit */
2321
2322 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2323 continue; /*Not in the same place */
2324
2325 if (exit->map->path != EXIT_PATH (tmp))
2326 continue; /*Not in the same map */
2327
2328 /* From here we have found the exit is valid. However we do
2329 * here the check of the exit owner. It is important for the
2330 * town portals to prevent strangers from visiting your appartments
2331 */
2332 if (!exit->race)
2333 return 1; /*No owner, free for all! */
2334
2335 object *exit_owner = 0;
2336
2337 for_all_players (pp)
2338 { 2293 {
2339 if (!pp->ob) 2294 lighter = tmp;
2340 continue;
2341
2342 if (pp->ob->name != exit->race)
2343 continue;
2344
2345 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2346 break; 2295 break;
2347 } 2296 }
2297 }
2348 2298
2349 if (!exit_owner) 2299 if (!lighter)
2350 return 0; /* No more owner */ 2300 {
2351 2301 who->failmsg (format (
2352 if (exit_owner->contr == op->contr) 2302 "You can't light up the %s with your bare hands! "
2353 return 1; /*It is your exit */ 2303 "H<You need a lighter in your inventory, for example a flint and steel.>",
2354 2304 &op->name));
2355 if (exit_owner && /*There is a owner */
2356 (op->contr) && /*A player tries to pass */
2357 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2358 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2359 return 0; 2305 return 0;
2306 }
2307 }
2360 2308
2309 // last_eat == 0 means the lighter is not being used up!
2310 if (lighter->last_eat && lighter->stats.food)
2311 {
2312 /* lighter gets used up */
2313 lighter = lighter->split ();
2314 lighter->stats.food--;
2315 who->insert (lighter);
2316 }
2317 else if (lighter->last_eat)
2318 {
2319 /* no charges left in lighter */
2320 who->failmsg (format (
2321 "You attempt to light the %s with a used up %s.",
2322 &op->name, &lighter->name));
2323 return 0;
2324 }
2325
2326 return lighter;
2327}
2328
2329/**
2330 * Designed primarily to light torches/lanterns/etc.
2331 * Also burns up burnable material too. First object in the inventory is
2332 * the selected object to "burn". -b.t.
2333 */
2334static void
2335apply_lighter (object *who, object *lighter)
2336{
2337 object *item;
2338 int is_player_env = 0;
2339
2340 item = find_marked_object (who);
2341 if (item)
2342 {
2343 if (!auto_apply_lighter (who, item, lighter))
2344 return;
2345
2346 /* Perhaps we should split what we are trying to light on fire?
2347 * I can't see many times when you would want to light multiple
2348 * objects at once.
2349 */
2350
2351 save_throw_object (item, AT_FIRE, who);
2352
2353 if (item->destroyed ()
2354 || ((item->type == LAMP || item->type == TORCH)
2355 && item->glow_radius > 0))
2356 who->statusmsg (format (
2357 "You light the %s with the %s.",
2358 &item->name, &lighter->name));
2359 else
2360 who->failmsg (format (
2361 "You attempt to light the %s with the %s and fail.",
2362 &item->name, &lighter->name));
2363 }
2364 else
2365 who->failmsg ("You need to mark a lightable object.");
2366}
2367
2368/**
2369 * This function generates a cursed effect for cursed lamps and torches.
2370 */
2371static void
2372player_apply_lamp_cursed_effect (object *who, object *op)
2373{
2374 if (op->level)
2375 {
2376 who->failmsg (format (
2377 "The %s was cursed, it explodes in a big fireball!",
2378 &op->name));
2379 create_exploding_ball_at (who, op->level);
2380 }
2381 else
2382 {
2383 who->failmsg (format (
2384 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2385 &op->name));
2386 }
2387
2388 op->destroy ();
2389}
2390
2391/**
2392 * Apply for players and lamps
2393 *
2394 * who - the player
2395 * op - the lamp
2396 */
2397static void
2398player_apply_lamp (object *who, object *op)
2399{
2400 bool switch_on = op->glow_radius ? false : true;
2401
2402 if (switch_on)
2403 {
2404 object *lighter = 0;
2405
2406 if (op->flag [FLAG_IS_LIGHTABLE]
2407 && !(lighter = auto_apply_lighter (who, op, 0)))
2408 return;
2409
2410 if (op->stats.food < 1)
2411 {
2412 if (op->type == LAMP)
2413 who->failmsg (format (
2414 "The %s is out of fuel! "
2415 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2416 &op->name));
2417 else
2418 who->failmsg (format (
2419 "The %s is burnt out! "
2420 "H<Torches and similar items burn out and become worthless.>",
2421 &op->name));
2361 return 1; 2422 return;
2423 }
2424
2425 if (op->flag [FLAG_CURSED])
2362 } 2426 {
2427 player_apply_lamp_cursed_effect (who, op);
2428 return;
2429 }
2430
2431 if (lighter)
2432 who->statusmsg (format (
2433 "You light up the %s with the %s.", &op->name, &lighter->name));
2434 else
2435 who->statusmsg (format ("You light up the %s.", &op->name));
2436 }
2437 else
2363 } 2438 {
2439 if (op->flag [FLAG_CURSED])
2440 {
2441 player_apply_lamp_cursed_effect (who, op);
2442 return;
2443 }
2364 2444
2445 if (op->type == TORCH)
2446 {
2447 if (!op->flag [FLAG_IS_LIGHTABLE])
2448 {
2449 who->statusmsg (format (
2450 "You put out the %s. "
2451 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2452 &op->name, &op->name));
2453 }
2454 else
2455 who->statusmsg (format (
2456 "You put out the %s."
2457 "H<Torches wear out if you put them out.>",
2458 &op->name));
2459 }
2460 else
2461 who->statusmsg (format ("You turn off the %s.", &op->name));
2462 }
2463
2464 apply_lamp (op, switch_on);
2465}
2466
2467void get_animation_from_arch (object *op, arch_ptr a)
2468{
2469 op->animation_id = a->animation_id;
2470 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2471 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2472 op->anim_speed = a->anim_speed;
2473 op->last_anim = 0;
2474 op->state = 0;
2475 op->face = a->face;
2476
2477 if (NUM_ANIMATIONS(op) > 1)
2478 {
2479 SET_ANIMATION(op, 0);
2480 animate_object (op, op->direction);
2481 }
2482 else
2483 update_object (op, UP_OBJ_FACE);
2484}
2485
2486/**
2487 * Apply for LAMPs and TORCHes.
2488 *
2489 * op - the lamp
2490 * switch_on - a flag which says whether the lamp should be switched on or off
2491 */
2492void apply_lamp (object *op, bool switch_on)
2493{
2494 op->set_glow_radius (switch_on ? op->range : 0);
2495 op->set_speed (switch_on ? op->arch->speed : 0);
2496
2497 // torches wear out if you put them out
2498 if (op->type == TORCH && !switch_on)
2499 {
2500 if (op->flag [FLAG_IS_LIGHTABLE])
2501 {
2502 op->stats.food -= (double) op->arch->stats.food / 15;
2503 if (op->stats.food < 0)
2504 op->stats.food = 0;
2505 }
2506 else
2507 op->stats.food = 0;
2508 }
2509
2510 // lamps and torched get worthless when used up
2511 if (op->stats.food <= 0)
2512 op->value = 0;
2513
2514 // FIXME: This is a hack to make the more sane torches and lamps
2515 // still animated ;-/
2516 if (op->other_arch)
2517 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2518
2519 if (object *pl = op->visible_to ())
2520 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2521}
2522
2523/**
2524 * This handles items of type 'transformer'.
2525 * Basically those items, used with a marked item, transform both items into something
2526 * else.
2527 * "Transformer" item has food decreased by 1, removed if 0 (0 at start means illimited)..
2528 * Change information is contained in the 'slaying' field of the marked item.
2529 * The format is as follow: transformer:[number ]yield[;transformer:...].
2530 * This way an item can be transformed in many things, and/or many objects.
2531 * The 'slaying' field for transformer is used as verb for the action.
2532 */
2533static void
2534apply_item_transformer (object *pl, object *transformer)
2535{
2536 object *marked;
2537 object *new_item;
2538 const char *find;
2539 char *separator;
2540 int yield;
2541 char got[MAX_BUF];
2542 int len;
2543
2544 if (!pl || !transformer)
2365 return 0; 2545 return;
2546
2547 marked = find_marked_object (pl);
2548
2549 if (!marked)
2550 {
2551 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
2552 return;
2553 }
2554
2555 if (!marked->slaying)
2556 {
2557 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2558 return;
2559 }
2560
2561 /* check whether they are compatible or not */
2562 find = strstr (&marked->slaying, transformer->arch->archname);
2563 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
2564 {
2565 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2566 return;
2567 }
2568
2569 find += strlen (transformer->arch->archname) + 1;
2570 /* Item can be used, now find how many and what it yields */
2571 if (isdigit (*(find)))
2572 {
2573 yield = atoi (find);
2574 if (yield < 1)
2575 {
2576 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
2577 yield = 1;
2578 }
2579 }
2580 else
2581 yield = 1;
2582
2583 while (isdigit (*find))
2584 find++;
2585
2586 while (*find == ' ')
2587 find++;
2588
2589 memset (got, 0, MAX_BUF);
2590
2591 if ((separator = (char *) strchr (find, ';')))
2592 len = separator - find;
2593 else
2594 len = strlen (find);
2595
2596 min_it (len, MAX_BUF - 1);
2597
2598 strcpy (got, find);
2599 got[len] = '\0';
2600
2601 /* Now create new item, remove used ones when required. */
2602 new_item = get_archetype (got);
2603 if (!new_item)
2604 {
2605 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
2606 return;
2607 }
2608
2609 new_item->nrof = yield;
2610
2611 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
2612
2613 pl->insert (new_item);
2614 /* Eat up one item */
2615 marked->decrease ();
2616
2617 /* Eat one transformer if needed */
2618 if (transformer->stats.food)
2619 if (--transformer->stats.food == 0)
2620 transformer->decrease ();
2366} 2621}
2367 2622
2368/** 2623/**
2369 * Main apply handler. 2624 * Main apply handler.
2370 * 2625 *
… …
2373 * Return value: 2628 * Return value:
2374 * 0: player or monster can't apply objects of that type 2629 * 0: player or monster can't apply objects of that type
2375 * 1: has been applied, or there was an error applying the object 2630 * 1: has been applied, or there was an error applying the object
2376 * 2: objects of that type can't be applied if not in inventory 2631 * 2: objects of that type can't be applied if not in inventory
2377 * 2632 *
2378 * op is the object that is causing object to be applied, tmp is the object 2633 * who is the object that is causing object to be applied, op is the object
2379 * being applied. 2634 * being applied.
2380 * 2635 *
2381 * aflag is special (always apply/unapply) flags. Nothing is done with 2636 * aflag is special (always apply/unapply) flags. Nothing is done with
2382 * them in this function - they are passed to apply_special 2637 * them in this function - they are passed to apply_special
2383 */ 2638 */
2384int 2639int
2385manual_apply (object *op, object *tmp, int aflag) 2640manual_apply (object *who, object *op, int aflag)
2386{ 2641{
2387 tmp = tmp->head_ (); 2642 op = op->head_ ();
2388 2643
2389 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2644 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2390 { 2645 {
2391 if (op->type == PLAYER) 2646 if (who->type == PLAYER)
2392 { 2647 {
2648 examine (who, op);
2393 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2649 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2394 return 1; 2650 return 1;
2395 } 2651 }
2396 else 2652 else
2397 return 0; /* monsters just skip unpaid items */ 2653 return 0; /* monsters just skip unpaid items */
2398 } 2654 }
2399 2655
2400 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2656 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2401 return RESULT_INT (0); 2657 return RESULT_INT (0);
2402 2658
2403 switch (tmp->type) 2659 switch (op->type)
2404 { 2660 {
2405 case CF_HANDLE: 2661 case T_HANDLE:
2406 op->play_sound (sound_find ("turn_handle")); 2662 who->play_sound (sound_find ("turn_handle"));
2407 op->statusmsg ("You turn the handle."); 2663 who->statusmsg ("You turn the handle.");
2408 tmp->value = tmp->value ? 0 : 1; 2664 op->value = op->value ? 0 : 1;
2409 SET_ANIMATION (tmp, tmp->value); 2665 SET_ANIMATION (op, op->value);
2410 update_object (tmp, UP_OBJ_FACE); 2666 update_object (op, UP_OBJ_FACE);
2411 push_button (tmp); 2667 push_button (op, who);
2412 return 1; 2668 return 1;
2413 2669
2414 case TRIGGER: 2670 case TRIGGER:
2415 if (check_trigger (tmp, op)) 2671 if (check_trigger (op, who, who))
2416 { 2672 {
2417 op->statusmsg ("You turn the handle."); 2673 who->statusmsg ("You turn the handle.");
2418 op->play_sound (sound_find ("turn_handle")); 2674 who->play_sound (sound_find ("turn_handle"));
2419 } 2675 }
2420 else 2676 else
2421 op->failmsg ("The handle doesn't move."); 2677 who->failmsg ("The handle doesn't move.");
2422 2678
2423 return 1; 2679 return 1;
2424 2680
2425 case EXIT: 2681 case EXIT:
2426 if (op->type != PLAYER) 2682 if (who->type != PLAYER)
2427 return 0; 2683 return 0;
2428 2684
2429 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2685 if (!EXIT_PATH (op))
2430 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2686 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)));
2431 else 2687 else
2432 { 2688 {
2433 /* Don't display messages for random maps. */ 2689 /* Don't display messages for random maps. */
2434 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2690 if (op->msg && EXIT_PATH (op) != shstr_random_map_exit)
2435 op->statusmsg (tmp->msg, NDI_NAVY); 2691 who->statusmsg (op->msg, NDI_NAVY);
2436 2692
2437 op->enter_exit (tmp); 2693 who->enter_exit (op);
2438 } 2694 }
2439 2695
2440 return 1; 2696 return 1;
2441 2697
2442 case INSCRIBABLE: 2698 case INSCRIBABLE:
2443 op->statusmsg (tmp->msg); 2699 who->statusmsg (op->msg);
2444 // maybe show a spell menu to chose from or something like that 2700 // maybe show a spell menu to chose from or something like that
2445 return 1; 2701 return 1;
2446 2702
2447 case SIGN: 2703 case SIGN:
2448 apply_sign (op, tmp, 0); 2704 apply_sign (who, op, 0);
2449 return 1; 2705 return 1;
2450 2706
2451 case BOOK: 2707 case BOOK:
2452 if (op->type == PLAYER) 2708 if (who->type == PLAYER)
2453 { 2709 {
2454 apply_book (op, tmp); 2710 apply_book (who, op);
2455 return 1; 2711 return 1;
2456 } 2712 }
2457 else 2713 else
2458 return 0; 2714 return 0;
2459 2715
2460 case SKILLSCROLL: 2716 case SKILLSCROLL:
2461 if (op->type == PLAYER) 2717 if (who->type == PLAYER)
2462 { 2718 {
2463 apply_skillscroll (op, tmp); 2719 apply_skillscroll (who, op);
2464 return 1; 2720 return 1;
2465 } 2721 }
2466 else 2722 else
2467 return 0; 2723 return 0;
2468 2724
2469 case SPELLBOOK: 2725 case SPELLBOOK:
2470 if (op->type == PLAYER) 2726 if (who->type == PLAYER)
2471 { 2727 {
2472 apply_spellbook (op, tmp); 2728 apply_spellbook (who, op);
2473 return 1; 2729 return 1;
2474 } 2730 }
2475 else 2731 else
2476 return 0; 2732 return 0;
2477 2733
2478 case SCROLL: 2734 case SCROLL:
2479 apply_scroll (op, tmp, 0); 2735 apply_scroll (who, op, 0);
2480 return 1; 2736 return 1;
2481 2737
2482 case POTION: 2738 case POTION:
2483 apply_potion (op, tmp); 2739 apply_potion (who, op);
2484 return 1; 2740 return 1;
2485 2741
2486 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2742 /* Eneq(@csd.uu.se): Handle apply on containers. */
2487 //TODO: remove, as it is unsed? 2743 //TODO: remove, as it is unsed?
2488 case CLOSE_CON: 2744 case CLOSE_CON:
2489 apply_container (op, tmp->env); 2745 apply_container (who, op->env);
2490 return 1; 2746 return 1;
2491 2747
2492 case CONTAINER: 2748 case CONTAINER:
2493 apply_container (op, tmp); 2749 apply_container (who, op);
2494 return 1; 2750 return 1;
2495 2751
2496 case TREASURE: 2752 case TREASURE:
2497 if (op->type == PLAYER) 2753 if (who->type == PLAYER)
2498 { 2754 {
2499 apply_treasure (op, tmp); 2755 apply_treasure (who, op);
2500 return 1; 2756 return 1;
2501 } 2757 }
2502 else 2758 else
2503 return 0; 2759 return 0;
2760
2761 case LAMP:
2762 case TORCH:
2763 player_apply_lamp (who, op);
2764 return 1;
2504 2765
2505 case WEAPON: 2766 case WEAPON:
2506 case ARMOUR: 2767 case ARMOUR:
2507 case BOOTS: 2768 case BOOTS:
2508 case GLOVES: 2769 case GLOVES:
… …
2516 case WAND: 2777 case WAND:
2517 case ROD: 2778 case ROD:
2518 case HORN: 2779 case HORN:
2519 case SKILL: 2780 case SKILL:
2520 case BOW: 2781 case BOW:
2521 case LAMP:
2522 case BUILDER: 2782 case BUILDER:
2523 case SKILL_TOOL: 2783 case SKILL_TOOL:
2524 if (tmp->env != op) 2784 if (op->env != who)
2525 return 2; /* not in inventory */ 2785 return 2; /* not in inventory */
2526 2786
2527 apply_special (op, tmp, aflag); 2787 apply_special (who, op, aflag);
2528 return 1; 2788 return 1;
2529 2789
2530 case DRINK: 2790 case DRINK:
2531 case FOOD: 2791 case FOOD:
2532 case FLESH: 2792 case FLESH:
2533 apply_food (op, tmp); 2793 apply_food (who, op);
2534 return 1; 2794 return 1;
2535 2795
2536 case POISON: 2796 case POISON:
2537 apply_poison (op, tmp); 2797 apply_poison (who, op);
2538 return 1; 2798 return 1;
2539 2799
2540 case SAVEBED: 2800 case SAVEBED:
2541 return 1; 2801 return 1;
2542 2802
2543 case ARMOUR_IMPROVER: 2803 case ARMOUR_IMPROVER:
2544 if (op->type == PLAYER) 2804 if (who->type == PLAYER)
2545 { 2805 {
2546 apply_armour_improver (op, tmp); 2806 apply_armour_improver (who, op);
2547 return 1; 2807 return 1;
2548 } 2808 }
2549 else 2809 else
2550 return 0; 2810 return 0;
2551 2811
2552 case WEAPON_IMPROVER: 2812 case WEAPON_IMPROVER:
2553 check_improve_weapon (op, tmp); 2813 check_improve_weapon (who, op);
2554 return 1; 2814 return 1;
2555 2815
2556 case CLOCK: 2816 case CLOCK:
2557 if (op->type == PLAYER) 2817 if (who->type == PLAYER)
2558 { 2818 {
2559 char buf[MAX_BUF]; 2819 char buf[MAX_BUF];
2560 timeofday_t tod; 2820 timeofday_t tod;
2561 2821
2562 get_tod (&tod); 2822 get_tod (&tod);
2563 op->play_sound (sound_find ("sound_clock")); 2823 who->play_sound (sound_find ("sound_clock"));
2564 op->statusmsg (format ( 2824 who->statusmsg (format (
2565 "It is %d minute%s past %d o'clock %s", 2825 "It is %d minute%s past %d o'clock %s",
2566 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2826 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2567 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2827 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2568 )); 2828 ));
2569 return 1; 2829 return 1;
2570 } 2830 }
2571 else 2831 else
2572 return 0; 2832 return 0;
2573 2833
2574 case MENU: 2834 case MENU:
2575 if (op->type == PLAYER) 2835 if (who->type == PLAYER)
2576 { 2836 {
2577 shop_listing (tmp, op); 2837 shop_listing (op, who);
2578 return 1; 2838 return 1;
2579 } 2839 }
2580 else 2840 else
2581 return 0; 2841 return 0;
2582 2842
2583 case POWER_CRYSTAL: 2843 case POWER_CRYSTAL:
2584 apply_power_crystal (op, tmp); /* see egoitem.c */ 2844 apply_power_crystal (who, op); /* see egoitem.c */
2585 return 1; 2845 return 1;
2586 2846
2587 case LIGHTER: /* for lighting torches/lanterns/etc */ 2847 case LIGHTER: /* for lighting torches/lanterns/etc */
2588 if (op->type == PLAYER) 2848 if (who->type == PLAYER)
2589 { 2849 {
2590 apply_lighter (op, tmp); 2850 apply_lighter (who, op);
2591 return 1; 2851 return 1;
2592 } 2852 }
2593 else 2853 else
2594 return 0; 2854 return 0;
2595 2855
2596 case ITEM_TRANSFORMER: 2856 case ITEM_TRANSFORMER:
2597 apply_item_transformer (op, tmp); 2857 apply_item_transformer (who, op);
2598 return 1; 2858 return 1;
2599 2859
2600 default: 2860 default:
2601 return 0; 2861 return 0;
2602 } 2862 }
… …
2654 * we don't use a corrupt pointer for the next object, so we get the 2914 * we don't use a corrupt pointer for the next object, so we get the
2655 * next object in the stack before applying. This is can only be a 2915 * next object in the stack before applying. This is can only be a
2656 * problem if player_apply() has a bug in that it uses the object but does 2916 * problem if player_apply() has a bug in that it uses the object but does
2657 * not return a proper value. 2917 * not return a proper value.
2658 */ 2918 */
2659 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next) 2919 for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next)
2660 { 2920 {
2661 next = tmp->below; 2921 next = tmp->below;
2662 2922
2663 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2923 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2664 floors++; 2924 floors++;
… …
2669 * person moving on it, also activate. Added code to make it 2929 * person moving on it, also activate. Added code to make it
2670 * so that at least one of players movement types be that which 2930 * so that at least one of players movement types be that which
2671 * the item needs. 2931 * the item needs.
2672 */ 2932 */
2673 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2933 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2674 {
2675 if (player_apply (pl, tmp, 0, 1) == 1) 2934 if (player_apply (pl, tmp, 0, 1) == 1)
2676 return; 2935 return;
2677 } 2936
2678 if (floors >= 2) 2937 if (floors >= 2)
2679 return; /* process at most two floor objects */ 2938 return; /* process at most two floor objects */
2680 } 2939 }
2681} 2940}
2682 2941
… …
2755 case CLOAK: 3014 case CLOAK:
2756 who->statusmsg (format ("You unwear %s.", query_name (op))); 3015 who->statusmsg (format ("You unwear %s.", query_name (op)));
2757 change_abil (who, op); 3016 change_abil (who, op);
2758 break; 3017 break;
2759 3018
2760 case LAMP:
2761 {
2762 who->statusmsg (format ("You turn off your %s.", &op->name));
2763
2764 object *tmp2 = arch_to_object (op->other_arch);
2765 tmp2->x = op->x;
2766 tmp2->y = op->y;
2767 tmp2->map = op->map;
2768 tmp2->below = op->below;
2769 tmp2->above = op->above;
2770 tmp2->stats.food = op->stats.food;
2771 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2772
2773 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2774 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2775
2776 op->destroy ();
2777 who->insert (tmp2);
2778 who->update_stats ();
2779
2780 if (who->contr)
2781 {
2782 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2783 {
2784 who->failmsg ("Oops, it feels deadly cold!");
2785 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2786 }
2787 }
2788 }
2789
2790 return 1; /* otherwise, an attempt to drop causes problems */
2791
2792 case BOW: 3019 case BOW:
2793 case WAND: 3020 case WAND:
2794 case ROD: 3021 case ROD:
2795 case HORN: 3022 case HORN:
2796 if (player *pl = who->contr) 3023 if (player *pl = who->contr)
… …
2875#define CANNOT_REMOVE_CURSED \ 3102#define CANNOT_REMOVE_CURSED \
2876 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \ 3103 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2877 "Praying over an altar, scrolls of remove curse/damnation, " \ 3104 "Praying over an altar, scrolls of remove curse/damnation, " \
2878 "priests or even other players might help.>" 3105 "priests or even other players might help.>"
2879 3106
2880int 3107static int
2881unapply_for_ob (object *who, object *op, int aflags) 3108unapply_for_ob (object *who, object *op, int aflags)
2882{ 3109{
2883 if (op->is_range ()) 3110 if (op->is_range ())
2884 for (object *tmp = who->inv; tmp; tmp = tmp->below) 3111 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2885 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ()) 3112 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
… …
3203 * skill so that the dam and wc get updated 3430 * skill so that the dam and wc get updated
3204 */ 3431 */
3205 who->change_skill (skop); 3432 who->change_skill (skop);
3206 } 3433 }
3207 3434
3208 if (who->type == PLAYER 3435 if (!check_item_power (who, op->item_power))
3209 && op->item_power
3210 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3211 { 3436 {
3212 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3437 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3213 return 1; 3438 return 1;
3214 } 3439 }
3215 3440
… …
3223 return RESULT_INT (0); 3448 return RESULT_INT (0);
3224 3449
3225 switch (op->type) 3450 switch (op->type)
3226 { 3451 {
3227 case WEAPON: 3452 case WEAPON:
3228 if (!check_weapon_power (who, op->last_eat))
3229 {
3230 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3231
3232 if (tmp)
3233 insert_ob_in_ob (tmp, who);
3234
3235 return 1;
3236 }
3237
3238 //TODO: this obviously fails for players using a shorter prefix 3453 //TODO: this obviously fails for players using a shorter prefix
3239 // i.e. "R" can use Ragnarok's sword. 3454 // i.e. "R" can use Ragnarok's sword.
3240 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3455 if (op->level && !op->name.starts_with (who->name))
3241 { 3456 {
3242 /* if the weapon does not have the name as the character, can't use it. */ 3457 /* if the weapon does not have the name as the character, can't use it. */
3243 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3458 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3244 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3459 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3245 3460
… …
3280 SET_FLAG (op, FLAG_APPLIED); 3495 SET_FLAG (op, FLAG_APPLIED);
3281 who->statusmsg (format ("You wear %s.", query_name (op))); 3496 who->statusmsg (format ("You wear %s.", query_name (op)));
3282 change_abil (who, op); 3497 change_abil (who, op);
3283 break; 3498 break;
3284 3499
3285 case LAMP:
3286 if (op->stats.food < 1)
3287 {
3288 who->failmsg (format (
3289 "Your %s is out of fuel! "
3290 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3291 &op->name
3292 ));
3293 return 1;
3294 }
3295
3296 who->statusmsg (format ("You turn on your %s.", &op->name));
3297
3298 tmp2 = arch_to_object (op->other_arch);
3299 tmp2->stats.food = op->stats.food;
3300 SET_FLAG (tmp2, FLAG_APPLIED);
3301
3302 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3303 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3304
3305 who->insert (tmp2);
3306
3307 /* Remove the old lantern */
3308 op->destroy ();
3309
3310 /* insert the portion that was split off */
3311 if (tmp)
3312 who->insert (tmp);
3313
3314 who->update_stats ();
3315
3316 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3317 if (who->type == PLAYER)
3318 {
3319 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3320 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3321 }
3322
3323 return 0;
3324
3325 case SKILL_TOOL: 3500 case SKILL_TOOL:
3326 // applying a skill tool also readies the skill 3501 // applying a skill tool also readies the skill
3327 SET_FLAG (op, FLAG_APPLIED); 3502 SET_FLAG (op, FLAG_APPLIED);
3328 3503
3329 if (!(aflags & AP_NO_READY)) 3504 if (!(aflags & AP_NO_READY))
… …
3337 case SKILL: 3512 case SKILL:
3338 if (player *pl = who->contr) 3513 if (player *pl = who->contr)
3339 { 3514 {
3340 if (IS_COMBAT_SKILL (op->subtype)) 3515 if (IS_COMBAT_SKILL (op->subtype))
3341 { 3516 {
3342 if (skill_flags [op->subtype] & SF_NEED_WEAPON) 3517 if (skill_flags [op->subtype] & SF_NEED_ITEM)
3343 { 3518 {
3344 for (object *item = who->inv; item; item = item->below) 3519 for (object *item = who->inv; item; item = item->below)
3345 if (item->type == WEAPON && item->flag [FLAG_APPLIED]) 3520 if (item->type == item->weapontype && item->flag [FLAG_APPLIED])
3346 { 3521 {
3347 if (item->skill == op->skill) 3522 if (item->skill == op->skill)
3348 { 3523 {
3349 who->change_weapon (pl->combat_ob = item); 3524 who->change_weapon (pl->combat_ob = item);
3350 goto found_weapon; 3525 goto found_weapon;
… …
3363 else 3538 else
3364 who->change_weapon (pl->combat_ob = op); 3539 who->change_weapon (pl->combat_ob = op);
3365 } 3540 }
3366 else if (IS_RANGED_SKILL (op->subtype)) 3541 else if (IS_RANGED_SKILL (op->subtype))
3367 { 3542 {
3368 if (skill_flags [op->subtype] & SF_NEED_BOW) 3543 if (skill_flags [op->subtype] & SF_NEED_ITEM)
3369 { 3544 {
3370 for (object *item = who->inv; item; item = item->below) 3545 for (object *item = who->inv; item; item = item->below)
3371 if (item->type == BOW && item->flag [FLAG_APPLIED]) 3546 if (item->type == item->weapontype && item->flag [FLAG_APPLIED])
3372 { 3547 {
3373 //TODO: bows should/must all have skill missile weapon right now 3548 //TODO: bows should/must all have skill missile weapon right now
3374 who->change_weapon (pl->ranged_ob = item); 3549 who->change_weapon (pl->ranged_ob = item);
3375 goto found_bow; 3550 goto found_bow;
3376 } 3551 }
… …
3408 } 3583 }
3409 3584
3410 break; 3585 break;
3411 3586
3412 case BOW: 3587 case BOW:
3413 if (!check_weapon_power (who, op->last_eat)) 3588 if (op->level && !op->name.starts_with (who->name))
3414 {
3415 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3416
3417 if (tmp)
3418 insert_ob_in_ob (tmp, who);
3419
3420 return 1;
3421 }
3422
3423 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3424 { 3589 {
3425 who->failmsg ("The weapon does not recognize you as its owner. " 3590 who->failmsg ("The weapon does not recognize you as its owner. "
3426 "H<Its name indicates that it belongs to somebody else.>"); 3591 "H<Its name indicates that it belongs to somebody else.>");
3427 if (tmp) 3592 if (tmp)
3428 insert_ob_in_ob (tmp, who); 3593 insert_ob_in_ob (tmp, who);
… …
3502 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3667 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3503 if (who->type == PLAYER) 3668 if (who->type == PLAYER)
3504 { 3669 {
3505 who->failmsg ( 3670 who->failmsg (
3506 "Oops, it feels deadly cold! " 3671 "Oops, it feels deadly cold! "
3507 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3672 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3508 ); 3673 );
3509 SET_FLAG (op, FLAG_KNOWN_CURSED); 3674 SET_FLAG (op, FLAG_KNOWN_CURSED);
3510 } 3675 }
3511 3676
3512 if (object *pl = op->visible_to ()) 3677 if (object *pl = op->visible_to ())
3513 esrv_send_item (pl, op); 3678 esrv_send_item (pl, op);
3514 3679
3515 return 0; 3680 return 0;
3516}
3517
3518int
3519monster_apply_special (object *who, object *op, int aflags)
3520{
3521 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3522 return 1;
3523
3524 return apply_special (who, op, aflags);
3525} 3681}
3526 3682
3527/** 3683/**
3528 * Map was just loaded, handle op's initialisation. 3684 * Map was just loaded, handle op's initialisation.
3529 * 3685 *
… …
3636 * treasure again for this object 3792 * treasure again for this object
3637 */ 3793 */
3638 invtmp->randomitems = NULL; 3794 invtmp->randomitems = NULL;
3639 } 3795 }
3640 } 3796 }
3797
3641 /* This is really temporary - the code at the bottom will 3798 /* This is really temporary - the code at the bottom will
3642 * also set randomitems to null. The problem is there are bunches 3799 * also set randomitems to null. The problem is there are bunches
3643 * of maps/players already out there with items that have spells 3800 * of maps/players already out there with items that have spells
3644 * which haven't had the randomitems set to null yet. 3801 * which haven't had the randomitems set to null yet.
3645 * MSW 2004-05-13 3802 * MSW 2004-05-13
… …
3649 * Ryo 2004-08-16 3806 * Ryo 2004-08-16
3650 */ 3807 */
3651 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3808 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3652 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3809 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3653 tmp->randomitems = NULL; 3810 tmp->randomitems = NULL;
3654
3655 } 3811 }
3656 3812
3657 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY)) 3813 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3658 auto_apply (tmp); 3814 auto_apply (tmp);
3659 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ()) 3815 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
… …
3692 } 3848 }
3693 3849
3694 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3850 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3695 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 3851 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3696 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3852 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3697 check_trigger (tmp, tmp->above); 3853 check_trigger (tmp, tmp->above, tmp->above);
3698} 3854}
3699 3855
3700/** 3856/**
3701 * Handles player eating food that temporarily changes status (resistances, stats). 3857 * Handles player eating food that temporarily changes status (resistances, stats).
3702 * This used to call cast_change_attr(), but 3858 * This used to call cast_change_attr(), but
… …
3707eat_special_food (object *who, object *food) 3863eat_special_food (object *who, object *food)
3708{ 3864{
3709 object *force; 3865 object *force;
3710 int i, did_one = 0; 3866 int i, did_one = 0;
3711 3867
3712 force = get_archetype (FORCE_NAME); 3868 char buf[64];
3869 snprintf (buf, sizeof(buf), "sp_food_%s", &food->title);
3870 shstr key (buf);
3713 3871
3714 for (i = 0; i < NUM_STATS; i++)
3715 if (sint8 k = food->stats.stat (i))
3716 {
3717 force->stats.stat (i) = k;
3718 did_one = 1;
3719 }
3720
3721 /* check if we can protect the eater */
3722 for (i = 0; i < NROFATTACKS; i++)
3723 {
3724 if (food->resist[i] > 0)
3725 {
3726 force->resist[i] = food->resist[i] / 2;
3727 did_one = 1;
3728 }
3729 }
3730
3731 if (did_one)
3732 {
3733 force->set_speed (0.1);
3734 /* bigger morsel of food = longer effect time */ 3872 /* bigger morsel of food = longer effect time */
3735 force->duration = food->stats.food / 5; 3873 int duration = TIME2TICK (food->stats.food);
3736 SET_FLAG (force, FLAG_APPLIED); 3874
3737 change_abil (who, force); 3875 if (force = who->force_find (key))
3738 insert_ob_in_ob (force, who); 3876 {
3877 if (duration > fabs (force->speed_left / force->speed))
3878 {
3879 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));
3880 force->force_set_timer (duration);
3881 }
3882 else
3883 new_draw_info (NDI_UNIQUE, 0, who, "It had no additional effect.");
3884
3885 return;
3739 } 3886 }
3740 else 3887 else
3888 {
3889 force = who->force_add (key, duration);
3890 force->name = key;
3891
3892 /* check if the food affects a stat */
3893 for (i = 0; i < NUM_STATS; i++)
3894 if (sint8 k = food->stats.stat (i))
3895 {
3896 force->stats.stat (i) = k;
3897 did_one = 1;
3898 }
3899
3900 /* check if we can protect the eater */
3901 for (i = 0; i < NROFATTACKS; i++)
3902 {
3903 if (food->resist[i] > 0)
3904 {
3905 force->resist[i] = food->resist[i];
3906 did_one = 1;
3907 }
3908 }
3909
3910 if (did_one)
3911 {
3912 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));
3913
3914 /* make the force take effect and report effects to user */
3915 change_abil (who, force);
3916 }
3917 else
3741 force->destroy (); 3918 force->destroy ();
3919 }
3742 3920
3743 /* check for hp, sp change */ 3921 /* check for hp, sp change */
3744 if (food->stats.hp != 0) 3922 if (food->stats.hp != 0)
3745 { 3923 {
3746 if (QUERY_FLAG (food, FLAG_CURSED)) 3924 if (QUERY_FLAG (food, FLAG_CURSED))
… …
3776 /* place limit on max sp from food? */ 3954 /* place limit on max sp from food? */
3777 } 3955 }
3778 } 3956 }
3779 3957
3780 who->update_stats (); 3958 who->update_stats ();
3781}
3782
3783/**
3784 * Designed primarily to light torches/lanterns/etc.
3785 * Also burns up burnable material too. First object in the inventory is
3786 * the selected object to "burn". -b.t.
3787 */
3788void
3789apply_lighter (object *who, object *lighter)
3790{
3791 object *item;
3792 int is_player_env = 0;
3793
3794 item = find_marked_object (who);
3795 if (item)
3796 {
3797 if (lighter->last_eat && lighter->stats.food)
3798 { /* lighter gets used up */
3799 object *oneLighter = lighter->split ();
3800 oneLighter->stats.food--;
3801 who->insert (oneLighter);
3802 }
3803 else if (lighter->last_eat)
3804 {
3805 /* no charges left in lighter */
3806 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3807 return;
3808 }
3809
3810 /* Perhaps we should split what we are trying to light on fire?
3811 * I can't see many times when you would want to light multiple
3812 * objects at once.
3813 */
3814
3815 if (who == item->in_player ())
3816 is_player_env = 1;
3817
3818 save_throw_object (item, AT_FIRE, who);
3819
3820 if (item->destroyed ())
3821 {
3822 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3823 /* Need to update the player so that the players glow radius
3824 * gets changed.
3825 */
3826 if (is_player_env)
3827 who->update_stats ();
3828 }
3829 else
3830 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3831 }
3832 else
3833 who->failmsg ("You need to mark a lightable object.");
3834}
3835
3836/**
3837 * op made some mistake with a scroll, this takes care of punishment.
3838 * scroll_failure()- hacked directly from spell_failure
3839 */
3840void
3841scroll_failure (object *op, int failure, int power)
3842{
3843 if (abs (failure / 4) > power)
3844 power = abs (failure / 4); /* set minimum effect */
3845
3846 if (failure <= -1 && failure > -15)
3847 { /* wonder */
3848 object *tmp;
3849
3850 op->failmsg ("Your spell warps!");
3851 tmp = get_archetype (SPELL_WONDER);
3852 cast_wonder (op, op, 0, tmp);
3853 tmp->destroy ();
3854 }
3855 else if (failure <= -15 && failure > -35)
3856 { /* drain mana */
3857 op->failmsg ("Your mana is drained!");
3858 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
3859 if (op->stats.sp < 0)
3860 op->stats.sp = 0;
3861 }
3862 else if (settings.spell_failure_effects == TRUE)
3863 {
3864 if (failure <= -35 && failure > -60)
3865 { /* confusion */
3866 op->failmsg ("The magic recoils on you!");
3867 confuse_player (op, op, power);
3868 }
3869 else if (failure <= -60 && failure > -70)
3870 { /* paralysis */
3871 op->failmsg ("The magic recoils and paralyzes you!");
3872 paralyze_player (op, op, power);
3873 }
3874 else if (failure <= -70 && failure > -80)
3875 { /* blind */
3876 op->failmsg ("The magic recoils on you!");
3877 blind_player (op, op, power);
3878 }
3879 else if (failure <= -80)
3880 { /* blast the immediate area */
3881 object *tmp = get_archetype (LOOSE_MANA);
3882 cast_magic_storm (op, tmp, power);
3883 op->failmsg ("You unleash uncontrolled mana!");
3884 tmp->destroy ();
3885 }
3886 }
3887} 3959}
3888 3960
3889void 3961void
3890apply_changes_to_player (object *pl, object *change) 3962apply_changes_to_player (object *pl, object *change)
3891{ 3963{
… …
3939 } 4011 }
3940 4012
3941 /* insert the randomitems from the change's treasurelist into 4013 /* insert the randomitems from the change's treasurelist into
3942 * the player ref: player.c 4014 * the player ref: player.c
3943 */ 4015 */
3944 if (change->randomitems != NULL) 4016 if (change->randomitems)
3945 give_initial_items (pl, change->randomitems); 4017 give_initial_items (pl, change->randomitems);
3946 4018
3947 /* set up the face, for some races. */ 4019 /* set up the face, for some races. */
3948 4020
3949 /* first, look for the force object banning 4021 /* first, look for the force object banning
3950 * changing the face. Certain races never change face with class. 4022 * changing the face. Certain races never change face with class.
3951 */ 4023 */
3952 for (walk = pl->inv; walk != NULL; walk = walk->below) 4024 for (walk = pl->inv; walk; walk = walk->below)
3953 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4025 if (walk->name == shstr_NOCLASSFACECHANGE)
3954 flag_change_face = 0; 4026 flag_change_face = 0;
3955 4027
3956 if (flag_change_face) 4028 if (flag_change_face)
3957 { 4029 {
3958 pl->face = change->face; 4030 pl->face = change->face;
… …
3960 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE]; 4032 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3961 } 4033 }
3962 4034
3963 /* check the special case of can't use weapons */ 4035 /* check the special case of can't use weapons */
3964 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4036 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3965 if (!strcmp (change->name, "monk")) 4037 if (change->name == shstr_monk)
3966 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4038 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
3967 4039
3968 break; 4040 break;
3969 } 4041 }
3970 } 4042 }
3971} 4043}
3972 4044
3973/**
3974 * This handles items of type 'transformer'.
3975 * Basically those items, used with a marked item, transform both items into something
3976 * else.
3977 * "Transformer" item has food decreased by 1, removed if 0 (0 at start means illimited)..
3978 * Change information is contained in the 'slaying' field of the marked item.
3979 * The format is as follow: transformer:[number ]yield[;transformer:...].
3980 * This way an item can be transformed in many things, and/or many objects.
3981 * The 'slaying' field for transformer is used as verb for the action.
3982 */
3983void
3984apply_item_transformer (object *pl, object *transformer)
3985{
3986 object *marked;
3987 object *new_item;
3988 char *find;
3989 char *separator;
3990 int yield;
3991 char got[MAX_BUF];
3992 int len;
3993
3994 if (!pl || !transformer)
3995 return;
3996
3997 marked = find_marked_object (pl);
3998
3999 if (!marked)
4000 {
4001 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
4002 return;
4003 }
4004
4005 if (!marked->slaying)
4006 {
4007 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4008 return;
4009 }
4010
4011 /* check whether they are compatible or not */
4012 find = strstr (marked->slaying, transformer->arch->archname);
4013 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4014 {
4015 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4016 return;
4017 }
4018
4019 find += strlen (transformer->arch->archname) + 1;
4020 /* Item can be used, now find how many and what it yields */
4021 if (isdigit (*(find)))
4022 {
4023 yield = atoi (find);
4024 if (yield < 1)
4025 {
4026 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
4027 yield = 1;
4028 }
4029 }
4030 else
4031 yield = 1;
4032
4033 while (isdigit (*find))
4034 find++;
4035
4036 while (*find == ' ')
4037 find++;
4038
4039 memset (got, 0, MAX_BUF);
4040
4041 if ((separator = strchr (find, ';')) != NULL)
4042 len = separator - find;
4043 else
4044 len = strlen (find);
4045
4046 if (len > MAX_BUF - 1)
4047 len = MAX_BUF - 1;
4048
4049 strcpy (got, find);
4050 got[len] = '\0';
4051
4052 /* Now create new item, remove used ones when required. */
4053 new_item = get_archetype (got);
4054 if (!new_item)
4055 {
4056 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
4057 return;
4058 }
4059
4060 new_item->nrof = yield;
4061
4062 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4063
4064 pl->insert (new_item);
4065 /* Eat up one item */
4066 marked->decrease ();
4067
4068 /* Eat one transformer if needed */
4069 if (transformer->stats.food)
4070 if (--transformer->stats.food == 0)
4071 transformer->decrease ();
4072}
4073

Diff Legend

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