Remove Giant Slugs

Slow melee-only monsters are awful, and nobody objected to removing
these. Next to be removed: elephant slugs.

Somebody might want to look over my vault edits, as ususal.

16 files changed, 31 insertions, 57 deletions

diff --git a/crawl-ref/source/dat/des/altar/ashenzari_visionary.des b/crawl-ref/source/dat/des/altar/ashenzari_visionary.des
index 7db089ccd7..a2b965e83c 100644
--- a/crawl-ref/source/dat/des/altar/ashenzari_visionary.des
+++ b/crawl-ref/source/dat/des/altar/ashenzari_visionary.des
@@ -127,8 +127,7 @@ MARKER: H = lua:fog_machine { cloud_type = "thin mist", pow_min = 3, \
                               size_min = 1, size_max = 3, walk_dist = 2 }
 # Monsters specified here to omit aquatic placements.
 MONS: plant w:150 / fungus w:99 / raven w:20 / giant frog w:30 / \
-      giant slug w:20 / giant newt w:20 / swamp drake w:80 / \
-      alligator band w:150 / water moccasin w:75
+      swamp drake w:80 / alligator band w:150 / water moccasin w:75
 KPROP: w = no_tele_into
 SUBST: w = wwwWWt1
 FTILE: 1 = floor_swamp
diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index de7d86735b..27f8e7d14d 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -165,7 +165,7 @@ DEPTH:   D:2-
 WEIGHT:  1
 KPROP:   1 = no_rtele_into
 KFEAT:   _ = altar_cheibriados
-MONS:    giant slug, elephant slug
+MONS:    worm
 SUBST:   1 : 1:50 2:30 3:10 4:10
 NSUBST:  4 = 1:1 / 1:2 / 1:3
 : interest_check(_G)
@@ -247,12 +247,12 @@ c.....c
 ccc+ccc
 ENDMAP
 
-NAME:   chei_snail_safe_becter
+NAME:   chei_worm_safe_becter
 TAGS:   overflow_altar_cheibriados transparent no_monster_gen
 TAGS:   transparent
 DEPTH:  D:4-9
 WEIGHT: 5
-KMONS:  a = giant slug
+KMONS:  a = worm
 NSUBST: ' = 1:a / *:.
 KFEAT:  _ = altar_cheibriados
 MAP
@@ -268,13 +268,13 @@ MAP
 .........
 ENDMAP
 
-NAME:   cheibrodos_slug_habitat
+NAME:   cheibrodos_worm_habitat
 TAGS:   no_item_gen no_monster_gen temple_overflow_1 transparent
 TAGS:   temple_overflow_cheibriados uniq_altar_cheibriados
 DEPTH:  D:5-9
 WEIGHT: 5
 KFEAT:  _ = altar_cheibriados
-MONS:   giant slug
+MONS:   worm
 MAP
 .............
 .xxxxx.xxxxx.
diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des
index 2deabb8590..8711b5ee4a 100644
--- a/crawl-ref/source/dat/des/branches/lair.des
+++ b/crawl-ref/source/dat/des/branches/lair.des
@@ -165,9 +165,10 @@ ENDMAP
 ##############################################################################
 # Generic Lair entry
 #
+# This could probably use some randomization.
 NAME:    david_lair_generic
 TAGS:    lair_entry
-MONS:    crocodile / sheep, giant slug / elephant slug / nothing
+MONS:    crocodile / sheep, worm
 MONS:    nothing / yak / weight:2 death yak, plant / fungus / w:20 nothing
 MONS:    elephant
 SHUFFLE: 12
@@ -212,13 +213,12 @@ ENDMAP
 NAME:    dpeg_lair_monsters
 TAGS:    lair_entry
 ORIENT:  float
