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.178 by root, Sun Dec 28 15:28:47 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 {
… …
1014 item->nrof = give; 995 item->nrof = give;
1015 996
1016 if (nr) 997 if (nr)
1017 item->nrof *= nr; 998 item->nrof *= nr;
1018 999
1019 if (is_in_shop (converter)) 1000 if (converter->flag [FLAG_PRECIOUS])
1020 SET_FLAG (item, FLAG_UNPAID); 1001 SET_FLAG (item, FLAG_UNPAID);
1002
1003 if (is_in_shop (converter))
1004 {
1005 // converters on shop floors don't work anymore, bug lets check for it
1006 // and report in case someone still does it.
1007 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
1008 converter->debug_desc ());
1009 SET_FLAG (item, FLAG_UNPAID);
1010 }
1021 else if (price_in < sint64 (item->nrof) * item->value) 1011 else if (price_in < sint64 (item->nrof) * item->value)
1022 { 1012 {
1023 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1013 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1024 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1014 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1025 /** 1015 /**
1026 * elmex: we are going to let the game continue, as the mapcreator 1016 * elmex: we are going to let the game continue, as the mapcreator
1027 * hopefully had something in mind when doing this. 1017 * hopefully had something in mind when doing this.
1028 */ 1018 */
1029 } 1019 }
1030 1020
1031 SET_FLAG (item, FLAG_IDENTIFIED); 1021 // elmex: only identify if we need to, for example so that generated money doesn't
1022 // get an 'identified' flag so easily.
1023 if (need_identify (item))
1024 identify (item);
1025
1032 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1026 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1033 return 1; 1027 return 1;
1034} 1028}
1035 1029
1036/** 1030/**
… …
1168 { 1162 {
1169 has_unpaid = true; 1163 has_unpaid = true;
1170 break; 1164 break;
1171 } 1165 }
1172 1166
1173 if (op->type != PLAYER) 1167 if (!op->is_player ())
1174 { 1168 {
1175 /* Remove all the unpaid objects that may be carried here. 1169 /* Remove all the unpaid objects that may be carried here.
1176 * This could be pets or monsters that are somehow in 1170 * This could be pets or monsters that are somehow in
1177 * the shop. 1171 * the shop.
1178 */ 1172 */
… …
1182 1176
1183 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1177 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1184 { 1178 {
1185 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1179 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1186 1180
1181 if (i >= 0)
1187 tmp->remove (); 1182 tmp->move (i);
1188
1189 if (i == -1)
1190 i = 0;
1191
1192 tmp->map = op->map;
1193 tmp->x = op->x + freearr_x[i];
1194 tmp->y = op->y + freearr_y[i];
1195 insert_ob_in_map (tmp, op->map, op, 0);
1196 } 1183 }
1197 } 1184 }
1198 1185
1199 /* Don't teleport things like spell effects */ 1186 /* Don't teleport things like spell effects */
1200 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1187 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1211 if (i != -1) 1198 if (i != -1)
1212 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1199 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1213 1200
1214 return 0; 1201 return 0;
1215 } 1202 }
1203
1216 /* Removed code that checked for multipart objects - it appears that 1204 /* Removed code that checked for multipart objects - it appears that
1217 * the teleport function should be able to handle this just fine. 1205 * the teleport function should be able to handle this just fine.
1218 */ 1206 */
1219 rv = teleport (shop_mat, SHOP_MAT, op); 1207 rv = teleport (shop_mat, SHOP_MAT, op);
1220 } 1208 }
… …
1275 * Handles applying a sign. 1263 * Handles applying a sign.
1276 */ 1264 */
1277static void 1265static void
1278apply_sign (object *op, object *sign, int autoapply) 1266apply_sign (object *op, object *sign, int autoapply)
1279{ 1267{
1280 readable_message_type *msgType; 1268 if (sign->has_dialogue ())
1269 {
1270 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1271 return;
1272 }
1281 1273
1282 if (!sign->msg) 1274 if (!sign->msg)
1283 { 1275 {
1284 op->statusmsg ("Nothing is written on it."); 1276 op->contr->infobox (MSG_CHANNEL ("examine"),
1277 format ("T<%s>\n\n Nothing %sis written on it.",
1278 &sign->name,
1279 sign->name == sign->arch->name ? "" : "else "));
1285 return; 1280 return;
1286 } 1281 }
1287 1282
1288 if (sign->stats.food) 1283 if (sign->stats.food)
1289 { 1284 {
1290 if (sign->last_eat >= sign->stats.food) 1285 if (sign->last_eat >= sign->stats.food)
1291 { 1286 {
1292 if (!sign->move_on) 1287 if (!sign->move_on)
1293 op->statusmsg ("You cannot read it anymore."); 1288 op->failmsg ("You cannot read it anymore.");
1294 1289
1295 return; 1290 return;
1296 } 1291 }
1297 1292
1298 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1293 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1316 if (sign->sound) 1311 if (sign->sound)
1317 ns->play_sound (sign->sound); 1312 ns->play_sound (sign->sound);
1318 else if (autoapply) 1313 else if (autoapply)
1319 ns->play_sound (sound_find ("msg_voice")); 1314 ns->play_sound (sound_find ("msg_voice"));
1320 1315
1321 if (ns->can_msg)
1322 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1316 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1323 else
1324 {
1325 msgType = get_readable_message_type (sign);
1326 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);
1328 }
1329 } 1317 }
1318}
1319
1320static void
1321move_apply_hole (object *trap, object *victim)
1322{
1323 /* Hole not open? */
1324 if (trap->stats.wc > 0)
1325 return;
1326
1327 /* Is this a multipart monster and not the head? If so, return.
1328 * Processing will happen if the head runs into the pit
1329 */
1330 if (victim->head)
1331 return;
1332
1333 // now find all possible locations and randomly pick one
1334 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1335 trap->range >= 3 ? SIZEOFFREE3 + 1
1336 : trap->range >= 2 ? SIZEOFFREE2 + 1
1337 : trap->range >= 1 ? SIZEOFFREE1 + 1
1338 : SIZEOFFREE0 + 1);
1339
1340 if (dir < 0)
1341 return;
1342
1343 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1344 victim->statusmsg ("You fall through the hole!", NDI_RED);
1345
1346 transfer_ob (victim,
1347 EXIT_X (trap) + freearr_x[dir],
1348 EXIT_Y (trap) + freearr_y[dir],
1349 0, victim);
1330} 1350}
1331 1351
1332/** 1352/**
1333 * 'victim' moves onto 'trap' 1353 * 'victim' moves onto 'trap'
1334 * 'victim' leaves 'trap' 1354 * 'victim' leaves 'trap'
… …
1483 1503
1484 case CONVERTER: 1504 case CONVERTER:
1485 if (convert_item (victim, trap) < 0) 1505 if (convert_item (victim, trap) < 0)
1486 { 1506 {
1487 originator->failmsg (format ("The %s seems to be broken!", query_name (trap))); 1507 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1488 get_archetype ("burnout")->insert_at (trap, trap); 1508 archetype::get (shstr_burnout)->insert_at (trap, trap);
1489 } 1509 }
1490 1510
1491 goto leave; 1511 goto leave;
1492 1512
1493 case TRIGGER_BUTTON: 1513 case TRIGGER_BUTTON:
… …
1503 case CHECK_INV: 1523 case CHECK_INV:
1504 check_inv (victim, trap); 1524 check_inv (victim, trap);
1505 goto leave; 1525 goto leave;
1506 1526
1507 case HOLE: 1527 case HOLE:
1508 /* Hole not open? */ 1528 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; 1529 goto leave;
1522 1530
1523 case EXIT: 1531 case EXIT:
1524 if (victim->type == PLAYER && EXIT_PATH (trap)) 1532 if (victim->type == PLAYER && EXIT_PATH (trap))
1525 { 1533 {
… …
1617 1625
1618 readable_message_type *msgType = get_readable_message_type (tmp); 1626 readable_message_type *msgType = get_readable_message_type (tmp);
1619 1627
1620 if (player *pl = op->contr) 1628 if (player *pl = op->contr)
1621 if (client *ns = pl->ns) 1629 if (client *ns = pl->ns)
1622 if (ns->can_msg)
1623 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); 1630 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1624 else
1625 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1626 msgType->message_type, msgType->message_subtype,
1627 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1628 long_desc (tmp, op), &tmp->msg);
1629 1631
1630 /* gain xp from reading */ 1632 /* gain xp from reading */
1631 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1633 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1632 { /* only if not read before */ 1634 { /* only if not read before */
1633 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1635 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1635 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1637 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1636 { 1638 {
1637 /*exp_gain *= 2; because they just identified it too */ 1639 /*exp_gain *= 2; because they just identified it too */
1638 SET_FLAG (tmp, FLAG_IDENTIFIED); 1640 SET_FLAG (tmp, FLAG_IDENTIFIED);
1639 1641
1640 /* If in a container, update how it looks */ 1642 if (object *pl = tmp->visible_to ())
1641 if (tmp->env)
1642 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1643 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1643 else
1644 op->contr->ns->floorbox_update ();
1645 } 1644 }
1646 1645
1647 change_exp (op, exp_gain, skill_ob->skill, 0); 1646 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 */ 1647 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1649 } 1648 }
… …
1799 } 1798 }
1800 1799
1801 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1800 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1802 1801
1803 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1802 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1804 {
1805 identify (tmp); 1803 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 1804
1813 /* I removed the check for special_prayer_mark here - it didn't make 1805 /* 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 1806 * 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 1807 * if the player doesn't know the spell, doesn't make a lot of sense that
1816 * they would have a special prayer mark. 1808 * they would have a special prayer mark.
… …
1966 if (op->destroyed () || tmp->destroyed ()) 1958 if (op->destroyed () || tmp->destroyed ())
1967 break; 1959 break;
1968 } 1960 }
1969 1961
1970 if (!tmp->destroyed () && !tmp->inv) 1962 if (!tmp->destroyed () && !tmp->inv)
1971 tmp->decrease (); 1963 tmp->decrease (true);
1972} 1964}
1973 1965
1974/** 1966/**
1975 * op eats food. 1967 * op eats food.
1976 * If player, takes care of messages and dragon special food. 1968 * If player, takes care of messages and dragon special food.
… …
2171 op->statusmsg (buf); 2163 op->statusmsg (buf);
2172 2164
2173 /* now choose a winner if we have any */ 2165 /* now choose a winner if we have any */
2174 i = -1; 2166 i = -1;
2175 if (winners > 0) 2167 if (winners > 0)
2176 i = atnr_winner[RANDOM () % winners]; 2168 i = atnr_winner [rndm (winners)];
2177 2169
2178 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2170 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2179 { 2171 {
2180 /* resistance increased! */ 2172 /* resistance increased! */
2181 skin->resist[i]++; 2173 skin->resist[i]++;
… …
2240 2232
2241 op->statusmsg ("Applying armour enchantment."); 2233 op->statusmsg ("Applying armour enchantment.");
2242 improve_armour (op, tmp, armor); 2234 improve_armour (op, tmp, armor);
2243} 2235}
2244 2236
2245extern void 2237void
2246apply_poison (object *op, object *tmp) 2238apply_poison (object *op, object *tmp)
2247{ 2239{
2240 // need to do it now when it is still on the map
2241 handle_apply_yield (tmp);
2242
2243 object *poison = tmp->split (1);
2244
2248 if (op->type == PLAYER) 2245 if (op->type == PLAYER)
2249 { 2246 {
2250 op->contr->play_sound (sound_find ("drink_poison")); 2247 op->contr->play_sound (sound_find ("drink_poison"));
2251 op->failmsg ("Yech! That tasted poisonous!"); 2248 op->failmsg ("Yech! That tasted poisonous!");
2252 strcpy (op->contr->killer, "poisonous booze"); 2249 op->contr->killer = poison;
2253 } 2250 }
2254 2251
2255 if (tmp->stats.hp > 0) 2252 if (poison->stats.hp > 0)
2256 { 2253 {
2257 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2254 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); 2255 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2259 } 2256 }
2260 2257
2261 op->stats.food -= op->stats.food / 4; 2258 op->stats.food -= op->stats.food / 4;
2262 handle_apply_yield (tmp); 2259 poison->destroy ();
2263 tmp->decrease ();
2264} 2260}
2265 2261
2266/** 2262/**
2267 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2263 * 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: 2264 * A valid 2 way exit means:
… …
2370 * them in this function - they are passed to apply_special 2366 * them in this function - they are passed to apply_special
2371 */ 2367 */
2372int 2368int
2373manual_apply (object *op, object *tmp, int aflag) 2369manual_apply (object *op, object *tmp, int aflag)
2374{ 2370{
2375 if (tmp->head)
2376 tmp = tmp->head; 2371 tmp = tmp->head_ ();
2377 2372
2378 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2373 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2379 { 2374 {
2380 if (op->type == PLAYER) 2375 if (op->type == PLAYER)
2381 { 2376 {
… …
2589 default: 2584 default:
2590 return 0; 2585 return 0;
2591 } 2586 }
2592} 2587}
2593 2588
2594
2595/* quiet suppresses the "don't know how to apply" and "you must get it first" 2589/* 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 2590 * messages as needed by player_apply_below(). But there can still be
2597 * "but you are floating high above the ground" messages. 2591 * "but you are floating high above the ground" messages.
2598 * 2592 *
2599 * Same return value as apply() function. 2593 * Same return value as apply() function.
2600 */ 2594 */
2601int 2595int
2602player_apply (object *pl, object *op, int aflag, int quiet) 2596player_apply (object *pl, object *op, int aflag, int quiet)
2603{ 2597{
2604 int tmp;
2605
2606 if (op->env && (pl->move_type & MOVE_FLYING)) 2598 if (!op->env && (pl->move_type & MOVE_FLYING))
2607 { 2599 {
2608 /* player is flying and applying object not in inventory */ 2600 /* player is flying and applying object not in inventory */
2609 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2601 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2610 { 2602 {
2611 pl->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2603 pl->failmsg ("But you are floating high above the ground! "
2604 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2605 "or waiting till the levitation effect wears off.>");
2612 return 0; 2606 return 0;
2613 } 2607 }
2614 } 2608 }
2615 2609
2616 pl->contr->last_used = op; 2610 pl->contr->last_used = op;
2617 2611
2618 tmp = manual_apply (pl, op, aflag); 2612 int tmp = manual_apply (pl, op, aflag);
2613
2619 if (!quiet) 2614 if (!quiet)
2620 { 2615 {
2621 if (tmp == 0) 2616 if (tmp == 0)
2622 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2617 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2623 else if (tmp == 2) 2618 else if (tmp == 2)
… …
2658 * person moving on it, also activate. Added code to make it 2653 * person moving on it, also activate. Added code to make it
2659 * so that at least one of players movement types be that which 2654 * so that at least one of players movement types be that which
2660 * the item needs. 2655 * the item needs.
2661 */ 2656 */
2662 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2657 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2663 {
2664 if (player_apply (pl, tmp, 0, 1) == 1) 2658 if (player_apply (pl, tmp, 0, 1) == 1)
2665 return; 2659 return;
2666 } 2660
2667 if (floors >= 2) 2661 if (floors >= 2)
2668 return; /* process at most two floor objects */ 2662 return; /* process at most two floor objects */
2669 } 2663 }
2670} 2664}
2671 2665
… …
2715 break; 2709 break;
2716 2710
2717 case SKILL: 2711 case SKILL:
2718 if (who->contr) 2712 if (who->contr)
2719 { 2713 {
2714 if (IS_COMBAT_SKILL (op->subtype))
2715 who->change_weapon (who->contr->combat_ob = 0);
2716 else if (IS_RANGED_SKILL (op->subtype))
2717 who->change_weapon (who->contr->ranged_ob = 0);
2718
2720 if (!op->invisible) 2719 if (op->invisible)
2720 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2721 else
2721 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2722 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 } 2723 }
2725 2724
2726 change_abil (who, op); 2725 change_abil (who, op);
2727 CLEAR_FLAG (who, FLAG_READY_SKILL); 2726 CLEAR_FLAG (who, FLAG_READY_SKILL);
2728 break; 2727 break;
… …
2756 2755
2757 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2756 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2758 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2757 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2759 2758
2760 op->destroy (); 2759 op->destroy ();
2761 insert_ob_in_ob (tmp2, who); 2760 who->insert (tmp2);
2762 who->update_stats (); 2761 who->update_stats ();
2763 2762
2764 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2765 {
2766 if (who->contr)
2767 {
2768 who->failmsg ("Oops, it feels deadly cold!");
2769 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2770 }
2771 }
2772
2773 if (who->contr) 2763 if (who->contr)
2774 esrv_send_item (who, tmp2); 2764 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2765 {
2766 who->failmsg ("Oops, it feels deadly cold!");
2767 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2768 }
2775 } 2769 }
2776 2770
2777 return 1; /* otherwise, an attempt to drop causes problems */ 2771 return 1; /* otherwise, an attempt to drop causes problems */
2778 2772
2779 case BOW: 2773 case BOW:
… …
2810 default: 2804 default:
2811 who->statusmsg (format ("You unapply %s.", query_name (op))); 2805 who->statusmsg (format ("You unapply %s.", query_name (op)));
2812 break; 2806 break;
2813 } 2807 }
2814 2808
2809 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2810 if (object *pl = op->visible_to ())
2811 esrv_send_item (pl, op);
2812
2815 who->update_stats (); 2813 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 2814
2833 return 0; 2815 return 0;
2834} 2816}
2835 2817
2836/** 2818/**
… …
3134 return 1; 3116 return 1;
3135 } 3117 }
3136 3118
3137 return unapply_special (who, op, aflags); 3119 return unapply_special (who, op, aflags);
3138 } 3120 }
3139
3140 if (basic_flag == AP_UNAPPLY) 3121 else if (basic_flag == AP_UNAPPLY)
3141 return 0; 3122 return 0;
3142 3123
3143 // if the item is combat/ranged, wield the relevant slot first 3124 // if the item is combat/ranged, wield the relevant slot first
3144 // to resolve conflicts. 3125 // to resolve conflicts.
3145 if (player *pl = who->contr) 3126 if (player *pl = who->contr)
… …
3225 switch (op->type) 3206 switch (op->type)
3226 { 3207 {
3227 case WEAPON: 3208 case WEAPON:
3228 if (!check_weapon_power (who, op->last_eat)) 3209 if (!check_weapon_power (who, op->last_eat))
3229 { 3210 {
3230 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER); 3211 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3231 3212
3232 if (tmp) 3213 if (tmp)
3233 insert_ob_in_ob (tmp, who); 3214 insert_ob_in_ob (tmp, who);
3234 3215
3235 return 1; 3216 return 1;
… …
3300 SET_FLAG (tmp2, FLAG_APPLIED); 3281 SET_FLAG (tmp2, FLAG_APPLIED);
3301 3282
3302 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3283 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3303 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3284 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3304 3285
3305 insert_ob_in_ob (tmp2, who); 3286 who->insert (tmp2);
3306 3287
3307 /* Remove the old lantern */ 3288 /* Remove the old lantern */
3308 op->destroy (); 3289 op->destroy ();
3309 3290
3310 /* insert the portion that was split off */ 3291 /* insert the portion that was split off */
3311 if (tmp) 3292 if (tmp)
3312 { 3293 who->insert (tmp);
3313 insert_ob_in_ob (tmp, who);
3314 if (who->type == PLAYER)
3315 esrv_send_item (who, tmp);
3316 }
3317 3294
3318 who->update_stats (); 3295 who->update_stats ();
3319 3296
3320 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3297 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3321 if (who->type == PLAYER) 3298 if (who->type == PLAYER)
3322 { 3299 {
3323 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); 3300 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright (hrhrhr) idea to apply this cursed or damned item.>");
3324 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3301 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3325 } 3302 }
3326
3327 if (who->type == PLAYER)
3328 esrv_send_item (who, tmp2);
3329 3303
3330 return 0; 3304 return 0;
3331 3305
3332 case SKILL_TOOL: 3306 case SKILL_TOOL:
3333 // applying a skill tool also readies the skill 3307 // applying a skill tool also readies the skill
… …
3493 } 3467 }
3494 3468
3495 SET_FLAG (op, FLAG_APPLIED); 3469 SET_FLAG (op, FLAG_APPLIED);
3496 3470
3497 if (tmp) 3471 if (tmp)
3498 tmp = insert_ob_in_ob (tmp, who); 3472 who->insert (tmp);
3499 3473
3500 who->update_stats (); 3474 who->update_stats ();
3501 3475
3502 /* We exclude spell casting objects. The fire code will set the 3476 /* We exclude spell casting objects. The fire code will set the
3503 * been applied flag when they are used - until that point, 3477 * been applied flag when they are used - until that point,
… …
3509 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3483 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3510 if (who->type == PLAYER) 3484 if (who->type == PLAYER)
3511 { 3485 {
3512 who->failmsg ( 3486 who->failmsg (
3513 "Oops, it feels deadly cold! " 3487 "Oops, it feels deadly cold! "
3514 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3488 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3515 ); 3489 );
3516 SET_FLAG (op, FLAG_KNOWN_CURSED); 3490 SET_FLAG (op, FLAG_KNOWN_CURSED);
3517 } 3491 }
3518 3492
3519 if (who->type == PLAYER) 3493 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); 3494 esrv_send_item (pl, op);
3526 }
3527 3495
3528 return 0; 3496 return 0;
3529} 3497}
3530 3498
3531int 3499int
… …
3545int 3513int
3546auto_apply (object *op) 3514auto_apply (object *op)
3547{ 3515{
3548 object *tmp = NULL, *tmp2; 3516 object *tmp = NULL, *tmp2;
3549 int i; 3517 int i;
3518
3519 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3550 3520
3551 switch (op->type) 3521 switch (op->type)
3552 { 3522 {
3553 case SHOP_FLOOR: 3523 case SHOP_FLOOR:
3554 if (!op->has_random_items ()) 3524 if (!op->has_random_items ())
… …
3556 3526
3557 do 3527 do
3558 { 3528 {
3559 i = 10; /* let's give it 10 tries */ 3529 i = 10; /* let's give it 10 tries */
3560 while ((tmp = generate_treasure (op->randomitems, 3530 while ((tmp = generate_treasure (op->randomitems,
3561 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3531 op->stats.exp
3532 ? (int) op->stats.exp
3533 : max (op->map->difficulty, 5)))
3534 == NULL && --i);
3535
3562 if (tmp == NULL) 3536 if (tmp == NULL)
3563 return 0; 3537 return 0;
3538
3564 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3539 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3565 { 3540 {
3566 tmp->destroy (); 3541 tmp->destroy ();
3567 tmp = NULL; 3542 tmp = NULL;
3568 } 3543 }
… …
3571 3546
3572 tmp->x = op->x; 3547 tmp->x = op->x;
3573 tmp->y = op->y; 3548 tmp->y = op->y;
3574 SET_FLAG (tmp, FLAG_UNPAID); 3549 SET_FLAG (tmp, FLAG_UNPAID);
3575 insert_ob_in_map (tmp, op->map, NULL, 0); 3550 insert_ob_in_map (tmp, op->map, NULL, 0);
3576 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3577 identify (tmp); 3551 identify (tmp);
3578 break; 3552 break;
3579 3553
3580 case TREASURE: 3554 case TREASURE:
3581 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3555 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3588 /* If we generated an object and put it in this object inventory, 3562 /* If we generated an object and put it in this object inventory,
3589 * move it to the parent object as the current object is about 3563 * move it to the parent object as the current object is about
3590 * to disappear. An example of this item is the random_* stuff 3564 * to disappear. An example of this item is the random_* stuff
3591 * that is put inside other objects. 3565 * that is put inside other objects.
3592 */ 3566 */
3593 for (tmp = op->inv; tmp; tmp = tmp2)
3594 {
3595 tmp2 = tmp->below;
3596 tmp->remove ();
3597
3598 if (op->env) 3567 if (op->env)
3599 insert_ob_in_ob (tmp, op->env); 3568 while (op->inv)
3600 else 3569 op->env->insert (op->inv);
3601 tmp->destroy ();
3602 }
3603 3570
3604 op->destroy (); 3571 op->destroy ();
3605 break; 3572 break;
3606 } 3573 }
3607 return tmp ? 1 : 0; 3574
3575 return !!tmp;
3608} 3576}
3609 3577
3610/** 3578/**
3611 * fix_auto_apply goes through the entire map every time a map 3579 * fix_auto_apply goes through the entire map every time a map
3612 * is loaded or swapped in and performs special actions for 3580 * is loaded or swapped in and performs special actions for
… …
3626 3594
3627 if (tmp->inv) 3595 if (tmp->inv)
3628 { 3596 {
3629 object *invtmp, *invnext; 3597 object *invtmp, *invnext;
3630 3598
3631 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3599 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3632 { 3600 {
3633 invnext = invtmp->below; 3601 invnext = invtmp->below;
3634 3602
3635 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3603 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3636 auto_apply (invtmp); 3604 auto_apply (invtmp);
3637 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3605 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3638 { 3606 {
3639 while ((invtmp->stats.hp--) > 0) 3607 while (invtmp->stats.hp-- > 0)
3640 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3608 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3641 3609
3642 invtmp->randomitems = NULL; 3610 invtmp->randomitems = NULL;
3643 } 3611 }
3644 else if (invtmp && invtmp->arch 3612 else if (invtmp && invtmp->arch
… …
3756 /* check for hp, sp change */ 3724 /* check for hp, sp change */
3757 if (food->stats.hp != 0) 3725 if (food->stats.hp != 0)
3758 { 3726 {
3759 if (QUERY_FLAG (food, FLAG_CURSED)) 3727 if (QUERY_FLAG (food, FLAG_CURSED))
3760 { 3728 {
3761 assign (who->contr->killer, food->name); 3729 who->contr->killer = food;
3762 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3730 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3763 who->failmsg ("Eck!...that was poisonous!"); 3731 who->failmsg ("Eck!...that was poisonous!");
3764 } 3732 }
3765 else 3733 else
3766 { 3734 {
… …
3770 who->failmsg ("Eck!...that was poisonous!"); 3738 who->failmsg ("Eck!...that was poisonous!");
3771 3739
3772 who->stats.hp += food->stats.hp; 3740 who->stats.hp += food->stats.hp;
3773 } 3741 }
3774 } 3742 }
3743
3775 if (food->stats.sp != 0) 3744 if (food->stats.sp != 0)
3776 { 3745 {
3777 if (QUERY_FLAG (food, FLAG_CURSED)) 3746 if (QUERY_FLAG (food, FLAG_CURSED))
3778 { 3747 {
3779 who->failmsg ("You are drained of mana!"); 3748 who->failmsg ("You are drained of mana!");
… …
3806 item = find_marked_object (who); 3775 item = find_marked_object (who);
3807 if (item) 3776 if (item)
3808 { 3777 {
3809 if (lighter->last_eat && lighter->stats.food) 3778 if (lighter->last_eat && lighter->stats.food)
3810 { /* lighter gets used up */ 3779 { /* 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 (); 3780 object *oneLighter = lighter->split ();
3816
3817 lighter->nrof -= 1;
3818 oneLighter->nrof = 1;
3819 oneLighter->stats.food--; 3781 oneLighter->stats.food--;
3820 esrv_send_item (who, lighter); 3782 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 } 3783 }
3827 else if (lighter->last_eat) 3784 else if (lighter->last_eat)
3828 { 3785 {
3829 /* no charges left in lighter */ 3786 /* no charges left in lighter */
3830 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name)); 3787 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
… …
3977 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3934 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3978 flag_change_face = 0; 3935 flag_change_face = 0;
3979 3936
3980 if (flag_change_face) 3937 if (flag_change_face)
3981 { 3938 {
3982 pl->animation_id = GET_ANIM_ID (change);
3983 pl->face = change->face; 3939 pl->face = change->face;
3984 3940 pl->animation_id = change->animation_id;
3985 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3941 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3986 SET_FLAG (pl, FLAG_ANIMATE);
3987 else
3988 CLEAR_FLAG (pl, FLAG_ANIMATE);
3989 } 3942 }
3990 3943
3991 /* check the special case of can't use weapons */ 3944 /* check the special case of can't use weapons */
3992 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3945 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3993 if (!strcmp (change->name, "monk")) 3946 if (!strcmp (change->name, "monk"))
… …
4087 4040
4088 new_item->nrof = yield; 4041 new_item->nrof = yield;
4089 4042
4090 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4043 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4091 4044
4092 insert_ob_in_ob (new_item, pl); 4045 pl->insert (new_item);
4093 esrv_send_inventory (pl, pl);
4094 /* Eat up one item */ 4046 /* Eat up one item */
4095 marked->decrease (); 4047 marked->decrease ();
4096 4048
4097 /* Eat one transformer if needed */ 4049 /* Eat one transformer if needed */
4098 if (transformer->stats.food) 4050 if (transformer->stats.food)

Diff Legend

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