* Modified the frog island sewer map to give the player a bit more options when facing the frogs

* Added another frog island map

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

1 files changed, 77 insertions, 22 deletions

diff --git a/crawl-ref/source/dat/sewer.des b/crawl-ref/source/dat/sewer.des
index 622ef8521d..475bee319d 100644
--- a/crawl-ref/source/dat/sewer.des
+++ b/crawl-ref/source/dat/sewer.des
@@ -239,24 +239,28 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ############################################################################
-# This one can be tough; you'll be in the water when the giant frogs notice you.
-# More rare (3 out of 10 sewers are this).
+# Two fairly waterly vaults with (usually) two giant frogs in the end.
+# More rare (3 out of 10 sewers are one of these).
 # Loot are good items, and often a scroll of blinking.
 #
-NAME:     sewer_island
+NAME:     sewer_frog_island_01
 TAGS:     sewer no_item_gen no_monster_gen no_pool_fixup
 ORIENT:   encompass
-WEIGHT:   30
-SUBST:    - = W..
-: sewer_colours(_G)
-: sewer_random_monster_list(_G)
-: sewer_milestone(_G)
+WEIGHT:   15
+SUBST:    - = WWW.
+SHUFFLE:  |d
 ITEM:     scroll of teleportation w:2 / scroll of blinking / \
           scroll of random uselessness w:1
 MONS:     giant newt / small snake w:5 / \
           generate_awake giant newt / generate_awake small snake w:5 / \
           snake w:4 / nothing w:4
-MONS:     giant frog / nothing w:2
+NSUBST:   ! = 2:! / *:w
+KFEAT:    ! = w
+COLOUR:   ! = green
+KMONS:    ! = giant frog / nothing w:2
+: sewer_colours(_G)
+: sewer_random_monster_list(_G)
+: sewer_milestone(_G)
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xcccccccccccccccccccccccccccccccccccxxxxxx
@@ -265,18 +269,18 @@ xc1WWW-ccccccccccccccccccccccc1WWW1cxxxxxx
 xc1WwWWcxxxxxxxxxxxxxxxxxxxxxc1WwW.cxxxxxx
 xc1WwwWcxxxxxxxxxxxxxxxxxxxxxc.WwW.cxxxxxx
 xc.WwW1cxxxxxccccccccxxxxxxxxc.WwW-cxxxxxx
-xc.WwwWcxxccccwwwwwwccccxxxxxc-WwW-cxxxxxx
-xc.Wwwwccccwwwwwwwwww2.ccxxxxc-WwW-cxxxxxx
-xc-Wwwwccwwwwwwwwwwwwww2ccxxxc-WwW-cxxxxxx
-xc-Wwwwcwwwwwwwwwwwwwwwwwcccxc-WwW-cxxxxxx
-xc-Wwwwwwwwwwwwww.*.wwwwwwwcxc-WwW-cxxxxxx
-xc-WwWwWWWwwwwww.*|*.wwwwwwcxc-WwW-cxxxxxx
-xc-WwWWWwwWwwwwww.d.wwwwwwwccc-WwW.cxxxxxx
-xc-WwWWwwwwWwWwWWwwwwwwwwwwwcc-WwW.cxxxxxx
-xc-WwWWWwwwwWWWwwwwwwwwwwwwccc.WwW.cxxxxxx
-xc-WwWWWwwwwWWwwwwwwwwWwwwccxc.WwW.cxxxxxx
-xc-WwW.WwwwwwwwwwwwwwWwwwccxxc-WwW.cxxxxxx
-xc.WwW.WwwwwwWWwwwwwwwwccccccc-WwW-cxxxxxx
+xc.WwwWcxxcccc!!!!!!ccccxxxxxc-WwW-cxxxxxx
+xc.Wwwwccccwwwwwwwww!!!ccxxxxc-WwW-cxxxxxx
+xc-WwwwccwwwWwwwwwwwwww!ccxxxc-WwW-cxxxxxx
+xc-WwwwcwwWW<-wwwwwwwwww!ccxxc-WwW-cxxxxxx
+xc-Wwwwwwww-..-ww.--wwwww!cxxc-WwW-cxxxxxx
+xc-WwWwwWww---.-.*.--wwwwwcxxc-WwW-cxxxxxx
+xc-WwWWWwWww-.--*|*.wwwwwwcxxc-WwW.cxxxxxx
+xc-WwWWwwwWww.---d-wwwwwwwcxxc-WwW.cxxxxxx
+xc-WwWWWwwwW------wwwwwwwwcxxc.WwW.cxxxxxx
+xc-WwWWWwwwwW---wwwwwwWwwccxxc.WwW.cxxxxxx
+xc-WwW.WwwwwwwwwwwwwwWwwwcxxxc-WwW.cxxxxxx
+xc.WwW.WwwwwwWWwwwwwwwWccccccc-WwW-cxxxxxx
 xc.WwWW..WWWWwwWwWW.........---Www-cxxxxxx
 xc.WwwWWWWwwwWWwWWWWWWWWWWWWWWWWwW-cxxxxxx
 xc.WWwwwwwwwwwwwwwwwwwwwwwwwwwwwwW.cxxxxxx