-MONS:    w:60 nothing / w:30 giant slug
 MONS:    w:100 nothing / w:40 yak / sheep / death yak
 MONS:    w:100 nothing / w:20 iguana / w:20 crocodile /\
          komodo dragon / basilisk w:5
 MONS:    green rat / porcupine / orange rat / quokka / rat
 MONS:    w:90 nothing / w:30 giant frog / blink frog / spiny frog
-SHUFFLE: 12345
+SHUFFLE: 1234
 KFEAT:   O = enter_lair
 MAP
 111...@......
@@ -293,7 +293,7 @@ NAME:   minmay_lair_entry_grove
 TAGS:   lair_entry
 ORIENT: float
 MONS:   plant / bush w:2 / fungus w:2
-MONS:   crocodile / basilisk w:5 / giant slug
+MONS:   crocodile / basilisk w:5
 MONS:   yak
 MONS:   sheep
 MONS:   rat w:2 / porcupine / green rat / quokka w:1
@@ -555,8 +555,7 @@ DEPTH:   Lair:3-7
 SUBST:   % = %%%%%$$$**|
 MONS:    patrolling necromancer / necromancer
 SHUFFLE: 23
-MONS:    giant slug zombie / \
-         elephant slug zombie w:2 / nothing
+MONS:    elephant slug zombie w:5 / nothing
 MONS:    crocodile zombie / basilisk zombie / \
          komodo dragon zombie w:4 / nothing
 MAP
@@ -1681,7 +1680,7 @@ ENDMAP
 # an altar to chei, and a few followers
 NAME:  kennysheep_slug_temple
 DEPTH: Lair
-MONS:  giant slug / elephant slug w:2 / nothing
+MONS:  worm / nothing
 KFEAT: a = altar_cheibriados
 MAP
  @
@@ -2522,7 +2521,7 @@ PLACE:   Lair:$
 TAGS:    no_wall_fixup no_monster_gen no_rotate
 ORIENT:  southeast
 MONS:    plant
-MONS:    elephant slug / giant slug, worm, brain worm
+MONS:    elephant slug / nothing, worm, brain worm
 MONS:    giant leech, lindwurm, fire dragon / ice dragon
 KMONS:   8 = giant firefly
 SHUFFLE: ABC
@@ -2813,7 +2812,7 @@ KMONS:   9 = water moccasin
 KMONS:   0 = blink frog
 KMONS:   A = spiny frog
 KMONS:   B = black mamba
-KMONS:   C = giant slug
+KMONS:   C = worm
 KMONS:   D = elephant slug
 KMONS:   E = boring beetle
 KMONS:   F = boulder beetle
diff --git a/crawl-ref/source/dat/des/builder/food.des b/crawl-ref/source/dat/des/builder/food.des
index d0a6cef8bb..4084f8648d 100644
--- a/crawl-ref/source/dat/des/builder/food.des
+++ b/crawl-ref/source/dat/des/builder/food.des
@@ -181,7 +181,7 @@ DEPTH:  D:8-14
 WEIGHT: 15
 TAGS:   uniq_second_food extra chance_second_food no_monster_gen patrolling
 MONS:   spider / brain worm w:5 / goliath beetle / worker ant
-MONS:   yellow wasp w:7 / boring beetle / soldier ant w:13 / giant slug
+MONS:   yellow wasp w:7 / boring beetle / soldier ant w:13
 ITEM:   beef jerky q:3 no_mimic / fruit q:3 no_mimic
 ITEM:   potion of porridge no_mimic, royal jelly q:6 no_mimic
 MAP
diff --git a/crawl-ref/source/dat/des/portals/sewer.des b/crawl-ref/source/dat/des/portals/sewer.des
index a7cc3eb122..2ba8826d0d 100644
--- a/crawl-ref/source/dat/des/portals/sewer.des
+++ b/crawl-ref/source/dat/des/portals/sewer.des
@@ -646,17 +646,16 @@ cc.....cc
 ENDMAP
 
 ###############################################################################
-# Another one with a big bad monster. Likely to be a giant slug, which hits
-# slightly harder than the crocodile, but is much slower.
+# Another one with a big bad monster.
 #
