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.130 by root, Sun Sep 2 04:57:15 2007 UTC vs.
Revision 1.169 by root, Sun Sep 7 21:31:23 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 (
… …
623 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 606 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
624 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 607 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
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. "
612 "H<A weapon is considered magical if it changes regeneration, "
613 "speed or ac, or has other protections.>");
629 return 0; 614 return 0;
630 } 615 }
631 616
632 sacrifice_count = check_sacrifice (op, improver); 617 sacrifice_count = check_sacrifice (op, improver);
633 if (sacrifice_count <= 0) 618 if (sacrifice_count <= 0)
… …
644 629
645 sprintf (buf, "%s's %s", &op->name, &weapon->name); 630 sprintf (buf, "%s's %s", &op->name, &weapon->name);
646 weapon->name = weapon->name_pl = buf; 631 weapon->name = weapon->name_pl = buf;
647 weapon->nrof = 0; /* prevents preparing n weapons in the same 632 weapon->nrof = 0; /* prevents preparing n weapons in the same
648 slot at once! */ 633 slot at once! */
649 decrease_ob (improver); 634 improver->decrease ();
650 weapon->last_eat = 0; 635 weapon->last_eat = 0;
651 return 1; 636 return 1;
652} 637}
653
654 638
655/** 639/**
656 * 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.
657 * This is the new improve weapon code. 641 * This is the new improve weapon code.
658 * 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.
… …
702 weapon->weight += 5000; /* 5 KG's */ 686 weapon->weight += 5000; /* 5 KG's */
703 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));
704 weapon->last_eat++; 688 weapon->last_eat++;
705 689
706 weapon->item_power++; 690 weapon->item_power++;
707 decrease_ob (improver); 691 improver->decrease ();
708 return 1; 692 return 1;
709 } 693 }
710 694
711 if (improver->stats.sp == IMPROVE_WEIGHT) 695 if (improver->stats.sp == IMPROVE_WEIGHT)
712 { 696 {
… …
716 weapon->weight = 1; 700 weapon->weight = 1;
717 701
718 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));
719 weapon->last_eat++; 703 weapon->last_eat++;
720 weapon->item_power++; 704 weapon->item_power++;
721 decrease_ob (improver); 705 improver->decrease ();
722 return 1; 706 return 1;
723 } 707 }
708
724 if (improver->stats.sp == IMPROVE_ENCHANT) 709 if (improver->stats.sp == IMPROVE_ENCHANT)
725 { 710 {
726 weapon->magic++; 711 weapon->magic++;
727 weapon->last_eat++; 712 weapon->last_eat++;
728 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 713 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
729 decrease_ob (improver); 714 improver->decrease ();
730 weapon->item_power++; 715 weapon->item_power++;
731 return 1; 716 return 1;
732 } 717 }
733 718
734 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
783 op->failmsg ("Something blocks the magic of the scroll!"); 768 op->failmsg ("Something blocks the magic of the scroll!");
784 return 0; 769 return 0;
785 } 770 }
786 771
787 otmp = find_marked_object (op); 772 otmp = find_marked_object (op);
773
788 if (!otmp) 774 if (!otmp)
789 { 775 {
790 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.>");
791 return 0; 777 return 0;
792 } 778 }
… …
834 if (armour->magic >= settings.armor_max_enchant) 820 if (armour->magic >= settings.armor_max_enchant)
835 { 821 {
836 op->failmsg ("This armour can not be enchanted any further!"); 822 op->failmsg ("This armour can not be enchanted any further!");
837 return 0; 823 return 0;
838 } 824 }
825
839 /* 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,
840 * 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.
841 * 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
842 * of gnarg and what not?) 829 * of gnarg and what not?)
843 */ 830 */
… …
845 { 832 {
846 op->failmsg ("This armour will not accept further enchantment."); 833 op->failmsg ("This armour will not accept further enchantment.");
847 return 0; 834 return 0;
848 } 835 }
849 836
850 /* Split objects if needed. Can't insert tmp until the 837 /* Split objects if needed. Can't insert tmp until the
851 * end of this function - otherwise it will just re-merge. 838 * end of this function - otherwise it will just re-merge.
852 */ 839 */
853 if (armour->nrof > 1) 840 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
854 tmp = get_split_ob (armour, armour->nrof - 1);
855 else
856 tmp = NULL;
857 841
858 armour->magic++; 842 armour->magic++;
859 843
860 if (!settings.armor_speed_linear) 844 if (!settings.armor_speed_linear)
861 { 845 {
… …
898 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);
899 883
900 if (op->type == PLAYER) 884 if (op->type == PLAYER)
901 { 885 {
902 esrv_send_item (op, armour); 886 esrv_send_item (op, armour);
887
903 if (QUERY_FLAG (armour, FLAG_APPLIED)) 888 if (QUERY_FLAG (armour, FLAG_APPLIED))
904 op->update_stats (); 889 op->update_stats ();
905 } 890 }
906 891
907 decrease_ob (improver); 892 improver->decrease ();
908 893
909 if (tmp) 894 if (tmp)
910 { 895 op->insert (tmp);
911 insert_ob_in_ob (tmp, op);
912 esrv_send_item (op, tmp);
913 }
914 896
915 return 1; 897 return 1;
916} 898}
917 899
918/* 900/*
919 * 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
920 * what the converter wants, -1 if the converter is broken. 902 * what the converter wants, -1 if the converter is broken.
921 */ 903 *
922#define CONV_FROM(xyz) xyz->slaying
923#define CONV_TO(xyz) xyz->other_arch
924#define CONV_NR(xyz) xyz->stats.sp
925#define CONV_NEED(xyz) xyz->stats.food
926
927/* Takes one items and makes another. 904 * Takes one type of items and makes another.
928 * converter is the object that is doing the conversion. 905 * converter is the object that is doing the conversion.
929 * 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
930 * what the converter wants, this will not do anything. 907 * what the converter wants, this will not do anything.
931 */ 908 */
932int 909static int
933convert_item (object *item, object *converter) 910convert_item (object *item, object *converter)
934{ 911{
935 int nr = 0;
936 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;
937 921
938 /* 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,
939 * 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
940 * 3 gp and player drops a platinum, tough luck) 924 * 3 gp and player drops a platinum, tough luck)
941 */ 925 */
942 if (CONV_FROM (converter) == shstr_money) 926 if (conv_from == shstr_money)
943 { 927 {
944 if (item->type != MONEY) 928 if (item->type != MONEY)
945 return 0; 929 return 0;
946 930
947 nr = (item->nrof * item->value) / CONV_NEED (converter); 931 nr = sint64 (item->nrof) * item->value / need;
948 if (!nr) 932 if (!nr)
949 return 0; 933 return 0;
950 934
951 converter->play_sound (sound_find ("shop_buy")); 935 converter->play_sound (sound_find ("shop_buy"));
952 936
953 int cost = nr * CONV_NEED (converter) / item->value; 937 sint64 cost = (nr * need + item->value - 1) / item->value;
954 /* take into account rounding errors */
955 if (nr * CONV_NEED (converter) % item->value)
956 cost++;
957 938
958 decrease_ob_nr (item, cost); 939 item->decrease (cost);
959 940
960 price_in = cost * item->value; 941 price_in = cost * item->value;
961 } 942 }
962 else 943 else
963 { 944 {
964 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 945 if (item->type == PLAYER
965 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 946 || conv_from != item->arch->archname
947 || (need && need > (uint16) item->nrof))
966 return 0; 948 return 0;
967 949
968 converter->play_sound (sound_find ("convert_item")); 950 converter->play_sound (sound_find ("convert_item"));
969 951
970 if (CONV_NEED (converter)) 952 if (need)
971 { 953 {
972 nr = item->nrof / CONV_NEED (converter); 954 nr = sint64 (item->nrof) / need;
973 decrease_ob_nr (item, nr * CONV_NEED (converter)); 955 item->decrease (nr * need);
974 price_in = nr * CONV_NEED (converter) * item->value; 956 price_in = nr * need * item->value;
975 } 957 }
976 else 958 else
977 { 959 {
978 price_in = item->value; 960 price_in = item->value;
979 item->destroy (); 961 item->destroy ();
… …
990 ob_to_copy = converter->inv; 972 ob_to_copy = converter->inv;
991 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++)
992 if (rndm (0, i) == 0) 974 if (rndm (0, i) == 0)
993 ob_to_copy = ob; 975 ob_to_copy = ob;
994 976
995 item = object_create_clone (ob_to_copy); 977 item = ob_to_copy->deep_clone ();
996 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
997 unflag_inv (item, FLAG_IS_A_TEMPLATE); 979 unflag_inv (item, FLAG_IS_A_TEMPLATE);
998 } 980 }
999 else 981 else
1000 { 982 {
1001 if (converter->other_arch == NULL) 983 if (!conv_to)
1002 { 984 {
1003 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",
1004 &converter->name, &converter->map->path, converter->x, converter->y); 986 &converter->name, &converter->map->path, converter->x, converter->y);
1005 return -1; 987 return -1;
1006 } 988 }
1007 989
1008 item = object_create_arch (converter->other_arch); 990 item = object_create_arch (conv_to);
1009 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1010 } 992 }
1011 993
1012 if (CONV_NR (converter)) 994 if (give)
1013 item->nrof = CONV_NR (converter); 995 item->nrof = give;
1014 996
1015 if (nr) 997 if (nr)
1016 item->nrof *= nr; 998 item->nrof *= nr;
1017 999
1018 if (is_in_shop (converter)) 1000 if (is_in_shop (converter))
1019 SET_FLAG (item, FLAG_UNPAID); 1001 SET_FLAG (item, FLAG_UNPAID);
1020 else if (price_in < item->nrof * item->value) 1002 else if (price_in < sint64 (item->nrof) * item->value)
1021 { 1003 {
1022 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",
1023 &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);
1024 /** 1006 /**
1025 * 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
1026 * hopefully had something in mind when doing this. 1008 * hopefully had something in mind when doing this.
1027 */ 1009 */
1028 } 1010 }
1029 1011
1030 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
1031 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);
1032 return 1; 1018 return 1;
1033} 1019}
1034 1020
1035/** 1021/**
… …
1274 * Handles applying a sign. 1260 * Handles applying a sign.
1275 */ 1261 */
1276static void 1262static void
1277apply_sign (object *op, object *sign, int autoapply) 1263apply_sign (object *op, object *sign, int autoapply)
1278{ 1264{
1279 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 }
1280 1270
1281 if (!sign->msg) 1271 if (!sign->msg)
1282 { 1272 {
1283 op->statusmsg ("Nothing is written on it."); 1273 op->statusmsg ("Nothing is written on it.");
1284 return; 1274 return;
… …
1310 } 1300 }
1311 1301
1312 if (op->contr) 1302 if (op->contr)
1313 if (client *ns = op->contr->ns) 1303 if (client *ns = op->contr->ns)
1314 { 1304 {
1305 if (sign->sound)
1315 ns->play_sound (sign->sound); 1306 ns->play_sound (sign->sound);
1307 else if (autoapply)
1308 ns->play_sound (sound_find ("msg_voice"));
1316 1309
1317 if (ns->can_msg) 1310 if (ns->can_msg)
1318 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\n\n%s", &sign->name, &sign->msg));
1319 else 1312 else
1320 { 1313 {
1321 msgType = get_readable_message_type (sign); 1314 readable_message_type *msgType = get_readable_message_type (sign);
1322 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg); 1315 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1323 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);
1324 } 1317 }
1325 } 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);
1326} 1351}
1327 1352
1328/** 1353/**
1329 * 'victim' moves onto 'trap' 1354 * 'victim' moves onto 'trap'
1330 * 'victim' leaves 'trap' 1355 * 'victim' leaves 'trap'
… …
1442 1467
1443 if (!trap->value) 1468 if (!trap->value)
1444 { 1469 {
1445 int tot; 1470 int tot;
1446 1471
1447 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1472 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1448 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1473 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1449 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1474 tot += ab->head_ ()->total_weight ();
1450 1475
1451 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1476 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1452 goto leave; 1477 goto leave;
1453 1478
1454 SET_ANIMATION (trap, trap->value); 1479 SET_ANIMATION (trap, trap->value);
… …
1479 1504
1480 case CONVERTER: 1505 case CONVERTER:
1481 if (convert_item (victim, trap) < 0) 1506 if (convert_item (victim, trap) < 0)
1482 { 1507 {
1483 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)));
1484 get_archetype ("burnout")->insert_at (trap, trap); 1509 archetype::get (shstr_burnout)->insert_at (trap, trap);
1485 } 1510 }
1486 1511
1487 goto leave; 1512 goto leave;
1488 1513
1489 case TRIGGER_BUTTON: 1514 case TRIGGER_BUTTON:
… …
1499 case CHECK_INV: 1524 case CHECK_INV:
1500 check_inv (victim, trap); 1525 check_inv (victim, trap);
1501 goto leave; 1526 goto leave;
1502 1527
1503 case HOLE: 1528 case HOLE:
1504 /* Hole not open? */ 1529 move_apply_hole (trap, victim);
1505 if (trap->stats.wc > 0)
1506 goto leave;
1507
1508 /* Is this a multipart monster and not the head? If so, return.
1509 * Processing will happen if the head runs into the pit
1510 */
1511 if (victim->head)
1512 goto leave;
1513
1514 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1515 victim->statusmsg ("You fall through the hole!", NDI_RED);
1516 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1517 goto leave; 1530 goto leave;
1518 1531
1519 case EXIT: 1532 case EXIT:
1520 if (victim->type == PLAYER && EXIT_PATH (trap)) 1533 if (victim->type == PLAYER && EXIT_PATH (trap))
1521 { 1534 {
… …
1523 * players output. 1536 * players output.
1524 */ 1537 */
1525 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1538 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1526 victim->statusmsg (trap->msg, NDI_NAVY); 1539 victim->statusmsg (trap->msg, NDI_NAVY);
1527 1540
1541 trap->play_sound (trap->sound);
1528 victim->enter_exit (trap); 1542 victim->enter_exit (trap);
1529 } 1543 }
1530 goto leave; 1544 goto leave;
1531 1545
1532 case ENCOUNTER: 1546 case ENCOUNTER:
… …
1599 } 1613 }
1600 1614
1601 lev_diff = tmp->level - (skill_ob->level + 5); 1615 lev_diff = tmp->level - (skill_ob->level + 5);
1602 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1616 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1603 { 1617 {
1604 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."
1605 : lev_diff < 3 ? "This book is slightly beyond your comprehension." 1619 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1606 : lev_diff < 5 ? "This book is beyond your comprehension." 1620 : lev_diff < 5 ? "This book is beyond your comprehension."
1607 : 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."
1608 : lev_diff < 15 ? "This book is way beyond your comprehension." 1622 : lev_diff < 15 ? "This book is way beyond your comprehension."
1609 : "This book is totally beyond your comprehension."); 1623 : "This book is totally beyond your comprehension.");
… …
1613 readable_message_type *msgType = get_readable_message_type (tmp); 1627 readable_message_type *msgType = get_readable_message_type (tmp);
1614 1628
1615 if (player *pl = op->contr) 1629 if (player *pl = op->contr)
1616 if (client *ns = pl->ns) 1630 if (client *ns = pl->ns)
1617 if (ns->can_msg) 1631 if (ns->can_msg)
1618 { 1632 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1619 dynbuf_text buf;
1620 buf << long_desc (tmp, op)
1621 << "\n\n"
1622 << tmp->msg
1623 << '\0';
1624 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1625 }
1626 else 1633 else
1627 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1634 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1628 msgType->message_type, msgType->message_subtype, 1635 msgType->message_type, msgType->message_subtype,
1629 "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",
1630 long_desc (tmp, op), &tmp->msg); 1637 long_desc (tmp, op), &tmp->msg);
… …
1637 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1644 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1638 { 1645 {
1639 /*exp_gain *= 2; because they just identified it too */ 1646 /*exp_gain *= 2; because they just identified it too */
1640 SET_FLAG (tmp, FLAG_IDENTIFIED); 1647 SET_FLAG (tmp, FLAG_IDENTIFIED);
1641 1648
1642 /* If in a container, update how it looks */ 1649 if (object *pl = tmp->visible_to ())
1643 if (tmp->env)
1644 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1650 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1645 else
1646 op->contr->ns->floorbox_update ();
1647 } 1651 }
1648 1652
1649 change_exp (op, exp_gain, skill_ob->skill, 0); 1653 change_exp (op, exp_gain, skill_ob->skill, 0);
1650 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 */
1651 } 1655 }
… …
1664 op->play_sound (sound_find ("generic_fail")); 1668 op->play_sound (sound_find ("generic_fail"));
1665 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)));
1666 break; 1670 break;
1667 1671
1668 case 1: 1672 case 1:
1669 decrease_ob (tmp); 1673 tmp->decrease ();
1670 op->play_sound (sound_find ("skill_learn")); 1674 op->play_sound (sound_find ("skill_learn"));
1671 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1675 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1672 break; 1676 break;
1673 1677
1674 default: 1678 default:
1675 decrease_ob (tmp); 1679 tmp->decrease ();
1676 op->play_sound (sound_find ("generic_fail")); 1680 op->play_sound (sound_find ("generic_fail"));
1677 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)));
1678 break; 1682 break;
1679 } 1683 }
1680} 1684}
… …
1801 } 1805 }
1802 1806
1803 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));
1804 1808
1805 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1809 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1806 {
1807 identify (tmp); 1810 identify (tmp);
1808
1809 if (tmp->env)
1810 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1811 else
1812 op->contr->ns->floorbox_update ();
1813 }
1814 1811
1815 /* 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
1816 * 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
1817 * 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
1818 * they would have a special prayer mark. 1815 * they would have a special prayer mark.
… …
1871 { 1868 {
1872 op->contr->play_sound (sound_find ("fumble_spell")); 1869 op->contr->play_sound (sound_find ("fumble_spell"));
1873 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");
1874 } 1871 }
1875 1872
1876 decrease_ob (tmp); 1873 tmp->decrease ();
1877} 1874}
1878 1875
1879/** 1876/**
1880 * Handles applying a spell scroll. 1877 * Handles applying a spell scroll.
1881 */ 1878 */
… …
1920 identify (tmp); 1917 identify (tmp);
1921 1918
1922 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));
1923 1920
1924 cast_spell (op, tmp, dir, tmp->inv, NULL); 1921 cast_spell (op, tmp, dir, tmp->inv, NULL);
1925 decrease_ob (tmp); 1922 tmp->decrease ();
1926} 1923}
1927 1924
1928/** 1925/**
1929 * Applies a treasure object - by default, chest. op 1926 * Applies a treasure object - by default, chest. op
1930 * is the person doing the applying, tmp is the treasure 1927 * is the person doing the applying, tmp is the treasure
… …
1942 object *treas = tmp->inv; 1939 object *treas = tmp->inv;
1943 1940
1944 if (!treas) 1941 if (!treas)
1945 { 1942 {
1946 op->statusmsg ("The chest was empty."); 1943 op->statusmsg ("The chest was empty.");
1947 decrease_ob (tmp); 1944 tmp->decrease ();
1948 return; 1945 return;
1949 } 1946 }
1950 1947
1951 while (tmp->inv) 1948 while (tmp->inv)
1952 { 1949 {
… …
1968 if (op->destroyed () || tmp->destroyed ()) 1965 if (op->destroyed () || tmp->destroyed ())
1969 break; 1966 break;
1970 } 1967 }
1971 1968
1972 if (!tmp->destroyed () && !tmp->inv) 1969 if (!tmp->destroyed () && !tmp->inv)
1973 decrease_ob (tmp); 1970 tmp->decrease ();
1974} 1971}
1975 1972
1976/** 1973/**
1977 * op eats food. 1974 * op eats food.
1978 * If player, takes care of messages and dragon special food. 1975 * If player, takes care of messages and dragon special food.
… …
1997 if (tmp->type == FOOD || tmp->type == FLESH) 1994 if (tmp->type == FOOD || tmp->type == FLESH)
1998 op->failmsg ("You feel full, but what a waste of food!"); 1995 op->failmsg ("You feel full, but what a waste of food!");
1999 else 1996 else
2000 op->statusmsg ("Most of the drink goes down your face not your throat!"); 1997 op->statusmsg ("Most of the drink goes down your face not your throat!");
2001 } 1998 }
1999
2000 tmp->play_sound (
2001 tmp->sound
2002 ? tmp->sound
2003 : tmp->type == DRINK
2004 ? sound_find ("eat_drink")
2005 : sound_find ("eat_food")
2006 );
2002 2007
2003 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 2008 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2004 { 2009 {
2005 const char *buf; 2010 const char *buf;
2006 2011
… …
2036 eat_special_food (op, tmp); 2041 eat_special_food (op, tmp);
2037 } 2042 }
2038 } 2043 }
2039 2044
2040 handle_apply_yield (tmp); 2045 handle_apply_yield (tmp);
2041 decrease_ob (tmp); 2046 tmp->decrease ();
2042} 2047}
2043 2048
2044/** 2049/**
2045 * A dragon is eating some flesh. If the flesh contains resistances, 2050 * A dragon is eating some flesh. If the flesh contains resistances,
2046 * 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.
… …
2234 2239
2235 op->statusmsg ("Applying armour enchantment."); 2240 op->statusmsg ("Applying armour enchantment.");
2236 improve_armour (op, tmp, armor); 2241 improve_armour (op, tmp, armor);
2237} 2242}
2238 2243
2239extern void 2244void
2240apply_poison (object *op, object *tmp) 2245apply_poison (object *op, object *tmp)
2241{ 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
2242 if (op->type == PLAYER) 2252 if (op->type == PLAYER)
2243 { 2253 {
2244 op->contr->play_sound (sound_find ("drink_poison")); 2254 op->contr->play_sound (sound_find ("drink_poison"));
2245 op->failmsg ("Yech! That tasted poisonous!"); 2255 op->failmsg ("Yech! That tasted poisonous!");
2246 strcpy (op->contr->killer, "poisonous booze"); 2256 op->contr->killer = poison;
2247 } 2257 }
2248 2258
2249 if (tmp->stats.hp > 0) 2259 if (poison->stats.hp > 0)
2250 { 2260 {
2251 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);
2252 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2262 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2253 } 2263 }
2254 2264
2255 op->stats.food -= op->stats.food / 4; 2265 op->stats.food -= op->stats.food / 4;
2256 handle_apply_yield (tmp); 2266 poison->destroy ();
2257 decrease_ob (tmp);
2258} 2267}
2259 2268
2260/** 2269/**
2261 * 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.
2262 * A valid 2 way exit means: 2271 * A valid 2 way exit means:
… …
2364 * them in this function - they are passed to apply_special 2373 * them in this function - they are passed to apply_special
2365 */ 2374 */
2366int 2375int
2367manual_apply (object *op, object *tmp, int aflag) 2376manual_apply (object *op, object *tmp, int aflag)
2368{ 2377{
2369 if (tmp->head)
2370 tmp = tmp->head; 2378 tmp = tmp->head_ ();
2371 2379
2372 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2373 { 2381 {
2374 if (op->type == PLAYER) 2382 if (op->type == PLAYER)
2375 { 2383 {
… …
2583 default: 2591 default:
2584 return 0; 2592 return 0;
2585 } 2593 }
2586} 2594}
2587 2595
2588
2589/* 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"
2590 * 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
2591 * "but you are floating high above the ground" messages. 2598 * "but you are floating high above the ground" messages.
2592 * 2599 *
2593 * Same return value as apply() function. 2600 * Same return value as apply() function.
2594 */ 2601 */
2595int 2602int
2596player_apply (object *pl, object *op, int aflag, int quiet) 2603player_apply (object *pl, object *op, int aflag, int quiet)
2597{ 2604{
2598 int tmp;
2599
2600 if (op->env && (pl->move_type & MOVE_FLYING)) 2605 if (!op->env && (pl->move_type & MOVE_FLYING))
2601 { 2606 {
2602 /* player is flying and applying object not in inventory */ 2607 /* player is flying and applying object not in inventory */
2603 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2608 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2604 { 2609 {
2605 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.>");
2606 return 0; 2613 return 0;
2607 } 2614 }
2608 } 2615 }
2609 2616
2610 pl->contr->last_used = op; 2617 pl->contr->last_used = op;
2611 2618
2612 tmp = manual_apply (pl, op, aflag); 2619 int tmp = manual_apply (pl, op, aflag);
2620
2613 if (!quiet) 2621 if (!quiet)
2614 { 2622 {
2615 if (tmp == 0) 2623 if (tmp == 0)
2616 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)));
2617 else if (tmp == 2) 2625 else if (tmp == 2)
2618 op->failmsg ("You must get it first!\n"); 2626 pl->failmsg ("You must get it first!\n");
2619 } 2627 }
2620 2628
2621 return tmp; 2629 return tmp;
2622} 2630}
2623 2631
… …
2709 break; 2717 break;
2710 2718
2711 case SKILL: 2719 case SKILL:
2712 if (who->contr) 2720 if (who->contr)
2713 { 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
2714 if (!op->invisible) 2727 if (op->invisible)
2728 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2729 else
2715 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2730 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2716 else
2717 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2718 } 2731 }
2719 2732
2720 change_abil (who, op); 2733 change_abil (who, op);
2721 CLEAR_FLAG (who, FLAG_READY_SKILL); 2734 CLEAR_FLAG (who, FLAG_READY_SKILL);
2722 break; 2735 break;
… …
2749 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2762 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2750 2763
2751 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2764 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2752 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2765 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2753 2766
2767 op->destroy ();
2768 who->insert (tmp2);
2769 who->update_stats ();
2770
2754 if (who->contr) 2771 if (who->contr)
2755 esrv_del_item (who->contr, op->count);
2756
2757 op->destroy ();
2758 insert_ob_in_ob (tmp2, who);
2759 who->update_stats ();
2760
2761 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2762 { 2772 {
2763 if (who->contr) 2773 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2764 { 2774 {
2765 who->failmsg ("Oops, it feels deadly cold!"); 2775 who->failmsg ("Oops, it feels deadly cold!");
2766 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2776 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2767 } 2777 }
2768 } 2778 }
2769
2770 if (who->contr)
2771 esrv_send_item (who, tmp2);
2772 } 2779 }
2773 2780
2774 return 1; /* otherwise, an attempt to drop causes problems */ 2781 return 1; /* otherwise, an attempt to drop causes problems */
2775 2782
2776 case BOW: 2783 case BOW:
… …
2807 default: 2814 default:
2808 who->statusmsg (format ("You unapply %s.", query_name (op))); 2815 who->statusmsg (format ("You unapply %s.", query_name (op)));
2809 break; 2816 break;
2810 } 2817 }
2811 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
2812 who->update_stats (); 2823 who->update_stats ();
2813
2814 if (!(aflags & AP_NO_MERGE))
2815 {
2816 object *tmp = merge_ob (op, 0);
2817
2818 if (who->contr)
2819 {
2820 if (tmp)
2821 { /* it was merged */
2822 esrv_del_item (who->contr, op->count);
2823 op = tmp;
2824 }
2825
2826 esrv_send_item (who, op);
2827 }
2828 }
2829 2824
2830 return 0; 2825 return 0;
2831} 2826}
2832 2827
2833/** 2828/**
… …
3131 return 1; 3126 return 1;
3132 } 3127 }
3133 3128
3134 return unapply_special (who, op, aflags); 3129 return unapply_special (who, op, aflags);
3135 } 3130 }
3136
3137 if (basic_flag == AP_UNAPPLY) 3131 else if (basic_flag == AP_UNAPPLY)
3138 return 0; 3132 return 0;
3139 3133
3140 // if the item is combat/ranged, wield the relevant slot first 3134 // if the item is combat/ranged, wield the relevant slot first
3141 // to resolve conflicts. 3135 // to resolve conflicts.
3142 if (player *pl = who->contr) 3136 if (player *pl = who->contr)
… …
3212 3206
3213 /* 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.
3214 * Note that we don't have the checks for can_use_... 3208 * Note that we don't have the checks for can_use_...
3215 * below - that is already taken care of by can_apply_object. 3209 * below - that is already taken care of by can_apply_object.
3216 */ 3210 */
3217 if (op->nrof > 1) 3211 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3218 tmp = get_split_ob (op, op->nrof - 1);
3219 else
3220 tmp = 0;
3221 3212
3222 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)))
3223 return RESULT_INT (0); 3214 return RESULT_INT (0);
3224 3215
3225 switch (op->type) 3216 switch (op->type)
3226 { 3217 {
3227 case WEAPON: 3218 case WEAPON:
3228 if (!check_weapon_power (who, op->last_eat)) 3219 if (!check_weapon_power (who, op->last_eat))
3229 { 3220 {
3230 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);
3231 3222
3232 if (tmp) 3223 if (tmp)
3233 insert_ob_in_ob (tmp, who); 3224 insert_ob_in_ob (tmp, who);
3234 3225
3235 return 1; 3226 return 1;
… …
3300 SET_FLAG (tmp2, FLAG_APPLIED); 3291 SET_FLAG (tmp2, FLAG_APPLIED);
3301 3292
3302 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3293 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3303 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3294 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3304 3295
3305 insert_ob_in_ob (tmp2, who); 3296 who->insert (tmp2);
3306 3297
3307 /* Remove the old lantern */ 3298 /* Remove the old lantern */
3308 if (who->type == PLAYER)
3309 esrv_del_item (who->contr, op->count);
3310
3311 op->destroy (); 3299 op->destroy ();
3312 3300
3313 /* insert the portion that was split off */ 3301 /* insert the portion that was split off */
3314 if (tmp) 3302 if (tmp)
3315 { 3303 who->insert (tmp);
3316 insert_ob_in_ob (tmp, who);
3317 if (who->type == PLAYER)
3318 esrv_send_item (who, tmp);
3319 }
3320 3304
3321 who->update_stats (); 3305 who->update_stats ();
3322 3306
3323 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3307 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3324 if (who->type == PLAYER) 3308 if (who->type == PLAYER)
3325 { 3309 {
3326 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.>");
3327 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3311 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3328 } 3312 }
3329
3330 if (who->type == PLAYER)
3331 esrv_send_item (who, tmp2);
3332 3313
3333 return 0; 3314 return 0;
3334 3315
3335 case SKILL_TOOL: 3316 case SKILL_TOOL:
3336 // applying a skill tool also readies the skill 3317 // applying a skill tool also readies the skill
… …
3496 } 3477 }
3497 3478
3498 SET_FLAG (op, FLAG_APPLIED); 3479 SET_FLAG (op, FLAG_APPLIED);
3499 3480
3500 if (tmp) 3481 if (tmp)
3501 tmp = insert_ob_in_ob (tmp, who); 3482 who->insert (tmp);
3502 3483
3503 who->update_stats (); 3484 who->update_stats ();
3504 3485
3505 /* We exclude spell casting objects. The fire code will set the 3486 /* We exclude spell casting objects. The fire code will set the
3506 * been applied flag when they are used - until that point, 3487 * been applied flag when they are used - until that point,
… …
3517 "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.>"
3518 ); 3499 );
3519 SET_FLAG (op, FLAG_KNOWN_CURSED); 3500 SET_FLAG (op, FLAG_KNOWN_CURSED);
3520 } 3501 }
3521 3502
3522 if (who->type == PLAYER) 3503 if (object *pl = op->visible_to ())
3523 {
3524 /* if multiple objects were applied, update both slots */
3525 if (tmp)
3526 esrv_send_item (who, tmp);
3527
3528 esrv_send_item (who, op); 3504 esrv_send_item (pl, op);
3529 }
3530 3505
3531 return 0; 3506 return 0;
3532} 3507}
3533 3508
3534int 3509int
… …
3548int 3523int
3549auto_apply (object *op) 3524auto_apply (object *op)
3550{ 3525{
3551 object *tmp = NULL, *tmp2; 3526 object *tmp = NULL, *tmp2;
3552 int i; 3527 int i;
3528
3529 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3553 3530
3554 switch (op->type) 3531 switch (op->type)
3555 { 3532 {
3556 case SHOP_FLOOR: 3533 case SHOP_FLOOR:
3557 if (!op->has_random_items ()) 3534 if (!op->has_random_items ())
… …
3559 3536
3560 do 3537 do
3561 { 3538 {
3562 i = 10; /* let's give it 10 tries */ 3539 i = 10; /* let's give it 10 tries */
3563 while ((tmp = generate_treasure (op->randomitems, 3540 while ((tmp = generate_treasure (op->randomitems,
3564 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
3565 if (tmp == NULL) 3546 if (tmp == NULL)
3566 return 0; 3547 return 0;
3548
3567 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3549 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3568 { 3550 {
3569 tmp->destroy (); 3551 tmp->destroy ();
3570 tmp = NULL; 3552 tmp = NULL;
3571 } 3553 }
… …
3574 3556
3575 tmp->x = op->x; 3557 tmp->x = op->x;
3576 tmp->y = op->y; 3558 tmp->y = op->y;
3577 SET_FLAG (tmp, FLAG_UNPAID); 3559 SET_FLAG (tmp, FLAG_UNPAID);
3578 insert_ob_in_map (tmp, op->map, NULL, 0); 3560 insert_ob_in_map (tmp, op->map, NULL, 0);
3579 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3580 identify (tmp); 3561 identify (tmp);
3581 break; 3562 break;
3582 3563
3583 case TREASURE: 3564 case TREASURE:
3584 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3565 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3605 } 3586 }
3606 3587
3607 op->destroy (); 3588 op->destroy ();
3608 break; 3589 break;
3609 } 3590 }
3610 return tmp ? 1 : 0; 3591
3592 return !!tmp;
3611} 3593}
3612 3594
3613/** 3595/**
3614 * fix_auto_apply goes through the entire map every time a map 3596 * fix_auto_apply goes through the entire map every time a map
3615 * is loaded or swapped in and performs special actions for 3597 * is loaded or swapped in and performs special actions for
… …
3629 3611
3630 if (tmp->inv) 3612 if (tmp->inv)
3631 { 3613 {
3632 object *invtmp, *invnext; 3614 object *invtmp, *invnext;
3633 3615
3634 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3616 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3635 { 3617 {
3636 invnext = invtmp->below; 3618 invnext = invtmp->below;
3637 3619
3638 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3620 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3639 auto_apply (invtmp); 3621 auto_apply (invtmp);
3640 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3622 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3641 { 3623 {
3642 while ((invtmp->stats.hp--) > 0) 3624 while (invtmp->stats.hp-- > 0)
3643 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3625 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3644 3626
3645 invtmp->randomitems = NULL; 3627 invtmp->randomitems = NULL;
3646 } 3628 }
3647 else if (invtmp && invtmp->arch 3629 else if (invtmp && invtmp->arch
… …
3759 /* check for hp, sp change */ 3741 /* check for hp, sp change */
3760 if (food->stats.hp != 0) 3742 if (food->stats.hp != 0)
3761 { 3743 {
3762 if (QUERY_FLAG (food, FLAG_CURSED)) 3744 if (QUERY_FLAG (food, FLAG_CURSED))
3763 { 3745 {
3764 assign (who->contr->killer, food->name); 3746 who->contr->killer = food;
3765 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3747 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3766 who->failmsg ("Eck!...that was poisonous!"); 3748 who->failmsg ("Eck!...that was poisonous!");
3767 } 3749 }
3768 else 3750 else
3769 { 3751 {
… …
3773 who->failmsg ("Eck!...that was poisonous!"); 3755 who->failmsg ("Eck!...that was poisonous!");
3774 3756
3775 who->stats.hp += food->stats.hp; 3757 who->stats.hp += food->stats.hp;
3776 } 3758 }
3777 } 3759 }
3760
3778 if (food->stats.sp != 0) 3761 if (food->stats.sp != 0)
3779 { 3762 {
3780 if (QUERY_FLAG (food, FLAG_CURSED)) 3763 if (QUERY_FLAG (food, FLAG_CURSED))
3781 { 3764 {
3782 who->failmsg ("You are drained of mana!"); 3765 who->failmsg ("You are drained of mana!");
… …
3809 item = find_marked_object (who); 3792 item = find_marked_object (who);
3810 if (item) 3793 if (item)
3811 { 3794 {
3812 if (lighter->last_eat && lighter->stats.food) 3795 if (lighter->last_eat && lighter->stats.food)
3813 { /* lighter gets used up */ 3796 { /* lighter gets used up */
3814 /* Split multiple lighters if they're being used up. Otherwise *
3815 * one charge from each would be used up. --DAMN */
3816 if (lighter->nrof > 1)
3817 {
3818 object *oneLighter = lighter->clone (); 3797 object *oneLighter = lighter->split ();
3819
3820 lighter->nrof -= 1;
3821 oneLighter->nrof = 1;
3822 oneLighter->stats.food--; 3798 oneLighter->stats.food--;
3823 esrv_send_item (who, lighter); 3799 who->insert (oneLighter);
3824 oneLighter = insert_ob_in_ob (oneLighter, who);
3825 esrv_send_item (who, oneLighter);
3826 }
3827 else
3828 lighter->stats.food--;
3829 } 3800 }
3830 else if (lighter->last_eat) 3801 else if (lighter->last_eat)
3831 { 3802 {
3832 /* no charges left in lighter */ 3803 /* no charges left in lighter */
3833 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name)); 3804 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
… …
3980 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3951 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3981 flag_change_face = 0; 3952 flag_change_face = 0;
3982 3953
3983 if (flag_change_face) 3954 if (flag_change_face)
3984 { 3955 {
3985 pl->animation_id = GET_ANIM_ID (change);
3986 pl->face = change->face; 3956 pl->face = change->face;
3987 3957 pl->animation_id = change->animation_id;
3988 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3958 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3989 SET_FLAG (pl, FLAG_ANIMATE);
3990 else
3991 CLEAR_FLAG (pl, FLAG_ANIMATE);
3992 } 3959 }
3993 3960
3994 /* check the special case of can't use weapons */ 3961 /* check the special case of can't use weapons */
3995 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3962 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3996 if (!strcmp (change->name, "monk")) 3963 if (!strcmp (change->name, "monk"))
… …
4090 4057
4091 new_item->nrof = yield; 4058 new_item->nrof = yield;
4092 4059
4093 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4060 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4094 4061
4095 insert_ob_in_ob (new_item, pl); 4062 pl->insert (new_item);
4096 esrv_send_inventory (pl, pl);
4097 /* Eat up one item */ 4063 /* Eat up one item */
4098 decrease_ob_nr (marked, 1); 4064 marked->decrease ();
4099 4065
4100 /* Eat one transformer if needed */ 4066 /* Eat one transformer if needed */
4101 if (transformer->stats.food) 4067 if (transformer->stats.food)
4102 if (--transformer->stats.food == 0) 4068 if (--transformer->stats.food == 0)
4103 decrease_ob_nr (transformer, 1); 4069 transformer->decrease ();
4104} 4070}
4105 4071

Diff Legend

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