Remove royal jellies

Somebody else might want to review my vault changes - I mostly replaced
them with honeycombs, which might be a problem, for example, in the
Jiyva vaults.

33 files changed, 67 insertions, 120 deletions

diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
index 7fc58f6991..300469dfde 100644
--- a/crawl-ref/source/acquire.cc
+++ b/crawl-ref/source/acquire.cc
@@ -388,7 +388,6 @@ static void _acquirement_determine_food(int& type_wanted, int& quantity)
     if (you.species == SP_GHOUL)
     {
         type_wanted = random_choose_weighted(4, FOOD_CHUNK,
-                                             2, FOOD_ROYAL_JELLY,
                                              1, FOOD_AMBROSIA,
                                              0);
     }
@@ -407,11 +406,10 @@ static void _acquirement_determine_food(int& type_wanted, int& quantity)
     else
     {
         type_wanted = random_choose_weighted(
-                        5, FOOD_ROYAL_JELLY,
+                        6, FOOD_HONEYCOMB,
                         3, FOOD_AMBROSIA,
                         1, player_mutation_level(MUT_HERBIVOROUS) ? FOOD_BREAD_RATION
                                                                   : FOOD_MEAT_RATION,
-                        1, FOOD_HONEYCOMB,
                         0);
     }
 
diff --git a/crawl-ref/source/dat/database/help.txt b/crawl-ref/source/dat/database/help.txt
index 6fbbd898cc..93f16ed1ae 100644
--- a/crawl-ref/source/dat/database/help.txt
+++ b/crawl-ref/source/dat/database/help.txt
@@ -79,7 +79,7 @@ hotkey to travel to its location.
 
 Some examples of search strings:
 <w>cure mutation</w> find all potions of cure mutation, including potions in shops.
-<w>jelly</w>         finds every single royal jelly and heaps of royal jellies.
+<w>honey</w>         finds every single honeycomb and heaps of honeycombs.
 <w>shop</w>          lists all shops. Press <w>?</w> and a shop's letter for the stock.
 <w>Lair:2</w>        find everything known to be on Lair:2.
 <w>D:[2-4]</w>       finds everything on Dungeon levels 2-4. Regexes are allowed!
diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des
index d3ae8eebf3..27ed234cca 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -296,7 +296,7 @@ KMONS:  1 = orange demon
 KMONS:  2 = red wasp / yellow wasp / killer bee w:2 / nothing w:2
 KMONS:  3 = death drake / green death
 KFEAT:  123 = W
-KITEM:  23 = honeycomb / royal jelly w:2 / nothing
+KITEM:  23 = honeycomb / nothing
 MAP
  xxxxxxx
 xx22222xx
@@ -907,7 +907,7 @@ MONS:    draconian shifter w:5 / shadow demon w:5 / lich / \
 MONS:    bone dragon / tentacled starspawn / starcursed mass / \
          apocalypse crab / dancing weapon / tentacled monstrosity / \
          glowing shapeshifter
-ITEM:    superb_item, piece of ambrosia q:2 / royal jelly q:2
+ITEM:    superb_item, honeycomb q:2
 ITEM:    dart good_item q:100, any magical staff
 ITEM:    scroll of magic mapping q:4 / scroll of random uselessness q:4
 ITEM:    ring mail randart / scale mail randart / chain mail randart w:20
@@ -1428,7 +1428,7 @@ ENDMAP
 NAME:   grunt_abyss_rune_wretched_hive
 TAGS:   abyss_rune unrand patrolling
 MONS:   killer bee, wretched star, green ugly thing
-ITEM:   royal jelly q:1 w:1 / honeycomb q:1 / nothing w:189
+ITEM:   honeycomb q:1 / nothing w:190
 KMONS:  O = queen bee
 KITEM:  O = abyssal rune of Zot
 NSUBST: 1 = 4:3 / 1:1 / 1:. / * = 1.
