From dec3c687da2a010a11c16cc0b19cacafe2ed49dd Mon Sep 17 00:00:00 2001 From: Stefan O'Rear Date: Tue, 3 Nov 2009 00:04:22 -0800 Subject: Remove +Tele as a randart property --- crawl-ref/source/abl-show.cc | 3 +-- crawl-ref/source/artefact.cc | 13 +------------ crawl-ref/source/debug.cc | 8 ++++---- crawl-ref/source/describe.cc | 2 -- crawl-ref/source/enum.h | 2 +- crawl-ref/source/item_use.cc | 20 +++++--------------- crawl-ref/source/itemprop.cc | 4 ++-- crawl-ref/source/player.cc | 2 -- crawl-ref/source/shopping.cc | 3 --- 9 files changed, 14 insertions(+), 43 deletions(-) diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 502215eb19..5dadcc134b 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -2459,8 +2459,7 @@ std::vector your_talents(bool check_confused) } } - if (player_equip( EQ_RINGS, RING_TELEPORTATION ) - || scan_artefacts( ARTP_CAN_TELEPORT )) + if (player_equip( EQ_RINGS, RING_TELEPORTATION )) { _add_talent(talents, ABIL_EVOKE_TELEPORTATION, check_confused); } diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 2ce6e13e99..4653872a55 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -1059,15 +1059,6 @@ void static _get_randart_properties(const item_def &item, power_level++; } - // teleport - if (!done_powers - && one_chance_in(10) - && (aclass != OBJ_JEWELLERY || atype != RING_TELEPORTATION)) - { - proprt[ARTP_CAN_TELEPORT] = 1; - power_level++; - } - // go berserk if (!done_powers && one_chance_in(10) @@ -1114,7 +1105,6 @@ void static _get_randart_properties(const item_def &item, if (aclass == OBJ_JEWELLERY && atype == RING_TELEPORT_CONTROL) break; // already is a ring of tport ctrl proprt[ARTP_BLINK] = 0; - proprt[ARTP_CAN_TELEPORT] = 0; proprt[ARTP_PREVENT_TELEPORTATION] = 1; break; case 4: // berserk on attack @@ -1782,8 +1772,7 @@ static bool _randart_is_redundant( const item_def &item, break; case RING_TELEPORTATION: - provides = ARTP_CAN_TELEPORT; - provides2 = ARTP_CAUSE_TELEPORTATION; + provides = ARTP_CAUSE_TELEPORTATION; break; case RING_EVASION: diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index a2f2aa0198..f2fad8c68b 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -1692,9 +1692,9 @@ const char* _prop_name[ARTP_NUM_PROPERTIES] = { "Inv", "Lev", "Blnk", - "Tele", + "Unsd2", "Bers", - "Map", + "Unsd1", "Nois", "NoSpl", "RndTl", @@ -1730,7 +1730,7 @@ char _prop_type[ARTP_NUM_PROPERTIES] = { ARTP_VAL_BOOL, //INVISIBLE ARTP_VAL_BOOL, //LEVITATE ARTP_VAL_BOOL, //BLINK - ARTP_VAL_BOOL, //CAN_TELEPORT + ARTP_VAL_BOOL, //UNUSED_2 ARTP_VAL_BOOL, //BERSERK ARTP_VAL_BOOL, //UNUSED_1 ARTP_VAL_POS, //NOISES @@ -3656,7 +3656,7 @@ static void _debug_rap_stats(FILE *ostat) "ARTP_INVISIBLE", "ARTP_LEVITATE", "ARTP_BLINK", - "ARTP_CAN_TELEPORT", + "ARTP_UNUSED_2", "ARTP_BERSERK", "ARTP_UNUSED_1", "ARTP_NOISES", diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 2a06aa347d..f723c1adfc 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -192,7 +192,6 @@ static std::vector _randart_propnames( const item_def& item ) // Evokable abilities come second { "+Blink", ARTP_BLINK, 2 }, - { "+Tele", ARTP_CAN_TELEPORT, 2 }, { "+Rage", ARTP_BERSERK, 2 }, { "+Inv", ARTP_INVISIBLE, 2 }, { "+Lev", ARTP_LEVITATE, 2 }, @@ -395,7 +394,6 @@ static std::string _randart_descrip( const item_def &item ) { ARTP_INVISIBLE, "It lets you turn invisible.", false}, { ARTP_LEVITATE, "It lets you levitate.", false}, { ARTP_BLINK, "It lets you blink.", false}, - { ARTP_CAN_TELEPORT, "It lets you teleport.", false}, { ARTP_BERSERK, "It lets you go berserk.", false}, { ARTP_SPIRIT_SHIELD, "It shields you from harm at the cost of magical power.", false}, { ARTP_NOISES, "It makes noises.", false}, diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 9967fbd948..2e188e3021 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2555,7 +2555,7 @@ enum artefact_prop_type ARTP_INVISIBLE, ARTP_LEVITATE, ARTP_BLINK, // 15 - ARTP_CAN_TELEPORT, + ARTP_UNUSED_2, ARTP_BERSERK, ARTP_UNUSED_1, ARTP_NOISES, diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 16d2717b38..a57f0ab949 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3207,14 +3207,11 @@ void jewellery_wear_effects(item_def &item) break; case RING_TELEPORTATION: - if (!scan_artefacts(ARTP_CAN_TELEPORT)) - { - mpr("You feel slightly jumpy."); - if (artefact) - fake_rap = ARTP_CAUSE_TELEPORTATION; - else - ident = ID_KNOWN_TYPE; - } + mpr("You feel slightly jumpy."); + if (artefact) + fake_rap = ARTP_CAUSE_TELEPORTATION; + else + ident = ID_KNOWN_TYPE; break; case AMU_RAGE: @@ -5480,13 +5477,6 @@ void use_artefact(item_def &item, bool *show_msgs, bool unmeld) artefact_wpn_learn_prop(item, ARTP_INVISIBLE); } - if (unknown_proprt(ARTP_CAN_TELEPORT) - && !items_give_ability(item.link, ARTP_CAN_TELEPORT)) - { - mpr("You feel slightly jumpy."); - artefact_wpn_learn_prop(item, ARTP_CAN_TELEPORT); - } - if (unknown_proprt(ARTP_BERSERK) && !items_give_ability(item.link, ARTP_BERSERK)) { diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index a407337fc5..eebf239bb2 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -2584,9 +2584,9 @@ bool gives_resistance(const item_def &item) return (false); // Check for randart resistances. - for (int rap = ARTP_FIRE; rap <= ARTP_CAN_TELEPORT; rap++) + for (int rap = ARTP_FIRE; rap <= ARTP_BERSERK; rap++) { - if (rap == ARTP_MAGIC || rap >= ARTP_INVISIBLE && rap != ARTP_CAN_TELEPORT) + if (rap == ARTP_MAGIC || rap >= ARTP_INVISIBLE) continue; if (artefact_wpn_property( item, static_cast(rap) )) diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index cf8d444564..69372b9fd7 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -4498,8 +4498,6 @@ bool items_give_ability(const int slot, artefact_prop_type abil) { if (abil == ARTP_LEVITATE && you.inv[eq].sub_type == RING_LEVITATION) return (true); - if (abil == ARTP_CAN_TELEPORT && you.inv[eq].sub_type == RING_TELEPORTATION) - return (true); if (abil == ARTP_INVISIBLE && you.inv[eq].sub_type == RING_INVISIBILITY) return (true); } diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index fe79eef620..bc20b7efad 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -815,9 +815,6 @@ int artefact_value( const item_def &item ) if (prop[ ARTP_BLINK ]) ret += 3; - if (prop[ ARTP_CAN_TELEPORT ]) - ret += 5; - if (prop[ ARTP_BERSERK ]) ret += 5; -- cgit v1.2.3-54-g00ecf