Make a BIG removal

PleasingFungus · PleasingFungus · commit 3d5cecec248e · 2021-09-10T09:15:51.000-07:00
Remove SIZE_BIG, switching monsters into either SIZE_LARGE or SIZE_GIANT as seems appropriate. Following up on 7bd0902, we really don't need two sizes that are 'bigger than any player race'. Is a yaktaur bigger than a centaur? How does a spatial maelstrom compare in size to a fire dragon? These are questions that we don't care about and shouldn't bother with. This is a small buff to dragon form and maybe a nerf to something else. Who knows.
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
@@ -5679,7 +5679,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monster* mon)
             && mon->add_ench(mon_enchant(ENCH_INNER_FLAME, 0, agent())))
         {
             if (simple_monster_message(*mon,
-                                       (mon->body_size(PSIZE_BODY) > SIZE_BIG)
+                                       (mon->body_size(PSIZE_BODY) > SIZE_LARGE)
                                         ? " is filled with an intense inner flame!"
                                         : " is filled with an inner flame."))
             {
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
@@ -4256,7 +4256,6 @@ const char* const size_adj[] =
     "small",
     "medium",
     "large",
-    "very large",
     "giant",
 };
 COMPILE_CHECK(ARRAYSZ(size_adj) == NUM_SIZE_LEVELS);
diff --git a/crawl-ref/source/evoke.cc b/crawl-ref/source/evoke.cc
@@ -360,7 +360,7 @@ static int _gale_push_dist(const actor* agent, const actor* victim, int pow)
 
     if (victim->body_size(PSIZE_BODY) < SIZE_MEDIUM)
         dist++;
-    else if (victim->body_size(PSIZE_BODY) > SIZE_BIG)
+    else if (victim->body_size(PSIZE_BODY) > SIZE_LARGE)
         dist /= 2;
     else if (victim->body_size(PSIZE_BODY) > SIZE_MEDIUM)
         dist -= 1;
diff --git a/crawl-ref/source/form-data.h b/crawl-ref/source/form-data.h
@@ -288,7 +288,7 @@ static const form_entry formdata[] =
     transformation::hydra, MONS_HYDRA, "Hydra", "hydra-form", "hydra",
     "",
     EQF_PHYSICAL, MR_RES_POISON,
-    DEFAULT_DURATION, 0, 0, SIZE_BIG, 13,
+    DEFAULT_DURATION, 0, 0, SIZE_GIANT, 13,
     6, 5, 0, true, 0, true, -1,
     SPWPN_NORMAL, GREEN, "", { "nip at", "bite", "gouge", "chomp" },
     FC_DEFAULT, FC_ENABLE, FC_ENABLE, false,
diff --git a/crawl-ref/source/item-prop.cc b/crawl-ref/source/item-prop.cc
@@ -90,7 +90,7 @@ static const armour_def Armour_prop[] =
     { ARM_ANIMAL_SKIN,          "animal skin",            2,   0,     3,
         EQ_BODY_ARMOUR, SIZE_LITTLE, SIZE_GIANT, true, ARMF_NO_FLAGS, 333 },
     { ARM_ROBE,                 "robe",                   2,   0,     7,
-        EQ_BODY_ARMOUR, SIZE_LITTLE, SIZE_BIG, true, ARMF_NO_FLAGS, 1000 },
+        EQ_BODY_ARMOUR, SIZE_LITTLE, SIZE_LARGE, true, ARMF_NO_FLAGS, 1000 },
     { ARM_LEATHER_ARMOUR,       "leather armour",         3,  -40,   20,
         EQ_BODY_ARMOUR, SIZE_SMALL,  SIZE_MEDIUM, true },
 