diff --git a/crawl-ref/source/dat/des/branches/depths_encompass.des b/crawl-ref/source/dat/des/branches/depths_encompass.des
index 042cc581c0..501ed2a698 100644
--- a/crawl-ref/source/dat/des/branches/depths_encompass.des
+++ b/crawl-ref/source/dat/des/branches/depths_encompass.des
@@ -232,7 +232,7 @@ KMONS:   Z = queen bee
 ITEM:    ring of teleportation
 ITEM:    scroll of teleportation
 ITEM:    amulet of stasis
-KITEM:   gzZ = royal jelly / honeycomb w:20 / nothing w:120
+KITEM:   gzZ = honeycomb w:10 / nothing w:40
 KFEAT:   L = l
 KFEAT:   ~ = w
 KFEAT:   ^ = known teleport trap / known Zot trap
diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des
index 9e6b17e4f3..68fd740222 100644
--- a/crawl-ref/source/dat/des/branches/lair.des
+++ b/crawl-ref/source/dat/des/branches/lair.des
@@ -379,7 +379,7 @@ MONS:    steam dragon / mottled dragon / swamp drake
 MONS:    w:20 iguana / komodo dragon / giant gecko / crocodile / nothing
 SUBST:   ? = x.c
 SHUFFLE: %*RO
-KITEM:   R = w:2 honeycomb / w:1 royal jelly
+KITEM:   R = honeycomb
 KFEAT:   O = enter_lair
 
 MAP
diff --git a/crawl-ref/source/dat/des/builder/food.des b/crawl-ref/source/dat/des/builder/food.des
index 902e2ba092..219b0e86cb 100644
--- a/crawl-ref/source/dat/des/builder/food.des
+++ b/crawl-ref/source/dat/des/builder/food.des
@@ -64,14 +64,14 @@ x.1xxx
 x+xxxx
 ENDMAP
 
-# 18.6k, min 14k
+# 14k
 NAME:   david_nohive_1
 DEPTH:  D:8-14
 : food_weight(_G, 8)
 WEIGHT: 15
 TAGS:   uniq_second_food extra chance_second_food
 MONS:   queen bee, killer bee
-ITEM:   w:2 honeycomb no_mimic / w:1 royal jelly no_mimic
+ITEM:   honeycomb no_mimic
 COLOUR: a = yellow
 TILE:   a = wall_wax
 SUBST:  a = x
@@ -173,7 +173,7 @@ KMONS:  B = ooze
 : if you.absdepth() > 10 then
 KMONS:  C = slime creature
 : end
-KITEM:  C = royal jelly q:4 no_mimic / royal jelly q:6 no_mimic
+KITEM:  C = honeycomb q:10 no_mimic / honeycomb q:15 no_mimic
 KFEAT:  C = altar_jiyva w:1 / . w:20
 KMASK:  W = no_monster_gen
 MAP
@@ -296,8 +296,7 @@ KMONS:   F = human
 KMONS:   G = necrophage
 KMONS:   H = crimson imp
 KITEM:   1 = stone q:1 no_pickup / large rock q:1 w:5
-KITEM:   Ya = royal jelly no_mimic / meat ration no_mimic / \
-              bread ration no_mimic
+KITEM:   Ya = bread ration no_mimic / meat ration no_mimic
 KITEM:   b = honeycomb no_mimic / cheese no_mimic / apricot q:2 no_mimic / \
              apple q:2 no_mimic / choko q:2 no_mimic
 KFEAT:   1Yab = shallow_water
diff --git a/crawl-ref/source/dat/des/builder/rooms.des b/crawl-ref/source/dat/des/builder/rooms.des
index e5e40ddc06..9ed0e789fb 100644
--- a/crawl-ref/source/dat/des/builder/rooms.des
+++ b/crawl-ref/source/dat/des/builder/rooms.des
@@ -99,7 +99,7 @@ function sroom_beehive(e)
     fill_special_room(e, "patrolling killer bee",
                       "patrolling queen bee", true)
 
-    e.kitem('12 = royal jelly w:1 / honeycomb w:24 / nothing w:25')
+    e.kitem('12 = honeycomb / nothing')
 end
 
 function sroom_morgue(e)
