From 8b14a9ec9150142c2e83e3a996e11ca50282fe5b Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Fri, 14 Dec 2007 02:21:13 +0000
Subject: Fix [1813286]: Rename the lochaber axe to the bardiche, and change
 its description accordingly.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3061 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/dat/descript/items.txt | 4 ++--
 crawl-ref/source/effects.cc             | 2 +-
 crawl-ref/source/item_use.cc            | 2 +-
 crawl-ref/source/itemprop.cc            | 4 ++--
 crawl-ref/source/itemprop.h             | 2 +-
 crawl-ref/source/makeitem.cc            | 6 +++---
 crawl-ref/source/shopping.cc            | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'crawl-ref')

diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 40e011e433..ed346f9a10 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -674,9 +674,9 @@ lemon
 
 A yellow fruit.
 %%%%
-lochaber axe
+bardiche
 
-An enormous combination of a pike and a battle axe.
+A long pole with an enormous cleaving blade on one end.
 %%%%
 long sword
 
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index b858cb61aa..5b9c309cf9 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1547,7 +1547,7 @@ bool acquirement(object_class_type class_wanted, int agent,
                 case WPN_HALBERD:
                 case WPN_GLAIVE:
                 case WPN_SCYTHE:
-                case WPN_LOCHABER_AXE:
+                case WPN_BARDICHE:
                     thing.sub_type = 
                             (coinflip() ? WPN_SPEAR : WPN_TRIDENT);
                     break;
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index baa5c2f833..f14002a9f4 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -147,7 +147,7 @@ bool can_wield(const item_def *weapon, bool say_reason,
                 || weapon->sub_type == WPN_DIRE_FLAIL
                 || weapon->sub_type == WPN_BATTLEAXE
                 || weapon->sub_type == WPN_EXECUTIONERS_AXE
-                || weapon->sub_type == WPN_LOCHABER_AXE
+                || weapon->sub_type == WPN_BARDICHE
                 || weapon->sub_type == WPN_HALBERD
                 || weapon->sub_type == WPN_GLAIVE
                 || weapon->sub_type == WPN_GIANT_CLUB
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 318cfa7207..6c1f5871a2 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -303,7 +303,7 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
     { WPN_GLAIVE,            "glaive",             15, -3, 18, 200,  6,
         SK_POLEARMS,     HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_CHOPPING, 10 },
-    { WPN_LOCHABER_AXE,      "lochaber axe",       18, -6, 20, 200,  8,
+    { WPN_BARDICHE,          "bardiche",           18, -6, 20, 200,  8,
         SK_POLEARMS,     HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_CHOPPING, 2 },
 
@@ -1345,7 +1345,7 @@ int weapon_rarity( int w_type )
 
     case WPN_GIANT_CLUB:
     case WPN_GIANT_SPIKED_CLUB:
-    case WPN_LOCHABER_AXE:
+    case WPN_BARDICHE:
         return (1);
 
     case WPN_DOUBLE_SWORD:
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index 433b6ed135..dd7964a816 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -464,7 +464,7 @@ enum weapon_type
     WPN_BLESSED_BLADE,                 //   44
     WPN_LONGBOW,
     WPN_LAJATANG,
-    WPN_LOCHABER_AXE,
+    WPN_BARDICHE,
 
     NUM_WEAPONS,                       //   48 - must be last regular member {dlb}
 
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index ded5a80b87..d4c7fe09a6 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1072,7 +1072,7 @@ static item_status_flag_type determine_weapon_race(const item_def& item,
         case WPN_HALBERD:
         case WPN_GLAIVE:
         case WPN_EXECUTIONERS_AXE:
-        case WPN_LOCHABER_AXE:
+        case WPN_BARDICHE:
             if (one_chance_in(5))
                 rc = ISFLAG_ORCISH;
             break;
@@ -1367,7 +1367,7 @@ static brand_type determine_weapon_brand(const item_def& item, int item_level)
         case WPN_GLAIVE:
         case WPN_SCYTHE:
         case WPN_TRIDENT:
-        case WPN_LOCHABER_AXE:
+        case WPN_BARDICHE:
             if (one_chance_in(30))
                 rc = SPWPN_HOLY_WRATH;
 
@@ -3260,7 +3260,7 @@ static item_make_species_type give_weapon(monsters *mon, int level,
                              (temp_rand >  8) ? WPN_WAR_AXE :       // 16%
                              (temp_rand >  5) ? WPN_GREAT_MACE :    // 12%
                              (temp_rand >  3) ? WPN_DIRE_FLAIL :    //  8%
-                             (temp_rand >  2) ? WPN_LOCHABER_AXE :  //  4%
+                             (temp_rand >  2) ? WPN_BARDICHE :      //  4%
                              (temp_rand >  1) ? WPN_GLAIVE :        //  4%
                              (temp_rand >  0) ? WPN_BROAD_AXE       //  4%
                                               : WPN_HALBERD);       //  4%
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 7d8353897f..f9aad54aeb 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -612,7 +612,7 @@ unsigned int item_value( item_def item, bool ident )
             break;
 
         case WPN_DIRE_FLAIL:
-        case WPN_LOCHABER_AXE:
+        case WPN_BARDICHE:
             valued += 90;
             break;
 
-- 
cgit v1.2.3-54-g00ecf