New Gehenna end.

Standard re-interpretation of trends in hell end structures paired with
diagonal mirroring symmetry and diversionary layout tactics, plus
finnicky and thorough minor pillar randomization and excess monster
definition for tangential spawns, with a focus on open-space diagonally
oriented level traversing and the vague notion of the non-orthodox
non-creator-set end. Same old style as dis_hangedman and coc_hangedman,
in other words, except mucking with the most solidly-designed of the hells
(said status due to the sheer effectiveness in design of hellfire and
fire monsters compared to the other hells, other elements, etc.)

To address: The player can get quite close to endless lava in this end,
which makes the previous minor issue of endless lava having the same
console glyph / colour / tiles tiles much more noticeable. They should
get different graphics, in the same fashion as open sea spaces.

diff --git a/crawl-ref/source/dat/des/branches/geh.des b/crawl-ref/source/dat/des/branches/geh.des
index 85ee49b..1cf5f39 100644 (file)
--- a/crawl-ref/source/dat/des/branches/geh.des
+++ b/crawl-ref/source/dat/des/branches/geh.des
@@ -387,10 +387,9 @@ ENDMAP
 ##############################################################################
 
 NAME:   geh_old
-ORIENT: encompass
 TAGS:   no_rotate
+ORIENT: encompass
 MONS:   patrolling Asmodeus, brimstone fiend, Balrug, molten gargoyle
-MONS:   nothing, random, random
 : serpent_of_hell_setup(_G)
 : geh_setup(_G)
 MAP
@@ -746,8 +745,8 @@ ENDMAP
 ##############################################################################
 
 NAME: lightli_geh_unto_the_cruel
+TAGS: no_vmirror no_monster_gen
 WEIGHT: 0
-TAGS: no_vmirror
 ORIENT: encompass
 MONS: patrolling Asmodeus
 MONS: smoke demon w:9 / sun demon w:9 / hellion w:1 / balrug w:1
@@ -802,3 +801,104 @@ ccc..6.......6.......cccccccccccccccccccccccccccccccccA+.2...2...2...ccccccccccc
 cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 ENDMAP
