diff options
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/godabil.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/invent.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/invent.h | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 5cb83e8638..f87b97954f 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -145,11 +145,11 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] = { ABIL_JIYVA_CALL_JELLY, ABIL_NON_ABILITY, ABIL_NON_ABILITY, ABIL_JIYVA_SLIMIFY, ABIL_JIYVA_CURE_BAD_MUTATION }, // Feawn - {ABIL_FEAWN_SUNLIGHT, ABIL_FEAWN_PLANT_RING, ABIL_FEAWN_RAIN, - ABIL_FEAWN_SPAWN_SPORES, ABIL_FEAWN_EVOLUTION }, + { ABIL_FEAWN_SUNLIGHT, ABIL_FEAWN_PLANT_RING, ABIL_FEAWN_RAIN, + ABIL_FEAWN_SPAWN_SPORES, ABIL_FEAWN_EVOLUTION }, // Chronos - { ABIL_CHRONOS_PONDEROUSIFY, ABIL_CHRONOS_TIME_STEP, - ABIL_CHRONOS_TIME_BEND, ABIL_CHRONOS_SLOUCH }, + { ABIL_CHRONOS_PONDEROUSIFY, ABIL_NON_ABILITY, ABIL_CHRONOS_TIME_BEND, + ABIL_CHRONOS_SLOUCH, ABIL_CHRONOS_TIME_STEP }, }; // The description screen was way out of date with the actual costs. diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc index 7414259429..c1348ab813 100644 --- a/crawl-ref/source/godabil.cc +++ b/crawl-ref/source/godabil.cc @@ -447,7 +447,7 @@ bool ponderousify_armour() if (item_slot == -1) { item_slot = prompt_invent_item("Make which item ponderous?", - MT_INVLIST, OSEL_ENCH_ARM, true, true, false); + MT_INVLIST, OSEL_PONDER_ARM, true, true, false); } if (prompt_failed(item_slot)) @@ -456,7 +456,8 @@ bool ponderousify_armour() item_def& arm(you.inv[item_slot]); if (!is_enchantable_armour(arm, true, true) - || get_armour_ego_type(arm) != SPARM_NORMAL) + || get_armour_ego_type(arm) != SPARM_NORMAL + || get_armour_slot(arm) != EQ_BODY_ARMOUR) { mpr("Choose some type of armour to enchant, or Esc to abort."); if (Options.auto_list) diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 2bbd8c9b70..2748df3756 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -461,6 +461,8 @@ static std::string _no_selectables_message(int item_selector) return("You aren't carrying any items that can be evoked."); case OSEL_FRUIT: return("You aren't carrying any fruit."); + case OSEL_PONDER_ARM: + return("You aren't carrying any armour which can be made ponderous."); } return("You aren't carrying any such object."); @@ -1044,6 +1046,9 @@ static bool _item_class_selected(const item_def &i, int selector) case OSEL_EVOKABLE: return (item_is_evokable(i, true, true)); + case OSEL_PONDER_ARM: + if (itype != OBJ_ARMOUR || get_armour_slot(i) != EQ_BODY_ARMOUR) + return (false); case OSEL_ENCH_ARM: return (is_enchantable_armour(i, true, true)); diff --git a/crawl-ref/source/invent.h b/crawl-ref/source/invent.h index 04001440c0..5e882bf5d8 100644 --- a/crawl-ref/source/invent.h +++ b/crawl-ref/source/invent.h @@ -28,7 +28,8 @@ enum object_selector OSEL_BUTCHERY = -10, OSEL_EVOKABLE = -11, OSEL_WORN_ARMOUR = -12, - OSEL_FRUIT = -13 + OSEL_FRUIT = -13, + OSEL_PONDER_ARM = -14 }; #define PROMPT_ABORT -1 |