From 9626e74a031ee6694aaf46605cadf6d485c2f82a Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 19 Nov 2009 22:41:11 -0600 Subject: Rename blessed eudemon blades to holy eudemon blades. This is shorter, consistent with the other demon-converted weapon, and consistent with its always getting the holy wrath brand. --- crawl-ref/source/dat/descript/items.txt | 10 +++++----- crawl-ref/source/itemprop-enum.h | 2 +- crawl-ref/source/itemprop.cc | 10 +++++----- crawl-ref/source/makeitem.cc | 2 +- crawl-ref/source/mon-gear.cc | 2 +- crawl-ref/source/monster.cc | 2 +- crawl-ref/source/shopping.cc | 2 +- crawl-ref/source/tilepick.cc | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt index d966eb7406..08fabe01ce 100644 --- a/crawl-ref/source/dat/descript/items.txt +++ b/crawl-ref/source/dat/descript/items.txt @@ -118,11 +118,6 @@ blessed double sword A magical weapon with two razor-sharp blades. It has been enhanced by the Shining One's power. %%%% -blessed eudemon blade - -A glorious blade from the forges of heaven. It is the favored weapon -of the Shining One's servants. -%%%% blessed falchion A sword with a broad slashing blade. It has been enhanced by the @@ -660,6 +655,11 @@ helmet A piece of metal headgear. %%%% +holy eudemon blade + +A glorious blade from the forges of heaven. It is the favored weapon +of the Shining One's servants. +%%%% holy scourge A blessed weapon, woven by the saints in Heaven and hated by the unholy. diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h index f9dea40511..44ef53c65c 100644 --- a/crawl-ref/source/itemprop-enum.h +++ b/crawl-ref/source/itemprop-enum.h @@ -463,7 +463,7 @@ enum weapon_type WPN_BLESSED_SCIMITAR, WPN_BLESSED_GREAT_SWORD, // 50 WPN_BLESSED_KATANA, - WPN_BLESSED_EUDEMON_BLADE, + WPN_HOLY_EUDEMON_BLADE, WPN_BLESSED_DOUBLE_SWORD, WPN_BLESSED_TRIPLE_SWORD, WPN_HOLY_SCOURGE, diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index d700b753d8..e61dc42617 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -260,7 +260,7 @@ static weapon_def Weapon_prop[NUM_WEAPONS] = { WPN_DEMON_BLADE, "demon blade", 13, -1, 15, 200, 4, SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, DAMV_SLICING, 2 }, - { WPN_BLESSED_EUDEMON_BLADE, "blessed eudemon blade", 14, -2, 14, 200, 4, + { WPN_HOLY_EUDEMON_BLADE, "holy eudemon blade", 14, -2, 14, 200, 4, SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, DAMV_SLICING, 0 }, { WPN_DOUBLE_SWORD, "double sword", 15, -2, 16, 220, 5, @@ -1324,7 +1324,7 @@ int weapon_rarity( int w_type ) case WPN_BLESSED_LONG_SWORD: case WPN_BLESSED_SCIMITAR: case WPN_BLESSED_KATANA: - case WPN_BLESSED_EUDEMON_BLADE: + case WPN_HOLY_EUDEMON_BLADE: case WPN_BLESSED_DOUBLE_SWORD: case WPN_BLESSED_GREAT_SWORD: case WPN_BLESSED_TRIPLE_SWORD: @@ -1510,7 +1510,7 @@ bool is_blessed(const item_def &item) case WPN_BLESSED_LONG_SWORD: case WPN_BLESSED_SCIMITAR: case WPN_BLESSED_KATANA: - case WPN_BLESSED_EUDEMON_BLADE: + case WPN_HOLY_EUDEMON_BLADE: case WPN_BLESSED_DOUBLE_SWORD: case WPN_BLESSED_GREAT_SWORD: case WPN_BLESSED_TRIPLE_SWORD: @@ -1566,7 +1566,7 @@ bool convert2good(item_def &item, bool allow_blessed) if (!allow_blessed) item.sub_type = WPN_SCIMITAR; else - item.sub_type = WPN_BLESSED_EUDEMON_BLADE; + item.sub_type = WPN_HOLY_EUDEMON_BLADE; break; case WPN_KATANA: @@ -1633,7 +1633,7 @@ bool convert2bad(item_def &item) item.sub_type = WPN_SCIMITAR; break; - case WPN_BLESSED_EUDEMON_BLADE: + case WPN_HOLY_EUDEMON_BLADE: item.sub_type = WPN_DEMON_BLADE; break; diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index f4d41d54a0..1e94f3af0a 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1508,7 +1508,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level) case WPN_BLESSED_LONG_SWORD: case WPN_BLESSED_SCIMITAR: case WPN_BLESSED_KATANA: - case WPN_BLESSED_EUDEMON_BLADE: + case WPN_HOLY_EUDEMON_BLADE: case WPN_BLESSED_DOUBLE_SWORD: case WPN_BLESSED_GREAT_SWORD: case WPN_BLESSED_TRIPLE_SWORD: diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc index ebc7fc6be4..ba2e2b68ab 100644 --- a/crawl-ref/source/mon-gear.cc +++ b/crawl-ref/source/mon-gear.cc @@ -659,7 +659,7 @@ static item_make_species_type _give_weapon(monsters *mon, int level, item.base_type = OBJ_WEAPONS; item.colour = YELLOW; // forced by force_item above {dlb} - item.sub_type = (one_chance_in(4) ? WPN_BLESSED_EUDEMON_BLADE + item.sub_type = (one_chance_in(4) ? WPN_HOLY_EUDEMON_BLADE : WPN_LONG_SWORD); set_equip_desc(item, ISFLAG_GLOWING); diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 9de8e7d9df..68ef785fd8 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -1255,7 +1255,7 @@ static bool _is_signature_weapon(monsters *monster, const item_def &weapon) return (weapon.sub_type == WPN_HOLY_SCOURGE); if (monster->type == MONS_DAEVA) - return (weapon.sub_type == WPN_BLESSED_EUDEMON_BLADE); + return (weapon.sub_type == WPN_HOLY_EUDEMON_BLADE); // We might allow Sigmund to pick up a better scythe if he finds one... if (monster->type == MONS_SIGMUND) diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index 21b6e50c53..5792e939fc 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -992,7 +992,7 @@ unsigned int item_value( item_def item, bool ident ) case WPN_DEMON_BLADE: case WPN_TRIPLE_SWORD: case WPN_BLESSED_KATANA: - case WPN_BLESSED_EUDEMON_BLADE: + case WPN_HOLY_EUDEMON_BLADE: case WPN_BLESSED_DOUBLE_SWORD: case WPN_BLESSED_GREAT_SWORD: case WPN_BLESSED_TRIPLE_SWORD: diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 92d9df5df5..69440ee2aa 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1292,7 +1292,7 @@ static int _tileidx_weapon_base(const item_def &item) case WPN_DEMON_TRIDENT: return TILE_WPN_DEMON_TRIDENT; - case WPN_BLESSED_EUDEMON_BLADE: + case WPN_HOLY_EUDEMON_BLADE: return TILE_WPN_BLESSED_BLADE; case WPN_LONGBOW: @@ -3747,8 +3747,8 @@ int tilep_equ_weapon(const item_def &item) case WPN_KATANA: return TILEP_HAND1_KATANA_SLANT; case WPN_DOUBLE_SWORD: return TILEP_HAND1_DOUBLE_SWORD; case WPN_TRIPLE_SWORD: return TILEP_HAND1_TRIPLE_SWORD; - case WPN_BLESSED_EUDEMON_BLADE: return TILEP_HAND1_BLESSED_BLADE; - // new blessed blades + case WPN_HOLY_EUDEMON_BLADE: return TILEP_HAND1_BLESSED_BLADE; + // new blessed weapons case WPN_BLESSED_LONG_SWORD: return TILEP_HAND1_LONG_SWORD_SLANT; case WPN_BLESSED_GREAT_SWORD: return TILEP_HAND1_GREAT_SWORD_SLANT; case WPN_BLESSED_SCIMITAR: return TILEP_HAND1_SCIMITAR; -- cgit v1.2.3-54-g00ecf