-NAME:   sewer_the_slug
+NAME:   sewer_the_crocodile
 TAGS:   no_item_gen no_monster_gen no_pool_fixup
 ORIENT: encompass
 SUBST:  - = WW...
 MONS:   kobold, jackal
 SUBST:  3 = 334
-KMONS:  3 = giant slug
-KMONS:  4 = Purgy, giant slug
+KMONS:  3 = crocodile
+KMONS:  4 = Purgy, crocodile
 ITEM:   potion of flight / potion of agility / potion of heal wounds / \
         potion of invisibility / potion of mutation / potion of degeneration /\
         scroll of blinking / scroll of teleportation / scroll of fear / \
diff --git a/crawl-ref/source/dat/des/sprint/menkaure.des b/crawl-ref/source/dat/des/sprint/menkaure.des
index 4201edb73f..6652a7a098 100644
--- a/crawl-ref/source/dat/des/sprint/menkaure.des
+++ b/crawl-ref/source/dat/des/sprint/menkaure.des
@@ -155,7 +155,7 @@ ENDMAP
 
 NAME:   sprint2_early_5
 TAGS:   sprint2_early no_item_gen no_trap_gen no_pool_fixup
-MONS:   giant slug
+MONS:   worm
 KITEM:  $ = gold q:243
 COLOUR: x = magenta
 MAP
diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des
index 1cce94d4d5..c924d5b20d 100644
--- a/crawl-ref/source/dat/des/sprint/pitsprint.des
+++ b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -29,7 +29,7 @@ function base_monster_setup(e)
            trapdoor spider / basilisk / cyclops band / efreet /\
            mottled dragon / blink frog band / vampire mosquito band /\
            griffon / ugly thing / gargoyle / molten gargoyle /\
-           kobold demonologist band / giant slug / deep troll /\
+           kobold demonologist band / deep troll /\
            deep elf fighter band / boulder beetle / red wasp /\
            orc high priest band w:5 / pulsating lump / boring beetle /\
            flayed ghost / freezing wraith / shadow wraith / shadow /\
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index e01a082840..0d150a744a 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -276,7 +276,7 @@ ENDMAP
 NAME:  worms_lemuel
 TAGS:  no_rotate no_monster_gen
 DEPTH: D:8-13, Lair, Spider
-KMONS: 1 = worm w:140 / giant slug w:60 / brain worm
+KMONS: 1 = worm w:190 / brain worm
 KMONS: 2| = swamp worm
 KMONS: P = plant
 KITEM: | = |, *, %
@@ -349,7 +349,7 @@ NAME:    hangedman_stitches_earthworm
 TAGS:    no_monster_gen no_item_gen transparent no_pool_fixup
 DEPTH:   Depths, Spider:2-, Abyss
 KMONS:   0 = 0
-KMONS:   1 = giant slug
+KMONS:   1 = worm
 KMONS:   2 = boulder beetle
 KMONS:   3 = trapdoor spider / orb spider w:5
 KMONS:   4 = thrashing horror
@@ -1009,7 +1009,7 @@ KMONS:   8 = ball python / adder w:8
 KMONS:   A = green rat
 KMONS:   B = vampire bat / fire bat w:8
 KMONS:   C = iguana / basilisk w:8
-KMONS:   D = giant slug
+KMONS:   D = worm
 KMONS:   E = jelly
 KMONS:   F = worker ant
 KMONS:   G = hound / wolf w:3
@@ -1068,7 +1068,7 @@ NAME:  guppyfry_early_lair_pool
 TAGS:  patrolling no_monster_gen transparent
 DEPTH: D:2-5
 KMONS: 1 = big fish
-KMONS: 2 = giant slug / adder
+KMONS: 2 = adder
 KMONS: 3 = plant
 ITEM:  fruit
 SUBST: - = wwwwwwWWW1
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 0ec8590c2d..ee08d41bb2 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -1254,10 +1254,6 @@ giant orange brain
 A huge wrinkled brain, floating just off the floor and glowing with mutagenic
 energies. Every now and then it seems to pulsate.
 %%%%
