Remove the unused jelly form

16 files changed, 71 insertions, 114 deletions

diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc
index fb2e408d1d..1e07e152be 100644
--- a/crawl-ref/source/chardump.cc
+++ b/crawl-ref/source/chardump.cc
@@ -300,9 +300,11 @@ static void _sdump_transform(dump_params &par)
         case TRAN_TREE:
             text += "You " + verb + " an animated tree.";
             break;
+#if TAG_MAJOR_VERSION == 34
         case TRAN_JELLY:
             text += "You " + verb + " an acidic jelly.";
             break;
+#endif
         case TRAN_PORCUPINE:
             text += "You " + verb + " a porcupine.";
             break;
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 669aa1e864..6a3c7d49fd 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -341,7 +341,9 @@ enum transformation_type
     TRAN_TREE,
     TRAN_PORCUPINE,
     TRAN_WISP,
+#if TAG_MAJOR_VERSION == 34
     TRAN_JELLY,
+#endif
     TRAN_FUNGUS,
     TRAN_SHADOW,
     // no NUM_TRANSFORMS due to too many switch statements
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 7f0cfec399..16eb02f98f 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -639,7 +639,6 @@ bool prompt_eat_inventory_item(int slot)
                 prompt_invent_item(you.species == SP_VAMPIRE ? "Drain what?"
                                                              : "Eat which item?",
                                    MT_INVLIST,
-                                   you.form == TRAN_JELLY ? OSEL_ANY :
                                    you.species == SP_VAMPIRE ? (int)OSEL_VAMP_EAT
                                                              : OBJ_FOOD,
                                    true, true, true, 0, -1, NULL,
@@ -652,17 +651,7 @@ bool prompt_eat_inventory_item(int slot)
     // This conditional can later be merged into food::can_ingest() when
     // expanded to handle more than just OBJ_FOOD 16mar200 {dlb}
     item_def &item(you.inv[which_inventory_slot]);
-    if (you.form == TRAN_JELLY)
-    {
-        if (item_is_melded(item))
-        {
-            // Allowing eating it would be natural, but we don't want to
-            // let folks get rid of curses or distortion a scummy way.
-            mpr("It's melded into your body!");
-            return false;
-        }
-    }
-    else if (you.species != SP_VAMPIRE)
+    if (you.species != SP_VAMPIRE)
     {
         if (item.base_type != OBJ_FOOD)
         {
@@ -984,9 +973,6 @@ static void _describe_food_change(int food_increment)
 
 static bool _player_can_eat_rotten_meat(bool need_msg = false)
 {
-    if (you.form == TRAN_JELLY) // gelatin from mad cow carcasses anyone?
-        return true;
-
     if (player_mutation_level(MUT_SAPROVOROUS))
         return true;
 
@@ -1009,9 +995,7 @@ bool eat_item(item_def &food)
             return false;
     }
 
-    if (you.form == TRAN_JELLY)
-        _eating(food);
-    else if (food.base_type == OBJ_CORPSES && food.sub_type == CORPSE_BODY)
+    if (food.base_type == OBJ_CORPSES && food.sub_type == CORPSE_BODY)
     {
         if (you.species != SP_VAMPIRE)
             return false;
@@ -1050,6 +1034,10 @@ class compare_by_freshness
 public:
     bool operator()(const item_def *food1, const item_def *food2)
     {
+        ASSERT(food1->base_type == OBJ_CORPSES || food1->base_type == OBJ_FOOD);
+        ASSERT(food2->base_type == OBJ_CORPSES || food2->base_type == OBJ_FOOD);
+        ASSERT(food1->base_type == food2->base_type);
+
         if (is_inedible(*food1))
             return false;
 
@@ -1062,13 +1050,6 @@ public:
         if (food2->base_type == OBJ_FOOD && food2->sub_type != FOOD_CHUNK)
             return true;
 
-        // If we can eat non-food (jelly), use it up first: when the transform
-        // expires, chunks may be usable, that chainmail won't.
-        if (food1->base_type != OBJ_CORPSES && food1->base_type != OBJ_FOOD)
-            return true;
-        if (food2->base_type != OBJ_CORPSES && food2->base_type != OBJ_FOOD)
-            return false;
-
         // At this point, we know both are corpses or chunks, edible
         // (not rotten, or player is saprovore).
 
@@ -1107,9 +1088,7 @@ int eat_from_floor(bool skip_chunks)
     vector<item_def*> food_items;
     for (stack_iterator si(you.pos(), true); si; ++si)
     {
-        if (you.form == TRAN_JELLY)
-            /*burp*/; // scuse me
-        else if (you.species == SP_VAMPIRE)
+        if (you.species == SP_VAMPIRE)
         {
             if (si->base_type != OBJ_CORPSES || si->sub_type != CORPSE_BODY)
                 continue;
@@ -1778,13 +1757,10 @@ static void _eating(item_def& food)
     ASSERT(food_value > 0);
 
     int duration = food_turns(food) - 1;
-    if (you.form == TRAN_JELLY) // remarkably fast eaters, monsters even get
-        duration = 0;           // to eat multiple things per turn
 
     // use delay.parm3 to figure out whether to output "finish eating"
     zin_recite_interrupt();
-    start_delay(DELAY_EAT, duration, 0, food.base_type == OBJ_FOOD ?
-        food.sub_type : -2, duration);
+    start_delay(DELAY_EAT, duration, 0, food.sub_type, duration);
 
     lessen_hunger(food_value, true);
 }
@@ -1793,12 +1769,6 @@ static void _eating(item_def& food)
 // Some food types may not get a message.
 void finished_eating_message(int food_type)
 {
-    if (food_type == -2) // non-food, unyay magic cookie
-    {
-        mpr("You finish eating.");
-        return;
-    }
-
     bool herbivorous = player_mutation_level(MUT_HERBIVOROUS) > 0;
     bool carnivorous = player_mutation_level(MUT_CARNIVOROUS) > 0;
 
@@ -2094,9 +2064,6 @@ bool causes_rot(const item_def &food)
 // be eaten (respecting species and mutations set).
 bool is_inedible(const item_def &item)
 {
-    if (you.form == TRAN_JELLY)
-        return !can_ingest(item, true, false);
-
     // Mummies and liches don't eat.
     if (you_foodless(true))
         return true;
@@ -2204,13 +2171,6 @@ bool is_forbidden_food(const item_def &food)
 
 bool can_ingest(const item_def &food, bool suppress_msg, bool check_hunger)
 {
-    if (food.is_critical())
-    {
-        if (!suppress_msg)
-            mpr("Eating this would be a bad idea.");
-        return false;
-    }
-
     if (check_hunger)
     {
         if (is_poisonous(food))
@@ -2242,13 +2202,6 @@ bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg,
     if (!_eat_check(check_hunger, suppress_msg))
         return false;
 
-    if (you.form == TRAN_JELLY)
-    {
-        // a rather indiscriminating diet
-        return what_isit != OBJ_MISSILES
-               || kindof_thing != MI_STONE && kindof_thing != MI_LARGE_ROCK;
-    }
-
     if (you.species == SP_VAMPIRE)
     {
         if (what_isit == OBJ_CORPSES && kindof_thing == CORPSE_BODY)
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index d439be92bc..090f93eb94 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -1847,10 +1847,7 @@ bool food_is_veggie(const item_def &item)
 
 int food_value(const item_def &item)
 {
-    ASSERT(item.defined());
-
-    if (item.base_type != OBJ_FOOD) // TRAN_JELLY
-        return max(1, item_mass(item) * 5);
+    ASSERT(item.defined() && item.base_type == OBJ_FOOD);
 
     const int herb = player_mutation_level(MUT_HERBIVOROUS);
     const int carn = player_mutation_level(MUT_CARNIVOROUS);
@@ -1867,10 +1864,8 @@ int food_value(const item_def &item)
 
 int food_turns(const item_def &item)
 {
-    ASSERT(item.defined());
-    if (item.base_type == OBJ_FOOD)
-        return Food_prop[Food_index[item.sub_type]].turns;
-    return max(1, item_mass(item) / 100); // TRAN_JELLY
+    ASSERT(item.defined() && item.base_type == OBJ_FOOD);
+    return Food_prop[Food_index[item.sub_type]].turns;
 }
 
 bool can_cut_meat(const item_def &item)
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index feec00b27a..ef62bf4854 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -4547,7 +4547,7 @@ static void _move_player(coord_def move)
         return;
     }
 
-    dungeon_feature_type targ_grid = grd(targ);
+    const dungeon_feature_type targ_grid = grd(targ);
 
     const string walkverb = you.flight_mode()           ? "fly"
                           : you.form == TRAN_SPIDER     ? "crawl"
@@ -4678,14 +4678,6 @@ static void _move_player(coord_def move)
         }
     }
 
-    if (you.form == TRAN_JELLY && feat_is_closed_door(targ_grid))
-    {
-        mpr("You eat the door.");
-        nuke_wall(targ);
-        targ_pass = true;
-        targ_grid = grd(targ);
-    }
-
     if (!attacking && targ_pass && moving && !beholder && !fmonger)
     {
         if (crawl_state.game_is_zotdef() && you.pos() == env.orb_pos)
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index 72485fd525..71b27ff8fe 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -2146,7 +2146,9 @@ void melee_attack::set_attack_verb()
         case TRAN_APPENDAGE:
         case TRAN_ICE_BEAST:
         case TRAN_SHADOW:
+#if TAG_MAJOR_VERSION == 34
         case TRAN_JELLY: // ?
+#endif
             if (you.damage_type() == DVORP_CLAWING)
             {
                 if (damage_to_display < HIT_WEAK)
@@ -3531,8 +3533,7 @@ void melee_attack::attacker_sustain_passive_damage()
     if (defender->type == MONS_PROGRAM_BUG)
         return;
 
-    if (mons_class_flag(defender->type, M_ACID_SPLASH)
-        || defender->is_player() && you.form == TRAN_JELLY)
+    if (mons_class_flag(defender->type, M_ACID_SPLASH))
     {
         int rA = attacker->res_acid();
         if (rA < 3)
@@ -3859,7 +3860,9 @@ int melee_attack::calc_to_hit(bool random)
             case TRAN_PORCUPINE:
             case TRAN_PIG:
             case TRAN_APPENDAGE:
+#if TAG_MAJOR_VERSION == 34
             case TRAN_JELLY:
+#endif
             case TRAN_SHADOW:
             case TRAN_NONE:
                 break;
@@ -5600,7 +5603,9 @@ int melee_attack::calc_base_unarmed_damage()
             break;
         case TRAN_PIG:
         case TRAN_PORCUPINE:
+#if TAG_MAJOR_VERSION == 34
         case TRAN_JELLY:
+#endif
         case TRAN_SHADOW:
         case TRAN_NONE:
         case TRAN_APPENDAGE:
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 1eaf30be46..f570bc00b8 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -836,9 +836,6 @@ static void _print_stats_wp(int y)
         case TRAN_TREE:
             col = BROWN;
             break;
-        case TRAN_JELLY:
-            col = LIGHTRED;
-            break;
         default:
             break;
         }
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc
index efdfa94885..4ae7e48ae6 100644
--- a/crawl-ref/source/player-act.cc
+++ b/crawl-ref/source/player-act.cc
@@ -262,10 +262,6 @@ brand_type player::damage_brand(int)
                 ret = SPWPN_VAMPIRICISM;
             break;
 
-        case TRAN_JELLY:
-            ret = SPWPN_ACID;
-            break;
-
         default:
             break;
         }
@@ -428,8 +424,6 @@ string player::hand_name(bool plural, bool *can_plural) const
         str = "branch";
     else if (form == TRAN_WISP)
         str = "misty tendril";
-    else if (form == TRAN_JELLY)
-        str = "bump"; // not even pseudopods...
     else if (form == TRAN_LICH || form == TRAN_STATUE
              || form == TRAN_SHADOW
              || !form_changed_physiology())
@@ -466,8 +460,6 @@ string player::foot_name(bool plural, bool *can_plural) const
         str = "root";
     else if (form == TRAN_WISP)
         str = "strand";
-    else if (form == TRAN_JELLY)
-        str = "underside", *can_plural = false;
     else if (form == TRAN_LICH || form == TRAN_STATUE
              || form == TRAN_SHADOW
              || !form_changed_physiology())
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 606f167ed7..6063fc20e9 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -530,7 +530,7 @@ bool player_likes_lava(bool permanently)
 
 bool player_can_open_doors()
 {
-    return you.form != TRAN_BAT && you.form != TRAN_JELLY;
+    return you.form != TRAN_BAT;
 }
 
 // TODO: get rid of this.
@@ -576,8 +576,10 @@ bool is_player_same_genus(const monster_type mon, bool transform)
             return mons_genus(mon) == MONS_DRAGON;
         case TRAN_PIG:
             return mons_genus(mon) == MONS_HOG;
+#if TAG_MAJOR_VERSION == 34
         case TRAN_JELLY:
             return mons_genus(mon) == MONS_JELLY;
+#endif
         case TRAN_STATUE:
         case TRAN_BLADE_HANDS:
         case TRAN_NONE:
@@ -842,8 +844,10 @@ bool you_tran_can_wear(int eq, bool check_mutation)
     if (eq == EQ_NONE)
         return true;
 
-    if (you.form == TRAN_JELLY
-        || you.form == TRAN_PORCUPINE
+    if (you.form == TRAN_PORCUPINE
+#if TAG_MAJOR_VERSION == 34
+        || you.form == TRAN_JELLY
+#endif
         || you.form == TRAN_WISP)
     {
         return false;
@@ -854,7 +858,7 @@ bool you_tran_can_wear(int eq, bool check_mutation)
     else if (eq >= EQ_RINGS && eq <= EQ_RINGS_PLUS2)
         eq = EQ_RINGS;
 
-    // Everybody but jellies and porcupines can wear at least some type of armour.
+    // Everybody but porcupines and wisps can wear at least some type of armour.
     if (eq == EQ_ALL_ARMOUR)
         return true;
 
@@ -1750,7 +1754,7 @@ bool player::res_corr(bool calc_unid, bool items) const
     if (religion == GOD_JIYVA && piety >= piety_breakpoint(2))
         return true;
 
-    if (form == TRAN_JELLY || form == TRAN_WISP)
+    if (form == TRAN_WISP)
         return 1;
 
     if (items)
@@ -1780,7 +1784,7 @@ bool player::res_corr(bool calc_unid, bool items) const
 
 int player_res_acid(bool calc_unid, bool items)
 {
-    if (you.form == TRAN_JELLY || you.form == TRAN_WISP)
+    if (you.form == TRAN_WISP)
         return 3;
 
     return you.res_corr(calc_unid, items) ? 1 : 0;
@@ -1933,7 +1937,6 @@ int player_res_poison(bool calc_unid, bool temp, bool items)
         case TRAN_DRAGON:
         case TRAN_FUNGUS:
         case TRAN_TREE:
-        case TRAN_JELLY:
         case TRAN_WISP:
             rp++;
             break;
@@ -3794,7 +3797,9 @@ int check_stealth(void)
         race_mod = 27; // masquerading as scenery
         break;
     case TRAN_SPIDER:
+#if TAG_MAJOR_VERSION == 34
     case TRAN_JELLY:
+#endif
     case TRAN_WISP:
         race_mod = 21;
         break;
@@ -6304,8 +6309,6 @@ string player::shout_verb() const
         return "sporulate";
     case TRAN_TREE:
         return "creak";
-    case TRAN_JELLY:
-        return "gurgle";
     case TRAN_WISP:
         return "whoosh"; // any wonder why?
 
@@ -6719,11 +6722,13 @@ int player::armour_class() const
         case TRAN_LICH:  // can wear normal body armour (no bonus)
             break;
 
-        case TRAN_JELLY:  // no bonus
+#if TAG_MAJOR_VERSION == 34
+        case TRAN_JELLY:
+#endif
         case TRAN_BAT:
         case TRAN_PIG:
         case TRAN_PORCUPINE:
-        case TRAN_SHADOW:
+        case TRAN_SHADOW: // no bonus
             break;
 
         case TRAN_SPIDER: // low level (small bonus), also gets EV
@@ -6910,7 +6915,6 @@ bool player::is_unbreathing() const
     case TRAN_STATUE:
     case TRAN_FUNGUS:
     case TRAN_TREE:
-    case TRAN_JELLY:
     case TRAN_WISP:
         return true;
     default:
@@ -7081,7 +7085,7 @@ int player::res_petrify(bool temp) const
 
 int player::res_constrict() const
 {
-    if (form == TRAN_JELLY || form == TRAN_PORCUPINE
+    if (form == TRAN_PORCUPINE
         || form == TRAN_WISP)
     {
         return 3;
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 6311dd84a9..cd92da8a40 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -3545,7 +3545,6 @@ void god_pitch(god_type which_god)
          you.form == TRAN_TREE   ? "sway towards" :
          you.form == TRAN_FUNGUS ? "release spores on" :
          you.form == TRAN_PORCUPINE ? "curl into a sanctuary of spikes before" :
-         you.form == TRAN_JELLY  ? "quiver devoutly before" :
          you.species == SP_NAGA  ? "coil in front of" :
          // < TGWi> you curl up on the altar and go to sleep
          you.species == SP_FELID ? "sit before" :
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 4933129025..18729549c0 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -555,7 +555,7 @@ void inspect_spells()
 
 static bool _can_cast()
 {
-    if (you.form == TRAN_BAT || you.form == TRAN_PIG || you.form == TRAN_JELLY
+    if (you.form == TRAN_BAT || you.form == TRAN_PIG
         || you.form == TRAN_PORCUPINE || you.form == TRAN_WISP
         || you.form == TRAN_FUNGUS)
     {
diff --git a/crawl-ref/source/status.cc b/crawl-ref/source/status.cc
index 565aa140a6..ccdb87ea6f 100644
--- a/crawl-ref/source/status.cc
+++ b/crawl-ref/source/status.cc
@@ -1038,11 +1038,13 @@ static void _describe_transform(status_info* inf)
         inf->short_text = "tree-form";
         inf->long_text  = "You are an animated tree.";
         break;
+#if TAG_MAJOR_VERSION == 34
     case TRAN_JELLY:
         inf->light_text = "Jelly";
         inf->short_text = "jelly-form";
         inf->long_text  = "You are a lump of jelly.";
         break;
+#endif
     case TRAN_PORCUPINE:
         inf->light_text = "Porc";
         inf->short_text = "porcupine-form";
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc
index d44726d1c4..450bd2b415 100644
--- a/crawl-ref/source/tilepick-p.cc
+++ b/crawl-ref/source/tilepick-p.cc
@@ -470,7 +470,9 @@ tileidx_t tileidx_player()
         // non-animals
         case TRAN_ICE_BEAST: ch = TILEP_TRAN_ICE_BEAST; break;
         case TRAN_WISP:      ch = TILEP_MONS_INSUBSTANTIAL_WISP; break;
+#if TAG_MAJOR_VERSION == 34
         case TRAN_JELLY:     ch = TILEP_MONS_JELLY;     break;
+#endif
         case TRAN_FUNGUS:    ch = TILEP_TRAN_MUSHROOM;  break;
         case TRAN_SHADOW:    ch = TILEP_TRAN_SHADOW;    break;
         case TRAN_DRAGON:
diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc
index 2b41103412..40c93449cc 100644
--- a/crawl-ref/source/transform.cc
+++ b/crawl-ref/source/transform.cc
@@ -57,7 +57,9 @@ static const char* form_names[] =
     "tree",
     "porcupine",
     "wisp",
+#if TAG_MAJOR_VERSION == 34
     "jelly",
+#endif
     "fungus",
     "shadow",
 };
@@ -92,8 +94,8 @@ bool form_can_fly(transformation_type form)
 
 bool form_can_swim(transformation_type form)
 {
-    // Ice floats, scum goes to the top.
-    if (form == TRAN_ICE_BEAST || form == TRAN_JELLY)
+    // Ice floats.
+    if (form == TRAN_ICE_BEAST)
         return true;
 
     if ((you.species == SP_MERFOLK || you.species == SP_OCTOPODE)
@@ -144,7 +146,6 @@ bool form_likes_lava(transformation_type form)
 bool form_can_butcher(transformation_type form)
 {
     return form != TRAN_WISP
-        && form != TRAN_JELLY
         && form != TRAN_FUNGUS;
 }
 
@@ -162,12 +163,18 @@ bool form_can_use_wand(transformation_type form)
 
 bool form_can_wear_item(const item_def& item, transformation_type form)
 {
-    if (form == TRAN_JELLY || form == TRAN_PORCUPINE || form == TRAN_WISP)
+    if (form == TRAN_PORCUPINE
+#if TAG_MAJOR_VERSION == 34
+        || form == TRAN_JELLY
+#endif
+        || form == TRAN_WISP)
+    {
         return false;
+    }
 
     if (item.base_type == OBJ_JEWELLERY)
     {
-        // Everyone but jellies, porcupines and wisps can wear amulets.
+        // Everyone but porcupines and wisps can wear amulets.
         if (jewellery_is_amulet(item))
             return true;
         // Bats and pigs can't wear rings.
@@ -438,7 +445,6 @@ size_type player::transform_size(transformation_type tform, int psize) const
     case TRAN_FUNGUS:
         return SIZE_TINY;
     case TRAN_PIG:
-    case TRAN_JELLY:
         return SIZE_SMALL;
     case TRAN_ICE_BEAST:
         return SIZE_LARGE;
@@ -481,8 +487,10 @@ monster_type transform_mons()
         return you.species == SP_VAMPIRE ? MONS_VAMPIRE_BAT : MONS_BAT;
     case TRAN_PIG:
         return MONS_HOG;
+#if TAG_MAJOR_VERSION == 34
     case TRAN_JELLY:
         return MONS_JELLY;
+#endif
     case TRAN_PORCUPINE:
         return MONS_PORCUPINE;
     case TRAN_TREE:
@@ -544,7 +552,6 @@ int form_hp_mod()
         return 13;
     case TRAN_ICE_BEAST:
         return 12;
-    case TRAN_JELLY:
     case TRAN_DRAGON:
     case TRAN_TREE:
         return 15;
@@ -726,7 +733,9 @@ static int _transform_duration(transformation_type which_trans, int pow)
     case TRAN_FUNGUS:
     case TRAN_PIG:
     case TRAN_PORCUPINE:
+#if TAG_MAJOR_VERSION == 34
     case TRAN_JELLY:
+#endif
     case TRAN_TREE:
     case TRAN_WISP:
         return min(15 + random2(pow) + random2(pow / 2), 100);
@@ -962,11 +971,6 @@ bool transform(int pow, transformation_type which_trans, bool involuntary,
         msg      += "a fleshy mushroom.";
         break;
 
-    case TRAN_JELLY:
-        tran_name = "jelly";
-        msg      += "a lump of acidic jelly.";
-        break;
-
     case TRAN_PORCUPINE:
         tran_name = "porcupine";
         str       = -3;
@@ -1316,7 +1320,6 @@ void untransform(bool skip_wielding, bool skip_move)
         break;
 
     case TRAN_PIG:
-    case TRAN_JELLY:
     case TRAN_PORCUPINE:
     case TRAN_WISP:
         break;
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index be00b62b38..315077b6e8 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -253,7 +253,7 @@ bool feat_is_traversable_now(dungeon_feature_type grid, bool try_fallback)
 
         // You can't open doors in bat form.
         if (grid == DNGN_CLOSED_DOOR || grid == DNGN_RUNED_DOOR)
-            return player_can_open_doors() || you.form == TRAN_JELLY;
+            return player_can_open_doors();
     }
 
     return feat_is_traversable(grid, try_fallback);
diff --git a/crawl-ref/source/wiz-you.cc b/crawl-ref/source/wiz-you.cc
index 5ff8fc6638..7a862b1343 100644
--- a/crawl-ref/source/wiz-you.cc
+++ b/crawl-ref/source/wiz-you.cc
@@ -1113,6 +1113,10 @@ void wizard_transform()
         string line;
         for (int i = 0; i <= LAST_FORM; i++)
         {
+#if TAG_MAJOR_VERSION == 34
+            if (i == TRAN_JELLY)
+                continue;
+#endif
             line += make_stringf("[%c] %-10s ", i + 'a',
                                  transform_name((transformation_type)i));
             if (i % 5 == 4 || i == LAST_FORM)
@@ -1135,6 +1139,11 @@ void wizard_transform()
         if (keyin < 'a' || keyin > 'a' + LAST_FORM)
             continue;
 
+#if TAG_MAJOR_VERSION == 34
+        if ((transformation_type)(keyin - 'a') == TRAN_JELLY)
+            continue;
+#endif
+
         form = (transformation_type)(keyin - 'a');
 
         break;