Remove the rod of venom.

It had OTR (available through staff of Olgreb), Poisonous Cloud (sort
of available through the rod of clouds), and Poison Arrow. A multi-spell
rod which duplicates effects of other items and whose sole remaining spell
is itself a normal spell does not need to exist.

8 files changed, 10 insertions, 7 deletions

diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
index 582e896bc6..8966ce835b 100644
--- a/crawl-ref/source/acquire.cc
+++ b/crawl-ref/source/acquire.cc
@@ -799,7 +799,7 @@ static int _find_acquirement_subtype(object_class_type &class_wanted,
         case OBJ_RODS:
             do
                 type_wanted = random2(NUM_RODS);
-            while (type_wanted == ROD_WARDING);
+            while (type_wanted == ROD_WARDING || type_wanted == ROD_VENOM);
             break;
 #else
         case OBJ_RODS:       type_wanted = random2(NUM_RODS); break;
diff --git a/crawl-ref/source/book-data.h b/crawl-ref/source/book-data.h
index 76f9a192df..07214005f5 100644
--- a/crawl-ref/source/book-data.h
+++ b/crawl-ref/source/book-data.h
@@ -589,6 +589,7 @@
     SPELL_NO_SPELL,
 },
 
+#if TAG_MAJOR_VERSION == 34
 {   // Rod of venom
     SPELL_OLGREBS_TOXIC_RADIANCE,
     SPELL_POISONOUS_CLOUD,
@@ -599,3 +600,4 @@
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
 },
+#endif
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index c3caa7dbea..dade9be835 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -1277,10 +1277,6 @@ rod of the swarm
 
 This rod allows its wielder to summon a swarm of insects.
 %%%%
-rod of venom
-
-This rod contains offensive spells of poison.
-%%%%
 royal jelly
 
 A particularly rich and golden gelatinous thing. Consuming it will restore lost
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 5385ffdc70..ad55df97a3 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1116,7 +1116,9 @@ static const char* rod_type_name(int type)
     case ROD_LIGHTNING:       return "lightning";
     case ROD_STRIKING:        return "striking";
     case ROD_SHADOWS:         return "shadows";
+#if TAG_MAJOR_VERSION == 34
     case ROD_VENOM:           return "venom";
+#endif
     case ROD_INACCURACY:      return "inaccuracy";
 
     case ROD_FIERY_DESTRUCTION:  return "fiery destruction";
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index 8ee2f57fa1..3f72b4a3b4 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -434,7 +434,9 @@ enum rod_type
 #endif
     ROD_SHADOWS,
     ROD_STRIKING,
+#if TAG_MAJOR_VERSION == 34
     ROD_VENOM,
+#endif
     NUM_RODS,
 };
 
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 3021c7c167..24ef433596 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2722,7 +2722,7 @@ static void _generate_rod_item(item_def& item, int force_type, int item_level)
     {
         do
             item.sub_type = random2(NUM_RODS);
-        while (item.sub_type == ROD_WARDING);
+        while (item.sub_type == ROD_WARDING || item.sub_type == ROD_VENOM);
     }
 #else
         item.sub_type = random2(NUM_RODS);
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index 264b465e56..d1bd5515ea 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -701,7 +701,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
 #if TAG_MAJOR_VERSION == 34
             do
                 item.sub_type  = static_cast<rod_type>(random2(NUM_RODS));
-            while (item.sub_type == ROD_WARDING);
+            while (item.sub_type == ROD_WARDING || item.sub_type == ROD_VENOM);
 #else
             item.sub_type = static_cast<rod_type>(random2(NUM_RODS));
 #endif
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 4b532be161..104a156e3e 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -974,6 +974,7 @@ i-rod_destruction_inaccuracy ROD_DESTRUCTION_INACCURACY
 i-rod_warding ROD_WARDING
 i-rod_demonology ROD_DEMONOLOGY
 i-rod_striking ROD_STRIKING
+# Remove when TAG_MAJOR_VERSION > 34
 i-rod_venom ROD_VENOM ROD_ID_LAST
 %rim 1