diff --git a/crawl-ref/source/dat/des/portals/sewer.des b/crawl-ref/source/dat/des/portals/sewer.des
index aa6a0de02c..c755523b23 100644
--- a/crawl-ref/source/dat/des/portals/sewer.des
+++ b/crawl-ref/source/dat/des/portals/sewer.des
@@ -660,8 +660,8 @@ KMONS:  4 = Purgy, giant slug
 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 / \
-        scroll of random uselessness / meat ration / royal jelly / \
-        potion of blood / nothing w:140
+        scroll of random uselessness / meat ration / potion of blood / \
+        nothing w:140
 : sewer_setup(_G)
 MAP
    ccccccccc
@@ -788,8 +788,8 @@ KMONS:  2 = 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 / \
-        scroll of random uselessness / meat ration / royal jelly / \
-        potion of blood / nothing w:140
+        scroll of random uselessness / meat ration / potion of blood / \
+        nothing w:140
 NSUBST: e = 3:* / 9:d / *:.
 NSUBST: 0 = 5:1 / 1:2 / *:.
 KFEAT:  ' = deep_water
diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des
index 00aaf9158c..fb3f34e4a8 100644
--- a/crawl-ref/source/dat/des/sprint/arena_sprint.des
+++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des
@@ -1073,7 +1073,7 @@ KFEAT:  L = armour shop count:17 greed:12 type:Basic suffix:Armour use_all ; \
             mundane not_cursed centaur barding | mundane not_cursed cloak |\
             mundane not_cursed buckler | mundane not_cursed pair of gloves |\
             mundane not_cursed helmet
-KFEAT:  M = food shop count:17 type:Bee suffix:Food greed:4 ; royal jelly q:3
+KFEAT:  M = food shop count:17 type:Bee suffix:Food greed:4 ; honeycomb q:3
 KFEAT:  N = weapon shop type:Staff suffix:Store count:9 use_all greed:30 ; \
             staff of summoning | staff of wizardry |\
             staff of fire | staff of air | staff of earth | staff of cold |\
diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des
index 3e7f66fd61..9f79eaddd3 100644
--- a/crawl-ref/source/dat/des/sprint/sprint_mu.des
+++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des
@@ -168,7 +168,7 @@ MONS: patrolling phantom hd:2 / patrolling wolf hd:2 / patrolling scorpion / \
 MONS: patrolling human hd:2 hp:35
 KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \
  potion of cure mutation ident:all q:2 / potion of cure mutation q:1 / any potion, \
- meat ration / bread ration / royal jelly / honeycomb / choko, \
+ meat ration / bread ration / honeycomb w:20 / choko, \
  scroll of remove curse ident:all q:2 / scroll of remove curse q:1 / any scroll, \
  scroll of identify ident:all q:2/ scroll of identify q:1 / any scroll, \
  scroll of torment / scroll of holy word / scroll of immolation, \
@@ -201,7 +201,7 @@ MONS: patrolling phantom hd:2 / patrolling wolf hd:2 / patrolling scorpion / \
 MONS: patrolling human hd:2 hp:35
 KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \
  potion of cure mutation ident:all q:2 / potion of cure mutation q:1 / any potion, \
- meat ration / bread ration / royal jelly / honeycomb / choko, \
+ meat ration / bread ration / honeycomb w:20 / choko, \
  scroll of remove curse ident:all q:2 / scroll of remove curse q:1 / any scroll, \
  scroll of identify ident:all q:2 / scroll of identify q:1 / any scroll, \
  scroll of torment / scroll of holy word / scroll of immolation, \
@@ -268,7 +268,7 @@ KFEAT: l = altar_lugonu
 KFEAT: J = altar_jiyva
 KMONS: m = shadow
 KMONS: j = patrolling jelly
