Ankusicide.

They were kept with a reduced weight as an oddity, but it looks like there is nothing interesting there not already done by one of 67854684369 1-handed maces.
crawl · Mar 28, 2012 · 0f299c7 · 0f299c7
1 parent 3224fde
commit 0f299c7
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 13 deletions.
diff --git a/crawl-ref/source/dat/des/branches/vaults.des b/crawl-ref/source/dat/des/branches/vaults.des
@@ -316,7 +316,7 @@ KMONS:  S = human; robe
 KMONS:  B: iron troll / cyclops / stone giant / minotaur / vault guard
 # the fans:
 SUBST:  F = 011112223334455679.........
-MONS:   human; leather armour|ring mail . dagger|club|ankus|whip|nothing
+MONS:   human; leather armour|ring mail . dagger|club|whip|nothing
 MONS:   elf; robe|leather armour . w:24 quarterstaff|w:1 lajatang|w:75 nothing
 # these are Sludge Elves.
 MONS:   ghoul / necrophage / rotting hulk / vampire

diff --git a/crawl-ref/source/dat/des/branches/zot.des b/crawl-ref/source/dat/des/branches/zot.des
@@ -640,7 +640,7 @@ ORIENT: float
 TAGS:   no_rotate no_hmirror no_monster_gen
 MONS:   killer klown
 MONS:   elephant / w:5 dire elephant / w:2 hellephant
-MONS:   human ; ankus
+MONS:   human ; club
 SUBST:  1 = 1 2:5 3:20
 SUBST:  2 = 2 2 .
 SUBST:  % = !:20 ?:5 $ .:20

diff --git a/crawl-ref/source/dat/des/portals/volcano.des b/crawl-ref/source/dat/des/portals/volcano.des
@@ -240,7 +240,7 @@ function setup_loot (e)
                                   " / fire dragon armour w:5")
     e.item([[potion of berserk rage w:20 / potion of poison w:2 / potion of might w:5 / potion of brilliance w:5 /
              potion of agility w:5 / potion of experience w:1 / potion of resistance]])