-giant slug
-
-A huge and disgusting gastropod, squirming slowly across the dungeon floor.
-%%%%
 giant spore
 
 A deceptively fast, floating ball filled with gas and spores, prone to burst at
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 9c925889fd..fbc3a9bac8 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2327,8 +2327,8 @@ enum monster_type                      // menv[].type
     MONS_HOG,
     MONS_HELL_HOG,
     MONS_HOLY_SWINE,            // porkalator
-    MONS_GIANT_SLUG,
 #if TAG_MAJOR_VERSION == 34
+    MONS_GIANT_SLUG,
     MONS_AGATE_SNAIL,
 #endif
     MONS_ELEPHANT_SLUG,
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 097a2659e8..d8693389d4 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -245,6 +245,7 @@ static monsterentry mondata[] =
     AXED_MON(MONS_PHOENIX)
     AXED_MON(MONS_SHEDU)
     AXED_MON(MONS_PLAGUE_SHAMBLER)
+    AXED_MON(MONS_GIANT_SLUG)
 #endif
 
 // Real monsters begin here {dlb}:
@@ -2244,22 +2245,10 @@ static monsterentry mondata[] =
 },
 
 {
-    MONS_GIANT_SLUG, 'w', GREEN, "giant slug",
-    M_NO_SKELETON,
-    MR_NO_FLAGS,
-    850, 4, MONS_GIANT_SLUG, MONS_GIANT_SLUG, MH_NATURAL, -3,
-    { {AT_BITE, AF_PLAIN, 23}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
-    { 10, 5, 3, 0 },
-    0, 2, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT,
-    I_INSECT, HT_AMPHIBIOUS, FL_NONE, 6, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE, MON_SHAPE_SNAIL
-},
-
-{
     MONS_ELEPHANT_SLUG, 'w', WHITE, "elephant slug",
     M_NO_SKELETON,
     MR_VUL_POISON,
-    1800, 2, MONS_GIANT_SLUG, MONS_ELEPHANT_SLUG, MH_NATURAL, -3,
+    1800, 2, MONS_ELEPHANT_SLUG, MONS_ELEPHANT_SLUG, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 20, 5, 3, 0 },
     2, 1, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT,
@@ -6351,7 +6340,7 @@ static monsterentry mondata[] =
     M_NO_SKELETON | M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS
         | M_SPEAKS | M_NO_WAND,
     MR_NO_FLAGS,
-    1800, 10, MONS_GIANT_SLUG, MONS_ELEPHANT_SLUG, MH_NATURAL, -3,
+    1800, 10, MONS_ELEPHANT_SLUG, MONS_ELEPHANT_SLUG, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 20, 0, 0, 150 },
     2, 1, MST_GASTRONOK, CE_POISONOUS, Z_NOZOMBIE, S_GURGLE,
diff --git a/crawl-ref/source/mon-pick-data.h b/crawl-ref/source/mon-pick-data.h
index 99a6b5fd79..c628ccea7e 100644
--- a/crawl-ref/source/mon-pick-data.h
+++ b/crawl-ref/source/mon-pick-data.h
@@ -97,7 +97,6 @@ static const pop_entry pop_d[] =
   { 15, 24,  345, DOWN, MONS_ORC_KNIGHT },
   { 15, 25,  315, DOWN, MONS_OGRE_MAGE },
   { 15, 25,  273, PEAK, MONS_WOLF_SPIDER },
-  { 15, 25,  277, PEAK, MONS_GIANT_SLUG },
   { 16, 24,   89, PEAK, MONS_REDBACK },
   { 16, 24,   66, PEAK, MONS_BORING_BEETLE },
   { 16, 24,   25, PEAK, MONS_SHADOW_WRAITH },
