Rename the "blessed blade" the "blessed eudemon blade", so that the name

of the Blessed Blade artefact is unique.  Also, attempt to add shopping 
values for the new blessed blades (these probably need adjustment).


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4909 c06c8d41-db1a-0410-9941-cceddc491573

8 files changed, 42 insertions, 42 deletions

diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index d1924aca4b..ce5aa8f4f9 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -127,14 +127,14 @@ beef jerky
 
 A strip of preserved dead cow or bull.
 %%%%
-blessed blade
-
-A blade blessed by the Shining One.
-%%%%
 blessed double sword
 
 A double sword blessed by the Shining One.
 %%%%
+blessed eudemon blade
+
+A glorious blade from the forges of heaven, blessed by the Shining One.
+%%%%
 blessed falchion
 
 A falchion blessed by the Shining One.
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index ffa7a24a71..c9d7c335b2 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -239,52 +239,52 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
         DAMV_SLICING | DAM_PIERCE, 10 },
 
     // Long blades
-    { WPN_FALCHION,             "falchion",              8,  2, 13, 170,  4,
+    { WPN_FALCHION,              "falchion",               8,  2, 13, 170,  4,
         SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
-        DAMV_SLICING, 10 },     // or perhaps DAMV_CHOPPING is more apt?
-    { WPN_BLESSED_FALCHION,     "blessed falchion",     10,  2, 11, 170,  4,
+        DAMV_SLICING, 10 },      // or perhaps DAMV_CHOPPING is more apt?
+    { WPN_BLESSED_FALCHION,      "blessed falchion",      10,  2, 11, 170,  4,
         SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
-        DAMV_SLICING, 10 },     // or perhaps DAMV_CHOPPING is more apt?
-    { WPN_LONG_SWORD,           "long sword",           10,  1, 14, 160,  3,
+        DAMV_SLICING, 10 },      // or perhaps DAMV_CHOPPING is more apt?
+    { WPN_LONG_SWORD,            "long sword",            10,  1, 14, 160,  3,
         SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING, 10 },
-    { WPN_BLESSED_LONG_SWORD,   "blessed long sword",   12,  0, 13, 160,  3,
+    { WPN_BLESSED_LONG_SWORD,    "blessed long sword",    12,  0, 13, 160,  3,
         SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING, 10 },
-    { WPN_SCIMITAR,             "scimitar",             11, -1, 14, 170,  3,
+    { WPN_SCIMITAR,              "scimitar",              11, -1, 14, 170,  3,
         SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING, 10 },
-    { WPN_BLESSED_SCIMITAR,     "blessed scimitar",     12, -1, 12, 170,  3,
+    { WPN_BLESSED_SCIMITAR,      "blessed scimitar",      12, -1, 12, 170,  3,
         SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING, 10 },
-    { WPN_KATANA,               "katana",               13,  2, 13, 160,  3,
+    { WPN_KATANA,                "katana",                13,  2, 13, 160,  3,
         SK_LONG_BLADES,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING, 2 },
-    { WPN_BLESSED_KATANA,       "blessed katana",       14,  1, 13, 160,  3,
+    { WPN_BLESSED_KATANA,        "blessed katana",        14,  1, 13, 160,  3,
         SK_LONG_BLADES,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING, 2 },
-    { WPN_DEMON_BLADE,          "demon blade",          13, -1, 15, 200,  4,
+    { 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_BLADE,        "blessed blade",        14, -2, 14, 200,  4,
+    { WPN_BLESSED_EUDEMON_BLADE, "blessed 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,
+    { WPN_DOUBLE_SWORD,          "double sword",          15, -2, 16, 220,  5,
         SK_LONG_BLADES,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING, 2 },
-    { WPN_BLESSED_DOUBLE_SWORD, "blessed double sword", 15, -2, 15, 220,  5,
+    { WPN_BLESSED_DOUBLE_SWORD,  "blessed double sword",  15, -2, 15, 220,  5,
         SK_LONG_BLADES,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING, 2 },
-    { WPN_GREAT_SWORD,          "great sword",          16, -3, 17, 250,  6,
+    { WPN_GREAT_SWORD,           "great sword",           16, -3, 17, 250,  6,
         SK_LONG_BLADES,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_SLICING, 10 },
-    { WPN_BLESSED_GREAT_SWORD,  "blessed great sword",  17, -5, 17, 250,  6,
+    { WPN_BLESSED_GREAT_SWORD,   "blessed great sword",   17, -5, 17, 250,  6,
         SK_LONG_BLADES,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_SLICING, 10 },
-    { WPN_TRIPLE_SWORD,         "triple sword",         19, -4, 19, 260,  6,
+    { WPN_TRIPLE_SWORD,          "triple sword",          19, -4, 19, 260,  6,
         SK_LONG_BLADES,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_SLICING, 2 },
-    { WPN_BLESSED_TRIPLE_SWORD, "blessed triple sword", 19, -5, 18, 260,  6,
+    { WPN_BLESSED_TRIPLE_SWORD,  "blessed triple sword",  19, -5, 18, 260,  6,
         SK_LONG_BLADES,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_SLICING, 2 },
 
@@ -1463,7 +1463,7 @@ int weapon_rarity( int w_type )
     case WPN_BLESSED_LONG_SWORD:
     case WPN_BLESSED_SCIMITAR:
     case WPN_BLESSED_KATANA:
-    case WPN_BLESSED_BLADE:
+    case WPN_BLESSED_EUDEMON_BLADE:
     case WPN_BLESSED_DOUBLE_SWORD:
     case WPN_BLESSED_GREAT_SWORD:
     case WPN_BLESSED_TRIPLE_SWORD:
@@ -1647,7 +1647,7 @@ bool is_blessed_blade( const item_def &item )
         case WPN_BLESSED_LONG_SWORD:
         case WPN_BLESSED_SCIMITAR:
         case WPN_BLESSED_KATANA:
-        case WPN_BLESSED_BLADE:
+        case WPN_BLESSED_EUDEMON_BLADE:
         case WPN_BLESSED_DOUBLE_SWORD:
         case WPN_BLESSED_GREAT_SWORD:
         case WPN_BLESSED_TRIPLE_SWORD:
@@ -1701,7 +1701,7 @@ bool convert2good( item_def &item, bool allow_blessed )
         if (!allow_blessed)
             item.sub_type = WPN_SCIMITAR;
         else
-            item.sub_type = WPN_BLESSED_BLADE;
+            item.sub_type = WPN_BLESSED_EUDEMON_BLADE;
         break;
 
     case WPN_KATANA:
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index b27c2573f1..7fee9e4710 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -465,7 +465,7 @@ enum weapon_type
     WPN_KNIFE,
     WPN_BLOWGUN,
     WPN_FALCHION,
-    WPN_BLESSED_BLADE,
+    WPN_BLESSED_EUDEMON_BLADE,
     WPN_LONGBOW,                       //   45
     WPN_LAJATANG,
     WPN_BARDICHE,
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index e3dd651184..95540dacfc 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1501,7 +1501,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_BLADE:
+        case WPN_BLESSED_EUDEMON_BLADE:
         case WPN_BLESSED_DOUBLE_SWORD:
         case WPN_BLESSED_GREAT_SWORD:
         case WPN_BLESSED_TRIPLE_SWORD:
@@ -3465,7 +3465,7 @@ static item_make_species_type _give_weapon(monsters *mon, int level,
         item.base_type = OBJ_WEAPONS;
         item.colour = WHITE;        // forced by force_item above {dlb}
 
-        item.sub_type = (one_chance_in(4) ? WPN_BLESSED_BLADE
+        item.sub_type = (one_chance_in(4) ? WPN_BLESSED_EUDEMON_BLADE
                                           : WPN_LONG_SWORD);
 
         set_equip_desc( item, ISFLAG_GLOWING );
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 7d43b91891..7c10f1d1d8 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -3303,7 +3303,7 @@ static bool _is_signature_weapon(monsters *monster, const item_def &weapon)
         return false;
 
     if (monster->type == MONS_DAEVA)
-        return (weapon.sub_type == WPN_BLESSED_BLADE);
+        return (weapon.sub_type == WPN_BLESSED_EUDEMON_BLADE);
 
     if (monster->type == MONS_SIGMUND)
         return (weapon.sub_type == WPN_SCYTHE);
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index 02446ad67d..4594cb43ac 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -1261,10 +1261,6 @@ static std::string _get_artefact_type(const int type)
 
 static bool _pick_db_name( const item_def &item )
 {
-    // Blessed blades always get database names.
-    if (is_blessed_blade(item))
-        return true;
-
     switch (item.base_type)
     {
     case OBJ_WEAPONS:
@@ -1811,7 +1807,7 @@ bool make_item_blessed_blade( item_def &item )
     for (vec_size i = 0; i < RA_PROPERTIES; i++)
         rap[i] = (short) 0;
 
-    // blessed blade of The Shining One
+    // blessed blade of the Shining One
     rap[RAP_BRAND] = (short) SPWPN_HOLY_WRATH;
 
     // set artefact name
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 30dc89f1f9..30cd1885d1 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -592,10 +592,13 @@ unsigned int item_value( item_def item, bool ident )
         case WPN_LONG_SWORD:
         case WPN_LONGBOW:
         case WPN_SCIMITAR:
+        case WPN_BLESSED_FALCHION:
             valued += 45;
             break;
 
         case WPN_SPIKED_FLAIL:
+        case WPN_BLESSED_LONG_SWORD:
+        case WPN_BLESSED_SCIMITAR:
             valued += 50;
 
         case WPN_HAND_CROSSBOW:
@@ -617,6 +620,7 @@ unsigned int item_value( item_def item, bool ident )
 
         case WPN_BATTLEAXE:
         case WPN_GREAT_MACE:
+        case WPN_EVENINGSTAR:
             valued += 65;
             break;
 
@@ -625,10 +629,6 @@ unsigned int item_value( item_def item, bool ident )
             valued += 90;
             break;
 
-        case WPN_EVENINGSTAR:
-            valued += 65;
-            break;
-
         case WPN_EXECUTIONERS_AXE:
             valued += 100;
             break;
@@ -647,9 +647,13 @@ unsigned int item_value( item_def item, bool ident )
             break;
 
         case WPN_KATANA:
-        case WPN_TRIPLE_SWORD:
         case WPN_DEMON_BLADE:
-        case WPN_BLESSED_BLADE:
+        case WPN_TRIPLE_SWORD:
+        case WPN_BLESSED_KATANA:
+        case WPN_BLESSED_EUDEMON_BLADE:
+        case WPN_BLESSED_DOUBLE_SWORD:
+        case WPN_BLESSED_GREAT_SWORD:
+        case WPN_BLESSED_TRIPLE_SWORD:
         case WPN_LAJATANG:
             valued += 200;
             break;
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index 23738e7d75..77cfc0e126 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -1116,7 +1116,7 @@ static int _tileidx_weapon(const item_def &item)
     case WPN_DEMON_TRIDENT:
         return TILE_WPN_DEMON_TRIDENT;
 
-    case WPN_BLESSED_BLADE:
+    case WPN_BLESSED_EUDEMON_BLADE:
         return TILE_WPN_BLESSED_BLADE;
 
     case WPN_LONGBOW:
@@ -3000,7 +3000,7 @@ 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_BLADE:         return TILEP_HAND1_BLESSED_BLADE;
+    case WPN_BLESSED_EUDEMON_BLADE: return TILEP_HAND1_BLESSED_BLADE;
     // new blessed blades
     case WPN_BLESSED_LONG_SWORD:    return TILEP_HAND1_LONG_SWORD_SLANT;
     case WPN_BLESSED_GREAT_SWORD:   return TILEP_HAND1_GREAT_SWORD_SLANT;