@@ -113,9 +113,9 @@ static const armour_def Armour_prop[] =
        EQ_BODY_ARMOUR, SIZE_LITTLE, SIZE_GIANT, false, ARMF_REGENERATION, 50 },
 
     { ARM_CLOAK,                "cloak",                  1,   0,   45,
-        EQ_CLOAK,       SIZE_LITTLE, SIZE_BIG, true },
+        EQ_CLOAK,       SIZE_LITTLE, SIZE_LARGE, true },
     { ARM_SCARF,                "scarf",                  0,   0,   50,
-        EQ_CLOAK,       SIZE_LITTLE, SIZE_BIG, true },
+        EQ_CLOAK,       SIZE_LITTLE, SIZE_LARGE, true },
 
     { ARM_GLOVES,               "gloves",                 1,   0,   45,
         EQ_GLOVES,      SIZE_SMALL,  SIZE_MEDIUM, true },
@@ -150,7 +150,7 @@ static const armour_def Armour_prop[] =
     { ARM_BUCKLER,              "buckler",                3,  -8,   45,
         EQ_SHIELD,      SIZE_LITTLE, SIZE_MEDIUM, true },
     { ARM_KITE_SHIELD,               "kite shield",                 8,  -30,  45,
-        EQ_SHIELD,      SIZE_SMALL,  SIZE_BIG, true    },
+        EQ_SHIELD,      SIZE_SMALL,  SIZE_LARGE, true    },
     { ARM_TOWER_SHIELD,         "tower shield",          13,  -50,  45,
         EQ_SHIELD,      SIZE_MEDIUM, SIZE_GIANT, true  },
 
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
@@ -101,8 +101,7 @@
      SIZE_SMALL,             // halflings/kobolds
      SIZE_MEDIUM,            // humans/elves/dwarves
      SIZE_LARGE,             // trolls/ogres/centaurs/nagas
-     SIZE_BIG,               // large quadrupeds
-     SIZE_GIANT,             // giants
+     SIZE_GIANT,             // giants and such
 
    tile:
     - a struct with up to two elements.
@@ -482,7 +481,7 @@ static monsterentry mondata[] =
     8, 440,
     4, 4, MST_NO_SPELLS, true, S_SHOUT,
     I_HUMAN, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_WEAPONS_ARMOUR, SIZE_BIG, MON_SHAPE_CENTAUR,
+    MONUSE_WEAPONS_ARMOUR, SIZE_LARGE, MON_SHAPE_CENTAUR,
     {TILEP_MONS_YAKTAUR}, TILE_CORPSE_YAKTAUR
 },
 
@@ -495,7 +494,7 @@ static monsterentry mondata[] =
     14, 770,
     5, 5, MST_NO_SPELLS, true, S_SHOUT,
     I_HUMAN, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_WEAPONS_ARMOUR, SIZE_BIG, MON_SHAPE_CENTAUR,
+    MONUSE_WEAPONS_ARMOUR, SIZE_LARGE, MON_SHAPE_CENTAUR,
     {TILEP_MONS_YAKTAUR_CAPTAIN}, TILE_ERROR
 },
 
@@ -965,7 +964,7 @@ static monsterentry mondata[] =
     13, 910,
     13, 3, MST_SHAMBLING_MANGROVE, false, S_SILENT,
     I_HUMAN, HT_AMPHIBIOUS, 8, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_PLANT,
+    MONUSE_NOTHING, SIZE_GIANT, MON_SHAPE_PLANT,
     {TILEP_MONS_TREANT}, TILE_ERROR
 },
 
@@ -2137,7 +2136,7 @@ DUMMY(MONS_SPIDER, 's', CYAN, "spider", TILEP_MONS_REDBACK)
     9, 585,
     10, 6, MST_NO_SPELLS, true, S_SCREAM,
     I_ANIMAL, HT_LAND, 13, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_CENTIPEDE,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_CENTIPEDE,
     {TILEP_MONS_DEMONIC_CRAWLER}, TILE_CORPSE_DEMONIC_CRAWLER
 },
 
@@ -2304,7 +2303,7 @@ DUMMY(MONS_CRAB, 't', LIGHTGREY, "crab", TILEP_MONS_FIRE_CRAB)
     10, 750,
     0, 5, MST_NO_SPELLS, false, S_SILENT,
     I_BRAINLESS, HT_LAND, 16, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_GIANT, MON_SHAPE_MISC,
     {TILEP_MONS_SPATIAL_MAELSTROM, TVARY_CYCLE}, TILE_ERROR
 },
 
