Remove SIZE_HUGE.

Do you know whether it was bigger than SIZE_GIANT or not? Chances
are no (it's bigger, to be clear). There are some small changes to
in constriction, though there aren't any constrictors at either size,
and knockback -- in particular, dragons will be less effective at
knocking back giants.

The other change is that Dragon Form will have slightly better EV,
as will monster dragons (but only while constricted or netted). The
change seems like it is rather minor; I tested it with 15 Dodging and
only had a difference of 3 EV.

6 files changed, 26 insertions, 24 deletions

diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc
index 144ba2f232..e846139847 100644
--- a/crawl-ref/source/actor.cc
+++ b/crawl-ref/source/actor.cc
@@ -244,9 +244,10 @@ int actor::body_weight(bool base) const
     case SIZE_BIG:
         return 1500;
     case SIZE_GIANT:
-        return 1800;
+#if TAG_MAJOR_VERSION == 34
     case SIZE_HUGE:
-        return 2200;
+#endif
+        return 1800;
     default:
         die("invalid body weight");
     }
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 31f2a379b9..beb472b1fb 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3568,7 +3568,9 @@ static string _monster_stat_description(const monster_info& mi)
         "large",
         "very large",
         "giant",
+#if TAG_MAJOR_VERSION == 34
         "huge",
+#endif
     };
 
     if (mons_is_feat_mimic(mi.type))
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index a267636b8e..cec2535818 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -3646,7 +3646,9 @@ enum size_type
     SIZE_LARGE,             // trolls/ogres/centaurs/nagas
     SIZE_BIG,               // large quadrupeds
     SIZE_GIANT,             // giants
+#if TAG_MAJOR_VERSION == 34
     SIZE_HUGE,              // dragons
+#endif
     NUM_SIZE_LEVELS,
     SIZE_CHARACTER,         // transformations that don't change size
 };
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 96d72e4a17..11508fa011 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -135,7 +135,6 @@
      SIZE_LARGE,             // trolls/ogres/centaurs/nagas
      SIZE_BIG,               // large quadrupeds
      SIZE_GIANT,             // giants
-     SIZE_HUGE               // dragons
 
 */
 
@@ -170,7 +169,7 @@ static monsterentry mondata[] =
     // intelligence, habitat, speed, energy usage, use type
     I_PLANT, HT_LAND, FL_NONE, 0, DEFAULT_ENERGY,
     // use type, eat type, body size, body shape
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_MISC,
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_MISC,
 },
 
 // Use this to replace removed monsters, to retain save compatibility.
@@ -186,7 +185,7 @@ static monsterentry mondata[] =
     { 0, 0, 0, 0 }, \
     0, 0, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, \
     I_PLANT, HT_LAND, FL_NONE, 0, DEFAULT_ENERGY, \
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_MISC \
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_MISC \
 },
 
 // Axed monsters.
@@ -2753,7 +2752,7 @@ static monsterentry mondata[] =
     { 12, 5, 5, 0 },
     10, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SILENT,
     I_ANIMAL, HT_LAND, FL_WINGED, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -2778,7 +2777,7 @@ static monsterentry mondata[] =
     { 12, 5, 5, 0 },
     10, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SILENT,
     I_ANIMAL, HT_LAND, FL_WINGED, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -2803,7 +2802,7 @@ static monsterentry mondata[] =
     { 12, 5, 5, 0 },
     10, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SILENT,
     I_ANIMAL, HT_LAND, FL_WINGED, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -2828,7 +2827,7 @@ static monsterentry mondata[] =
     { 9, 5, 5, 0 },
     7, 7, MST_SWAMP_DRAGON, CE_POISON_CONTAM, Z_BIG, S_ROAR,
     I_ANIMAL, HT_LAND, FL_WINGED, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -2866,7 +2865,7 @@ static monsterentry mondata[] =
     { 18, 5, 3, 0 },
     20, 6, MST_IRON_DRAGON, CE_CONTAMINATED, Z_BIG, S_ROAR,
     I_ANIMAL, HT_LAND, FL_NONE, 8, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED
 },
 
 {
@@ -2879,7 +2878,7 @@ static monsterentry mondata[] =
     { 14, 5, 5, 0 },
     13, 10, MST_STORM_DRAGON, CE_CLEAN, Z_BIG, S_ROAR,
     I_ANIMAL, HT_LAND, FL_WINGED, 12, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -2892,7 +2891,7 @@ static monsterentry mondata[] =
     { 18, 4, 4, 0 },
     15, 7, MST_GOLDEN_DRAGON, CE_POISONOUS, Z_BIG, S_ROAR,
     I_ANIMAL, HT_LAND, FL_WINGED, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -2918,7 +2917,7 @@ static monsterentry mondata[] =
     { 20, 6, 6, 0 },
     20, 4, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
     I_ANIMAL, HT_LAND, FL_WINGED, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_HUMANOID_WINGED
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_HUMANOID_WINGED
 },
 
 {
@@ -4363,7 +4362,7 @@ static monsterentry mondata[] =
     { 12, 9, 7, 0 },
     10, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
     I_ANIMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_MISC
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_MISC
 },
 
 // yaks, sheep, elephants, and other beasts ('Y')