+
+##############################################################################
+# Asmodeus (Gehenna) by hangedman
+##############################################################################
+
+NAME:    geh_hangedman
+ORIENT:  encompass
+MONS:    patrolling Asmodeus, brimstone fiend, balrug, hellion
+MONS:    fire giant, salamander firebrand, hell knight
+KMONS:   y = red devil w:20 / fire elemental / salamander
+KMONS:   Y = molten gargoyle
+KMONS:   zZ = sun demon / efreet / smoke demon w:5 / \
+              fire dragon skeleton w:5
+KITEM:   $ = $ no_pickup
+KFEAT:   yYZ = lava
+KFEAT:   L = endless_lava
+SHUFFLE: 56, O1 / |0, =- / =- / -=, !? / !? / ?!
+# Just some pillar, door, and floor/wall/lava edge randomization.
+SHUFFLE: ef, hi, def / def / edf / fed, ghi / ghi / hgi / ihg
+SHUFFLE: EF / EF / FE, GH / GH / HG, IJ / IJ / JI
+SHUFFLE: PQ / PQ / QP, RS / RS / SR, TU / TU / UT
+SUBST:   X : ^<>, ^ = xxx., < = xx., > = x.
+SUBST:   ` : `'", ` = ll., ' = l., " = l..
+SUBST:   =! = +, -? = ., dg = v, efhi = .
+SUBST:   EGIPRT = x, FHJQSU = l
+KMASK:   l = no_monster_gen
+: serpent_of_hell_setup(_G)
+: set_border_fill_type("endless_lava")
+: geh_setup(_G)
+MAP
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLllllllllllllllllllllllllllllccccccccccccxxxxxxxxxxxxxxxxxxxxxxxxxxLL
+LLllllllllllllll..............+....4....ccxXXXXXXXXXXXXXXXXXXXXXXXxxLL
+LLlll.........................c++cc+cc++cccX..................[..XXxLL
+LLll.6...........ll````````llcc.........ccc..```````x```````x...{.XxLL
+LLll..vv-vvvvvvvvllllllllllll+...vd3dv...cc..llllllllllllllllll...XxLL
+LLll..v...v$$$.vvYlllllllllllc..f..e..f..cc..lllllllllllllllllll.(XxLL
+LLll..-.$..$.2$vvllllllFFllllc..f..e..f..cc..lllllllllllllllllll..XxLL
+LLll..v...v$..$vvYlllllxxllll+...vd.dv...cc.xlllllll.xllllllllllx.XxLL
+LLll..vv.vv.$$$vvllllllEEllllc.....v.....cc..llxllll.xlllllxllll`.XxLL
+LLll..v$$$.vv=vvvYlllllllllllccc...v...cccc..lllllllllllllllllll`.XxLL
+LLll..v$..$v%%.vvlll..llllllllccv+++++vccc7.lllllxxlllllxxllllll`.XxLL
+LLll..v$2.$=%0%vvlllxx.lllllllc....v....cc..lllllxxlllllxxllllll`.XxLL
+LLll..v.$$$v.%|vvlllxx.llHHlll+.ef*z*fe.cc..lllllllylll.llllllll`.XxLL
+LLll..vvvvvvvvvvvllllllllxxllyc.fdededf.cc..llllllll.$.lllllllll`.XxLL
+LLll..vvvvvvvvvvvl.3lllllGGlll+.ef*+*fe.cc..llxxllll$.$llllxxlll`.XxLL
+LLl..llYlYlYllllll*.llllllllllc....v....cc.xll..llll3$.llll..lllx.XxLL
+LLl..lllllllllll.**.Zlllllllllccc..v..cccc..lllllll.lllyllllllll`.XxLL
+LLl..`llllllllll3..2lllllllllllccv+++vccc7..lllllxxlllllxxllllll`.XxLL
+LLl..`llllll.xxlllZllllllllllllc...v...cc..llllllxxlllllxxllllll`.XxLL
+LLl..`llllll.xxllllllllllllllll+...v...cc..lllllllllllllllllllll`.XxLL
+LLl..`lllllll..lllllllEElllllll+..v7v..cc..llxxxllll.xlllllxllll`.XxLL
+LLl..`llFxElllllllllllExFllllllc...v...cc.xllxxxllll.xllllllllll`.XxLL
+LLl..`llFxEllllllllllllFFllllllccc.v.cccc..llxxxllllllllllllllll`.XxLL
+LLl..`llllllllGxHlllllllllllllllcc+v+ccc7..lllllllllllllll..x.....XxLL
+LLl..`llllllllGxHlllllllllllllllc..5..cc..llllllll..x............XXxLL
+LLl..lllllllllllllllllllllllllll+..v..cc..ll..x..........7ccccccccxxLL
+LLl..lllllllllllllllllllllllllllc.....cc.........7ccccccccccccccccccLL
+LLl..c+cc+cclllyllllllllllllllllccc.ccc....7ccccccccccccccc.....ccccLL
+LLc+cc.....ccc+c+cclllllllllllxxxzc+c....ccccccccccc..7..cc......+.cLL
+LLc.+......cc.....ccc++cclllllx6........cccccc....cc.ivh.+...ii..c.cLL
+LLc.c..ii...+.ivh.cc....ccc+ccx.........c...cc.hg.+..*g*.c..v..v.+.cLL
+LLc.+.v..v..c.*g*..+.gh.cc...cz..d..e..cc...+..iv.c..hvi.+..g..g.c.cLL
+LLc.c.g..g..+.hvi..c.iv..+.v.cc....f...+..v5c...7.+...z..c...hh3.+4cLL
+LLc4+.3hh...c..z...+.7...c5...+...f....cc...+..iv.c..ivh.+..g..g.c.cLL
+LLc.c.g..g..+.ivh..c.iv..+.v.cc..e..d..zc...cc.hg.+..*g*.c..v..v.+.cLL
+LLc.+.v..v..c.*g*..+.gh.cc...c.........xcc+ccc....cc.hvi.+...ii..c.cLL
+LLc.c..ii...+.hvi.cc....ccc+ccxD......6xlllllcc++ccc.....cc......+.cLL
+LLc.+......cc.....ccc++cclllllxx.c+czxxxlllllllllllcc+c+ccc.....cc+cLL
+LLc+cc.....ccc+c+ccllllllllllllccc.cccllllllllllllllllylllcc+cc+c..lLL
+LLl..c+cc+cclllylllllllllllllllc.....clllllllllllllllllllllllllll..lLL
+LLl..llllllllllllllllllllllllll+.v.v.+lllllllllllllllllllllllllll..lLL
+LLl..`llldlllllllllllllllllllllc..5..clllllllllllllllSxRllllllll`..lLL
+LLl..`lldllllllllllllllllllllllcc+v+cclllllllllllllllSxRllllllll`..lLL
+LLll..llllllllllllllllllllllllccc.v.cccllllllUUllllllllllllPxQll`..lLL
+LLll..`llellllllllllllllllllllc...v...cllllllUxTlllllllllllPxQll`..lLL
+LLll..`lelllllllllllllllllllll+..v7v..+lllllllTTlllllll..lllllll`..lLL
+LLll..`lllllllllllllllllllllll+...v...+llllllllllllllllxx.llllll`..lLL
+LLlll..lllflllllllllllllllllllc...v...cllllllllllllZlllxx.llllll`..lLL
+LLlll..`lfllllllllllllllllllllccv+++vcclllllllllll2..3llllllllll`..lLL
+LLlll..`lllZlllllllllllllllllccc..v..ccclllllllllZ.**.lllllllllll..lLL
+LLlll..`llgllllllllllllllllllc....v....cllllllllll.*llllllYlYlYll..lLL
+LLlll..`lglllllllllllllllllllc.ef*+*fe.+lllSSlllll3.lvvvvvvvvvvv..llLL
+LLllll..lllllllllllllllllllly+.fdededf.cyllxxllllllllvvvvvvvvvvv..llLL
+LLllll..`llhlllllllllllllllllc.ef*z*fe.+lllRRll.xxlllvvO%.v$$$.v..llLL
+LLllll..`lhllllllllllllllllllc....v....clllllll.xxlllvv%1%!$.2$v..llLL
+LLllll..`llllllllllllllllllllccv+++++vccllllllll..lllvv.%%v$..$v..llLL
+LLllll..`llillhlllZlllllllllccc...v...ccclllllllllllYvvv!vv.$$$v..llLL
+LLllll..`lillhlllgllflllllllc.....v.....cllllPPllllllvv$$$.vv.vv..llLL
+LLlllll..lllllllgllflllelldl+...vd.dv...+llllxxlllllYvv$..$v...v..llLL
+LLlllll.2.`````lllllllelldllc..f..e..f..cllllQQllllllvv$2.$..$.?..llLL
+LLllv+vv........````llllllllc..f..e..f..clllllllllllYvv.$$$v...v..llLL
+LLllv..vll...........```llll+...vd3dv...+llllllllllllvvvvvvvv?vv..llLL
+LLllv*.+llllllll.........``lcc.........ccll````````ll...........6.llLL
+LLllvvvvlllllllllllll........cc++c+c++cc.........................lllLL
+LLlllllllllllllllllllllll....+....4....+..............llllllllllllllLL
+LLlllllllllllllllllllllllllllcccccccccccllllllllllllllllllllllllllllLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+ENDMAP