@@ -2415,7 +2414,7 @@ DUMMY(MONS_INSUBSTANTIAL_WISP, 'v', LIGHTGREY, "insubstantial wisp",
     20, 1300,
     2, 1, MST_NO_SPELLS, true, S_SILENT,
     I_ANIMAL, HT_LAND, 4, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_SNAIL,
+    MONUSE_NOTHING, SIZE_GIANT, MON_SHAPE_SNAIL,
     {TILEP_MONS_DART_SLUG}, TILE_CORPSE_ELEPHANT_SLUG
 },
 
@@ -2801,7 +2800,7 @@ DUMMY(MONS_MOTH, 'y', WHITE, "moth", TILEP_MONS_MOTH_OF_WRATH)
     12, 765,
     20, 2, MST_BOULDER_BEETLE, true, S_SILENT,
     I_ANIMAL, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_INSECT,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_INSECT,
     {TILEP_MONS_BOULDER_BEETLE}, TILE_CORPSE_BOULDER_BEETLE
 },
 
@@ -2977,7 +2976,7 @@ DUMMY(MONS_DRAGON, 'D', GREEN, "dragon", TILEP_MONS_FIRE_DRAGON)
     13, 715,
     0, 5, MST_NO_SPELLS, true, S_ROAR,
     I_ANIMAL, HT_AMPHIBIOUS, 10, SWIM_ENERGY(6),
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_QUADRUPED,
+    MONUSE_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED,
     {TILEP_MONS_PROGRAM_BUG}, TILE_CORPSE_HYDRA
 },
 
@@ -3004,7 +3003,7 @@ DUMMY(MONS_DRAGON, 'D', GREEN, "dragon", TILEP_MONS_FIRE_DRAGON)
     4, 300,
     5, 10, MST_STEAM_DRAGON, true, S_HISS, // just for the pun
     I_ANIMAL, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_QUADRUPED_WINGED,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_QUADRUPED_WINGED,
     {TILEP_MONS_STEAM_DRAGON}, TILE_CORPSE_STEAM_DRAGON
 },
 
@@ -3031,7 +3030,7 @@ DUMMY(MONS_DRAGON, 'D', GREEN, "dragon", TILEP_MONS_FIRE_DRAGON)
     5, 275,
     5, 10, MST_ACID_DRAGON, true, S_ROAR,
     I_ANIMAL, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_QUADRUPED_WINGED,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_QUADRUPED_WINGED,
     {TILEP_MONS_ACID_DRAGON}, TILE_CORPSE_ACID_DRAGON
 },
 
@@ -3144,7 +3143,7 @@ DUMMY(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental", TILEP_MONS_WATER_ELEMENTAL)
     6, 450,
     14, 4, MST_NO_SPELLS, false, S_SILENT,
     I_BRAINLESS, HT_LAND, 6, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_EARTH_ELEMENTAL}, TILE_ERROR
 },
 
@@ -3157,7 +3156,7 @@ DUMMY(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental", TILEP_MONS_WATER_ELEMENTAL)
     16, 800,
     1, 20, MST_QUICKSILVER_DRAGON, false, S_SILENT,
     I_BRAINLESS, HT_LAND, 20, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_QUICKSILVER_ELEMENTAL}, TILE_ERROR
 },
 
@@ -3171,7 +3170,7 @@ DUMMY(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental", TILEP_MONS_WATER_ELEMENTAL)
     6, 330,
     4, 12, MST_NO_SPELLS, false, S_SILENT,
     I_BRAINLESS, HT_AMPHIBIOUS_LAVA, 13, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_FIRE_ELEMENTAL}, TILE_ERROR
 },
 