-KITEM: * = royal jelly
+KITEM: * = honeycomb
 COLOUR: # = yellow
 KFEAT: # = closed_door
 : lua_marker('#', props_marker {
@@ -445,9 +445,9 @@ ENDMAP
 NAME: sprint_mu_hive_nellie
 TAGS: sprint_mu_hive no_rotate no_hmirror no_vmirror
 KMONS: 1 = killer bee
-KITEM: 1 = honeycomb / w:2 royal jelly / w:4 nothing
+KITEM: 1 = honeycomb w:30 / nothing
 KMONS: 2 = queen bee
-KITEM: 2 = royal jelly
+KITEM: 2 = honeycomb
 KMONS: 3 = generate_awake Nellie
 KITEM: 3 = demonic rune of zot
 : acq_on_sight(_G, '3', {"food","misc","wand"})
diff --git a/crawl-ref/source/dat/des/variable/large_themed.des b/crawl-ref/source/dat/des/variable/large_themed.des
index 0108932f35..a748b1c774 100644
--- a/crawl-ref/source/dat/des/variable/large_themed.des
+++ b/crawl-ref/source/dat/des/variable/large_themed.des
@@ -94,7 +94,7 @@ WEIGHT: 5
 TAGS:   uniq_black_bear_nest
 DEPTH:  D:4-8
 NSUBST: ' = 1:1 / 2:R / *:.
-KITEM:  R = w:2 honeycomb / w:1 royal jelly
+KITEM:  R = honeycomb
 MONS:   patrolling black bear
 MAP
 xxxxxxxxxxxxxxx
@@ -112,7 +112,7 @@ WEIGHT: 5
 TAGS:   uniq_black_bear_nest
 DEPTH:  D:4-8
 NSUBST: ' = 1:1 / 2:R / *:.
-KITEM:  R = w:2 honeycomb / w:1 royal jelly
+KITEM:  R = honeycomb
 MONS:   patrolling black bear
 MAP
 xxxxxxxx@xx
@@ -1440,7 +1440,7 @@ DEPTH:   D:12-
 ORIENT:  north
 MONS:    killer bee, queen bee, oklob plant
 KFEAT:   X = x
-ITEM:    honeycomb / royal jelly w:1, honeycomb w:4 / royal jelly
+ITEM:    honeycomb / honeycomb / honeycomb
 KITEM:   | = |
 SUBST:   A = X:3 .:2, z = x.., ' = .:460 01d%
 : if you.absdepth() > 14 then
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index 0bb4ebe717..dcab4ba798 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -131,7 +131,7 @@ SUBST:  ? : .w
 SUBST:  1 = 1 a:2, 1 : 1:15 2 3:2
 SUBST:  * : * R:3
 KITEM:  * = *
-KITEM:  R = honeycomb w:20 / royal jelly
+KITEM:  R = honeycomb
 COLOUR: x = yellow
 TILE:   x = wall_wax
 MAP
@@ -154,7 +154,7 @@ NAME:   minivault_7
 TAGS:   uniq_beehive
 DEPTH:  D:9-
 MONS:   patrolling queen bee, patrolling killer bee
-KITEM:  R = honeycomb w:20 / royal jelly
+KITEM:  R = honeycomb
 COLOUR: x = yellow
 TILE:   x = wall_wax
 MAP
@@ -1817,7 +1817,7 @@ MONS:  ettin ; rod of the swarm ident:type . great mace
 : end
 MONS:  killer bee w:3 / wolf spider w:1 / scorpion w:1 / worm w:1
 MONS:  worker ant w:3 / vampire mosquito w:1 / goliath beetle w:1 / yellow wasp w:1
-ITEM:  royal jelly
+ITEM: honeycomb
 MAP
 xxxxxx
 x32*dx
@@ -2851,7 +2851,7 @@ NAME:    minislime_mu
 TAGS:    no_monster_gen no_item_gen
 DEPTH:   Depths, !Depths:$
 MONS:    large slime creature, great orb of eyes, eye of draining
-KITEM:   R = royal jelly
+KITEM:   R = honeycomb
 ITEM:    ring of teleportation / scroll of teleportation w:30 q:2
 ITEM:    wand of digging / wand of disintegration
 ITEM:    stone of tremors
diff --git a/crawl-ref/source/dat/descript/da/items.txt b/crawl-ref/source/dat/descript/da/items.txt
index 7554d825ea..e71fb9c14c 100644
--- a/crawl-ref/source/dat/descript/da/items.txt
+++ b/crawl-ref/source/dat/descript/da/items.txt
@@ -690,11 +690,6 @@ rod of the swarm
 
 Denne stok lader brugeren hidkalde en sværm af insekter.
 %%%%
-royal jelly
-
-En særligt fed og gylden geléagtig tingest. Hvis du indtager den, giver den,
-udover næring, dig dine tabte evner tilbage.
-%%%%
 rune of zot
 
 En talisman, som lader dig træde ind i Zots domæne.
diff --git a/crawl-ref/source/dat/descript/de/items.txt b/crawl-ref/source/dat/descript/de/items.txt
index 9c5945aad4..6134522f75 100644
--- a/crawl-ref/source/dat/descript/de/items.txt
+++ b/crawl-ref/source/dat/descript/de/items.txt
@@ -624,12 +624,6 @@ rod of the swarm
 
 Dieser Stab erlaubt seinem Benutzer einen Schwarm Insekten zu rufen.
 %%%%
-royal jelly
-
-Eine besonders reiche und goldene gallertartige Sache. Der Konsum wird
-verlorene Fähigkeiten wieder herstellen, zusätzlich zu der Ernährung die es
-bietet.
-%%%%
 rune of zot
 
 Ein Talisman, der Eintritt in Zots Reich gewährt.
diff --git a/crawl-ref/source/dat/descript/es/items.txt b/crawl-ref/source/dat/descript/es/items.txt
index ae89552e81..067f4abe3f 100644
--- a/crawl-ref/source/dat/descript/es/items.txt
+++ b/crawl-ref/source/dat/descript/es/items.txt
@@ -532,11 +532,6 @@ ring of wizardry
 
 Este anillo incrementa la habilidad de su portador para usar hechizos mágicos.
 %%%%
-royal jelly
-
-Una cosa gelatinosa dorada bastante nutritiva. Consumirla restaurará tus
-habilidades, además de que es saludable.
-%%%%
 rune of zot
 
 Un talismán que permite la entrada a los dominios de Zot.
diff --git a/crawl-ref/source/dat/descript/fr/items.txt b/crawl-ref/source/dat/descript/fr/items.txt
index 1da9496663..b33289cd1e 100644
--- a/crawl-ref/source/dat/descript/fr/items.txt
+++ b/crawl-ref/source/dat/descript/fr/items.txt
@@ -876,11 +876,6 @@ rod of the swarm
 
 Ce sceptre permet à son porteur de convoquer un essaim d'insectes.
 %%%%
-royal jelly
-
-Une gelée dorée et particulièrement nourrissante. La consommer restaure les
-caractéristiques en plus de la satiété qu'elle apporte.
-%%%%
 rune of zot
 
 Un talisman qui permet d'entrer dans le domaine de Zot.
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 55a94e1167..b85ac726a0 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -1148,11 +1148,6 @@ rod of the swarm
 
 This rod allows its wielder to summon a swarm of insects.
 %%%%
-royal jelly
-
-A particularly rich and golden gelatinous thing. Consuming it will restore lost
-abilities, in addition to the nutrition it provides.
-%%%%
 rune of zot
 
 A talisman which allows entry into Zot's domain.
diff --git a/crawl-ref/source/dat/descript/ja/items.txt b/crawl-ref/source/dat/descript/ja/items.txt
index 4d4a42405d..7ffd87fbed 100644
--- a/crawl-ref/source/dat/descript/ja/items.txt
+++ b/crawl-ref/source/dat/descript/ja/items.txt
@@ -562,11 +562,6 @@ rod of the swarm
 
 このロッドは手にしている者に昆虫の群れを召喚することを可能にする。
 %%%%
-royal jelly
-
-とりわけ豪華な、金色をしたゼリー状の存在だ。 Consuming it will restore lost
-abilities, in addition to the nutrition it provides.
-%%%%
 rune of zot
 
 ゾットの領域に訪れることを可能にする御守りだ。
diff --git a/crawl-ref/source/dat/descript/ko/items.txt b/crawl-ref/source/dat/descript/ko/items.txt
index 21c452549e..2dabcabf70 100644
--- a/crawl-ref/source/dat/descript/ko/items.txt
+++ b/crawl-ref/source/dat/descript/ko/items.txt
@@ -650,11 +650,6 @@ rod of the swarm
 
 이 지팡이는 사용자가 벌레떼를 소환할 수 있도록 해준다.
 %%%%
-royal jelly
-
-아주 호화로운 금빛을 한 젤라틴 덩어리다. 일반적인 보존식량보다 더 많은 만복도를
-회복시켜주는 것은 물론, 손실된 능력치까지도 회복시켜준다.
-%%%%
 rune of zot
 
 조트의 방으로 갈 수 있게 해주는 일종의 부적이다.
diff --git a/crawl-ref/source/dat/descript/pl/items.txt b/crawl-ref/source/dat/descript/pl/items.txt
index 9b3d82e37e..863734ef23 100644
--- a/crawl-ref/source/dat/descript/pl/items.txt
+++ b/crawl-ref/source/dat/descript/pl/items.txt
@@ -576,11 +576,6 @@ rod of the swarm
 
 Ten pręt pozwala przyzwać chmarę owadów.
 %%%%
-royal jelly
-
-Lekko złotawa galaretowata substancja, wyjątkowo bogata w składniki odżywcze.
-Oprócz wartości pokarmowych, pozwala także odzyskać utracone siły.
-%%%%
 rune of zot
 
 Talizman który pozwala otworzyć bramę do krainy Zot.
diff --git a/crawl-ref/source/dat/descript/zh/items.txt b/crawl-ref/source/dat/descript/zh/items.txt
index aafc715bef..9b88212fe1 100644
--- a/crawl-ref/source/dat/descript/zh/items.txt
+++ b/crawl-ref/source/dat/descript/zh/items.txt
@@ -526,10 +526,6 @@ rod of the swarm
 
 这根法杖能召唤出一大群昆虫。
 %%%%
-royal jelly
-
-一团金色的胶状物质。食用它不仅能提供营养，还可以回复食用者失去的属性值。
-%%%%
 rune of zot
 
 这个神符是打开佐特老巢大门的钥匙。
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 34666565c0..b3be3572b2 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1849,10 +1849,6 @@ void finished_eating_message(int food_type)
     case FOOD_HONEYCOMB:
         mpr("That honeycomb was delicious!");
         break;
-    case FOOD_ROYAL_JELLY:
-        mpr("That royal jelly was delicious!");
-        restore_stat(STAT_ALL, 0, false);
-        break;
     case FOOD_AMBROSIA:                       // XXX: could put some more
         mpr("That ambrosia tasted strange."); // inspired messages here --evk
         potion_effect(POT_CONFUSION, 0, nullptr, false);
@@ -2104,10 +2100,6 @@ bool is_preferred_food(const item_def &food)
     if (is_bad_food(food))
         return false;
 
-    // Royal jellies restore stats for everyone.
-    if (food.sub_type == FOOD_ROYAL_JELLY)
-        return true;
-
     // Ghouls specifically like rotten food.
     if (you.species == SP_GHOUL)
         return food_is_rotten(food);
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index eeee364d57..b3b059c664 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1575,7 +1575,6 @@ string item_def::name_aux(description_level_type desc, bool terse, bool ident,
         case FOOD_APPLE: buff << "apple"; break;
         case FOOD_CHOKO: buff << "choko"; break;
         case FOOD_HONEYCOMB: buff << "honeycomb"; break;
-        case FOOD_ROYAL_JELLY: buff << "royal jelly"; break;
         case FOOD_SNOZZCUMBER: buff << "snozzcumber"; break;
         case FOOD_PIZZA: buff << "slice of pizza"; break;
         case FOOD_APRICOT: buff << "apricot"; break;
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index 6a4ec32212..b384a8ec8c 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -606,7 +606,9 @@ enum food_type
     FOOD_APPLE,
     FOOD_CHOKO,
     FOOD_HONEYCOMB,
+#if TAG_MAJOR_VERSION == 34
     FOOD_ROYAL_JELLY,
+#endif
     FOOD_SNOZZCUMBER,
     FOOD_PIZZA,
     FOOD_APRICOT,
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index cefdb4d909..8227b3a665 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -426,7 +426,6 @@ static const food_def Food_prop[NUM_FOODS] =
     { FOOD_GRAPE,        "grape",         100,   -20,    20,   2, 1, FFL_FRUIT},
     { FOOD_SULTANA,      "sultana",        70,   -20,    20,   1, 1, FFL_FRUIT},
 
-    { FOOD_ROYAL_JELLY,  "royal jelly",  5000,     0,     0,  55, 2, FFL_NONE },
     { FOOD_HONEYCOMB,    "honeycomb",    2000,     0,     0,  40, 2, FFL_NONE },
     { FOOD_PIZZA,        "pizza",        1500,     0,     0,  40, 2, FFL_NONE },
     { FOOD_CHEESE,       "cheese",       1200,     0,     0,  40, 2, FFL_NONE },
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index b988853308..93bed40d74 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -380,7 +380,6 @@ void item_colour(item_def &item)
         case FOOD_HONEYCOMB:
         case FOOD_LEMON:
         case FOOD_PIZZA:
-        case FOOD_ROYAL_JELLY:
             item.colour = YELLOW;
             break;
         case FOOD_PEAR:
@@ -2232,28 +2231,27 @@ static void _generate_food_item(item_def& item, int force_quant, int force_type)
     // Determine sub_type:
     if (force_type == OBJ_RANDOM)
     {
-        item.sub_type = random_choose_weighted(250, FOOD_MEAT_RATION,
-                                                300, FOOD_BREAD_RATION,
-                                                100, FOOD_PEAR,
-                                                100, FOOD_APPLE,
-                                                100, FOOD_CHOKO,
-                                                 10, FOOD_CHEESE,
-                                                 10, FOOD_PIZZA,
-                                                 10, FOOD_SNOZZCUMBER,
-                                                 10, FOOD_APRICOT,
-                                                 10, FOOD_ORANGE,
-                                                 10, FOOD_BANANA,
-                                                 10, FOOD_STRAWBERRY,
-                                                 10, FOOD_RAMBUTAN,
-                                                 10, FOOD_LEMON,
-                                                 10, FOOD_GRAPE,
-                                                 10, FOOD_SULTANA,
-                                                 10, FOOD_LYCHEE,
-                                                 10, FOOD_BEEF_JERKY,
-                                                 10, FOOD_SAUSAGE,
-                                                  5, FOOD_HONEYCOMB,
-                                                  5, FOOD_ROYAL_JELLY,
-                                                  0);
+        item.sub_type = random_choose_weighted( 30, FOOD_BREAD_RATION,
+                                                25, FOOD_MEAT_RATION,
+                                                10, FOOD_PEAR,
+                                                10, FOOD_APPLE,
+                                                10, FOOD_CHOKO,
+                                                 1, FOOD_CHEESE,
+                                                 1, FOOD_PIZZA,
+                                                 1, FOOD_SNOZZCUMBER,
+                                                 1, FOOD_APRICOT,
+                                                 1, FOOD_ORANGE,
+                                                 1, FOOD_BANANA,
+                                                 1, FOOD_STRAWBERRY,
+                                                 1, FOOD_RAMBUTAN,
+                                                 1, FOOD_LEMON,
+                                                 1, FOOD_GRAPE,
+                                                 1, FOOD_SULTANA,
+                                                 1, FOOD_LYCHEE,
+                                                 1, FOOD_BEEF_JERKY,
+                                                 1, FOOD_SAUSAGE,
+                                                 1, FOOD_HONEYCOMB,
+                                                 0);
     }
     else
         item.sub_type = force_type;
diff --git a/crawl-ref/source/rltiles/item/food/lump_of_royal_jelly.png b/crawl-ref/source/rltiles/UNUSED/other/lump_of_royal_jelly.png
index 3f356ae79a..3f356ae79a 100644
--- a/crawl-ref/source/rltiles/item/food/lump_of_royal_jelly.png
+++ b/crawl-ref/source/rltiles/UNUSED/other/lump_of_royal_jelly.png
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index d9b4409c0b..e9d15cc830 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -551,7 +551,6 @@ pear FOOD_PEAR
 apple FOOD_APPLE
 choko FOOD_CHOKO
 honeycomb FOOD_HONEYCOMB
-lump_of_royal_jelly FOOD_ROYAL_JELLY
 snozzcumber FOOD_SNOZZCUMBER
 pizza FOOD_PIZZA
 apricot FOOD_APRICOT
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index f54ede1baf..568b83e62a 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1489,10 +1489,6 @@ unsigned int item_value(item_def item, bool ident)
     case OBJ_FOOD:
         switch (item.sub_type)
         {
-        case FOOD_ROYAL_JELLY:
-            valued = 120;
-            break;
-
         case FOOD_MEAT_RATION:
             valued = 50;
             break;
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index a8f0d52658..6e2111063b 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -84,7 +84,7 @@ string stash_annotate_item(const char *s, const item_def *item, bool exclusive)
         text += fs.tostring(2, -2);
     }
 
-    // Include singular form (royal jelly vs royal jellies).
+    // Include singular form (slice of pizza vs slices of pizza).
     if (item->quantity > 1)
     {
         text += "\n";
diff --git a/crawl-ref/source/tag-version.h b/crawl-ref/source/tag-version.h
index a856ace86f..6cddb9bf52 100644
--- a/crawl-ref/source/tag-version.h
+++ b/crawl-ref/source/tag-version.h
@@ -99,6 +99,7 @@ enum tag_minor_version
     TAG_MINOR_CALC_UNRAND_REACTS,  // Compute you.unrand_reacts on load
     TAG_MINOR_SAPROVOROUS,         // Remove Saprovorous from several species
     TAG_MINOR_CE_HA_DIET,          // Remove intrinsic diet muts from Ce & Ha
+    TAG_MINOR_NO_POT_FOOD,         // Remove Royal Jellies
 #endif
     NUM_TAG_MINORS,
     TAG_MINOR_VERSION = NUM_TAG_MINORS - 1
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 4cead7570f..8c9af4b3ba 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -3690,9 +3690,19 @@ void unmarshallItem(reader &th, item_def &item)
         }
     }
 
-    // Replace War Chants with Battle to avoid empty-book errors.
-    if (item.base_type == OBJ_BOOKS && item.sub_type == BOOK_WAR_CHANTS)
-        item.sub_type = BOOK_BATTLE;
+    if (th.getMinorVersion() < TAG_MINOR_NO_POT_FOOD)
+    {
+        // Replace War Chants with Battle to avoid empty-book errors.
+
+        // Moved under TAG_MINOR_NO_POT_FOOD because it was formerly
+        // not restricted to a particular range of minor tags.
+        if (item.base_type == OBJ_BOOKS && item.sub_type == BOOK_WAR_CHANTS)
+            item.sub_type = BOOK_BATTLE;
+
+        if (item.base_type == OBJ_FOOD && item.sub_type == FOOD_ROYAL_JELLY)
+            item.sub_type = FOOD_HONEYCOMB;
+    }
+
 #endif
 
     if (is_unrandom_artefact(item))
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 7be2746bec..608ec93a2a 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -3411,7 +3411,6 @@ static tileidx_t _tileidx_food(const item_def &item)
     case FOOD_APPLE:        return TILE_FOOD_APPLE;
     case FOOD_CHOKO:        return TILE_FOOD_CHOKO;
     case FOOD_HONEYCOMB:    return TILE_FOOD_HONEYCOMB;
-    case FOOD_ROYAL_JELLY:  return TILE_FOOD_ROYAL_JELLY;
     case FOOD_SNOZZCUMBER:  return TILE_FOOD_SNOZZCUMBER;
     case FOOD_PIZZA:        return TILE_FOOD_PIZZA;
     case FOOD_APRICOT:      return TILE_FOOD_APRICOT;