Don't give out royal jellies in Spider (ends).

It's not necessary to have a reward in the branch end (Swamp has none, and
Snake has only the gear of the nagas), royal jellies aren't very connected
to Spider, and food isn't very good loot anyway.

The main reason the vaults got ambrosia replaced with royal jelly was
pending a review, so here one is.

1 files changed, 13 insertions, 23 deletions

diff --git a/crawl-ref/source/dat/des/branches/spider.des b/crawl-ref/source/dat/des/branches/spider.des
index 36224c37f6..ffc24485fb 100644
--- a/crawl-ref/source/dat/des/branches/spider.des
+++ b/crawl-ref/source/dat/des/branches/spider.des
@@ -351,8 +351,7 @@ NAME:   spiders_nest_the_unseen
 TAGS:   no_item_gen no_monster_gen
 DEPTH:  Spider:3-
 MONS:   trapdoor spider, patrolling ghost moth
-SUBST:  | = %%d, * = ..%%d
-ITEM:   royal jelly
+SUBST:  | = %%., * = ...%%
 MAP
      ........
     ..xxxxxx..
@@ -376,7 +375,6 @@ NAME:   spiders_nest_ghost_moth_duel
 TAGS:   no_item_gen no_monster_gen
 DEPTH:  Spider:3-
 MONS:   ghost moth, tarantella
-ITEM:   royal jelly
 MAP
     ........
    ..xx..xx..
@@ -391,7 +389,7 @@ MAP
 .xx....WW....xx.
 ..xx...1....xx..
  ..xx......xx..
-  ..xxddddxx..
+  ..xx....xx..
    ..xxxxxx..
     ........
 ENDMAP
@@ -421,8 +419,6 @@ SUBST:   W = W w:15 x:4
 SUBST:   . = .:6 W
 SUBST:   z = W:5 w:50 .:2
 SUBST:   X = w x
-# Monster sets, and some items
-NSUBST:  1 = 2:t / *:w
 SUBST:   2 = 2 *:4
 KMONS:   2 = tarantella / redback w:12 / jumping spider w:8 / wolf spider w:5
 KMONS:   3 = redback
@@ -432,7 +428,6 @@ SUBST:   6 = 6 *:2
 KMONS:   6 = spider / wolf spider w:4 / jumping spider w:1
 SUBST:   7 = 7 .:50
 KMONS:   7 = trapdoor spider
-KITEM:   t = royal jelly
 MAP
      ..........   ......  ........
      .xwxxxxxx3....xxxx....xxxxwx..
@@ -447,8 +442,8 @@ MAP
   .x4xx.WWxxxxxxx2...w.22.wxxxxxxW.www.
   .xxw.WXxxxxxx2..2|x2w..w.xxxxwwwW.Wx.
  ..xx7WXxxxxx2..2.x2www.w..2wwwxxxW7Wx.
-..xxW.Wxxxxx2.x...ww11wwxwww2xxxxxXW.x.
-.xxW.Wxxxxxxx..wwwww11www...2xxxxxXW.x.
+..xxW.Wxxxxx2.x...wwwwwwxwww2xxxxxXW.x.
+.xxW.Wxxxxxxx..wwwwwwwwww...2xxxxxXW.x.
 3xW.Wxxxxx4wwww.x..www.x.www.2xxxxXW7x.
 .xW.WWxxxwwxxxx....x........wxxxxXW.xx.
 .wwW..WWwxxxxxxxxx......xxxxxw4xxW.Wx..
@@ -1300,7 +1295,7 @@ NAME:   spider_rune_water
 PLACE:  Spider:$
 WEIGHT: 20
 ORIENT: northwest
-KITEM:  O = royal jelly q:3, gossamer rune of Zot
+KITEM:  O = gossamer rune of Zot
 MONS:   ghost moth, red wasp / w:5 yellow wasp, emperor scorpion
 MONS:   wolf spider / redback / tarantella / jumping spider / w:20 nothing
 MONS:   trapdoor spider / nothing
@@ -1358,7 +1353,6 @@ WEIGHT: 20
 PLACE:  Spider:$
 ORIENT: northwest
 KITEM:  O = gossamer rune of Zot
-ITEM:   royal jelly
 MONS:   ghost moth / w:7 nothing, moth of wrath / ghost moth, emperor scorpion
 MONS:   wolf spider / redback / tarantella / jumping spider / w:20 nothing
 MONS:   orb spider / nothing, trapdoor spider / nothing
@@ -1379,9 +1373,9 @@ xxxxxxx...4W6W6ccccWWccccWWcccccccccxxxx4.-xxxxxxcx
 xxxxxxW54.x6W6WcWWW.4..........444.ccccxx..Wxxxxxcx
 xxxxxxwW.xcccW666....W5.W....WWWWW..cccxx.W.xxxxxcx
 xxxxxxx4Wxcc66..wwwwcccccccc..444....cccxx...Wxxxcx
-xxxxxx.WxxcW-..wwcccc--575dccccc..-.-.cccxx..-xxxcx
+xxxxxx.WxxcW-..wwcccc--575.ccccc..-.-.cccxx..-xxxcx
 xxxxxx..xxcW-4.wcc-.575dwww4.--ccc.-..cccxx.4-xxxcx