@@ -3184,7 +3183,7 @@ DUMMY(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental", TILEP_MONS_WATER_ELEMENTAL)
     6, 420,
     4, 7, MST_NO_SPELLS, false, S_SILENT,
     I_BRAINLESS, HT_AMPHIBIOUS, 10, SWIM_ENERGY(6),
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_WATER_ELEMENTAL}, TILE_ERROR
 },
 
@@ -3197,7 +3196,7 @@ DUMMY(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental", TILEP_MONS_WATER_ELEMENTAL)
     6, 330,
     2, 18, MST_AIR_ELEMENTAL, false, S_SILENT,
     I_BRAINLESS, HT_LAND, 25, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_AIR_ELEMENTAL}, TILE_ERROR
 },
 
@@ -3210,7 +3209,7 @@ DUMMY(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental", TILEP_MONS_WATER_ELEMENTAL)
     12, 1080,
     20, 2, MST_IRON_ELEMENTAL, false, S_SILENT,
     I_BRAINLESS, HT_LAND, 6, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_IRON_ELEMENTAL}, TILE_ERROR
 },
 
@@ -3223,7 +3222,7 @@ DUMMY(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental", TILEP_MONS_WATER_ELEMENTAL)
     18, 620,
     8, 8, MST_ELEMENTAL_WELLSPRING, false, S_SILENT,
     I_BRAINLESS, HT_WATER, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_ELEMENTAL_WELLSPRING}, TILE_ERROR
 },
 
@@ -3440,7 +3439,7 @@ DUMMY(MONS_FROG, 'F', LIGHTGREEN, "giant frog", TILEP_MONS_BULLFROG)
     16, 880,
     5, 5, MST_SPHINX, true, S_SHOUT,
     I_HUMAN, HT_LAND, 11, DEFAULT_ENERGY,
-    MONUSE_OPEN_DOORS, SIZE_BIG, MON_SHAPE_QUADRUPED_WINGED,
+    MONUSE_OPEN_DOORS, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED,
     {TILEP_MONS_SPHINX}, TILE_CORPSE_SPHINX
 },
 
@@ -3469,7 +3468,7 @@ DUMMY(MONS_FROG, 'F', LIGHTGREEN, "giant frog", TILEP_MONS_BULLFROG)
     8, 450,
     15, 5, MST_NO_SPELLS, true, S_SHOUT,
     I_HUMAN, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_WEAPONS_ARMOUR, SIZE_BIG, MON_SHAPE_HUMANOID,
+    MONUSE_WEAPONS_ARMOUR, SIZE_LARGE, MON_SHAPE_HUMANOID,
     {TILEP_MONS_BOULDER_BEETLE}, TILE_CORPSE_BOULDER_BEETLE
 },
 
@@ -4022,7 +4021,7 @@ DUMMY(MONS_MERGED_SLIME_CREATURE, 'J', LIGHTGREEN, "merged slime creature",
     20, 1100,
     15, 0, MST_NO_SPELLS, false, S_SILENT,
     I_BRAINLESS, HT_LAND, 0, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_PLANT,
+    MONUSE_NOTHING, SIZE_GIANT, MON_SHAPE_PLANT,
     {TILEP_MONS_BUSH, TVARY_MOD}, TILE_ERROR
 },
 
@@ -4035,7 +4034,7 @@ DUMMY(MONS_MERGED_SLIME_CREATURE, 'J', LIGHTGREEN, "merged slime creature",
     8, 440,
     10, 0, MST_BURNING_BUSH, false, S_SILENT,
     I_BRAINLESS, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_PLANT,
+    MONUSE_NOTHING, SIZE_GIANT, MON_SHAPE_PLANT,
     {TILEP_MONS_BUSH_BURNING}, TILE_ERROR
 },
 
@@ -4402,7 +4401,7 @@ DUMMY(MONS_SNAKE, 'S', LIGHTGREEN, "snake", TILEP_MONS_ADDER)
     16, 880,
     20, 4, MST_NO_SPELLS, true, S_SHOUT,
     I_HUMAN, HT_LAND, 7, DEFAULT_ENERGY,
