Deprecate various symbols for vault making:

F (was granite statue or rarely hostile statue),
P (was non-guaranteed rune),
R (was chance between honeycomb and royal jelly).
Patch by Zaba.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10053 c06c8d41-db1a-0410-9941-cceddc491573

5 files changed, 18 insertions, 1 deletions

diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 9c5add4bd0..77e963bdeb 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -211,6 +211,8 @@ MONS:    mummy, patrolling guardian mummy, patrolling greater mummy
 MONS:    large zombie
 MONS:    mummy / nothing
 SHUFFLE: 2F, cbv
+SUBST:   F = G:100 F:1
+KMONS:   F = orange crystal statue / silver statue / ice statue
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxx3$$xxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/hive.des b/crawl-ref/source/dat/hive.des
index b49bf91a23..3008e352e4 100644
--- a/crawl-ref/source/dat/hive.des
+++ b/crawl-ref/source/dat/hive.des
@@ -22,6 +22,7 @@ ENDMAP
 NAME: david_hive_1
 TAGS: hive_entry
 MONS: queen bee, killer bee, killer bee larva
+KITEM: R = w:2 honeycomb / w:1 royal jelly
 ORIENT: float
 MAP
 ............
@@ -181,8 +182,9 @@ MONS:      killer bee / killer bee larva w:2
 MONS:      queen bee / killer bee w:2
 MONS:      oklob plant / plant w:1
 MONS:      plant / nothing
+KITEM:     R = w:2 honeycomb / w:1 royal jelly
 KMONS:     R = killer bee / killer bee larva w:2
-KFEAT:     R = R
+KFEAT:     R = .
 KMONS:     M = plant
 KMONS:     N = plant
 KFEAT:     M = *
@@ -476,6 +478,7 @@ PLACE:  Hive:2
 ORIENT: encompass
 MONS:   queen bee, killer bee, killer bee larva, plant, yellow wasp
 MONS:   random, random
+KITEM:  R = w:2 honeycomb / w:1 royal jelly
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 63a60abc79..7df4edb5ae 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -169,6 +169,7 @@ MONS:    steam dragon / mottled dragon / swamp drake
 MONS:    w:20 giant iguana / komodo dragon / giant gecko / giant lizard / nothing
 SUBST:   ? = x.c
 SHUFFLE: %*RO
+KITEM:   R = w:2 honeycomb / w:1 royal jelly
 
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 413f321f3d..1c7aa82bd0 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -493,6 +493,7 @@ SUBST: ? : .w
 SUBST: 1 = 1 a:2
 SUBST: 1 : 1:15 2 3:2 4:1
 SUBST: * : * R:3
+KITEM: R = w:2 honeycomb / w:1 royal jelly
 MAP
   ????????
  ??????????
@@ -778,6 +779,7 @@ ENDMAP
 NAME: minivault_7
 TAGS: allow_dup
 MONS: patrolling queen bee, patrolling killer bee, killer bee larva
+KITEM: R = w:2 honeycomb / w:1 royal jelly
 MAP
 ............
 ....aaaa....
@@ -799,6 +801,8 @@ ENDMAP
 NAME: minivault_8
 TAGS: allow_dup
 MONS: patrolling molten gargoyle
+SUBST: F = G:100 F:1
+KMONS: F = orange crystal statue / silver statue / ice statue
 MAP
 x.x.x.x.x.x.
 .c.c.c.c.c.x
@@ -909,6 +913,8 @@ KITEM: A = gold / nothing
 KITEM: B = gold / nothing
 KITEM: C = gold / nothing
 KITEM: D = gold / nothing
+SUBST: F = G:100 F:1
+KMONS: F = orange crystal statue / silver statue / ice statue
 MAP
 ............
 .xxxxxxxxxx.
@@ -1567,6 +1573,8 @@ NAME:   small_statue_alley_a
 TAGS:   uniq_statue_alley extra luniq_mini
 DEPTH:  D:10-20
 WEIGHT: 7
+SUBST:  F = G:100 F:1
+KMONS:  F = orange crystal statue / silver statue / ice statue
 MAP
 xxxcccccx
 ...G...G@
diff --git a/crawl-ref/source/dat/pan.des b/crawl-ref/source/dat/pan.des
index d217f12fb6..36cd3631e1 100644
--- a/crawl-ref/source/dat/pan.des
+++ b/crawl-ref/source/dat/pan.des
@@ -262,6 +262,7 @@ ENDMAP
 NAME: rand_demon_4
 TAGS: pan allow_dup
 MONS: pandemonium demon, any demon, any demon
+SUBST: P = O..
 MAP
 ............
 .xxxxxxxxx..
@@ -282,6 +283,7 @@ ENDMAP
 NAME: rand_demon_5
 TAGS: pan allow_dup
 MONS: pandemonium demon, any demon, any demon
+SUBST: P = O..
 MAP
 ............
 ...xxxxxx...
@@ -362,6 +364,7 @@ ENDMAP
 NAME: rand_demon_9
 TAGS: pan allow_dup
 MONS: pandemonium demon, any demon, greater demon
+SUBST: P = O..
 MAP
 ............
 .xxxxxxxxxx.