Merge branch 'master' into win32-x64-working

This commit is contained in:
nhmall
2015-05-02 14:04:17 -04:00
2 changed files with 20 additions and 7 deletions

View File

@@ -13,11 +13,12 @@
MAZE: "Ran-strt",'.'
FLAGS: noteleport,hardfloor,arboreal
INIT_MAP:mines,'.','.',true,true,lit,false
REPLACE_TERRAIN:(0,0,76,19),'.', 'T', 5%
GEOMETRY:left,center
#1234567890123456789012345678901234567890123456789012345678901234567890
MAP
..
................................... .
xx
................................... x
.. ..
.. ...............F............... ..
. .. .F. .. .
@@ -35,8 +36,8 @@ MAP
. .. .F. .. .
.. ...............F............... ..
.. ..
................................... .
..
................................... x
xx
ENDMAP
# Dungeon Description
REGION:(00,00,40,20),lit,"ordinary"

View File

@@ -247,7 +247,7 @@ GEOMETRY:center,center
MAP
.......................
......---------.---------......
......-------------------......
......----.................----......
....----.....-------------.....----....
....--.....----...........----.....--....
@@ -255,11 +255,11 @@ MAP
...|....--....---.......---....--....|...
....|...||...---...--+--...---...||...|....
....|...|....|....|-...-|....|....|...|....
....|...|....|....+.....+....|........|....
....|...|....|....+.....+....|....|...|....
....|...|....|....|-...-|....|....|...|....
....|...||...---...--+--...---...||...|....
...|....--....---.......---....--....|...
...||....---....----.----....---....||...
...||....---....---------....---....||...
....--.....----...........----.....--....
....----.....-------------.....----....
......----.................----......
@@ -278,6 +278,18 @@ DOOR:closed,(22,12)
DOOR:closed,(25,10)
# Stairs
STAIR:$place[0],up
# Holes in the concentric ring walls
$place = { (22,14),(30,10),(22, 6),(14,10) }
SHUFFLE:$place
TERRAIN:$place[0],'.'
$place = { (22, 4),(35,10),(22,16),( 9,10) }
SHUFFLE:$place
TERRAIN:$place[0],'.'
$place = { (22, 2),(22,18) }
SHUFFLE:$place
TERRAIN:$place[0],'.'
# Non diggable walls
NON_DIGGABLE:(00,00,44,19)
# Objects