-    MONUSE_OPEN_DOORS, SIZE_BIG, MON_SHAPE_HUMANOID,
+    MONUSE_OPEN_DOORS, SIZE_LARGE, MON_SHAPE_HUMANOID,
     {TILEP_MONS_IRON_TROLL}, TILE_CORPSE_IRON_TROLL
 },
 
@@ -4691,7 +4690,7 @@ DUMMY(MONS_SNAKE, 'S', LIGHTGREEN, "snake", TILEP_MONS_ADDER)
     11, 495,
     0, 0, MST_NO_SPELLS, false, S_SILENT,
     I_BRAINLESS, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_ABOMINATION_LARGE, TVARY_MOD}, TILE_ERROR
 },
 
@@ -4705,7 +4704,7 @@ DUMMY(MONS_SNAKE, 'S', LIGHTGREEN, "snake", TILEP_MONS_ADDER)
     9, 495,
     5, 10, MST_THRASHING_HORROR, false, S_ROAR,
     I_ANIMAL, HT_LAND, 25, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_THRASHING_HORROR}, TILE_ERROR
 },
 
@@ -4842,7 +4841,7 @@ DUMMY(MONS_SNAKE, 'S', LIGHTGREEN, "snake", TILEP_MONS_ADDER)
     14, 770,
     9, 5, MST_NO_SPELLS, true, S_BELLOW,
     I_ANIMAL, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_QUADRUPED,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_QUADRUPED,
     {TILEP_MONS_DEATH_YAK}, TILE_CORPSE_DEATH_YAK
 },
 
@@ -4855,7 +4854,7 @@ DUMMY(MONS_SNAKE, 'S', LIGHTGREEN, "snake", TILEP_MONS_ADDER)
     14, 770,
     10, 2, MST_CATOBLEPAS, true, S_BELLOW,
     I_ANIMAL, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_QUADRUPED,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_QUADRUPED,
     {TILEP_MONS_CATOBLEPAS}, TILE_CORPSE_CATOBLEPAS
 },
 
@@ -4910,7 +4909,7 @@ DUMMY(MONS_SNAKE, 'S', LIGHTGREEN, "snake", TILEP_MONS_ADDER)
     16, 1200,
     9, 5, MST_NO_SPELLS, true, S_SILENT,
     I_ANIMAL, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, SIZE_BIG, MON_SHAPE_QUADRUPED,
+    MONUSE_NOTHING, SIZE_LARGE, MON_SHAPE_QUADRUPED,
     {TILEP_MONS_APIS}, TILE_CORPSE_APIS
 },
 
@@ -5705,7 +5704,7 @@ DUMMY(MONS_WALKING_TOME, ';', BROWN, "walking tome", TILE_ERROR) // XXX TODO
     6, 330,
     7, 12, MST_NO_SPELLS, false, S_RANDOM,
     I_ANIMAL, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_OPEN_DOORS, SIZE_BIG, MON_SHAPE_MISC,
+    MONUSE_OPEN_DOORS, SIZE_LARGE, MON_SHAPE_MISC,
     {TILEP_MONS_CHAOS_SPAWN, TVARY_RANDOM}, TILE_ERROR
 },
 
@@ -7178,7 +7177,7 @@ DUMMY(MONS_HELL_LORD, '&', COLOUR_UNDEF, "hell lord", TILEP_MONS_PROGRAM_BUG)
     18, 990,
     20, 4, MST_MOON_TROLL, false, S_SHOUT,
     I_HUMAN, HT_LAND, 12, DEFAULT_ENERGY,
-    MONUSE_WEAPONS_ARMOUR, SIZE_BIG, MON_SHAPE_HUMANOID,
+    MONUSE_WEAPONS_ARMOUR, SIZE_LARGE, MON_SHAPE_HUMANOID,
     {TILEP_MONS_MOON_TROLL}, TILE_ERROR
 },
 