-    e.item(make_fiery_weapon(e, {"demon whip w:2", "dire flail w:4", "ankus w:20", "dagger w:20",
+    e.item(make_fiery_weapon(e, {"demon whip w:2", "dire flail w:4", "dagger w:20",
                                  "sabre w:20", "scimitar w:20", "demon blade w:2",
                                  "triple sword w:1", "broad axe w:20", "battleaxe w:10",
                                  "executioner's axe w:1", "spear w:20", "trident w:20", "demon " ..

diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des
@@ -822,7 +822,7 @@ KMONS: b = patrolling Duvessa hp:150 ; great sword ego:freezing \
 KMONS: a = patrolling Jozef hd:15 hp:100 \
  spells:poison_arrow;teleport_other;.;minor_healing;slow \
  ; dire flail ego:distortion
-KMONS: b = patrolling Joseph hd:5 hp:150 ; ankus ego:freezing \
+KMONS: b = patrolling Joseph hd:5 hp:150 ; quarterstaff ego:freezing \
  . blowgun . needle ego:curare q:7
 : else
 # changed Francis to Wiglaf for now
@@ -917,7 +917,7 @@ MONS: stone giant / shadow dragon / quicksilver dragon / golden dragon /\
 MONS: skeletal warrior
 KMONS: 8 = silver statue
 KMONS: f = butterfly
-KMONS: U = Norris ; ankus ego:vorpal . large shield ego:reflection / \
+KMONS: U = Norris ; spiked flail ego:vorpal . large shield ego:reflection / \
            Frederick ; trident ego:freezing . large shield ego:reflection
 KMONS: C = generate_awake Chuck
 KMONS: k = yaktaur captain ; crossbow ego:chaos . bolt

diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
@@ -53,10 +53,6 @@ An amulet meticulously constructed with magical wards to block magical and physi
 
 While the amulet is effective against most translocular magic, plane shifts such as banishment are beyond its ability to block.
 %%%%
-ankus
-
-What mahouts steer their elephants with. It basically resembles a fireplace poker with a short, stout handle, and a bluntish spike and hook for communicating one's desires through the pachyderm's thick skin.
-%%%%
 animal skin
 
 The skins of several animals.

diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
@@ -470,7 +470,9 @@ enum weapon_type
     WPN_LONGBOW,
     WPN_MAX_RACIAL = WPN_LONGBOW,
 
+#if TAG_MAJOR_VERSION == 32
     WPN_ANKUS,
+#endif
     WPN_DEMON_WHIP,
     WPN_GIANT_CLUB,
     WPN_GIANT_SPIKED_CLUB,

diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
@@ -193,9 +193,11 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
     { WPN_FLAIL,             "flail",               9,  2, 15, 130,  8,
         SK_MACES_FLAILS, HANDS_ONE,    SIZE_SMALL,  MI_NONE, false,
         DAMV_CRUSHING, 10 },
+#if TAG_MAJOR_VERSION == 32
     { WPN_ANKUS,             "ankus",               9,  2, 14, 120,  8,
         SK_MACES_FLAILS, HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_PIERCING | DAM_BLUDGEON,  1 },
+#endif
     { WPN_MORNINGSTAR,       "morningstar",        10, -1, 15, 140,  8,
         SK_MACES_FLAILS, HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_PIERCING | DAM_BLUDGEON, 10 },

diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
@@ -55,7 +55,9 @@ orcish_hammer2
 dwarven_hammer1 WPN_HAMMER_DWARF
 dwarven_hammer2
 %rim 1
+#... if TAG_MAJOR_VERSION == 32
 ankus WPN_ANKUS
+#...
 bullwhip WPN_WHIP
 bullwhip2
 %rim 0

diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt
@@ -544,7 +544,9 @@ mace MACE2
 mace3 MACE
 mace2 GREAT_MACE
 mace_ruby MACE_RUBY
+#... if TAG_MAJOR_VERSION == 32
 ankus ANKUS
+#...
 morningstar MORNINGSTAR2
 morningstar2 MORNINGSTAR
 eveningstar EVENINGSTAR

diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
@@ -964,7 +964,9 @@ unsigned int item_value(item_def item, bool ident)
             valued += 35;
             break;
 
+#if TAG_MAJOR_VERSION == 32
         case WPN_ANKUS:
+#endif
         case WPN_WAR_AXE:
         case WPN_MORNINGSTAR:
         case WPN_SABRE:

diff --git a/crawl-ref/source/spl-summoning.cc b/crawl-ref/source/spl-summoning.cc
@@ -180,7 +180,9 @@ static bool _snakable_weapon(const item_def& item)
     return (item.base_type == OBJ_WEAPONS
             && !is_artefact(item)
             && (item.sub_type == WPN_CLUB
+#if TAG_MAJOR_VERSION == 32
                 || item.sub_type == WPN_ANKUS
+#endif
                 || item.sub_type == WPN_GIANT_CLUB
                 || item.sub_type == WPN_GIANT_SPIKED_CLUB
                 || item.sub_type == WPN_SPEAR

diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc
@@ -88,7 +88,9 @@ tileidx_t tilep_equ_weapon(const item_def &item)
     case WPN_EVENINGSTAR:       return TILEP_HAND1_EVENINGSTAR;
     case WPN_GIANT_CLUB:        return TILEP_HAND1_GIANT_CLUB_PLAIN;
     case WPN_GIANT_SPIKED_CLUB: return TILEP_HAND1_GIANT_CLUB_SPIKE_SLANT;
+#if TAG_MAJOR_VERSION == 32
     case WPN_ANKUS:             return TILEP_HAND1_ANKUS;
+#endif
     case WPN_WHIP:              return TILEP_HAND1_WHIP;
     case WPN_DEMON_WHIP:        return TILEP_HAND1_BLACK_WHIP;
     case WPN_SACRED_SCOURGE:    return TILEP_HAND1_SACRED_SCOURGE;

diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
@@ -2809,8 +2809,10 @@ static tileidx_t _tileidx_weapon_base(const item_def &item)
     case WPN_GIANT_SPIKED_CLUB:
         return TILE_WPN_GIANT_SPIKED_CLUB;
 
+#if TAG_MAJOR_VERSION == 32
     case WPN_ANKUS:
         return TILE_WPN_ANKUS;
+#endif
 
     case WPN_WHIP:
         return TILE_WPN_WHIP;

diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
@@ -1804,12 +1804,12 @@ static int _xom_rearrange_pieces(int sever, bool debug = false)
 
 static int _xom_random_stickable(const int HD)
 {
-    int c;
+    unsigned int c;
     // XXX: Unify this with the list in spl-summoning:_snakable_weapon().
     // It has everything but tridents, demon tridents and bardiches, and
     // puts the giant club types at the end as special cases.
-    static const int arr[13] = {
-        WPN_CLUB,    WPN_ANKUS,      WPN_SPEAR,        WPN_HALBERD,
+    static const int arr[] = {
+        WPN_CLUB,    WPN_SPEAR,      WPN_HALBERD,
         WPN_SCYTHE,  WPN_GLAIVE,     WPN_STAFF,        WPN_QUARTERSTAFF,
         WPN_BLOWGUN, WPN_BOW,        WPN_LONGBOW,      WPN_GIANT_CLUB,
         WPN_GIANT_SPIKED_CLUB
@@ -1819,7 +1819,7 @@ static int _xom_random_stickable(const int HD)
     // weapon_rarity also gives us 1-10.
     do
         c = random2(HD);
-    while (c > 11
+    while (c >= ARRAYSZ(arr)
            || random2(HD) > weapon_rarity(arr[c]) && x_chance_in_y(c, HD));
 
     return arr[c];