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.152 by root, Fri May 2 20:16:24 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 if (const char *yield = get_ob_key_value (tmp, "on_use_yield")) 165 if (shstr yield = tmp->kv (shstr_on_use_yield))
166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR); 166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167} 167}
168 168
169/** 169/**
170 * Handles applying a potion. 170 * Handles applying a potion.
… …
608 weapon->stats.exp || /* speed */ 608 weapon->stats.exp || /* speed */
609 weapon->stats.ac) /* AC - only taifu's I think */ 609 weapon->stats.ac) /* AC - only taifu's I think */
610 { 610 {
611 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, " 612 "H<A weapon is considered magical if it changes regeneration, "
613 "speed or ac.>"); 613 "speed or ac, or has other protections.>");
614 return 0; 614 return 0;
615 } 615 }
616 616
617 sacrifice_count = check_sacrifice (op, improver); 617 sacrifice_count = check_sacrifice (op, improver);
618 if (sacrifice_count <= 0) 618 if (sacrifice_count <= 0)
… …
703 weapon->last_eat++; 703 weapon->last_eat++;
704 weapon->item_power++; 704 weapon->item_power++;
705 improver->decrease (); 705 improver->decrease ();
706 return 1; 706 return 1;
707 } 707 }
708
708 if (improver->stats.sp == IMPROVE_ENCHANT) 709 if (improver->stats.sp == IMPROVE_ENCHANT)
709 { 710 {
710 weapon->magic++; 711 weapon->magic++;
711 weapon->last_eat++; 712 weapon->last_eat++;
712 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 713 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
… …
767 op->failmsg ("Something blocks the magic of the scroll!"); 768 op->failmsg ("Something blocks the magic of the scroll!");
768 return 0; 769 return 0;
769 } 770 }
770 771
771 otmp = find_marked_object (op); 772 otmp = find_marked_object (op);
773
772 if (!otmp) 774 if (!otmp)
773 { 775 {
774 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.>");
775 return 0; 777 return 0;
776 } 778 }
… …
970 ob_to_copy = converter->inv; 972 ob_to_copy = converter->inv;
971 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++)
972 if (rndm (0, i) == 0) 974 if (rndm (0, i) == 0)
973 ob_to_copy = ob; 975 ob_to_copy = ob;
974 976
975 item = object_create_clone (ob_to_copy); 977 item = ob_to_copy->deep_clone ();
976 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
977 unflag_inv (item, FLAG_IS_A_TEMPLATE); 979 unflag_inv (item, FLAG_IS_A_TEMPLATE);
978 } 980 }
979 else 981 else
980 { 982 {
… …
993 item->nrof = give; 995 item->nrof = give;
994 996
995 if (nr) 997 if (nr)
996 item->nrof *= nr; 998 item->nrof *= nr;
997 999
998 if (is_in_shop (converter)) 1000 if (converter->flag [FLAG_PRECIOUS])
999 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 }
1000 else if (price_in < sint64 (item->nrof) * item->value) 1011 else if (price_in < sint64 (item->nrof) * item->value)
1001 { 1012 {
1002 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",
1003 &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);
1004 /** 1015 /**
1005 * 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
1006 * hopefully had something in mind when doing this. 1017 * hopefully had something in mind when doing this.
1007 */ 1018 */
1008 } 1019 }
1009 1020
1010 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
1011 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);
1012 return 1; 1027 return 1;
1013} 1028}
1014 1029
1015/** 1030/**
… …
1147 { 1162 {
1148 has_unpaid = true; 1163 has_unpaid = true;
1149 break; 1164 break;
1150 } 1165 }
1151 1166
1152 if (op->type != PLAYER) 1167 if (!op->is_player ())
1153 { 1168 {
1154 /* Remove all the unpaid objects that may be carried here. 1169 /* Remove all the unpaid objects that may be carried here.
1155 * This could be pets or monsters that are somehow in 1170 * This could be pets or monsters that are somehow in
1156 * the shop. 1171 * the shop.
1157 */ 1172 */
… …
1161 1176
1162 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1177 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1163 { 1178 {
1164 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);
1165 1180
1181 if (i >= 0)
1166 tmp->remove (); 1182 tmp->move (i);
1167
1168 if (i == -1)
1169 i = 0;
1170
1171 tmp->map = op->map;
1172 tmp->x = op->x + freearr_x[i];
1173 tmp->y = op->y + freearr_y[i];
1174 insert_ob_in_map (tmp, op->map, op, 0);
1175 } 1183 }
1176 } 1184 }
1177 1185
1178 /* Don't teleport things like spell effects */ 1186 /* Don't teleport things like spell effects */
1179 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1187 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1190 if (i != -1) 1198 if (i != -1)
1191 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);
1192 1200
1193 return 0; 1201 return 0;
1194 } 1202 }
1203
1195 /* Removed code that checked for multipart objects - it appears that 1204 /* Removed code that checked for multipart objects - it appears that
1196 * the teleport function should be able to handle this just fine. 1205 * the teleport function should be able to handle this just fine.
1197 */ 1206 */
1198 rv = teleport (shop_mat, SHOP_MAT, op); 1207 rv = teleport (shop_mat, SHOP_MAT, op);
1199 } 1208 }
… …
1254 * Handles applying a sign. 1263 * Handles applying a sign.
1255 */ 1264 */
1256static void 1265static void
1257apply_sign (object *op, object *sign, int autoapply) 1266apply_sign (object *op, object *sign, int autoapply)
1258{ 1267{
1259 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 }
1260 1273
1261 if (!sign->msg) 1274 if (!sign->msg)
1262 { 1275 {
1263 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 "));
1264 return; 1280 return;
1265 } 1281 }
1266 1282
1267 if (sign->stats.food) 1283 if (sign->stats.food)
1268 { 1284 {
1269 if (sign->last_eat >= sign->stats.food) 1285 if (sign->last_eat >= sign->stats.food)
1270 { 1286 {
1271 if (!sign->move_on) 1287 if (!sign->move_on)
1272 op->statusmsg ("You cannot read it anymore."); 1288 op->failmsg ("You cannot read it anymore.");
1273 1289
1274 return; 1290 return;
1275 } 1291 }
1276 1292
1277 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1293 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1295 if (sign->sound) 1311 if (sign->sound)
1296 ns->play_sound (sign->sound); 1312 ns->play_sound (sign->sound);
1297 else if (autoapply) 1313 else if (autoapply)
1298 ns->play_sound (sound_find ("msg_voice")); 1314 ns->play_sound (sound_find ("msg_voice"));
1299 1315
1300 if (ns->can_msg)
1301 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));
1302 else
1303 {
1304 msgType = get_readable_message_type (sign);
1305 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1306 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1307 }
1308 } 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);
1309} 1350}
1310 1351
1311/** 1352/**
1312 * 'victim' moves onto 'trap' 1353 * 'victim' moves onto 'trap'
1313 * 'victim' leaves 'trap' 1354 * 'victim' leaves 'trap'
… …
1462 1503
1463 case CONVERTER: 1504 case CONVERTER:
1464 if (convert_item (victim, trap) < 0) 1505 if (convert_item (victim, trap) < 0)
1465 { 1506 {
1466 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)));
1467 get_archetype ("burnout")->insert_at (trap, trap); 1508 archetype::get (shstr_burnout)->insert_at (trap, trap);
1468 } 1509 }
1469 1510
1470 goto leave; 1511 goto leave;
1471 1512
1472 case TRIGGER_BUTTON: 1513 case TRIGGER_BUTTON:
… …
1482 case CHECK_INV: 1523 case CHECK_INV:
1483 check_inv (victim, trap); 1524 check_inv (victim, trap);
1484 goto leave; 1525 goto leave;
1485 1526
1486 case HOLE: 1527 case HOLE:
1487 /* Hole not open? */ 1528 move_apply_hole (trap, victim);
1488 if (trap->stats.wc > 0)
1489 goto leave;
1490
1491 /* Is this a multipart monster and not the head? If so, return.
1492 * Processing will happen if the head runs into the pit
1493 */
1494 if (victim->head)
1495 goto leave;
1496
1497 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1498 victim->statusmsg ("You fall through the hole!", NDI_RED);
1499 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1500 goto leave; 1529 goto leave;
1501 1530
1502 case EXIT: 1531 case EXIT:
1503 if (victim->type == PLAYER && EXIT_PATH (trap)) 1532 if (victim->type == PLAYER && EXIT_PATH (trap))
1504 { 1533 {
… …
1596 1625
1597 readable_message_type *msgType = get_readable_message_type (tmp); 1626 readable_message_type *msgType = get_readable_message_type (tmp);
1598 1627
1599 if (player *pl = op->contr) 1628 if (player *pl = op->contr)
1600 if (client *ns = pl->ns) 1629 if (client *ns = pl->ns)
1601 if (ns->can_msg)
1602 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));
1603 else
1604 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1605 msgType->message_type, msgType->message_subtype,
1606 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1607 long_desc (tmp, op), &tmp->msg);
1608 1631
1609 /* gain xp from reading */ 1632 /* gain xp from reading */
1610 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1633 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1611 { /* only if not read before */ 1634 { /* only if not read before */
1612 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1635 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1935 if (op->destroyed () || tmp->destroyed ()) 1958 if (op->destroyed () || tmp->destroyed ())
1936 break; 1959 break;
1937 } 1960 }
1938 1961
1939 if (!tmp->destroyed () && !tmp->inv) 1962 if (!tmp->destroyed () && !tmp->inv)
1940 tmp->decrease (); 1963 tmp->decrease (true);
1941} 1964}
1942 1965
1943/** 1966/**
1944 * op eats food. 1967 * op eats food.
1945 * If player, takes care of messages and dragon special food. 1968 * If player, takes care of messages and dragon special food.
… …
2140 op->statusmsg (buf); 2163 op->statusmsg (buf);
2141 2164
2142 /* now choose a winner if we have any */ 2165 /* now choose a winner if we have any */
2143 i = -1; 2166 i = -1;
2144 if (winners > 0) 2167 if (winners > 0)
2145 i = atnr_winner[RANDOM () % winners]; 2168 i = atnr_winner [rndm (winners)];
2146 2169
2147 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2170 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2148 { 2171 {
2149 /* resistance increased! */ 2172 /* resistance increased! */
2150 skin->resist[i]++; 2173 skin->resist[i]++;
… …
2212} 2235}
2213 2236
2214void 2237void
2215apply_poison (object *op, object *tmp) 2238apply_poison (object *op, object *tmp)
2216{ 2239{
2240 // need to do it now when it is still on the map
2241 handle_apply_yield (tmp);
2242
2217 object *poison = tmp->split (1); 2243 object *poison = tmp->split (1);
2218 2244
2219 if (op->type == PLAYER) 2245 if (op->type == PLAYER)
2220 { 2246 {
2221 op->contr->play_sound (sound_find ("drink_poison")); 2247 op->contr->play_sound (sound_find ("drink_poison"));
… …
2228 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp); 2254 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2229 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1); 2255 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2230 } 2256 }
2231 2257
2232 op->stats.food -= op->stats.food / 4; 2258 op->stats.food -= op->stats.food / 4;
2233 handle_apply_yield (poison);
2234 poison->destroy (); 2259 poison->destroy ();
2235} 2260}
2236 2261
2237/** 2262/**
2238 * 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.
… …
2341 * them in this function - they are passed to apply_special 2366 * them in this function - they are passed to apply_special
2342 */ 2367 */
2343int 2368int
2344manual_apply (object *op, object *tmp, int aflag) 2369manual_apply (object *op, object *tmp, int aflag)
2345{ 2370{
2346 if (tmp->head)
2347 tmp = tmp->head; 2371 tmp = tmp->head_ ();
2348 2372
2349 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2373 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2350 { 2374 {
2351 if (op->type == PLAYER) 2375 if (op->type == PLAYER)
2352 { 2376 {
… …
2560 default: 2584 default:
2561 return 0; 2585 return 0;
2562 } 2586 }
2563} 2587}
2564 2588
2565
2566/* 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"
2567 * 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
2568 * "but you are floating high above the ground" messages. 2591 * "but you are floating high above the ground" messages.
2569 * 2592 *
2570 * Same return value as apply() function. 2593 * Same return value as apply() function.
2571 */ 2594 */
2572int 2595int
2573player_apply (object *pl, object *op, int aflag, int quiet) 2596player_apply (object *pl, object *op, int aflag, int quiet)
2574{ 2597{
2575 int tmp;
2576
2577 if (op->env && (pl->move_type & MOVE_FLYING)) 2598 if (!op->env && (pl->move_type & MOVE_FLYING))
2578 { 2599 {
2579 /* player is flying and applying object not in inventory */ 2600 /* player is flying and applying object not in inventory */
2580 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2601 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2581 { 2602 {
2582 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.>");
2583 return 0; 2606 return 0;
2584 } 2607 }
2585 } 2608 }
2586 2609
2587 pl->contr->last_used = op; 2610 pl->contr->last_used = op;
2588 2611
2589 tmp = manual_apply (pl, op, aflag); 2612 int tmp = manual_apply (pl, op, aflag);
2613
2590 if (!quiet) 2614 if (!quiet)
2591 { 2615 {
2592 if (tmp == 0) 2616 if (tmp == 0)
2593 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)));
2594 else if (tmp == 2) 2618 else if (tmp == 2)
… …
2629 * person moving on it, also activate. Added code to make it 2653 * person moving on it, also activate. Added code to make it
2630 * 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
2631 * the item needs. 2655 * the item needs.
2632 */ 2656 */
2633 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2657 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2634 {
2635 if (player_apply (pl, tmp, 0, 1) == 1) 2658 if (player_apply (pl, tmp, 0, 1) == 1)
2636 return; 2659 return;
2637 } 2660
2638 if (floors >= 2) 2661 if (floors >= 2)
2639 return; /* process at most two floor objects */ 2662 return; /* process at most two floor objects */
2640 } 2663 }
2641} 2664}
2642 2665
… …
2686 break; 2709 break;
2687 2710
2688 case SKILL: 2711 case SKILL:
2689 if (who->contr) 2712 if (who->contr)
2690 { 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
2691 if (!op->invisible) 2719 if (op->invisible)
2720 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2721 else
2692 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2722 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2693 else
2694 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2695 } 2723 }
2696 2724
2697 change_abil (who, op); 2725 change_abil (who, op);
2698 CLEAR_FLAG (who, FLAG_READY_SKILL); 2726 CLEAR_FLAG (who, FLAG_READY_SKILL);
2699 break; 2727 break;
… …
2731 op->destroy (); 2759 op->destroy ();
2732 who->insert (tmp2); 2760 who->insert (tmp2);
2733 who->update_stats (); 2761 who->update_stats ();
2734 2762
2735 if (who->contr) 2763 if (who->contr)
2736 {
2737 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2764 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2738 { 2765 {
2739 who->failmsg ("Oops, it feels deadly cold!"); 2766 who->failmsg ("Oops, it feels deadly cold!");
2740 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2767 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2741 } 2768 }
2742 }
2743 } 2769 }
2744 2770
2745 return 1; /* otherwise, an attempt to drop causes problems */ 2771 return 1; /* otherwise, an attempt to drop causes problems */
2746 2772
2747 case BOW: 2773 case BOW:
… …
3090 return 1; 3116 return 1;
3091 } 3117 }
3092 3118
3093 return unapply_special (who, op, aflags); 3119 return unapply_special (who, op, aflags);
3094 } 3120 }
3095
3096 if (basic_flag == AP_UNAPPLY) 3121 else if (basic_flag == AP_UNAPPLY)
3097 return 0; 3122 return 0;
3098 3123
3099 // if the item is combat/ranged, wield the relevant slot first 3124 // if the item is combat/ranged, wield the relevant slot first
3100 // to resolve conflicts. 3125 // to resolve conflicts.
3101 if (player *pl = who->contr) 3126 if (player *pl = who->contr)
… …
3181 switch (op->type) 3206 switch (op->type)
3182 { 3207 {
3183 case WEAPON: 3208 case WEAPON:
3184 if (!check_weapon_power (who, op->last_eat)) 3209 if (!check_weapon_power (who, op->last_eat))
3185 { 3210 {
3186 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);
3187 3212
3188 if (tmp) 3213 if (tmp)
3189 insert_ob_in_ob (tmp, who); 3214 insert_ob_in_ob (tmp, who);
3190 3215
3191 return 1; 3216 return 1;
… …
3270 who->update_stats (); 3295 who->update_stats ();
3271 3296
3272 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3297 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3273 if (who->type == PLAYER) 3298 if (who->type == PLAYER)
3274 { 3299 {
3275 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.>");
3276 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3301 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3277 } 3302 }
3278 3303
3279 return 0; 3304 return 0;
3280 3305
… …
3458 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3483 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3459 if (who->type == PLAYER) 3484 if (who->type == PLAYER)
3460 { 3485 {
3461 who->failmsg ( 3486 who->failmsg (
3462 "Oops, it feels deadly cold! " 3487 "Oops, it feels deadly cold! "
3463 "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.>"
3464 ); 3489 );
3465 SET_FLAG (op, FLAG_KNOWN_CURSED); 3490 SET_FLAG (op, FLAG_KNOWN_CURSED);
3466 } 3491 }
3467 3492
3468 if (object *pl = op->visible_to ()) 3493 if (object *pl = op->visible_to ())
… …
3488int 3513int
3489auto_apply (object *op) 3514auto_apply (object *op)
3490{ 3515{
3491 object *tmp = NULL, *tmp2; 3516 object *tmp = NULL, *tmp2;
3492 int i; 3517 int i;
3518
3519 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3493 3520
3494 switch (op->type) 3521 switch (op->type)
3495 { 3522 {
3496 case SHOP_FLOOR: 3523 case SHOP_FLOOR:
3497 if (!op->has_random_items ()) 3524 if (!op->has_random_items ())
… …
3499 3526
3500 do 3527 do
3501 { 3528 {
3502 i = 10; /* let's give it 10 tries */ 3529 i = 10; /* let's give it 10 tries */
3503 while ((tmp = generate_treasure (op->randomitems, 3530 while ((tmp = generate_treasure (op->randomitems,
3504 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
3505 if (tmp == NULL) 3536 if (tmp == NULL)
3506 return 0; 3537 return 0;
3538
3507 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3539 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3508 { 3540 {
3509 tmp->destroy (); 3541 tmp->destroy ();
3510 tmp = NULL; 3542 tmp = NULL;
3511 } 3543 }
… …
3514 3546
3515 tmp->x = op->x; 3547 tmp->x = op->x;
3516 tmp->y = op->y; 3548 tmp->y = op->y;
3517 SET_FLAG (tmp, FLAG_UNPAID); 3549 SET_FLAG (tmp, FLAG_UNPAID);
3518 insert_ob_in_map (tmp, op->map, NULL, 0); 3550 insert_ob_in_map (tmp, op->map, NULL, 0);
3519 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3520 identify (tmp); 3551 identify (tmp);
3521 break; 3552 break;
3522 3553
3523 case TREASURE: 3554 case TREASURE:
3524 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3555 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3531 /* 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,
3532 * 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
3533 * to disappear. An example of this item is the random_* stuff 3564 * to disappear. An example of this item is the random_* stuff
3534 * that is put inside other objects. 3565 * that is put inside other objects.
3535 */ 3566 */
3536 for (tmp = op->inv; tmp; tmp = tmp2)
3537 {
3538 tmp2 = tmp->below;
3539 tmp->remove ();
3540
3541 if (op->env) 3567 if (op->env)
3542 insert_ob_in_ob (tmp, op->env); 3568 while (op->inv)
3543 else 3569 op->env->insert (op->inv);
3544 tmp->destroy ();
3545 }
3546 3570
3547 op->destroy (); 3571 op->destroy ();
3548 break; 3572 break;
3549 } 3573 }
3550 return tmp ? 1 : 0; 3574
3575 return !!tmp;
3551} 3576}
3552 3577
3553/** 3578/**
3554 * 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
3555 * is loaded or swapped in and performs special actions for 3580 * is loaded or swapped in and performs special actions for
… …
3569 3594
3570 if (tmp->inv) 3595 if (tmp->inv)
3571 { 3596 {
3572 object *invtmp, *invnext; 3597 object *invtmp, *invnext;
3573 3598
3574 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3599 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3575 { 3600 {
3576 invnext = invtmp->below; 3601 invnext = invtmp->below;
3577 3602
3578 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3603 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3579 auto_apply (invtmp); 3604 auto_apply (invtmp);
3580 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3605 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3581 { 3606 {
3582 while ((invtmp->stats.hp--) > 0) 3607 while (invtmp->stats.hp-- > 0)
3583 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3608 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3584 3609
3585 invtmp->randomitems = NULL; 3610 invtmp->randomitems = NULL;
3586 } 3611 }
3587 else if (invtmp && invtmp->arch 3612 else if (invtmp && invtmp->arch
… …
3909 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3934 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3910 flag_change_face = 0; 3935 flag_change_face = 0;
3911 3936
3912 if (flag_change_face) 3937 if (flag_change_face)
3913 { 3938 {
3914 pl->animation_id = GET_ANIM_ID (change);
3915 pl->face = change->face; 3939 pl->face = change->face;
3916 3940 pl->animation_id = change->animation_id;
3917 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3941 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3918 SET_FLAG (pl, FLAG_ANIMATE);
3919 else
3920 CLEAR_FLAG (pl, FLAG_ANIMATE);
3921 } 3942 }
3922 3943
3923 /* check the special case of can't use weapons */ 3944 /* check the special case of can't use weapons */
3924 /*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); */
3925 if (!strcmp (change->name, "monk")) 3946 if (!strcmp (change->name, "monk"))

Diff Legend

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