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.148 by root, Tue Apr 22 04:06:07 2008 UTC vs.
Revision 1.169 by root, Sun Sep 7 21:31:23 2008 UTC

… …
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 */
… …
626 weapon->stats.exp || /* speed */ 608 weapon->stats.exp || /* speed */
627 weapon->stats.ac) /* AC - only taifu's I think */ 609 weapon->stats.ac) /* AC - only taifu's I think */
628 { 610 {
629 op->failmsg ("You cannot prepare magic weapons. " 611 op->failmsg ("You cannot prepare magic weapons. "
630 "H<A weapon is considered magical if it changes regeneration, " 612 "H<A weapon is considered magical if it changes regeneration, "
631 "speed or ac.>"); 613 "speed or ac, or has other protections.>");
632 return 0; 614 return 0;
633 } 615 }
634 616
635 sacrifice_count = check_sacrifice (op, improver); 617 sacrifice_count = check_sacrifice (op, improver);
636 if (sacrifice_count <= 0) 618 if (sacrifice_count <= 0)
… …
651 slot at once! */ 633 slot at once! */
652 improver->decrease (); 634 improver->decrease ();
653 weapon->last_eat = 0; 635 weapon->last_eat = 0;
654 return 1; 636 return 1;
655} 637}
656
657 638
658/** 639/**
659 * 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.
660 * This is the new improve weapon code. 641 * This is the new improve weapon code.
661 * 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.
… …
722 weapon->last_eat++; 703 weapon->last_eat++;
723 weapon->item_power++; 704 weapon->item_power++;
724 improver->decrease (); 705 improver->decrease ();
725 return 1; 706 return 1;
726 } 707 }
708
727 if (improver->stats.sp == IMPROVE_ENCHANT) 709 if (improver->stats.sp == IMPROVE_ENCHANT)
728 { 710 {
729 weapon->magic++; 711 weapon->magic++;
730 weapon->last_eat++; 712 weapon->last_eat++;
731 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 713 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
… …
786 op->failmsg ("Something blocks the magic of the scroll!"); 768 op->failmsg ("Something blocks the magic of the scroll!");
787 return 0; 769 return 0;
788 } 770 }
789 771
790 otmp = find_marked_object (op); 772 otmp = find_marked_object (op);
773
791 if (!otmp) 774 if (!otmp)
792 { 775 {
793 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.>");
794 return 0; 777 return 0;
795 } 778 }
… …
899 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);
900 883
901 if (op->type == PLAYER) 884 if (op->type == PLAYER)
902 { 885 {
903 esrv_send_item (op, armour); 886 esrv_send_item (op, armour);
887
904 if (QUERY_FLAG (armour, FLAG_APPLIED)) 888 if (QUERY_FLAG (armour, FLAG_APPLIED))
905 op->update_stats (); 889 op->update_stats ();
906 } 890 }
907 891
908 improver->decrease (); 892 improver->decrease ();
909 893
910 if (tmp) 894 if (tmp)
911 { 895 op->insert (tmp);
912 insert_ob_in_ob (tmp, op);
913 esrv_send_item (op, tmp);
914 }
915 896
916 return 1; 897 return 1;
917} 898}
918 899
919/* 900/*
… …
991 ob_to_copy = converter->inv; 972 ob_to_copy = converter->inv;
992 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++)
993 if (rndm (0, i) == 0) 974 if (rndm (0, i) == 0)
994 ob_to_copy = ob; 975 ob_to_copy = ob;
995 976
996 item = object_create_clone (ob_to_copy); 977 item = ob_to_copy->deep_clone ();
997 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
998 unflag_inv (item, FLAG_IS_A_TEMPLATE); 979 unflag_inv (item, FLAG_IS_A_TEMPLATE);
999 } 980 }
1000 else 981 else
1001 { 982 {
… …
1026 * 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
1027 * hopefully had something in mind when doing this. 1008 * hopefully had something in mind when doing this.
1028 */ 1009 */
1029 } 1010 }
1030 1011
1031 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
1032 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);
1033 return 1; 1018 return 1;
1034} 1019}
1035 1020
1036/** 1021/**
… …
1275 * Handles applying a sign. 1260 * Handles applying a sign.
1276 */ 1261 */
1277static void 1262static void
1278apply_sign (object *op, object *sign, int autoapply) 1263apply_sign (object *op, object *sign, int autoapply)
1279{ 1264{
1280 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 }
1281 1270
1282 if (!sign->msg) 1271 if (!sign->msg)
1283 { 1272 {
1284 op->statusmsg ("Nothing is written on it."); 1273 op->statusmsg ("Nothing is written on it.");
1285 return; 1274 return;
… …
1320 1309
1321 if (ns->can_msg) 1310 if (ns->can_msg)
1322 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));
1323 else 1312 else
1324 { 1313 {
1325 msgType = get_readable_message_type (sign); 1314 readable_message_type *msgType = get_readable_message_type (sign);
1326 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg); 1315 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1327 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);
1328 } 1317 }
1329 } 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);
1330} 1351}
1331 1352
1332/** 1353/**
1333 * 'victim' moves onto 'trap' 1354 * 'victim' moves onto 'trap'
1334 * 'victim' leaves 'trap' 1355 * 'victim' leaves 'trap'
… …
1483 1504
1484 case CONVERTER: 1505 case CONVERTER:
1485 if (convert_item (victim, trap) < 0) 1506 if (convert_item (victim, trap) < 0)
1486 { 1507 {
1487 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)));
1488 get_archetype ("burnout")->insert_at (trap, trap); 1509 archetype::get (shstr_burnout)->insert_at (trap, trap);
1489 } 1510 }
1490 1511
1491 goto leave; 1512 goto leave;
1492 1513
1493 case TRIGGER_BUTTON: 1514 case TRIGGER_BUTTON:
… …
1503 case CHECK_INV: 1524 case CHECK_INV:
1504 check_inv (victim, trap); 1525 check_inv (victim, trap);
1505 goto leave; 1526 goto leave;
1506 1527
1507 case HOLE: 1528 case HOLE:
1508 /* Hole not open? */ 1529 move_apply_hole (trap, victim);
1509 if (trap->stats.wc > 0)
1510 goto leave;
1511
1512 /* Is this a multipart monster and not the head? If so, return.
1513 * Processing will happen if the head runs into the pit
1514 */
1515 if (victim->head)
1516 goto leave;
1517
1518 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1519 victim->statusmsg ("You fall through the hole!", NDI_RED);
1520 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1521 goto leave; 1530 goto leave;
1522 1531
1523 case EXIT: 1532 case EXIT:
1524 if (victim->type == PLAYER && EXIT_PATH (trap)) 1533 if (victim->type == PLAYER && EXIT_PATH (trap))
1525 { 1534 {
… …
1635 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1644 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1636 { 1645 {
1637 /*exp_gain *= 2; because they just identified it too */ 1646 /*exp_gain *= 2; because they just identified it too */
1638 SET_FLAG (tmp, FLAG_IDENTIFIED); 1647 SET_FLAG (tmp, FLAG_IDENTIFIED);
1639 1648
1640 /* If in a container, update how it looks */ 1649 if (object *pl = tmp->visible_to ())
1641 if (tmp->env)
1642 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1650 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1643 else
1644 op->contr->ns->floorbox_update ();
1645 } 1651 }
1646 1652
1647 change_exp (op, exp_gain, skill_ob->skill, 0); 1653 change_exp (op, exp_gain, skill_ob->skill, 0);
1648 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 */
1649 } 1655 }
… …
1799 } 1805 }
1800 1806
1801 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));
1802 1808
1803 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1809 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1804 {
1805 identify (tmp); 1810 identify (tmp);
1806
1807 if (tmp->env)
1808 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1809 else
1810 op->contr->ns->floorbox_update ();
1811 }
1812 1811
1813 /* 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
1814 * 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
1815 * 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
1816 * they would have a special prayer mark. 1815 * they would have a special prayer mark.
… …
2240 2239
2241 op->statusmsg ("Applying armour enchantment."); 2240 op->statusmsg ("Applying armour enchantment.");
2242 improve_armour (op, tmp, armor); 2241 improve_armour (op, tmp, armor);
2243} 2242}
2244 2243
2245extern void 2244void
2246apply_poison (object *op, object *tmp) 2245apply_poison (object *op, object *tmp)
2247{ 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
2248 if (op->type == PLAYER) 2252 if (op->type == PLAYER)
2249 { 2253 {
2250 op->contr->play_sound (sound_find ("drink_poison")); 2254 op->contr->play_sound (sound_find ("drink_poison"));
2251 op->failmsg ("Yech! That tasted poisonous!"); 2255 op->failmsg ("Yech! That tasted poisonous!");
2252 strcpy (op->contr->killer, "poisonous booze"); 2256 op->contr->killer = poison;
2253 } 2257 }
2254 2258
2255 if (tmp->stats.hp > 0) 2259 if (poison->stats.hp > 0)
2256 { 2260 {
2257 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);
2258 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2262 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2259 } 2263 }
2260 2264
2261 op->stats.food -= op->stats.food / 4; 2265 op->stats.food -= op->stats.food / 4;
2262 handle_apply_yield (tmp); 2266 poison->destroy ();
2263 tmp->decrease ();
2264} 2267}
2265 2268
2266/** 2269/**
2267 * 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.
2268 * A valid 2 way exit means: 2271 * A valid 2 way exit means:
… …
2370 * them in this function - they are passed to apply_special 2373 * them in this function - they are passed to apply_special
2371 */ 2374 */
2372int 2375int
2373manual_apply (object *op, object *tmp, int aflag) 2376manual_apply (object *op, object *tmp, int aflag)
2374{ 2377{
2375 if (tmp->head)
2376 tmp = tmp->head; 2378 tmp = tmp->head_ ();
2377 2379
2378 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2379 { 2381 {
2380 if (op->type == PLAYER) 2382 if (op->type == PLAYER)
2381 { 2383 {
… …
2589 default: 2591 default:
2590 return 0; 2592 return 0;
2591 } 2593 }
2592} 2594}
2593 2595
2594
2595/* 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"
2596 * 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
2597 * "but you are floating high above the ground" messages. 2598 * "but you are floating high above the ground" messages.
2598 * 2599 *
2599 * Same return value as apply() function. 2600 * Same return value as apply() function.
2600 */ 2601 */
2601int 2602int
2602player_apply (object *pl, object *op, int aflag, int quiet) 2603player_apply (object *pl, object *op, int aflag, int quiet)
2603{ 2604{
2604 int tmp;
2605
2606 if (op->env && (pl->move_type & MOVE_FLYING)) 2605 if (!op->env && (pl->move_type & MOVE_FLYING))
2607 { 2606 {
2608 /* player is flying and applying object not in inventory */ 2607 /* player is flying and applying object not in inventory */
2609 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2608 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2610 { 2609 {
2611 pl->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.>");
2612 return 0; 2613 return 0;
2613 } 2614 }
2614 } 2615 }
2615 2616
2616 pl->contr->last_used = op; 2617 pl->contr->last_used = op;
2617 2618
2618 tmp = manual_apply (pl, op, aflag); 2619 int tmp = manual_apply (pl, op, aflag);
2620
2619 if (!quiet) 2621 if (!quiet)
2620 { 2622 {
2621 if (tmp == 0) 2623 if (tmp == 0)
2622 pl->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)));
2623 else if (tmp == 2) 2625 else if (tmp == 2)
… …
2715 break; 2717 break;
2716 2718
2717 case SKILL: 2719 case SKILL:
2718 if (who->contr) 2720 if (who->contr)
2719 { 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
2720 if (!op->invisible) 2727 if (op->invisible)
2728 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2729 else
2721 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2730 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2722 else
2723 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2724 } 2731 }
2725 2732
2726 change_abil (who, op); 2733 change_abil (who, op);
2727 CLEAR_FLAG (who, FLAG_READY_SKILL); 2734 CLEAR_FLAG (who, FLAG_READY_SKILL);
2728 break; 2735 break;
… …
2756 2763
2757 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2764 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2758 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2765 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2759 2766
2760 op->destroy (); 2767 op->destroy ();
2761 insert_ob_in_ob (tmp2, who); 2768 who->insert (tmp2);
2762 who->update_stats (); 2769 who->update_stats ();
2763 2770
2764 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2771 if (who->contr)
2765 { 2772 {
2766 if (who->contr) 2773 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2767 { 2774 {
2768 who->failmsg ("Oops, it feels deadly cold!"); 2775 who->failmsg ("Oops, it feels deadly cold!");
2769 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2776 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2770 } 2777 }
2771 } 2778 }
2772
2773 if (who->contr)
2774 esrv_send_item (who, tmp2);
2775 } 2779 }
2776 2780
2777 return 1; /* otherwise, an attempt to drop causes problems */ 2781 return 1; /* otherwise, an attempt to drop causes problems */
2778 2782
2779 case BOW: 2783 case BOW:
… …
2810 default: 2814 default:
2811 who->statusmsg (format ("You unapply %s.", query_name (op))); 2815 who->statusmsg (format ("You unapply %s.", query_name (op)));
2812 break; 2816 break;
2813 } 2817 }
2814 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
2815 who->update_stats (); 2823 who->update_stats ();
2816
2817 if (!(aflags & AP_NO_MERGE))
2818 {
2819 object *tmp = merge_ob (op, 0);
2820
2821 if (who->contr)
2822 {
2823 if (tmp)
2824 { /* it was merged */
2825 esrv_del_item (who->contr, op->count);
2826 op = tmp;
2827 }
2828
2829 esrv_send_item (who, op);
2830 }
2831 }
2832 2824
2833 return 0; 2825 return 0;
2834} 2826}
2835 2827
2836/** 2828/**
… …
3134 return 1; 3126 return 1;
3135 } 3127 }
3136 3128
3137 return unapply_special (who, op, aflags); 3129 return unapply_special (who, op, aflags);
3138 } 3130 }
3139
3140 if (basic_flag == AP_UNAPPLY) 3131 else if (basic_flag == AP_UNAPPLY)
3141 return 0; 3132 return 0;
3142 3133
3143 // if the item is combat/ranged, wield the relevant slot first 3134 // if the item is combat/ranged, wield the relevant slot first
3144 // to resolve conflicts. 3135 // to resolve conflicts.
3145 if (player *pl = who->contr) 3136 if (player *pl = who->contr)
… …
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 op->destroy (); 3299 op->destroy ();
3309 3300
3310 /* insert the portion that was split off */ 3301 /* insert the portion that was split off */
3311 if (tmp) 3302 if (tmp)
3312 { 3303 who->insert (tmp);
3313 insert_ob_in_ob (tmp, who);
3314 if (who->type == PLAYER)
3315 esrv_send_item (who, tmp);
3316 }
3317 3304
3318 who->update_stats (); 3305 who->update_stats ();
3319 3306
3320 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3307 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3321 if (who->type == PLAYER) 3308 if (who->type == PLAYER)
3322 { 3309 {
3323 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.>");
3324 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3311 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3325 } 3312 }
3326
3327 if (who->type == PLAYER)
3328 esrv_send_item (who, tmp2);
3329 3313
3330 return 0; 3314 return 0;
3331 3315
3332 case SKILL_TOOL: 3316 case SKILL_TOOL:
3333 // applying a skill tool also readies the skill 3317 // applying a skill tool also readies the skill
… …
3493 } 3477 }
3494 3478
3495 SET_FLAG (op, FLAG_APPLIED); 3479 SET_FLAG (op, FLAG_APPLIED);
3496 3480
3497 if (tmp) 3481 if (tmp)
3498 tmp = insert_ob_in_ob (tmp, who); 3482 who->insert (tmp);
3499 3483
3500 who->update_stats (); 3484 who->update_stats ();
3501 3485
3502 /* We exclude spell casting objects. The fire code will set the 3486 /* We exclude spell casting objects. The fire code will set the
3503 * been applied flag when they are used - until that point, 3487 * been applied flag when they are used - until that point,
… …
3514 "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.>"
3515 ); 3499 );
3516 SET_FLAG (op, FLAG_KNOWN_CURSED); 3500 SET_FLAG (op, FLAG_KNOWN_CURSED);
3517 } 3501 }
3518 3502
3519 if (who->type == PLAYER) 3503 if (object *pl = op->visible_to ())
3520 {
3521 /* if multiple objects were applied, update both slots */
3522 if (tmp)
3523 esrv_send_item (who, tmp);
3524
3525 esrv_send_item (who, op); 3504 esrv_send_item (pl, op);
3526 }
3527 3505
3528 return 0; 3506 return 0;
3529} 3507}
3530 3508
3531int 3509int
… …
3545int 3523int
3546auto_apply (object *op) 3524auto_apply (object *op)
3547{ 3525{
3548 object *tmp = NULL, *tmp2; 3526 object *tmp = NULL, *tmp2;
3549 int i; 3527 int i;
3528
3529 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3550 3530
3551 switch (op->type) 3531 switch (op->type)
3552 { 3532 {
3553 case SHOP_FLOOR: 3533 case SHOP_FLOOR:
3554 if (!op->has_random_items ()) 3534 if (!op->has_random_items ())
… …
3556 3536
3557 do 3537 do
3558 { 3538 {
3559 i = 10; /* let's give it 10 tries */ 3539 i = 10; /* let's give it 10 tries */
3560 while ((tmp = generate_treasure (op->randomitems, 3540 while ((tmp = generate_treasure (op->randomitems,
3561 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
3562 if (tmp == NULL) 3546 if (tmp == NULL)
3563 return 0; 3547 return 0;
3548
3564 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3549 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3565 { 3550 {
3566 tmp->destroy (); 3551 tmp->destroy ();
3567 tmp = NULL; 3552 tmp = NULL;
3568 } 3553 }
… …
3571 3556
3572 tmp->x = op->x; 3557 tmp->x = op->x;
3573 tmp->y = op->y; 3558 tmp->y = op->y;
3574 SET_FLAG (tmp, FLAG_UNPAID); 3559 SET_FLAG (tmp, FLAG_UNPAID);
3575 insert_ob_in_map (tmp, op->map, NULL, 0); 3560 insert_ob_in_map (tmp, op->map, NULL, 0);
3576 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3577 identify (tmp); 3561 identify (tmp);
3578 break; 3562 break;
3579 3563
3580 case TREASURE: 3564 case TREASURE:
3581 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3565 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3602 } 3586 }
3603 3587
3604 op->destroy (); 3588 op->destroy ();
3605 break; 3589 break;
3606 } 3590 }
3607 return tmp ? 1 : 0; 3591
3592 return !!tmp;
3608} 3593}
3609 3594
3610/** 3595/**
3611 * 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
3612 * is loaded or swapped in and performs special actions for 3597 * is loaded or swapped in and performs special actions for
… …
3626 3611
3627 if (tmp->inv) 3612 if (tmp->inv)
3628 { 3613 {
3629 object *invtmp, *invnext; 3614 object *invtmp, *invnext;
3630 3615
3631 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3616 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3632 { 3617 {
3633 invnext = invtmp->below; 3618 invnext = invtmp->below;
3634 3619
3635 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3620 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3636 auto_apply (invtmp); 3621 auto_apply (invtmp);
3637 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3622 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3638 { 3623 {
3639 while ((invtmp->stats.hp--) > 0) 3624 while (invtmp->stats.hp-- > 0)
3640 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3625 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3641 3626
3642 invtmp->randomitems = NULL; 3627 invtmp->randomitems = NULL;
3643 } 3628 }
3644 else if (invtmp && invtmp->arch 3629 else if (invtmp && invtmp->arch
… …
3756 /* check for hp, sp change */ 3741 /* check for hp, sp change */
3757 if (food->stats.hp != 0) 3742 if (food->stats.hp != 0)
3758 { 3743 {
3759 if (QUERY_FLAG (food, FLAG_CURSED)) 3744 if (QUERY_FLAG (food, FLAG_CURSED))
3760 { 3745 {
3761 assign (who->contr->killer, food->name); 3746 who->contr->killer = food;
3762 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3747 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3763 who->failmsg ("Eck!...that was poisonous!"); 3748 who->failmsg ("Eck!...that was poisonous!");
3764 } 3749 }
3765 else 3750 else
3766 { 3751 {
… …
3770 who->failmsg ("Eck!...that was poisonous!"); 3755 who->failmsg ("Eck!...that was poisonous!");
3771 3756
3772 who->stats.hp += food->stats.hp; 3757 who->stats.hp += food->stats.hp;
3773 } 3758 }
3774 } 3759 }
3760
3775 if (food->stats.sp != 0) 3761 if (food->stats.sp != 0)
3776 { 3762 {
3777 if (QUERY_FLAG (food, FLAG_CURSED)) 3763 if (QUERY_FLAG (food, FLAG_CURSED))
3778 { 3764 {
3779 who->failmsg ("You are drained of mana!"); 3765 who->failmsg ("You are drained of mana!");
… …
3806 item = find_marked_object (who); 3792 item = find_marked_object (who);
3807 if (item) 3793 if (item)
3808 { 3794 {
3809 if (lighter->last_eat && lighter->stats.food) 3795 if (lighter->last_eat && lighter->stats.food)
3810 { /* lighter gets used up */ 3796 { /* lighter gets used up */
3811 /* Split multiple lighters if they're being used up. Otherwise *
3812 * one charge from each would be used up. --DAMN */
3813 if (lighter->nrof > 1)
3814 {
3815 object *oneLighter = lighter->clone (); 3797 object *oneLighter = lighter->split ();
3816
3817 lighter->nrof -= 1;
3818 oneLighter->nrof = 1;
3819 oneLighter->stats.food--; 3798 oneLighter->stats.food--;
3820 esrv_send_item (who, lighter); 3799 who->insert (oneLighter);
3821 oneLighter = insert_ob_in_ob (oneLighter, who);
3822 esrv_send_item (who, oneLighter);
3823 }
3824 else
3825 lighter->stats.food--;
3826 } 3800 }
3827 else if (lighter->last_eat) 3801 else if (lighter->last_eat)
3828 { 3802 {
3829 /* no charges left in lighter */ 3803 /* no charges left in lighter */
3830 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));
… …
3977 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3951 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3978 flag_change_face = 0; 3952 flag_change_face = 0;
3979 3953
3980 if (flag_change_face) 3954 if (flag_change_face)
3981 { 3955 {
3982 pl->animation_id = GET_ANIM_ID (change);
3983 pl->face = change->face; 3956 pl->face = change->face;
3984 3957 pl->animation_id = change->animation_id;
3985 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3958 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3986 SET_FLAG (pl, FLAG_ANIMATE);
3987 else
3988 CLEAR_FLAG (pl, FLAG_ANIMATE);
3989 } 3959 }
3990 3960
3991 /* check the special case of can't use weapons */ 3961 /* check the special case of can't use weapons */
3992 /*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); */
3993 if (!strcmp (change->name, "monk")) 3963 if (!strcmp (change->name, "monk"))
… …
4087 4057
4088 new_item->nrof = yield; 4058 new_item->nrof = yield;
4089 4059
4090 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)));
4091 4061
4092 insert_ob_in_ob (new_item, pl); 4062 pl->insert (new_item);
4093 esrv_send_inventory (pl, pl);
4094 /* Eat up one item */ 4063 /* Eat up one item */
4095 marked->decrease (); 4064 marked->decrease ();
4096 4065
4097 /* Eat one transformer if needed */ 4066 /* Eat one transformer if needed */
4098 if (transformer->stats.food) 4067 if (transformer->stats.food)

Diff Legend

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