-xxxxxx.4WxcW-..5cd4wwwww3Oww474-3c..W5cccxxxW.xxxcx
+xxxxxx.4WxcW-..5c.4wwwww3Oww474-3c..W5cccxxxW.xxxcx
 xxxxxw..xxccW.4.c-74.wwwwwww4..ccc6-.Wcccxx..Wxxxcx
 xxxxxx.4.xxccW4Wcccc...4...4---6-6-6ccccxx..-xxxxcx
 xxxxxxx...xxcW45..-cccc-3cc-66-6-ccccxxxx4.Wxxxxxcx
@@ -1407,7 +1401,6 @@ TAGS:   no_pool_fixup
 ORIENT: southwest
 KITEM:  O = gossamer rune of zot
 KMONS:  O = ghost moth
-KITEM:  *d = royal jelly
 KMONS:  * = emperor scorpion
 MONS:   ghost moth, ghost moth / moth of wrath
 MONS:   yellow wasp / red wasp / w:5 nothing
@@ -1445,7 +1438,7 @@ xxxxxxxxxxcccc..-cccccx-.xccccc-..ccccxxxxxxxx
 xxxxxxxxxxcccW.-ccCCCc-...cCCCcc-.Wcccxxxxxxxx
 xxxxxxxxxxcc..-c"c55Ccx-.xcC55c"c-..ccxxxxxxxx
 xxxxxxxxxxcW.-..c.45*c7--7c254.c..-.Wcxxxxxxxx
-xxxxxxxxxxc6..c...CCCccddccCCC...c..6cxxxxxxxx
+xxxxxxxxxxc6..c...CCCcc..ccCCC...c..6cxxxxxxxx
 xxxxxxxxxxc6WccccccccccccccccccccccW6cxxxxxxxx
 xxxxxxxxxxccccccccccccccccccccccccccccxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -1456,7 +1449,6 @@ PLACE:  Spider:$
 ORIENT: east
 NSUBST: O = 1:O / *:P
 KITEM:  O = gossamer rune of Zot
-KITEM:  P = royal jelly
 MONS:   ghost moth, moth of wrath, emperor scorpion
 MONS:   wolf spider w:11 / redback / tarantella / jumping spider
 MONS:   orb spider / red wasp, trapdoor spider
@@ -1474,7 +1466,7 @@ xxxxxxxxxxxxxxxCCCCCCCC--------CCCCCcxxxxxx
 xxxxxCCCCCCCCCCC--C-----...4..------cccccxxxxx
 CCCCCC-----------.C......5.4.4.4...----cccxxxxx
 -------...........C.""""...1.4.4...."""---cccxxxx
-."""........4.4...CCP"""..5.4.4.4.."""...---ccxxxx
+."""........4.4...CC."""..5.4.4.4.."""...---ccxxxx
 @"""5......4.4.....C"""".-------.4.""".....--ccxxx
 @..........4..4....CC..---ccccc-.----...3.4.--ccxx
 @-------------......CC--ccc---cc--cc-..4..4..--cxx
@@ -1490,7 +1482,7 @@ CCCCCC-----------.C......5.4.4.4...----cccxxxxx
 .""".....4....--------C--..4.4.4....."--ccxxxxxx
 ------....4.4.4......CC...5..4.4.....---ccxxxxxx
 CCCCC-----.4.4......CC""""..4.4....---cccxxxxxxx
-xxxxCCCCC-----.....CCP"""".1.4.4..--CCCxxxxxxxx
+xxxxCCCCC-----.....CC."""".1.4.4..--CCCxxxxxxxx
 xxxxxxxxCCCCC---...C.."""".......--CCxxxxxxxxx
  xxxxxxxxxxxCCC---.C---....-------CCxxxxxxxxx
     xxxxxxxxxxCCCCCCC-------CCCCCCCxxxxxxx
@@ -1503,9 +1495,7 @@ NAME:    grunt_spider_rune_island
 TAGS:    no_monster_gen
 PLACE:   Spider:$
 ORIENT:  north
-NSUBST:  d = 1:O / 3:d / *:.
 KITEM:   O = gossamer rune of Zot
-ITEM:    royal jelly
 MONS:    ghost moth, moth of wrath, emperor scorpion
 MONS:    red wasp / yellow wasp w:2, orb spider
 MONS:    wolf spider, redback / tarantella
@@ -1544,9 +1534,9 @@ xxc--......k..WWwwwCCCCCCwwwwwW...f.-"-.x
 xxc-k.........WwwwCC----CCCwwwW...g.-"-.x
 xxc-..........WwwCC--0.---CwwwW.....-"-.x
 xxc-....j....-WwwC--3.9..-CCwwW..0..-"-.x
-xxc--..j.j..-"-"wC-0.0d0.--CwwW.....-"-..
-xxc--......-"---.+3.9ddd9-CCwwW...f.-"-..
-xxcc-..j.j..-"-"wC-0.0d0--CwwwW...g.-"-.@
+xxc--..j.j..-"-"wC-0.0.0.--CwwW.....-"-..
+xxc--......-"---.+3.9.O.9-CCwwW...f.-"-..
+xxcc-..j.j..-"-"wC-0.0.0--CwwwW...g.-"-.@
 xxxc-...j...."WwwC--3.9--CCwwwW..g..-"-.@
 xxxc-.........WwwCC--0.-CCwwwWW.....-"---
  xxc--........WwwwCC----CwwwwW....5.-"--x