@@ -4664,7 +4663,7 @@ static monsterentry mondata[] =
     { 16, 10, 6, 0 },
     20, 0, MST_KRAKEN, CE_POISON_CONTAM, Z_BIG, S_SILENT,
     I_ANIMAL, HT_WATER, FL_NONE, 14, DEFAULT_ENERGY,
-    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_MISC
+    MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_MISC
 },
 
 {
@@ -5553,7 +5552,7 @@ static monsterentry mondata[] =
     { 20, 3, 5, 0 },
     25, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
     I_PLANT, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
-    MONUSE_STARTING_EQUIPMENT, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_PLANT
+    MONUSE_STARTING_EQUIPMENT, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_PLANT
 },
 
 // non-living creatures
@@ -6057,7 +6056,7 @@ static monsterentry mondata[] =
     { 19, 0, 0, 133 },
     15, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_ROAR,
     I_NORMAL, HT_LAND, FL_WINGED, 10, DEFAULT_ENERGY,
-    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -6082,7 +6081,7 @@ static monsterentry mondata[] =
     { 20, 0, 0, 160 },
     16, 12, MST_SERPENT_OF_HELL_GEHENNA, CE_CLEAN, Z_NOZOMBIE, S_ROAR,
     I_HIGH, HT_LAND, FL_WINGED, 14, DEFAULT_ENERGY,
-    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -6095,7 +6094,7 @@ static monsterentry mondata[] =
     { 20, 0, 0, 160 },
     16, 12, MST_SERPENT_OF_HELL_COCYTUS, CE_CLEAN, Z_NOZOMBIE, S_ROAR,
     I_HIGH, HT_LAND, FL_WINGED, 14, DEFAULT_ENERGY,
-    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -6108,7 +6107,7 @@ static monsterentry mondata[] =
     { 20, 0, 0, 160 },
     20, 12, MST_SERPENT_OF_HELL_DIS, CE_CLEAN, Z_NOZOMBIE, S_ROAR,
     I_HIGH, HT_LAND, FL_NONE, 14, DEFAULT_ENERGY,
-    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 {
@@ -6121,7 +6120,7 @@ static monsterentry mondata[] =
     { 20, 0, 0, 160 },
     16, 12, MST_SERPENT_OF_HELL_TARTARUS, CE_CLEAN, Z_NOZOMBIE, S_ROAR,
     I_HIGH, HT_LAND, FL_WINGED, 14, DEFAULT_ENERGY,
-    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_HUGE, MON_SHAPE_QUADRUPED_WINGED
+    MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_QUADRUPED_WINGED
 },
 
 // "e"lves
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 4191dd71ca..4fe7b70f49 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -3435,10 +3435,8 @@ static tileidx_t _tileidx_bone(const item_def &item)
     case SIZE_LARGE:
     case SIZE_BIG:
         cs = 2; break;
-    case SIZE_HUGE:
     case SIZE_GIANT:
         cs = 3; break;
-
     }
 
     switch (get_mon_shape(item.mon_type))
diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc
index 1c57fedc6f..35cdbec14e 100644
--- a/crawl-ref/source/transform.cc
+++ b/crawl-ref/source/transform.cc
@@ -447,7 +447,7 @@ size_type player::transform_size(transformation_type tform, int psize) const
     case TRAN_ICE_BEAST:
         return SIZE_LARGE;
     case TRAN_DRAGON:
-        return SIZE_HUGE;
+        return SIZE_GIANT;
     default:
         return SIZE_CHARACTER;
     }