@@ -7208,7 +7207,7 @@ DUMMY(MONS_HELL_LORD, '&', COLOUR_UNDEF, "hell lord", TILEP_MONS_PROGRAM_BUG)
     20, 1500,
     2, 1, MST_GASTRONOK, true, S_GURGLE,
     I_HUMAN, HT_AMPHIBIOUS, 5, DEFAULT_ENERGY,
-    MONUSE_STARTING_EQUIPMENT, SIZE_BIG, MON_SHAPE_SNAIL,
+    MONUSE_STARTING_EQUIPMENT, SIZE_GIANT, MON_SHAPE_SNAIL,
     {TILEP_MONS_GASTRONOK}, TILE_ERROR
 },
 
diff --git a/crawl-ref/source/mon-explode.cc b/crawl-ref/source/mon-explode.cc
@@ -130,12 +130,12 @@ static void _setup_inner_flame_explosion(bolt & beam, const monster& origin,
     _setup_base_explosion(beam, origin);
     const int size   = origin.body_size(PSIZE_BODY);
     beam.flavour     = BEAM_FIRE;
-    beam.damage      = (size > SIZE_BIG)  ? dice_def(3, 25) :
-                       (size > SIZE_TINY) ? dice_def(3, 20) :
-                                            dice_def(3, 15);
+    beam.damage      = (size > SIZE_LARGE) ? dice_def(3, 25) :
+                       (size > SIZE_TINY)  ? dice_def(3, 20) :
+                                             dice_def(3, 15);
     beam.name        = "fiery explosion";
     beam.colour      = RED;
-    beam.ex_size     = (size > SIZE_BIG) ? 2 : 1;
+    beam.ex_size     = (size > SIZE_LARGE) ? 2 : 1;
     beam.source_name = origin.name(DESC_PLAIN, true);
     beam.origin_spell = SPELL_INNER_FLAME;
     beam.thrower     = (agent && agent->is_player()) ? KILL_YOU_MISSILE
diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc
@@ -1592,9 +1592,7 @@ size_type monster_info::body_size() const
             return SIZE_MEDIUM;
         else if (slime_size == 3)
             return SIZE_LARGE;
-        else if (slime_size == 4)
-            return SIZE_BIG;
-        else if (slime_size == 5)
+        else if (slime_size >= 4) // sizes 4 & 5
             return SIZE_GIANT;
     }
 
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
@@ -1286,8 +1286,6 @@ int max_corpse_chunks(monster_type mc)
         return 4;
     case SIZE_LARGE:
         return 9;
-    case SIZE_BIG:
-        return 10;
     case SIZE_GIANT:
         return 12;
     default:
diff --git a/crawl-ref/source/size-type.h b/crawl-ref/source/size-type.h
@@ -8,8 +8,7 @@ enum size_type
     SIZE_SMALL,             // halflings/kobolds
     SIZE_MEDIUM,            // humans/elves/dwarves
     SIZE_LARGE,             // trolls/ogres/centaurs/nagas
-    SIZE_BIG,               // large quadrupeds
-    SIZE_GIANT,             // giants
+    SIZE_GIANT,             // giants and such
     NUM_SIZE_LEVELS,
     SIZE_CHARACTER,         // transformations that don't change size
 };
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
diff --git a/crawl-ref/source/util/monster/monster-main.cc b/crawl-ref/source/util/monster/monster-main.cc
diff --git a/crawl-ref/source/util/species-gen.py b/crawl-ref/source/util/species-gen.py

Original file line number	Diff line number	Diff line change
`@@ -5679,7 +5679,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monster* mon)`
`5679`	`5679`	`&& mon->add_ench(mon_enchant(ENCH_INNER_FLAME, 0, agent())))`
`5680`	`5680`	`{`
`5681`	`5681`	`if (simple_monster_message(*mon,`
`5682`		`- (mon->body_size(PSIZE_BODY) > SIZE_BIG)`
	`5682`	`+ (mon->body_size(PSIZE_BODY) > SIZE_LARGE)`
`5683`	`5683`	`? " is filled with an intense inner flame!"`
`5684`	`5684`	`: " is filled with an inner flame."))`
`5685`	`5685`	`{`