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.133 by root, Thu Sep 27 01:25:05 2007 UTC vs.
Revision 1.172 by root, Mon Sep 29 10:32:50 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
… …
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <cmath> 24#include <cmath>
25 25
26#include <global.h> 26#include <global.h>
… …
53 * subtype 5: arch or race 53 * subtype 5: arch or race
54 * subtype 7: all three 54 * subtype 7: all three
55 */ 55 */
56 if (op->subtype) 56 if (op->subtype)
57 { 57 {
58 arch_flag = (op->subtype & 1); 58 arch_flag = op->subtype & 1;
59 name_flag = (op->subtype & 2); 59 name_flag = op->subtype & 2;
60 race_flag = (op->subtype & 4); 60 race_flag = op->subtype & 4;
61 } 61 }
62 else 62 else
63 { 63 {
64 arch_flag = 1; 64 arch_flag = 1;
65 name_flag = 1; 65 name_flag = 1;
… …
113 { 113 {
114 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
115 { 115 {
116 identify (marked); 116 identify (marked);
117 117
118 buf.printf ("You have %s.\n\n", long_desc (marked, pl)); 118 buf.printf ("You have %s.\r", long_desc (marked, pl));
119 if (marked->msg) 119 if (marked->msg)
120 buf << "The item has a story:\n\n" << marked->msg << "\n\n"; 120 buf << "The item has a story:\r" << marked->msg << "\n\n";
121 121
122 return !money; 122 return !money;
123 } 123 }
124 } 124 }
125 125
… …
129 { 129 {
130 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
131 { 131 {
132 identify (id); 132 identify (id);
133 133
134 buf.printf ("You have %s.\n\n", long_desc (id, pl)); 134 buf.printf ("You have %s.\r", long_desc (id, pl));
135 if (id->msg) 135 if (id->msg)
136 buf << "The item has a story:\n\n" << id->msg << "\n\n"; 136 buf << "The item has a story:\r" << id->msg << "\n\n";
137 137
138 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
139 if (!money || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
140 break; 140 break;
141 } 141 }
… …
160 * matching item. 160 * matching item.
161 **/ 161 **/
162void 162void
163handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
164{ 164{
165 const char *yield; 165 if (shstr yield = tmp->kv (shstr_on_use_yield))
166 166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167 yield = get_ob_key_value (tmp, "on_use_yield");
168 if (yield != NULL)
169 {
170 object *drop = get_archetype (yield);
171
172 if (tmp->env)
173 {
174 drop = insert_ob_in_ob (drop, tmp->env);
175 if (tmp->env->type == PLAYER)
176 esrv_send_item (tmp->env, drop);
177 }
178 else
179 {
180 drop->x = tmp->x;
181 drop->y = tmp->y;
182 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
183 }
184 }
185} 167}
186 168
187/** 169/**
188 * Handles applying a potion. 170 * Handles applying a potion.
189 */ 171 */
… …
217 199
218 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 200 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
219 { 201 {
220 op->drain_stat (); 202 op->drain_stat ();
221 op->update_stats (); 203 op->update_stats ();
222 decrease_ob (tmp); 204 tmp->decrease ();
223 return 1; 205 return 1;
224 } 206 }
225 207
226 if (!(at = archetype::find (ARCH_DEPLETION))) 208 if (!(at = archetype::find (ARCH_DEPLETION)))
227 { 209 {
228 LOG (llevError, "Could not find archetype depletion\n"); 210 LOG (llevError, "Could not find archetype depletion\n");
229 return 0; 211 return 0;
230 } 212 }
213
231 depl = present_arch_in_ob (at, op); 214 depl = present_arch_in_ob (at, op);
232 215
233 if (depl) 216 if (depl)
234 { 217 {
235 for (i = 0; i < NUM_STATS; i++) 218 for (i = 0; i < NUM_STATS; i++)
… …
240 op->update_stats (); 223 op->update_stats ();
241 } 224 }
242 else 225 else
243 op->statusmsg ("Your potion had no effect."); 226 op->statusmsg ("Your potion had no effect.");
244 227
245 decrease_ob (tmp); 228 tmp->decrease ();
246 return 1; 229 return 1;
247 } 230 }
248 231
249 /* improvement potion - only for players */ 232 /* improvement potion - only for players */
250 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER)) 233 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
… …
318 } 301 }
319 else 302 else
320 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE); 303 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
321 } 304 }
322 305
323 decrease_ob (tmp); 306 tmp->decrease ();
324 return 1; 307 return 1;
325 } 308 }
326 309
327 310
328 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 311 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
347 insert_ob_in_map (fball, op->map, NULL, 0); 330 insert_ob_in_map (fball, op->map, NULL, 0);
348 } 331 }
349 else 332 else
350 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 333 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
351 334
352 decrease_ob (tmp); 335 tmp->decrease ();
353 336
354 /* if youre dead, no point in doing this... */ 337 /* if youre dead, no point in doing this... */
355 if (!QUERY_FLAG (op, FLAG_REMOVED)) 338 if (!QUERY_FLAG (op, FLAG_REMOVED))
356 op->update_stats (); 339 op->update_stats ();
357 340
… …
388 force->speed_left = -1; 371 force->speed_left = -1;
389 force = insert_ob_in_ob (force, op); 372 force = insert_ob_in_ob (force, op);
390 CLEAR_FLAG (tmp, FLAG_APPLIED); 373 CLEAR_FLAG (tmp, FLAG_APPLIED);
391 SET_FLAG (force, FLAG_APPLIED); 374 SET_FLAG (force, FLAG_APPLIED);
392 change_abil (op, force); 375 change_abil (op, force);
393 decrease_ob (tmp); 376 tmp->decrease ();
394 return 1; 377 return 1;
395 } 378 }
396 379
397 /* Only thing left are the stat potions */ 380 /* Only thing left are the stat potions */
398 if (op->type == PLAYER) 381 if (op->type == PLAYER)
… …
411 * stat will not be raised by them. fix_player just clears 394 * stat will not be raised by them. fix_player just clears
412 * up all the stats. 395 * up all the stats.
413 */ 396 */
414 CLEAR_FLAG (tmp, FLAG_APPLIED); 397 CLEAR_FLAG (tmp, FLAG_APPLIED);
415 op->update_stats (); 398 op->update_stats ();
416 decrease_ob (tmp); 399 tmp->decrease ();
417 return 1; 400 return 1;
418} 401}
419 402
420/**************************************************************************** 403/****************************************************************************
421 * Weapon improvement code follows 404 * Weapon improvement code follows
… …
468 { 451 {
469 if (strcmp (op->arch->archname, item) == 0) 452 if (strcmp (op->arch->archname, item) == 0)
470 { 453 {
471 if (op->nrof >= nrof) 454 if (op->nrof >= nrof)
472 { 455 {
473 decrease_ob_nr (op, nrof); 456 op->decrease (nrof);
474 return; 457 return;
475 } 458 }
476 else 459 else
477 { 460 {
478 decrease_ob_nr (op, op->nrof); 461 op->decrease (nrof);
479 nrof -= op->nrof; 462 nrof -= op->nrof;
480 } 463 }
481 464
482 op = prev; 465 op = prev;
483 } 466 }
… …
568static int 551static int
569improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname) 552improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
570{ 553{
571 stat += sacrifice_count; 554 stat += sacrifice_count;
572 weapon->last_eat++; 555 weapon->last_eat++;
573 decrease_ob (improver); 556 improver->decrease ();
574 557
575 /* So it updates the players stats and the window */ 558 /* So it updates the players stats and the window */
576 op->update_stats (); 559 op->update_stats ();
577 560
578 op->statusmsg (format ( 561 op->statusmsg (format (
… …
625 weapon->stats.exp || /* speed */ 608 weapon->stats.exp || /* speed */
626 weapon->stats.ac) /* AC - only taifu's I think */ 609 weapon->stats.ac) /* AC - only taifu's I think */
627 { 610 {
628 op->failmsg ("You cannot prepare magic weapons. " 611 op->failmsg ("You cannot prepare magic weapons. "
629 "H<A weapon is considered magical if it changes regeneration, " 612 "H<A weapon is considered magical if it changes regeneration, "
630 "speed or ac.>"); 613 "speed or ac, or has other protections.>");
631 return 0; 614 return 0;
632 } 615 }
633 616
634 sacrifice_count = check_sacrifice (op, improver); 617 sacrifice_count = check_sacrifice (op, improver);
635 if (sacrifice_count <= 0) 618 if (sacrifice_count <= 0)
… …
646 629
647 sprintf (buf, "%s's %s", &op->name, &weapon->name); 630 sprintf (buf, "%s's %s", &op->name, &weapon->name);
648 weapon->name = weapon->name_pl = buf; 631 weapon->name = weapon->name_pl = buf;
649 weapon->nrof = 0; /* prevents preparing n weapons in the same 632 weapon->nrof = 0; /* prevents preparing n weapons in the same
650 slot at once! */ 633 slot at once! */
651 decrease_ob (improver); 634 improver->decrease ();
652 weapon->last_eat = 0; 635 weapon->last_eat = 0;
653 return 1; 636 return 1;
654} 637}
655
656 638
657/** 639/**
658 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 640 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
659 * This is the new improve weapon code. 641 * This is the new improve weapon code.
660 * Returns 0 if it was not able to work for some reason. 642 * Returns 0 if it was not able to work for some reason.
… …
704 weapon->weight += 5000; /* 5 KG's */ 686 weapon->weight += 5000; /* 5 KG's */
705 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam)); 687 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
706 weapon->last_eat++; 688 weapon->last_eat++;
707 689
708 weapon->item_power++; 690 weapon->item_power++;
709 decrease_ob (improver); 691 improver->decrease ();
710 return 1; 692 return 1;
711 } 693 }
712 694
713 if (improver->stats.sp == IMPROVE_WEIGHT) 695 if (improver->stats.sp == IMPROVE_WEIGHT)
714 { 696 {
… …
718 weapon->weight = 1; 700 weapon->weight = 1;
719 701
720 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0)); 702 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
721 weapon->last_eat++; 703 weapon->last_eat++;
722 weapon->item_power++; 704 weapon->item_power++;
723 decrease_ob (improver); 705 improver->decrease ();
724 return 1; 706 return 1;
725 } 707 }
708
726 if (improver->stats.sp == IMPROVE_ENCHANT) 709 if (improver->stats.sp == IMPROVE_ENCHANT)
727 { 710 {
728 weapon->magic++; 711 weapon->magic++;
729 weapon->last_eat++; 712 weapon->last_eat++;
730 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 713 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
731 decrease_ob (improver); 714 improver->decrease ();
732 weapon->item_power++; 715 weapon->item_power++;
733 return 1; 716 return 1;
734 } 717 }
735 718
736 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
785 op->failmsg ("Something blocks the magic of the scroll!"); 768 op->failmsg ("Something blocks the magic of the scroll!");
786 return 0; 769 return 0;
787 } 770 }
788 771
789 otmp = find_marked_object (op); 772 otmp = find_marked_object (op);
773
790 if (!otmp) 774 if (!otmp)
791 { 775 {
792 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>"); 776 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
793 return 0; 777 return 0;
794 } 778 }
… …
836 if (armour->magic >= settings.armor_max_enchant) 820 if (armour->magic >= settings.armor_max_enchant)
837 { 821 {
838 op->failmsg ("This armour can not be enchanted any further!"); 822 op->failmsg ("This armour can not be enchanted any further!");
839 return 0; 823 return 0;
840 } 824 }
825
841 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 826 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
842 * etc), so take the easy way out and don't worry about it. 827 * etc), so take the easy way out and don't worry about it.
843 * Note - maybe add scrolls which make the random artifact versions (eg, armour 828 * Note - maybe add scrolls which make the random artifact versions (eg, armour
844 * of gnarg and what not?) 829 * of gnarg and what not?)
845 */ 830 */
… …
847 { 832 {
848 op->failmsg ("This armour will not accept further enchantment."); 833 op->failmsg ("This armour will not accept further enchantment.");
849 return 0; 834 return 0;
850 } 835 }
851 836
852 /* Split objects if needed. Can't insert tmp until the 837 /* Split objects if needed. Can't insert tmp until the
853 * end of this function - otherwise it will just re-merge. 838 * end of this function - otherwise it will just re-merge.
854 */ 839 */
855 if (armour->nrof > 1) 840 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
856 tmp = get_split_ob (armour, armour->nrof - 1);
857 else
858 tmp = NULL;
859 841
860 armour->magic++; 842 armour->magic++;
861 843
862 if (!settings.armor_speed_linear) 844 if (!settings.armor_speed_linear)
863 { 845 {
… …
900 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 882 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
901 883
902 if (op->type == PLAYER) 884 if (op->type == PLAYER)
903 { 885 {
904 esrv_send_item (op, armour); 886 esrv_send_item (op, armour);
887
905 if (QUERY_FLAG (armour, FLAG_APPLIED)) 888 if (QUERY_FLAG (armour, FLAG_APPLIED))
906 op->update_stats (); 889 op->update_stats ();
907 } 890 }
908 891
909 decrease_ob (improver); 892 improver->decrease ();
910 893
911 if (tmp) 894 if (tmp)
912 { 895 op->insert (tmp);
913 insert_ob_in_ob (tmp, op);
914 esrv_send_item (op, tmp);
915 }
916 896
917 return 1; 897 return 1;
918} 898}
919 899
920/* 900/*
921 * convert_item() returns 1 if anything was converted, 0 if the item was not 901 * convert_item() returns 1 if anything was converted, 0 if the item was not
922 * what the converter wants, -1 if the converter is broken. 902 * what the converter wants, -1 if the converter is broken.
923 */ 903 *
924#define CONV_FROM(xyz) xyz->slaying
925#define CONV_TO(xyz) xyz->other_arch
926#define CONV_NR(xyz) xyz->stats.sp
927#define CONV_NEED(xyz) xyz->stats.food
928
929/* Takes one items and makes another. 904 * Takes one type of items and makes another.
930 * converter is the object that is doing the conversion. 905 * converter is the object that is doing the conversion.
931 * item is the object that triggered the converter - if it is not 906 * item is the object that triggered the converter - if it is not
932 * what the converter wants, this will not do anything. 907 * what the converter wants, this will not do anything.
933 */ 908 */
934int 909static int
935convert_item (object *item, object *converter) 910convert_item (object *item, object *converter)
936{ 911{
937 int nr = 0;
938 uint32 price_in; 912 sint64 nr, price_in;
913
914 if (item->flag [FLAG_UNPAID])
915 return 0;
916
917 shstr conv_from = converter->slaying;
918 archetype *conv_to = converter->other_arch;
919 sint64 need = converter->stats.food;
920 sint64 give = converter->stats.sp;
939 921
940 /* We make some assumptions - we assume if it takes money as it type, 922 /* We make some assumptions - we assume if it takes money as it type,
941 * it wants some amount. We don't make change (ie, if something costs 923 * it wants some amount. We don't make change (ie, if something costs
942 * 3 gp and player drops a platinum, tough luck) 924 * 3 gp and player drops a platinum, tough luck)
943 */ 925 */
944 if (CONV_FROM (converter) == shstr_money) 926 if (conv_from == shstr_money)
945 { 927 {
946 if (item->type != MONEY) 928 if (item->type != MONEY)
947 return 0; 929 return 0;
948 930
949 nr = (item->nrof * item->value) / CONV_NEED (converter); 931 nr = sint64 (item->nrof) * item->value / need;
950 if (!nr) 932 if (!nr)
951 return 0; 933 return 0;
952 934
953 converter->play_sound (sound_find ("shop_buy")); 935 converter->play_sound (sound_find ("shop_buy"));
954 936
955 int cost = nr * CONV_NEED (converter) / item->value; 937 sint64 cost = (nr * need + item->value - 1) / item->value;
956 /* take into account rounding errors */
957 if (nr * CONV_NEED (converter) % item->value)
958 cost++;
959 938
960 decrease_ob_nr (item, cost); 939 item->decrease (cost);
961 940
962 price_in = cost * item->value; 941 price_in = cost * item->value;
963 } 942 }
964 else 943 else
965 { 944 {
966 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 945 if (item->type == PLAYER
967 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 946 || conv_from != item->arch->archname
947 || (need && need > (uint16) item->nrof))
968 return 0; 948 return 0;
969 949
970 converter->play_sound (sound_find ("convert_item")); 950 converter->play_sound (sound_find ("convert_item"));
971 951
972 if (CONV_NEED (converter)) 952 if (need)
973 { 953 {
974 nr = item->nrof / CONV_NEED (converter); 954 nr = sint64 (item->nrof) / need;
975 decrease_ob_nr (item, nr * CONV_NEED (converter)); 955 item->decrease (nr * need);
976 price_in = nr * CONV_NEED (converter) * item->value; 956 price_in = nr * need * item->value;
977 } 957 }
978 else 958 else
979 { 959 {
980 price_in = item->value; 960 price_in = item->value;
981 item->destroy (); 961 item->destroy ();
… …
992 ob_to_copy = converter->inv; 972 ob_to_copy = converter->inv;
993 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++) 973 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
994 if (rndm (0, i) == 0) 974 if (rndm (0, i) == 0)
995 ob_to_copy = ob; 975 ob_to_copy = ob;
996 976
997 item = object_create_clone (ob_to_copy); 977 item = ob_to_copy->deep_clone ();
998 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
999 unflag_inv (item, FLAG_IS_A_TEMPLATE); 979 unflag_inv (item, FLAG_IS_A_TEMPLATE);
1000 } 980 }
1001 else 981 else
1002 { 982 {
1003 if (converter->other_arch == NULL) 983 if (!conv_to)
1004 { 984 {
1005 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 985 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
1006 &converter->name, &converter->map->path, converter->x, converter->y); 986 &converter->name, &converter->map->path, converter->x, converter->y);
1007 return -1; 987 return -1;
1008 } 988 }
1009 989
1010 item = object_create_arch (converter->other_arch); 990 item = object_create_arch (conv_to);
1011 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1012 } 992 }
1013 993
1014 if (CONV_NR (converter)) 994 if (give)
1015 item->nrof = CONV_NR (converter); 995 item->nrof = give;
1016 996
1017 if (nr) 997 if (nr)
1018 item->nrof *= nr; 998 item->nrof *= nr;
1019 999
1020 if (is_in_shop (converter)) 1000 if (is_in_shop (converter))
1021 SET_FLAG (item, FLAG_UNPAID); 1001 SET_FLAG (item, FLAG_UNPAID);
1022 else if (price_in < item->nrof * item->value) 1002 else if (price_in < sint64 (item->nrof) * item->value)
1023 { 1003 {
1024 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1004 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1025 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1005 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1026 /** 1006 /**
1027 * elmex: we are going to let the game continue, as the mapcreator 1007 * elmex: we are going to let the game continue, as the mapcreator
1028 * hopefully had something in mind when doing this. 1008 * hopefully had something in mind when doing this.
1029 */ 1009 */
1030 } 1010 }
1031 1011
1032 SET_FLAG (item, FLAG_IDENTIFIED); 1012 // elmex: only identify if we need to, for example so that generated money doesn't
1013 // get an 'identified' flag so easily.
1014 if (need_identify (item))
1015 identify (item);
1016
1033 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1017 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1034 return 1; 1018 return 1;
1035} 1019}
1036 1020
1037/** 1021/**
… …
1276 * Handles applying a sign. 1260 * Handles applying a sign.
1277 */ 1261 */
1278static void 1262static void
1279apply_sign (object *op, object *sign, int autoapply) 1263apply_sign (object *op, object *sign, int autoapply)
1280{ 1264{
1281 readable_message_type *msgType; 1265 if (sign->has_dialogue ())
1266 {
1267 op->statusmsg (form ("Maybe you should I<talk> to the %s instead?", &sign->name));
1268 return;
1269 }
1282 1270
1283 if (!sign->msg) 1271 if (!sign->msg)
1284 { 1272 {
1285 op->statusmsg ("Nothing is written on it."); 1273 op->statusmsg ("Nothing is written on it.");
1286 return; 1274 return;
… …
1312 } 1300 }
1313 1301
1314 if (op->contr) 1302 if (op->contr)
1315 if (client *ns = op->contr->ns) 1303 if (client *ns = op->contr->ns)
1316 { 1304 {
1305 if (sign->sound)
1317 ns->play_sound (sign->sound); 1306 ns->play_sound (sign->sound);
1307 else if (autoapply)
1308 ns->play_sound (sound_find ("msg_voice"));
1318 1309
1319 if (ns->can_msg) 1310 if (ns->can_msg)
1320 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1311 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1321 else 1312 else
1322 { 1313 {
1323 msgType = get_readable_message_type (sign); 1314 readable_message_type *msgType = get_readable_message_type (sign);
1324 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg); 1315 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); 1316 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1326 } 1317 }
1327 } 1318 }
1319}
1320
1321static void
1322move_apply_hole (object *trap, object *victim)
1323{
1324 /* Hole not open? */
1325 if (trap->stats.wc > 0)
1326 return;
1327
1328 /* Is this a multipart monster and not the head? If so, return.
1329 * Processing will happen if the head runs into the pit
1330 */
1331 if (victim->head)
1332 return;
1333
1334 // now find all possible locations and randomly pick one
1335 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1336 trap->range >= 3 ? SIZEOFFREE3 + 1
1337 : trap->range >= 2 ? SIZEOFFREE2 + 1
1338 : trap->range >= 1 ? SIZEOFFREE1 + 1
1339 : SIZEOFFREE0 + 1);
1340
1341 if (dir < 0)
1342 return;
1343
1344 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1345 victim->statusmsg ("You fall through the hole!", NDI_RED);
1346
1347 transfer_ob (victim,
1348 EXIT_X (trap) + freearr_x[dir],
1349 EXIT_Y (trap) + freearr_y[dir],
1350 0, victim);
1328} 1351}
1329 1352
1330/** 1353/**
1331 * 'victim' moves onto 'trap' 1354 * 'victim' moves onto 'trap'
1332 * 'victim' leaves 'trap' 1355 * 'victim' leaves 'trap'
… …
1444 1467
1445 if (!trap->value) 1468 if (!trap->value)
1446 { 1469 {
1447 int tot; 1470 int tot;
1448 1471
1449 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1472 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1450 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1473 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1451 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1474 tot += ab->head_ ()->total_weight ();
1452 1475
1453 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1476 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1454 goto leave; 1477 goto leave;
1455 1478
1456 SET_ANIMATION (trap, trap->value); 1479 SET_ANIMATION (trap, trap->value);
… …
1481 1504
1482 case CONVERTER: 1505 case CONVERTER:
1483 if (convert_item (victim, trap) < 0) 1506 if (convert_item (victim, trap) < 0)
1484 { 1507 {
1485 originator->failmsg (format ("The %s seems to be broken!", query_name (trap))); 1508 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1486 get_archetype ("burnout")->insert_at (trap, trap); 1509 archetype::get (shstr_burnout)->insert_at (trap, trap);
1487 } 1510 }
1488 1511
1489 goto leave; 1512 goto leave;
1490 1513
1491 case TRIGGER_BUTTON: 1514 case TRIGGER_BUTTON:
… …
1501 case CHECK_INV: 1524 case CHECK_INV:
1502 check_inv (victim, trap); 1525 check_inv (victim, trap);
1503 goto leave; 1526 goto leave;
1504 1527
1505 case HOLE: 1528 case HOLE:
1506 /* Hole not open? */ 1529 move_apply_hole (trap, victim);
1507 if (trap->stats.wc > 0)
1508 goto leave;
1509
1510 /* Is this a multipart monster and not the head? If so, return.
1511 * Processing will happen if the head runs into the pit
1512 */
1513 if (victim->head)
1514 goto leave;
1515
1516 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1517 victim->statusmsg ("You fall through the hole!", NDI_RED);
1518 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1519 goto leave; 1530 goto leave;
1520 1531
1521 case EXIT: 1532 case EXIT:
1522 if (victim->type == PLAYER && EXIT_PATH (trap)) 1533 if (victim->type == PLAYER && EXIT_PATH (trap))
1523 { 1534 {
… …
1602 } 1613 }
1603 1614
1604 lev_diff = tmp->level - (skill_ob->level + 5); 1615 lev_diff = tmp->level - (skill_ob->level + 5);
1605 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1616 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1606 { 1617 {
1607 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension." 1618 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1608 : lev_diff < 3 ? "This book is slightly beyond your comprehension." 1619 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1609 : lev_diff < 5 ? "This book is beyond your comprehension." 1620 : lev_diff < 5 ? "This book is beyond your comprehension."
1610 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension." 1621 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1611 : lev_diff < 15 ? "This book is way beyond your comprehension." 1622 : lev_diff < 15 ? "This book is way beyond your comprehension."
1612 : "This book is totally beyond your comprehension."); 1623 : "This book is totally beyond your comprehension.");
… …
1616 readable_message_type *msgType = get_readable_message_type (tmp); 1627 readable_message_type *msgType = get_readable_message_type (tmp);
1617 1628
1618 if (player *pl = op->contr) 1629 if (player *pl = op->contr)
1619 if (client *ns = pl->ns) 1630 if (client *ns = pl->ns)
1620 if (ns->can_msg) 1631 if (ns->can_msg)
1621 { 1632 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1622 dynbuf_text buf;
1623 buf << long_desc (tmp, op)
1624 << "\n\n"
1625 << tmp->msg
1626 << '\0';
1627 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1628 }
1629 else 1633 else
1630 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1634 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1631 msgType->message_type, msgType->message_subtype, 1635 msgType->message_type, msgType->message_subtype,
1632 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1636 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1633 long_desc (tmp, op), &tmp->msg); 1637 long_desc (tmp, op), &tmp->msg);
… …
1640 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1644 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1641 { 1645 {
1642 /*exp_gain *= 2; because they just identified it too */ 1646 /*exp_gain *= 2; because they just identified it too */
1643 SET_FLAG (tmp, FLAG_IDENTIFIED); 1647 SET_FLAG (tmp, FLAG_IDENTIFIED);
1644 1648
1645 /* If in a container, update how it looks */ 1649 if (object *pl = tmp->visible_to ())
1646 if (tmp->env)
1647 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1650 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1648 else
1649 op->contr->ns->floorbox_update ();
1650 } 1651 }
1651 1652
1652 change_exp (op, exp_gain, skill_ob->skill, 0); 1653 change_exp (op, exp_gain, skill_ob->skill, 0);
1653 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1654 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1654 } 1655 }
… …
1667 op->play_sound (sound_find ("generic_fail")); 1668 op->play_sound (sound_find ("generic_fail"));
1668 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp))); 1669 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1669 break; 1670 break;
1670 1671
1671 case 1: 1672 case 1:
1672 decrease_ob (tmp); 1673 tmp->decrease ();
1673 op->play_sound (sound_find ("skill_learn")); 1674 op->play_sound (sound_find ("skill_learn"));
1674 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1675 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1675 break; 1676 break;
1676 1677
1677 default: 1678 default:
1678 decrease_ob (tmp); 1679 tmp->decrease ();
1679 op->play_sound (sound_find ("generic_fail")); 1680 op->play_sound (sound_find ("generic_fail"));
1680 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp))); 1681 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1681 break; 1682 break;
1682 } 1683 }
1683} 1684}
… …
1804 } 1805 }
1805 1806
1806 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1807 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1807 1808
1808 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1809 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1809 {
1810 identify (tmp); 1810 identify (tmp);
1811
1812 if (tmp->env)
1813 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1814 else
1815 op->contr->ns->floorbox_update ();
1816 }
1817 1811
1818 /* I removed the check for special_prayer_mark here - it didn't make 1812 /* I removed the check for special_prayer_mark here - it didn't make
1819 * a lot of sense - special prayers are not found in spellbooks, and 1813 * a lot of sense - special prayers are not found in spellbooks, and
1820 * if the player doesn't know the spell, doesn't make a lot of sense that 1814 * if the player doesn't know the spell, doesn't make a lot of sense that
1821 * they would have a special prayer mark. 1815 * they would have a special prayer mark.
… …
1874 { 1868 {
1875 op->contr->play_sound (sound_find ("fumble_spell")); 1869 op->contr->play_sound (sound_find ("fumble_spell"));
1876 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n"); 1870 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1877 } 1871 }
1878 1872
1879 decrease_ob (tmp); 1873 tmp->decrease ();
1880} 1874}
1881 1875
1882/** 1876/**
1883 * Handles applying a spell scroll. 1877 * Handles applying a spell scroll.
1884 */ 1878 */
… …
1923 identify (tmp); 1917 identify (tmp);
1924 1918
1925 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name)); 1919 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1926 1920
1927 cast_spell (op, tmp, dir, tmp->inv, NULL); 1921 cast_spell (op, tmp, dir, tmp->inv, NULL);
1928 decrease_ob (tmp); 1922 tmp->decrease ();
1929} 1923}
1930 1924
1931/** 1925/**
1932 * Applies a treasure object - by default, chest. op 1926 * Applies a treasure object - by default, chest. op
1933 * is the person doing the applying, tmp is the treasure 1927 * is the person doing the applying, tmp is the treasure
… …
1945 object *treas = tmp->inv; 1939 object *treas = tmp->inv;
1946 1940
1947 if (!treas) 1941 if (!treas)
1948 { 1942 {
1949 op->statusmsg ("The chest was empty."); 1943 op->statusmsg ("The chest was empty.");
1950 decrease_ob (tmp); 1944 tmp->decrease ();
1951 return; 1945 return;
1952 } 1946 }
1953 1947
1954 while (tmp->inv) 1948 while (tmp->inv)
1955 { 1949 {
… …
1971 if (op->destroyed () || tmp->destroyed ()) 1965 if (op->destroyed () || tmp->destroyed ())
1972 break; 1966 break;
1973 } 1967 }
1974 1968
1975 if (!tmp->destroyed () && !tmp->inv) 1969 if (!tmp->destroyed () && !tmp->inv)
1976 decrease_ob (tmp); 1970 tmp->decrease (true);
1977} 1971}
1978 1972
1979/** 1973/**
1980 * op eats food. 1974 * op eats food.
1981 * If player, takes care of messages and dragon special food. 1975 * If player, takes care of messages and dragon special food.
… …
2047 eat_special_food (op, tmp); 2041 eat_special_food (op, tmp);
2048 } 2042 }
2049 } 2043 }
2050 2044
2051 handle_apply_yield (tmp); 2045 handle_apply_yield (tmp);
2052 decrease_ob (tmp); 2046 tmp->decrease ();
2053} 2047}
2054 2048
2055/** 2049/**
2056 * A dragon is eating some flesh. If the flesh contains resistances, 2050 * A dragon is eating some flesh. If the flesh contains resistances,
2057 * there is a chance for the dragon's skin to get improved. 2051 * there is a chance for the dragon's skin to get improved.
… …
2245 2239
2246 op->statusmsg ("Applying armour enchantment."); 2240 op->statusmsg ("Applying armour enchantment.");
2247 improve_armour (op, tmp, armor); 2241 improve_armour (op, tmp, armor);
2248} 2242}
2249 2243
2250extern void 2244void
2251apply_poison (object *op, object *tmp) 2245apply_poison (object *op, object *tmp)
2252{ 2246{
2247 // need to do it now when it is still on the map
2248 handle_apply_yield (tmp);
2249
2250 object *poison = tmp->split (1);
2251
2253 if (op->type == PLAYER) 2252 if (op->type == PLAYER)
2254 { 2253 {
2255 op->contr->play_sound (sound_find ("drink_poison")); 2254 op->contr->play_sound (sound_find ("drink_poison"));
2256 op->failmsg ("Yech! That tasted poisonous!"); 2255 op->failmsg ("Yech! That tasted poisonous!");
2257 strcpy (op->contr->killer, "poisonous booze"); 2256 op->contr->killer = poison;
2258 } 2257 }
2259 2258
2260 if (tmp->stats.hp > 0) 2259 if (poison->stats.hp > 0)
2261 { 2260 {
2262 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2261 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2263 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2262 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2264 } 2263 }
2265 2264
2266 op->stats.food -= op->stats.food / 4; 2265 op->stats.food -= op->stats.food / 4;
2267 handle_apply_yield (tmp); 2266 poison->destroy ();
2268 decrease_ob (tmp);
2269} 2267}
2270 2268
2271/** 2269/**
2272 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2270 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2273 * A valid 2 way exit means: 2271 * A valid 2 way exit means:
… …
2375 * them in this function - they are passed to apply_special 2373 * them in this function - they are passed to apply_special
2376 */ 2374 */
2377int 2375int
2378manual_apply (object *op, object *tmp, int aflag) 2376manual_apply (object *op, object *tmp, int aflag)
2379{ 2377{
2380 if (tmp->head)
2381 tmp = tmp->head; 2378 tmp = tmp->head_ ();
2382 2379
2383 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2384 { 2381 {
2385 if (op->type == PLAYER) 2382 if (op->type == PLAYER)
2386 { 2383 {
… …
2594 default: 2591 default:
2595 return 0; 2592 return 0;
2596 } 2593 }
2597} 2594}
2598 2595
2599
2600/* quiet suppresses the "don't know how to apply" and "you must get it first" 2596/* quiet suppresses the "don't know how to apply" and "you must get it first"
2601 * messages as needed by player_apply_below(). But there can still be 2597 * messages as needed by player_apply_below(). But there can still be
2602 * "but you are floating high above the ground" messages. 2598 * "but you are floating high above the ground" messages.
2603 * 2599 *
2604 * Same return value as apply() function. 2600 * Same return value as apply() function.
2605 */ 2601 */
2606int 2602int
2607player_apply (object *pl, object *op, int aflag, int quiet) 2603player_apply (object *pl, object *op, int aflag, int quiet)
2608{ 2604{
2609 int tmp;
2610
2611 if (op->env && (pl->move_type & MOVE_FLYING)) 2605 if (!op->env && (pl->move_type & MOVE_FLYING))
2612 { 2606 {
2613 /* player is flying and applying object not in inventory */ 2607 /* player is flying and applying object not in inventory */
2614 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2608 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2615 { 2609 {
2616 op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2610 pl->failmsg ("But you are floating high above the ground! "
2611 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2612 "or waiting till the levitation effect wears off.>");
2617 return 0; 2613 return 0;
2618 } 2614 }
2619 } 2615 }
2620 2616
2621 pl->contr->last_used = op; 2617 pl->contr->last_used = op;
2622 2618
2623 tmp = manual_apply (pl, op, aflag); 2619 int tmp = manual_apply (pl, op, aflag);
2620
2624 if (!quiet) 2621 if (!quiet)
2625 { 2622 {
2626 if (tmp == 0) 2623 if (tmp == 0)
2627 op->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2624 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2628 else if (tmp == 2) 2625 else if (tmp == 2)
2629 op->failmsg ("You must get it first!\n"); 2626 pl->failmsg ("You must get it first!\n");
2630 } 2627 }
2631 2628
2632 return tmp; 2629 return tmp;
2633} 2630}
2634 2631
… …
2720 break; 2717 break;
2721 2718
2722 case SKILL: 2719 case SKILL:
2723 if (who->contr) 2720 if (who->contr)
2724 { 2721 {
2722 if (IS_COMBAT_SKILL (op->subtype))
2723 who->change_weapon (who->contr->combat_ob = 0);
2724 else if (IS_RANGED_SKILL (op->subtype))
2725 who->change_weapon (who->contr->ranged_ob = 0);
2726
2725 if (!op->invisible) 2727 if (op->invisible)
2728 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2729 else
2726 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2730 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2727 else
2728 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2729 } 2731 }
2730 2732
2731 change_abil (who, op); 2733 change_abil (who, op);
2732 CLEAR_FLAG (who, FLAG_READY_SKILL); 2734 CLEAR_FLAG (who, FLAG_READY_SKILL);
2733 break; 2735 break;
… …
2760 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2762 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2761 2763
2762 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2764 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2763 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2765 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2764 2766
2767 op->destroy ();
2768 who->insert (tmp2);
2769 who->update_stats ();
2770
2765 if (who->contr) 2771 if (who->contr)
2766 esrv_del_item (who->contr, op->count);
2767
2768 op->destroy ();
2769 insert_ob_in_ob (tmp2, who);
2770 who->update_stats ();
2771
2772 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2773 { 2772 {
2774 if (who->contr) 2773 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2775 { 2774 {
2776 who->failmsg ("Oops, it feels deadly cold!"); 2775 who->failmsg ("Oops, it feels deadly cold!");
2777 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2776 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2778 } 2777 }
2779 } 2778 }
2780
2781 if (who->contr)
2782 esrv_send_item (who, tmp2);
2783 } 2779 }
2784 2780
2785 return 1; /* otherwise, an attempt to drop causes problems */ 2781 return 1; /* otherwise, an attempt to drop causes problems */
2786 2782
2787 case BOW: 2783 case BOW:
… …
2818 default: 2814 default:
2819 who->statusmsg (format ("You unapply %s.", query_name (op))); 2815 who->statusmsg (format ("You unapply %s.", query_name (op)));
2820 break; 2816 break;
2821 } 2817 }
2822 2818
2819 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2820 if (object *pl = op->visible_to ())
2821 esrv_send_item (pl, op);
2822
2823 who->update_stats (); 2823 who->update_stats ();
2824
2825 if (!(aflags & AP_NO_MERGE))
2826 {
2827 object *tmp = merge_ob (op, 0);
2828
2829 if (who->contr)
2830 {
2831 if (tmp)
2832 { /* it was merged */
2833 esrv_del_item (who->contr, op->count);
2834 op = tmp;
2835 }
2836
2837 esrv_send_item (who, op);
2838 }
2839 }
2840 2824
2841 return 0; 2825 return 0;
2842} 2826}
2843 2827
2844/** 2828/**
… …
3142 return 1; 3126 return 1;
3143 } 3127 }
3144 3128
3145 return unapply_special (who, op, aflags); 3129 return unapply_special (who, op, aflags);
3146 } 3130 }
3147
3148 if (basic_flag == AP_UNAPPLY) 3131 else if (basic_flag == AP_UNAPPLY)
3149 return 0; 3132 return 0;
3150 3133
3151 // if the item is combat/ranged, wield the relevant slot first 3134 // if the item is combat/ranged, wield the relevant slot first
3152 // to resolve conflicts. 3135 // to resolve conflicts.
3153 if (player *pl = who->contr) 3136 if (player *pl = who->contr)
… …
3223 3206
3224 /* Ok. We are now at the state where we can apply the new object. 3207 /* Ok. We are now at the state where we can apply the new object.
3225 * Note that we don't have the checks for can_use_... 3208 * Note that we don't have the checks for can_use_...
3226 * below - that is already taken care of by can_apply_object. 3209 * below - that is already taken care of by can_apply_object.
3227 */ 3210 */
3228 if (op->nrof > 1) 3211 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3229 tmp = get_split_ob (op, op->nrof - 1);
3230 else
3231 tmp = 0;
3232 3212
3233 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3213 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3234 return RESULT_INT (0); 3214 return RESULT_INT (0);
3235 3215
3236 switch (op->type) 3216 switch (op->type)
3237 { 3217 {
3238 case WEAPON: 3218 case WEAPON:
3239 if (!check_weapon_power (who, op->last_eat)) 3219 if (!check_weapon_power (who, op->last_eat))
3240 { 3220 {
3241 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER); 3221 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3242 3222
3243 if (tmp) 3223 if (tmp)
3244 insert_ob_in_ob (tmp, who); 3224 insert_ob_in_ob (tmp, who);
3245 3225
3246 return 1; 3226 return 1;
… …
3311 SET_FLAG (tmp2, FLAG_APPLIED); 3291 SET_FLAG (tmp2, FLAG_APPLIED);
3312 3292
3313 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3293 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3314 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3294 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3315 3295
3316 insert_ob_in_ob (tmp2, who); 3296 who->insert (tmp2);
3317 3297
3318 /* Remove the old lantern */ 3298 /* Remove the old lantern */
3319 if (who->type == PLAYER)
3320 esrv_del_item (who->contr, op->count);
3321
3322 op->destroy (); 3299 op->destroy ();
3323 3300
3324 /* insert the portion that was split off */ 3301 /* insert the portion that was split off */
3325 if (tmp) 3302 if (tmp)
3326 { 3303 who->insert (tmp);
3327 insert_ob_in_ob (tmp, who);
3328 if (who->type == PLAYER)
3329 esrv_send_item (who, tmp);
3330 }
3331 3304
3332 who->update_stats (); 3305 who->update_stats ();
3333 3306
3334 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3307 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3335 if (who->type == PLAYER) 3308 if (who->type == PLAYER)
3336 { 3309 {
3337 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); 3310 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3338 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3311 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3339 } 3312 }
3340
3341 if (who->type == PLAYER)
3342 esrv_send_item (who, tmp2);
3343 3313
3344 return 0; 3314 return 0;
3345 3315
3346 case SKILL_TOOL: 3316 case SKILL_TOOL:
3347 // applying a skill tool also readies the skill 3317 // applying a skill tool also readies the skill
… …
3507 } 3477 }
3508 3478
3509 SET_FLAG (op, FLAG_APPLIED); 3479 SET_FLAG (op, FLAG_APPLIED);
3510 3480
3511 if (tmp) 3481 if (tmp)
3512 tmp = insert_ob_in_ob (tmp, who); 3482 who->insert (tmp);
3513 3483
3514 who->update_stats (); 3484 who->update_stats ();
3515 3485
3516 /* We exclude spell casting objects. The fire code will set the 3486 /* We exclude spell casting objects. The fire code will set the
3517 * been applied flag when they are used - until that point, 3487 * been applied flag when they are used - until that point,
… …
3528 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3498 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
3529 ); 3499 );
3530 SET_FLAG (op, FLAG_KNOWN_CURSED); 3500 SET_FLAG (op, FLAG_KNOWN_CURSED);
3531 } 3501 }
3532 3502
3533 if (who->type == PLAYER) 3503 if (object *pl = op->visible_to ())
3534 {
3535 /* if multiple objects were applied, update both slots */
3536 if (tmp)
3537 esrv_send_item (who, tmp);
3538
3539 esrv_send_item (who, op); 3504 esrv_send_item (pl, op);
3540 }
3541 3505
3542 return 0; 3506 return 0;
3543} 3507}
3544 3508
3545int 3509int
… …
3559int 3523int
3560auto_apply (object *op) 3524auto_apply (object *op)
3561{ 3525{
3562 object *tmp = NULL, *tmp2; 3526 object *tmp = NULL, *tmp2;
3563 int i; 3527 int i;
3528
3529 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3564 3530
3565 switch (op->type) 3531 switch (op->type)
3566 { 3532 {
3567 case SHOP_FLOOR: 3533 case SHOP_FLOOR:
3568 if (!op->has_random_items ()) 3534 if (!op->has_random_items ())
… …
3570 3536
3571 do 3537 do
3572 { 3538 {
3573 i = 10; /* let's give it 10 tries */ 3539 i = 10; /* let's give it 10 tries */
3574 while ((tmp = generate_treasure (op->randomitems, 3540 while ((tmp = generate_treasure (op->randomitems,
3575 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3541 op->stats.exp
3542 ? (int) op->stats.exp
3543 : max (op->map->difficulty, 5)))
3544 == NULL && --i);
3545
3576 if (tmp == NULL) 3546 if (tmp == NULL)
3577 return 0; 3547 return 0;
3548
3578 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3549 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3579 { 3550 {
3580 tmp->destroy (); 3551 tmp->destroy ();
3581 tmp = NULL; 3552 tmp = NULL;
3582 } 3553 }
… …
3585 3556
3586 tmp->x = op->x; 3557 tmp->x = op->x;
3587 tmp->y = op->y; 3558 tmp->y = op->y;
3588 SET_FLAG (tmp, FLAG_UNPAID); 3559 SET_FLAG (tmp, FLAG_UNPAID);
3589 insert_ob_in_map (tmp, op->map, NULL, 0); 3560 insert_ob_in_map (tmp, op->map, NULL, 0);
3590 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3591 identify (tmp); 3561 identify (tmp);
3592 break; 3562 break;
3593 3563
3594 case TREASURE: 3564 case TREASURE:
3595 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3565 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3602 /* If we generated an object and put it in this object inventory, 3572 /* If we generated an object and put it in this object inventory,
3603 * move it to the parent object as the current object is about 3573 * move it to the parent object as the current object is about
3604 * to disappear. An example of this item is the random_* stuff 3574 * to disappear. An example of this item is the random_* stuff
3605 * that is put inside other objects. 3575 * that is put inside other objects.
3606 */ 3576 */
3607 for (tmp = op->inv; tmp; tmp = tmp2)
3608 {
3609 tmp2 = tmp->below;
3610 tmp->remove ();
3611
3612 if (op->env) 3577 if (op->env)
3613 insert_ob_in_ob (tmp, op->env); 3578 while (op->inv)
3614 else 3579 op->env->insert (op->inv);
3615 tmp->destroy ();
3616 }
3617 3580
3618 op->destroy (); 3581 op->destroy ();
3619 break; 3582 break;
3620 } 3583 }
3621 return tmp ? 1 : 0; 3584
3585 return !!tmp;
3622} 3586}
3623 3587
3624/** 3588/**
3625 * fix_auto_apply goes through the entire map every time a map 3589 * fix_auto_apply goes through the entire map every time a map
3626 * is loaded or swapped in and performs special actions for 3590 * is loaded or swapped in and performs special actions for
… …
3640 3604
3641 if (tmp->inv) 3605 if (tmp->inv)
3642 { 3606 {
3643 object *invtmp, *invnext; 3607 object *invtmp, *invnext;
3644 3608
3645 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3609 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3646 { 3610 {
3647 invnext = invtmp->below; 3611 invnext = invtmp->below;
3648 3612
3649 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3613 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3650 auto_apply (invtmp); 3614 auto_apply (invtmp);
3651 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3615 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3652 { 3616 {
3653 while ((invtmp->stats.hp--) > 0) 3617 while (invtmp->stats.hp-- > 0)
3654 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3618 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3655 3619
3656 invtmp->randomitems = NULL; 3620 invtmp->randomitems = NULL;
3657 } 3621 }
3658 else if (invtmp && invtmp->arch 3622 else if (invtmp && invtmp->arch
… …
3770 /* check for hp, sp change */ 3734 /* check for hp, sp change */
3771 if (food->stats.hp != 0) 3735 if (food->stats.hp != 0)
3772 { 3736 {
3773 if (QUERY_FLAG (food, FLAG_CURSED)) 3737 if (QUERY_FLAG (food, FLAG_CURSED))
3774 { 3738 {
3775 assign (who->contr->killer, food->name); 3739 who->contr->killer = food;
3776 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3740 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3777 who->failmsg ("Eck!...that was poisonous!"); 3741 who->failmsg ("Eck!...that was poisonous!");
3778 } 3742 }
3779 else 3743 else
3780 { 3744 {
… …
3784 who->failmsg ("Eck!...that was poisonous!"); 3748 who->failmsg ("Eck!...that was poisonous!");
3785 3749
3786 who->stats.hp += food->stats.hp; 3750 who->stats.hp += food->stats.hp;
3787 } 3751 }
3788 } 3752 }
3753
3789 if (food->stats.sp != 0) 3754 if (food->stats.sp != 0)
3790 { 3755 {
3791 if (QUERY_FLAG (food, FLAG_CURSED)) 3756 if (QUERY_FLAG (food, FLAG_CURSED))
3792 { 3757 {
3793 who->failmsg ("You are drained of mana!"); 3758 who->failmsg ("You are drained of mana!");
… …
3820 item = find_marked_object (who); 3785 item = find_marked_object (who);
3821 if (item) 3786 if (item)
3822 { 3787 {
3823 if (lighter->last_eat && lighter->stats.food) 3788 if (lighter->last_eat && lighter->stats.food)
3824 { /* lighter gets used up */ 3789 { /* lighter gets used up */
3825 /* Split multiple lighters if they're being used up. Otherwise *
3826 * one charge from each would be used up. --DAMN */
3827 if (lighter->nrof > 1)
3828 {
3829 object *oneLighter = lighter->clone (); 3790 object *oneLighter = lighter->split ();
3830
3831 lighter->nrof -= 1;
3832 oneLighter->nrof = 1;
3833 oneLighter->stats.food--; 3791 oneLighter->stats.food--;
3834 esrv_send_item (who, lighter); 3792 who->insert (oneLighter);
3835 oneLighter = insert_ob_in_ob (oneLighter, who);
3836 esrv_send_item (who, oneLighter);
3837 }
3838 else
3839 lighter->stats.food--;
3840 } 3793 }
3841 else if (lighter->last_eat) 3794 else if (lighter->last_eat)
3842 { 3795 {
3843 /* no charges left in lighter */ 3796 /* no charges left in lighter */
3844 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name)); 3797 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
… …
3991 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3944 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3992 flag_change_face = 0; 3945 flag_change_face = 0;
3993 3946
3994 if (flag_change_face) 3947 if (flag_change_face)
3995 { 3948 {
3996 pl->animation_id = GET_ANIM_ID (change);
3997 pl->face = change->face; 3949 pl->face = change->face;
3998 3950 pl->animation_id = change->animation_id;
3999 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3951 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
4000 SET_FLAG (pl, FLAG_ANIMATE);
4001 else
4002 CLEAR_FLAG (pl, FLAG_ANIMATE);
4003 } 3952 }
4004 3953
4005 /* check the special case of can't use weapons */ 3954 /* check the special case of can't use weapons */
4006 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3955 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
4007 if (!strcmp (change->name, "monk")) 3956 if (!strcmp (change->name, "monk"))
… …
4101 4050
4102 new_item->nrof = yield; 4051 new_item->nrof = yield;
4103 4052
4104 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4053 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4105 4054
4106 insert_ob_in_ob (new_item, pl); 4055 pl->insert (new_item);
4107 esrv_send_inventory (pl, pl);
4108 /* Eat up one item */ 4056 /* Eat up one item */
4109 decrease_ob_nr (marked, 1); 4057 marked->decrease ();
4110 4058
4111 /* Eat one transformer if needed */ 4059 /* Eat one transformer if needed */
4112 if (transformer->stats.food) 4060 if (transformer->stats.food)
4113 if (--transformer->stats.food == 0) 4061 if (--transformer->stats.food == 0)
4114 decrease_ob_nr (transformer, 1); 4062 transformer->decrease ();
4115} 4063}
4116 4064

Diff Legend

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