@@ -292,6 +296,57 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxcccccccxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
+NAME:     sewer_frog_island_02
+TAGS:     sewer no_item_gen no_monster_gen no_pool_fixup
+ORIENT:   encompass
+WEIGHT:   15
+NSUBST:   ! = 2:! / *:w
+SUBST:    - = WWWW.
+KMONS:    W = giant newt / small snake / snake w:2 / jelly w:1 / \
+              nothing w:250
+KFEAT:    W = W
+KFEAT:    ! = w
+COLOUR:   ! = green
+KMONS:    ! = giant frog / nothing w:2
+SHUFFLE:  edfgh$|
+ITEM:     any good_item, any good_item
+ITEM:     scroll of teleportation w:2 / scroll of blinking / \
+          scroll of random uselessness w:1
+ITEM:     nothing, nothing
+: sewer_colours(_G)
+: sewer_random_monster_list(_G)
+: sewer_milestone(_G)
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxcccccccccccccxxxxxxxxxxx
+xxxxxxxxxcccc-----------ccccxxxxxxxx
+xxxxxxcccc-----------------ccccxxxxx
+xxxxxcc-------ccccccccc-------ccxxxx
+xxxxcc-----cccc-------cccc-----ccxxx
+xxxcc----ccc-------------ccc----ccxx
+xxxc----cc-----ccccccc-----cc----cxx
+xxcc---cc----ccc!!!!!ccc----cc---ccx
+xxc----c----cc!w---ww!!cc----c----cx
+xcc---cc---ccw--..---ww!cc---cc---cx
+xc.---c----cw--.gh|.---w!c----c---cx
+xc<.--c----c--.edf.-----!c----c---cx
+xc.---c----c----$------w!c----c---cx
+xcc---cc---c---.------w!cc---cc---cx
+xxc----c---c--.------w!cc----c----cx
+xxcc---cc--cc--c---wwccc----cc---ccx
+xxxc----cc--c--ccccccc-----cc----cxx
+xxxcc----c--cc-..--------ccc----ccxx
+xxxxcc-------c..------cccc-----ccxxx
+xxxxxcccc---ccccccc-<-c-------ccxxxx
+xxxxxxxxcc--c-----ccccc----cccccxxxx
+xxxxxxxxxcccc-----------cccc--<cxxxx
+xxxxxxxxxxxxc---ccccccccc-...-ccxxxx
+xxxxxxxxxxxxc-----------..A.cccxxxxx
+xxxxxxxxxxxxc----------.cccccxxxxxxx
+xxxxxxxxxxxxcccccccccccccxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
 ############################################################################
 # The hardest one, and most rare (1 out of 10). Loot is good items.
 #
@@ -335,7 +390,7 @@ xxxxcccxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-############################################################################
+###############################################################################
 # If you can get to the middle, there are four doors to try; two will give you
 # monsters, two will yield you treasure. As rare as the last one (1/10).
 #