Two more instances of deprecated R glyphs in maps (Eino).

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

3 files changed, 99 insertions, 1 deletions

diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 77e963bdeb..3e7baf6a9f 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -703,3 +703,56 @@ MAP
          x++x
           @.
 ENDMAP
+
+#
+NAME:   bailey_6
+#ORIENT: encompass
+#TAGS:   bailey
+TAGS:   no_pool_fixup
+MONS:   orc warrior ; crossbow . bolt
+MONS:   orc knight ; halberd ego:reaching
+MONS:   orc warlord
+SUBST:  W : w..
+KFEAT:  T = teleport trap
+SUBST:  X = I G
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xA........................................x
+x.........................................x
+x.........................................x
+x.........................................x
+x.........................................x
+x.........................................x
+x......WwwwwwWWWWWWWWWWWWWWWWWwwwwwW......x
+x......wwc1cwwWWWWWWWWWWWWWWWwwc1cww......x
+x......wcc.ccwWWWWWWWWWWWWWWWwcc.ccw......x
+x......w1.T.1wWWWWWWWWWWWWWWWw1.T.1w......x
+x......wcc.ccwWWWWWWWWWWWWWWWwcc.ccw......x
+x......wwc1cwwWWWWWWcccWWWWWWwwc1cww......x
+x......WwwwwwWWWWcccccccccWWWWwwwwwW......x
+x......WWWWWWWWWccWWWWWWWccWWWWWWWWW......x
+x......WWWWWWWWccWWc=c=cWWccWWWWWWWW......x
+x......WWWWWWWWcWWcc2c2ccWWcWWWWWWWW......x
+x......WWWWWWWccWcccccccccWccWWWWWWW......x
+x......WWWWWWWccW=2c.3.c2=WccWWWWWWW......x
+x......WWWWWWWccWccc3X3cccWccWWWWWWW......x
+x......WWWWWWWccW=2c.3.c2=WccWWWWWWW......x
+x......WWWWWWWccWccc+++cccWccWWWWWWW......x
+x......WWWWWWWccWWcc...ccWWcWWWWWWWW......x
+x......WWWWWWWWWWWcc+++cWWccWWWWWWWW......x
+x......WWWWWWWWWWWccWWWWWccWWWWWWWWW......x
+x......WwwwwwWWWWWccWWWWccWWWWwwwwww......x
+x......wwc1cwwWWWWcccccccWWWWwwc1cww......x
+x......wcc.ccwWWWWWWWWWWWWWWWwcc.ccw......x
+x......w1.T.1wWWWWWWWWWWWWWWWw1.T.1w......x
+x......wcc.ccwWWWWWWWWWWWWWWWwcc.ccw......x
+x......wwc1cwwWWWWWWWWWWWWWWWwwc1cww......x
+x......WwwwwwWWWWWWWWWWWWWWWWWwwwwwW......x
+x.........................................x
+x.........................................x
+x.........................................x
+x.........................................x
+x.........................................x
+x........................................<x
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
\ No newline at end of file
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index d35aa2bc1d..e6daf229d8 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -91,6 +91,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
 MONS:   patrolling black bear
 MAP
 xxxxxxxxxxxxxxx
@@ -108,6 +109,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
 MONS:   patrolling black bear
 MAP
 xxxxxxxx@xx
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index bb51574ae1..06bc0eaa04 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -559,7 +559,6 @@ MAP
  !xxxxxxx!
 ENDMAP
 
-
 ##################################################
 # Some deep elves on a diplomatic mission (Shiori)
 # They have brought some of their enchanted armaments as gifts
@@ -590,3 +589,47 @@ xxXX.6.6XXx
 xxxXX..XXxx
  xxxx@@@xx
 ENDMAP
+
+############################################################
+# Orc chapel by nrook
+#
+NAME:    orc_chapel
+DEPTH:   Orc:2
+#PLACE:   Orc:2
+CHANCE:  100:10000
+TAGS:    no_monster_gen mini_float
+MONS:    orc priest
+MONS:    orc; nothing
+MONS:    orc
+MONS:    orc warrior
+MONS:    orc wizard
+: if you.absdepth() < 6 then
+SUBST:   o = 2:10 3:10 4:1 5:1 .:2
+# on average, only one more orc will appear here
+SUBST:   q = 2:10 3:10 4:1 5:1 .:550
+: else
+SUBST:   o = 3:10 4:4  5:4 1:2 .:2
+# around four more orcs will appear from q glyphs
+SUBST:   q = 2:4  3:10 4:2 5:2 .:36
+: end
+KFEAT:   A = altar_beogh
+MAP
+        ...
+     xxxx=xxxx     
+     xI..A..Ix     
+xxxxxxxx.1.xxxxxxxx
+x......xmmmx......x
+x.................x
+x..xxxxx...xxxxx..x
+x...qoq.....qoq...x
+x..xxxxx...xxxxx..x
+x...qoq.....qoq...x
+x..xxxxx...xxxxx..x
+x...qoq.....qoq...x
+x..xxxxx...xxxxx..x
+x.................x
+xxxxxxxx+++xxxxxxxx
+      xI...$x      
+      xx+++xx      
+        ...        
+ENDMAP