… | |
… | |
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 | } |
… | |
… | |
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 | } |
… | |
… | |
1005 | * 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 |
1006 | * hopefully had something in mind when doing this. |
1008 | * hopefully had something in mind when doing this. |
1007 | */ |
1009 | */ |
1008 | } |
1010 | } |
1009 | |
1011 | |
1010 | 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 | |
1011 | 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); |
1012 | return 1; |
1018 | return 1; |
1013 | } |
1019 | } |
1014 | |
1020 | |
1015 | /** |
1021 | /** |
… | |
… | |
1254 | * Handles applying a sign. |
1260 | * Handles applying a sign. |
1255 | */ |
1261 | */ |
1256 | static void |
1262 | static void |
1257 | apply_sign (object *op, object *sign, int autoapply) |
1263 | apply_sign (object *op, object *sign, int autoapply) |
1258 | { |
1264 | { |
1259 | 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 | } |
1260 | |
1270 | |
1261 | if (!sign->msg) |
1271 | if (!sign->msg) |
1262 | { |
1272 | { |
1263 | op->statusmsg ("Nothing is written on it."); |
1273 | op->statusmsg ("Nothing is written on it."); |
1264 | return; |
1274 | return; |
… | |
… | |
1299 | |
1309 | |
1300 | if (ns->can_msg) |
1310 | if (ns->can_msg) |
1301 | 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)); |
1302 | else |
1312 | else |
1303 | { |
1313 | { |
1304 | msgType = get_readable_message_type (sign); |
1314 | readable_message_type *msgType = get_readable_message_type (sign); |
1305 | const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg); |
1315 | 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); |
1316 | draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg); |
1307 | } |
1317 | } |
1308 | } |
1318 | } |
|
|
1319 | } |
|
|
1320 | |
|
|
1321 | static void |
|
|
1322 | move_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); |
1309 | } |
1351 | } |
1310 | |
1352 | |
1311 | /** |
1353 | /** |
1312 | * 'victim' moves onto 'trap' |
1354 | * 'victim' moves onto 'trap' |
1313 | * 'victim' leaves 'trap' |
1355 | * 'victim' leaves 'trap' |
… | |
… | |
1482 | case CHECK_INV: |
1524 | case CHECK_INV: |
1483 | check_inv (victim, trap); |
1525 | check_inv (victim, trap); |
1484 | goto leave; |
1526 | goto leave; |
1485 | |
1527 | |
1486 | case HOLE: |
1528 | case HOLE: |
1487 | /* Hole not open? */ |
1529 | 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; |
1530 | goto leave; |
1501 | |
1531 | |
1502 | case EXIT: |
1532 | case EXIT: |
1503 | if (victim->type == PLAYER && EXIT_PATH (trap)) |
1533 | if (victim->type == PLAYER && EXIT_PATH (trap)) |
1504 | { |
1534 | { |
… | |
… | |
2687 | break; |
2717 | break; |
2688 | |
2718 | |
2689 | case SKILL: |
2719 | case SKILL: |
2690 | if (who->contr) |
2720 | if (who->contr) |
2691 | { |
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 | |
2692 | if (!op->invisible) |
2727 | if (op->invisible) |
|
|
2728 | who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill)); |
|
|
2729 | else |
2693 | who->statusmsg (format ("You stop using the %s.", query_name (op))); |
2730 | who->statusmsg (format ("You stop using the %s.", query_name (op))); |
2694 | else |
|
|
2695 | who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill)); |
|
|
2696 | } |
2731 | } |
2697 | |
2732 | |
2698 | change_abil (who, op); |
2733 | change_abil (who, op); |
2699 | CLEAR_FLAG (who, FLAG_READY_SKILL); |
2734 | CLEAR_FLAG (who, FLAG_READY_SKILL); |
2700 | break; |
2735 | break; |
… | |
… | |
3091 | return 1; |
3126 | return 1; |
3092 | } |
3127 | } |
3093 | |
3128 | |
3094 | return unapply_special (who, op, aflags); |
3129 | return unapply_special (who, op, aflags); |
3095 | } |
3130 | } |
3096 | |
|
|
3097 | if (basic_flag == AP_UNAPPLY) |
3131 | else if (basic_flag == AP_UNAPPLY) |
3098 | return 0; |
3132 | return 0; |
3099 | |
3133 | |
3100 | // if the item is combat/ranged, wield the relevant slot first |
3134 | // if the item is combat/ranged, wield the relevant slot first |
3101 | // to resolve conflicts. |
3135 | // to resolve conflicts. |
3102 | if (player *pl = who->contr) |
3136 | if (player *pl = who->contr) |
… | |
… | |
3490 | auto_apply (object *op) |
3524 | auto_apply (object *op) |
3491 | { |
3525 | { |
3492 | object *tmp = NULL, *tmp2; |
3526 | object *tmp = NULL, *tmp2; |
3493 | int i; |
3527 | int i; |
3494 | |
3528 | |
|
|
3529 | CLEAR_FLAG (op, FLAG_AUTO_APPLY); |
|
|
3530 | |
3495 | switch (op->type) |
3531 | switch (op->type) |
3496 | { |
3532 | { |
3497 | case SHOP_FLOOR: |
3533 | case SHOP_FLOOR: |
3498 | if (!op->has_random_items ()) |
3534 | if (!op->has_random_items ()) |
3499 | return 0; |
3535 | return 0; |
3500 | |
3536 | |
3501 | do |
3537 | do |
3502 | { |
3538 | { |
3503 | i = 10; /* let's give it 10 tries */ |
3539 | i = 10; /* let's give it 10 tries */ |
3504 | while ((tmp = generate_treasure (op->randomitems, |
3540 | while ((tmp = generate_treasure (op->randomitems, |
3505 | 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 | |
3506 | if (tmp == NULL) |
3546 | if (tmp == NULL) |
3507 | return 0; |
3547 | return 0; |
|
|
3548 | |
3508 | if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) |
3549 | if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) |
3509 | { |
3550 | { |
3510 | tmp->destroy (); |
3551 | tmp->destroy (); |
3511 | tmp = NULL; |
3552 | tmp = NULL; |
3512 | } |
3553 | } |
… | |
… | |
3515 | |
3556 | |
3516 | tmp->x = op->x; |
3557 | tmp->x = op->x; |
3517 | tmp->y = op->y; |
3558 | tmp->y = op->y; |
3518 | SET_FLAG (tmp, FLAG_UNPAID); |
3559 | SET_FLAG (tmp, FLAG_UNPAID); |
3519 | insert_ob_in_map (tmp, op->map, NULL, 0); |
3560 | insert_ob_in_map (tmp, op->map, NULL, 0); |
3520 | CLEAR_FLAG (op, FLAG_AUTO_APPLY); |
|
|
3521 | identify (tmp); |
3561 | identify (tmp); |
3522 | break; |
3562 | break; |
3523 | |
3563 | |
3524 | case TREASURE: |
3564 | case TREASURE: |
3525 | if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
3565 | if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
… | |
… | |
3546 | } |
3586 | } |
3547 | |
3587 | |
3548 | op->destroy (); |
3588 | op->destroy (); |
3549 | break; |
3589 | break; |
3550 | } |
3590 | } |
3551 | return tmp ? 1 : 0; |
3591 | |
|
|
3592 | return !!tmp; |
3552 | } |
3593 | } |
3553 | |
3594 | |
3554 | /** |
3595 | /** |
3555 | * 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 |
3556 | * is loaded or swapped in and performs special actions for |
3597 | * is loaded or swapped in and performs special actions for |
… | |
… | |
3570 | |
3611 | |
3571 | if (tmp->inv) |
3612 | if (tmp->inv) |
3572 | { |
3613 | { |
3573 | object *invtmp, *invnext; |
3614 | object *invtmp, *invnext; |
3574 | |
3615 | |
3575 | for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) |
3616 | for (invtmp = tmp->inv; invtmp; invtmp = invnext) |
3576 | { |
3617 | { |
3577 | invnext = invtmp->below; |
3618 | invnext = invtmp->below; |
3578 | |
3619 | |
3579 | if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) |
3620 | if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) |
3580 | auto_apply (invtmp); |
3621 | auto_apply (invtmp); |
3581 | else if (invtmp->type == TREASURE && invtmp->has_random_items ()) |
3622 | else if (invtmp->type == TREASURE && invtmp->has_random_items ()) |
3582 | { |
3623 | { |
3583 | while ((invtmp->stats.hp--) > 0) |
3624 | while (invtmp->stats.hp-- > 0) |
3584 | create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); |
3625 | create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); |
3585 | |
3626 | |
3586 | invtmp->randomitems = NULL; |
3627 | invtmp->randomitems = NULL; |
3587 | } |
3628 | } |
3588 | else if (invtmp && invtmp->arch |
3629 | else if (invtmp && invtmp->arch |