@@ -239,7 +238,6 @@ static const pop_entry pop_lair[] =
   {  0,  8,  258, SEMI, MONS_BASILISK },
   {  1,  8,  981, FLAT, MONS_WATER_MOCCASIN },
   {  0,  8,  258, SEMI, MONS_WOLF },
-  {  1,  8,  807, FLAT, MONS_GIANT_SLUG },
   {  1,  8,  514, FLAT, MONS_HIPPOGRIFF },
   {  1,  8,  879, FLAT, MONS_SPINY_FROG },
   {  2,  6,    8, PEAK, MONS_YELLOW_WASP },
@@ -280,7 +278,6 @@ static const pop_entry pop_swamp[] =
   {  1,  5,  999, FLAT, MONS_FUNGUS },
   {  1,  5, 1000, FLAT, MONS_PLANT },
   {  1,  5,  879, FLAT, MONS_WATER_MOCCASIN },
-  {  1,  3,   50, DOWN, MONS_GIANT_SLUG },
   {  1,  5, 1000, FLAT, MONS_ALLIGATOR },
   { -2,  5,  155, FLAT, MONS_GIANT_FROG },
   {  1,  5,  923, FLAT, MONS_SWAMP_DRAKE },
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index f1ccef35c1..a155b2a874 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -5186,7 +5186,7 @@ void monster::apply_location_effects(const coord_def &oldpos,
     {
         monster_type genus = mons_genus(type);
 
-        if (genus == MONS_JELLY || genus == MONS_GIANT_SLUG)
+        if (genus == MONS_JELLY || genus == MONS_ELEPHANT_SLUG)
         {
             prop &= ~FPROP_BLOODY;
             if (you.see_cell(pos()) && !visible_to(&you))
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 43099fd1be..67a94724e4 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -105,7 +105,6 @@ komodo_dragon MONS_KOMODO_DRAGON
 %sdir mon/unique
 gastronok MONS_GASTRONOK
 %sdir mon/animals
-giant_slug MONS_GIANT_SLUG
 elephant_slug MONS_ELEPHANT_SLUG
 
 ## Rodents ('r')
diff --git a/crawl-ref/source/spl-summoning.cc b/crawl-ref/source/spl-summoning.cc
index 8fc50515d7..8368e4d1df 100644
--- a/crawl-ref/source/spl-summoning.cc
+++ b/crawl-ref/source/spl-summoning.cc
@@ -1801,7 +1801,7 @@ static bool _raise_remains(const coord_def &pos, int corps, beh_type beha,
     else if (mons_genus(zombie_type)    == MONS_SNAKE
              || mons_genus(zombie_type) == MONS_NAGA
              || mons_genus(zombie_type) == MONS_GUARDIAN_SERPENT
-             || mons_genus(zombie_type) == MONS_GIANT_SLUG
+             || mons_genus(zombie_type) == MONS_ELEPHANT_SLUG
              || mons_genus(zombie_type) == MONS_GIANT_LEECH
              || mons_genus(zombie_type) == MONS_WORM)
     {
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index b04f6174fc..2a3666b875 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -1187,8 +1187,6 @@ static tileidx_t _tileidx_monster_base(int type, bool in_water, int colour,
     // slugs ('j')
     case MONS_ELEPHANT_SLUG:
         return TILEP_MONS_ELEPHANT_SLUG;
-    case MONS_GIANT_SLUG:
-        return TILEP_MONS_GIANT_SLUG;
 
     // killer bees ('k')
     case MONS_KILLER_BEE:
@@ -3564,8 +3562,6 @@ static tileidx_t _tileidx_corpse(const item_def &item)
     // slugs ('j')
     case MONS_ELEPHANT_SLUG:
         return TILE_CORPSE_ELEPHANT_SLUG;
-    case MONS_GIANT_SLUG:
-        return TILE_CORPSE_GIANT_SLUG;
 
     // bees ('k')
     case MONS_KILLER_BEE: