From b1cd5bfe3cd0df6900523dae3695a2ebdec3fcab Mon Sep 17 00:00:00 2001
From: Sage <SageBasilMint@gmail.com>
Date: Thu, 13 Feb 2014 02:40:13 -0800
Subject: [PATCH] Prevent chaos champions from generating with giant (spiked)
 clubs.

---
 crawl-ref/source/mon-gear.cc |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index 7cb736b..a3ef6c7 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -1580,7 +1580,12 @@ static item_make_species_type _give_weapon(monster* mon, int level,
         item_race      = MAKE_ITEM_NO_RACE;
         item.base_type = OBJ_WEAPONS;
         do
+        {
             item.sub_type = random2(NUM_WEAPONS);
+            if (item.sub_type == WPN_GIANT_CLUB
+                || item.sub_type == WPN_GIANT_SPIKED_CLUB)
+                item.sub_type = WPN_GREAT_MACE;
+        }
         while ((melee_only && (item.sub_type == WPN_BLOWGUN
                                || item.sub_type == WPN_CROSSBOW
                                || item.sub_type == WPN_BOW
-- 
1.7.9.5