From 9bfeb16b5652c1d41a00fd931cde5b0256ed1fb5 Mon Sep 17 00:00:00 2001
From: Sage <SageBasilMint@gmail.com>
Date: Sun, 23 Feb 2014 01:34:20 -0800
Subject: [PATCH] Remove spiny worms.

Needling a slow creature is not fun, and unlike slugs, you should still
needle them when you are strong because of corrosion.
---
 crawl-ref/source/enum.h          |    2 ++
 crawl-ref/source/mon-data.h      |    3 +++
 crawl-ref/source/mon-pick-data.h |    4 ----
 crawl-ref/source/tilepick.cc     |    4 ++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 3c332a8..a24bb7a 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2254,7 +2254,9 @@ enum monster_type                      // menv[].type
 #if TAG_MAJOR_VERSION == 34
     MONS_ROCK_WORM,
 #endif
+#if TAG_MAJOR_VERSION == 34
     MONS_SPINY_WORM,
+#endif
     MONS_WYVERN,
 #if TAG_MAJOR_VERSION > 34
     MONS_DRAKE,                 // genus
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 61c5001..c6e23c7 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -218,6 +218,7 @@ static monsterentry mondata[] =
     AXED_MON(MONS_LAVA_FISH)
     AXED_MON(MONS_LEMURE)
     AXED_MON(MONS_JELLYFISH)
+    AXED_MON(MONS_SPINY_WORM)
 #endif
 
 // Real monsters begin here {dlb}:
@@ -2310,6 +2311,7 @@ static monsterentry mondata[] =
     MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM
 },
 
+#if TAG_MAJOR_VERSION == 34
 {
     MONS_SPINY_WORM, 'w', LIGHTGREEN, "spiny worm",
     M_NO_SKELETON,
@@ -2321,6 +2323,7 @@ static monsterentry mondata[] =
     I_PLANT, HT_LAND, FL_NONE, 8, DEFAULT_ENERGY,
     MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG
 },
+#endif
 
 {
     MONS_GIANT_LEECH, 'w', RED, "giant leech",
diff --git a/crawl-ref/source/mon-pick-data.h b/crawl-ref/source/mon-pick-data.h
index 348f7ea..716c442 100644
--- a/crawl-ref/source/mon-pick-data.h
+++ b/crawl-ref/source/mon-pick-data.h
@@ -103,7 +103,6 @@ static const pop_entry pop_d[] =
   { 16, 20,   45, SEMI, MONS_AGATE_SNAIL },
   { 16, 22,   40, PEAK, MONS_KOBOLD_DEMONOLOGIST },
   { 16, 24,  258, PEAK, MONS_FREEZING_WRAITH },
-  { 16, 24,  176, PEAK, MONS_SPINY_WORM },
   { 16, 24,   89, PEAK, MONS_REDBACK },
   { 16, 24,   66, PEAK, MONS_BORING_BEETLE },
   { 16, 24,   25, PEAK, MONS_SHADOW_WRAITH },
@@ -294,7 +293,6 @@ static const pop_entry pop_lair[] =
   {  5,  9,   17, SEMI, MONS_REDBACK },
   {  5,  9,   17, SEMI, MONS_WANDERING_MUSHROOM },
   {  3,  8,  192, UP  , MONS_DEATH_YAK },
-  {  6, 10,   21, SEMI, MONS_SPINY_WORM },
   {  8,  8,    1, FLAT, MONS_FIRE_CRAB },
   {  3,  8,  180, UP  , MONS_BORING_BEETLE },
   {  4,  8,   89, UP  , MONS_BOULDER_BEETLE },
@@ -404,7 +402,6 @@ static const pop_entry pop_spider[] =
   {  1,  5,   89, FLAT, MONS_GOLIATH_BEETLE },
   {  1,  5,  879, FLAT, MONS_TRAPDOOR_SPIDER },
   {  1,  5,  607, FLAT, MONS_REDBACK },
-  {  1,  7,   52, SEMI, MONS_SPINY_WORM },
   {  1,  7,   52, SEMI, MONS_BORING_BEETLE },
   {  1,  7,   89, SEMI, MONS_BOULDER_BEETLE },
   {  1,  7,  763, FLAT, MONS_JUMPING_SPIDER },
@@ -481,7 +478,6 @@ static const pop_entry pop_vaults[] =
   { -4,  6,  334, SEMI, MONS_YAKTAUR },
   { -4,  6,  420, SEMI, MONS_OGRE_MAGE },
   { -2,  6,   89, PEAK, MONS_AGATE_SNAIL },
-  { -3,  7,  192, PEAK, MONS_SPINY_WORM },
   {  0, 10,  367, FLAT, MONS_VAULT_WARDEN },
   { -2,  6,   89, PEAK, MONS_ICE_DRAGON },
   { -2,  6,  136, SEMI, MONS_GREAT_ORB_OF_EYES },
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 74faed0..44fed69 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -1393,8 +1393,10 @@ static tileidx_t _tileidx_monster_base(int type, bool in_water, int colour,
         return TILEP_MONS_SWAMP_WORM;
     case MONS_GIANT_LEECH:
         return TILEP_MONS_GIANT_LEECH;
+#if TAG_MAJOR_VERSION == 34
     case MONS_SPINY_WORM:
         return TILEP_MONS_SPINY_WORM;
+#endif
 
     // small abominations ('x')
     case MONS_UNSEEN_HORROR:
@@ -4009,8 +4011,10 @@ static tileidx_t _tileidx_corpse(const item_def &item)
         return TILE_CORPSE_SWAMP_WORM;
     case MONS_GIANT_LEECH:
         return TILE_CORPSE_GIANT_LEECH;
+#if TAG_MAJOR_VERSION == 34
     case MONS_SPINY_WORM:
         return TILE_CORPSE_SPINY_WORM;
+#endif
 
     // flying insects ('y')
     case MONS_VAMPIRE_MOSQUITO:
-- 
1.7.9.5