nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Minor special level and compiler tweakage

Browse Source 
Fix allowed map characters.
Make some predefined MAPs blend in better with randomly
generated parts.
This commit is contained in:
Pasi Kallinen
2015-04-10 16:47:32 +03:00
parent 0edd645384
commit c266d05680
7 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dat/Knight.des
+11 -11
View File
@@ -112,18 +112,18 @@ FLAGS: hardfloor
INIT_MAP: mines, '.' , 'P' , false , true , lit , false INIT_MAP: mines, '.' , 'P' , false , true , lit , false
GEOMETRY:center,center GEOMETRY:center,center
MAP MAP
...PPP.........PPPP..............PPPP... xxxxxxxxx......xxxx...........xxxxxxxxxx
.PPPP...........PP................PPPP.. xxxxxxx.........xxx.............xxxxxxxx
PP.................................PPP.. xxxx..............................xxxxxx
....................................PPP. xx.................................xxxxx
.....................................PP. ....................................xxxx
.......................................P .......................................x
........................................ ........................................
PP...................................PPP xx...................................xxx
.PPP...............................PPP.. xxxx..............................xxxxxx
..PP.............................PPPP... xxxxxx..........................xxxxxxxx
..PPP...........................PPPPPP.. xxxxxxxx.........xx..........xxxxxxxxxxx
....PPPP.........PPP.........PPPP..PP... xxxxxxxxx.......xxxxxx.....xxxxxxxxxxxxx
ENDMAP ENDMAP
# Dungeon Description # Dungeon Description
# The Isle of Glass is a Tor rising out of the swamps surrounding it. # The Isle of Glass is a Tor rising out of the swamps surrounding it.
dat/Monk.des
+11 -11
View File
@@ -203,17 +203,17 @@ MAZE: "Mon-goal", ' '
INIT_MAP: mines, 'L' , '.' , false , false , unlit , false INIT_MAP: mines, 'L' , '.' , false , false , unlit , false
GEOMETRY:center,center GEOMETRY:center,center
MAP MAP
.L......L.LLL.......LL.... xxxxxx..xxxxxx...xxxxxxxxx
.LLL.......L......LL...... xxxx......xx......xxxxxxxx
LL.LL.............L.LL.... xx.xx.............xxxxxxxx
.......................... x....................xxxxx
......................LL.. ......................xxxx
......................LLL. ......................xxxx
LL........................ xx........................
.LL....................... xxx......................x
.LL................LL.L... xxx................xxxxxxx
..LL.....L.LL.......LLL... xxxx.....x.xx.......xxxxxx
.........LLL.........L.... xxxxx...xxxxxx....xxxxxxxx
ENDMAP ENDMAP
# Dungeon Description # Dungeon Description
$place = { (14,04),(13,07) } $place = { (14,04),(13,07) }
dat/Priest.des
+11 -11
View File
@@ -186,17 +186,17 @@ MAZE: "Pri-goal", ' '
INIT_MAP: mines, 'L' , '.' , false , false , unlit , false INIT_MAP: mines, 'L' , '.' , false , false , unlit , false
GEOMETRY:center,center GEOMETRY:center,center
MAP MAP
.L......L.LLL.......LL.... xxxxxx..xxxxxx...xxxxxxxxx
.LLL.......L......LL...... xxxx......xx......xxxxxxxx
LL.LL.............L.LL.... xx.xx.............xxxxxxxx
.......................... x....................xxxxx
......................LL.. ......................xxxx
......................LLL. ......................xxxx
LL........................ xx........................
.LL....................... xxx......................x
.LL................LL.L... xxx................xxxxxxx
..LL.....L.LL.......LLL... xxxx.....x.xx.......xxxxxx
.........LLL.........L.... xxxxx...xxxxxx....xxxxxxxx
ENDMAP ENDMAP
# Dungeon Description # Dungeon Description
$place = { (14,04),(13,07) } $place = { (14,04),(13,07) }
dat/Valkyrie.des
+24 -24
View File
@@ -94,19 +94,19 @@ FLAGS: hardfloor,icedpools
INIT_MAP: mines, '.', 'I', true, true, lit, false INIT_MAP: mines, '.', 'I', true, true, lit, false
GEOMETRY:center,center GEOMETRY:center,center
MAP MAP
PPPP.... ....PPPPP. PPPPxxxx xxxxPPPPPx
PLP... .PPLLLPP PLPxxx xPPLLLPP
PPP ....................... PPPLLP PPP ....................... PPPLLP
.. ............................ PPPP xx ............................ PPPP
. ............................... .... x ............................... xxxx
................................. .. ................................. xx
.................................... . .................................... x
................................... ...................................
. .................................. . x .................................. x
.. .............................. PP xx .............................. PP
.PPP .......................... PLP xPPP .......................... PLP
.PLLP ..PLLP xPLLP xxPLLP
.PPPP.. ....PPPP xPPPPxx xxxxPPPP
ENDMAP ENDMAP
# Dungeon Description # Dungeon Description
REGION:(00,00,39,12),lit,"ordinary" REGION:(00,00,39,12),lit,"ordinary"
@@ -180,23 +180,23 @@ FLAGS: icedpools
INIT_MAP: mines, '.', 'L', true, true, lit, false INIT_MAP: mines, '.', 'L', true, true, lit, false
GEOMETRY:center,center GEOMETRY:center,center
MAP MAP
.L............................LLLLL xxxxxx.....................xxxxxxxx
LLL.........LLLLL.LLLLL.........LLL xxxxx.......LLLLL.LLLLL......xxxxxx
.LLL......LLLLLLLLLLLLLLL.......LL. xxxx......LLLLLLLLLLLLLLL......xxxx
.LLL.....LLL|---------|LLL.....L... xxxx.....LLL|---------|LLL.....xxxx
..LL....LL|--.........--|LL.....LLL xxxx....LL|--.........--|LL.....xxx
.......LL|-...LLLLLLL...-|LL.....L. x......LL|-...LLLLLLL...-|LL.....xx
.......LL|...LL.....LL...|LL....... .......LL|...LL.....LL...|LL......x
......LL|-..LL.......LL..-|LL...... ......LL|-..LL.......LL..-|LL......
......LL|.................|LL...... ......LL|.................|LL......
......LL|-..LL.......LL..-|LL...... ......LL|-..LL.......LL..-|LL......
.......LL|...LL.....LL...|LL....... .......LL|...LL.....LL...|LL.......
.......LL|-...LLLLLLL...-|LL....... xx.....LL|-...LLLLLLL...-|LL......x
..L.....LL|--.........--|LL.....LL. xxx.....LL|--.........--|LL.....xxx
..LL.....LLL|---------|LLL....LLLL. xxxx.....LLL|---------|LLL...xxxxxx
..LLL.....LLLLLLLLLLLLLLL...LLLLL.. xxxxx.....LLLLLLLLLLLLLLL...xxxxxxx
.LLLL.......LLLLL.LLLLL.....LLLL... xxxxxx......LLLLL.LLLLL.....xxxxxxx
..LL............................... xxxxxxxxx..................xxxxxxxx
ENDMAP ENDMAP
# Dungeon Description # Dungeon Description
REGION:(00,00,34,16),lit,"ordinary" REGION:(00,00,34,16),lit,"ordinary"
dat/gehennom.des
+22 -22
View File
@@ -163,43 +163,43 @@ INIT_MAP:mines,'.','}',true,true,unlit,false
# guarantee at least one open spot to ensure successful stair placement # guarantee at least one open spot to ensure successful stair placement
GEOMETRY:left,bottom GEOMETRY:left,bottom
MAP MAP
}}}}}}}} xxxxxxxx
}}...}}} xx...xxx
}}}...}} xxx...xx
}}}}.}}} xxxx.xxx
}}}}}}}} xxxxxxxx
ENDMAP ENDMAP
OBJECT:('`',"boulder"),random OBJECT:('`',"boulder"),random
GEOMETRY:right,top GEOMETRY:right,top
MAP MAP
}}}}}}}} xxxxxxxx
}}}}.}}} xxxx.xxx
}}}...}} xxx...xx
}}...}}} xx...xxx
}}}}}}}} xxxxxxxx
ENDMAP ENDMAP
OBJECT:('`',"boulder"),random OBJECT:('`',"boulder"),random
# lair # lair
GEOMETRY:center,center GEOMETRY:center,center
MAP MAP
..}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.. xx}}}}}x}}}}}x}}}}}x}}}}}x}}}}}x}}}}}x}}}}}x}}}}}xx
.}}}.}}}}}..}}}..}}}}}..}}}..}}}}}..}}}..}}}}}.}}}. x}}}.}}}}}..}}}..}}}}}..}}}..}}}}}..}}}..}}}}}.}}}x
}}}...}}..}}.}.}}.}}.}}}...}}}.}}}..}}}..}}}}...}}} }}}...}}..}}.}.}}.}}.}}}...}}}.}}}..}}}..}}}}...}}}
.}}}.}}.}}}.}}.}}.}}...}}.}}.....}}.....}....}.}}}. x}}}.}}.}}}.}}.}}.}}...}}.}}.....}}.....}....}.}}}x
..}}}..}}}.}}.}}.}}..}}.....}}.}}}.}}.}}}}}}}}}}}.. xx}}}..}}}.}}.}}.}}..}}.....}}.}}}.}}.}}}}}}}}}}}xx
.}}}..}}}}}.}}.}}.}}...}}}}}.....}}.}}}}}}.....}}}. x}}}..}}}}}.}}.}}.}}...}}}}}.....}}.}}}}}}.....}}}x
}}}..}}...}}..}}.}}}.}}}...}}}.}}}.}.}}}}..P.P..}}} }}}..}}...}}..}}.}}}.}}}...}}}.}}}.}.}}}}..P.P..}}}
}}.}}}}...}}}}}.}...}}}..P..}}}.}.}}}.}}}}.....}}}} }}.}}}}...}}}}}.}...}}}..P..}}}.}.}}}.}}}}.....}}}}
}.}}}}.}}.}..}.}}}}}}}..P.P..}}}.}}}.}}..}}...}}}}. }.}}}}.}}.}..}.}}}}}}}..P.P..}}}.}}}.}}..}}...}}}}x
.}}}}.}}}}....}}}}}.}}}..P..}}}.}}}}.}}..}}...}}}.} x}}}}.}}}}....}}}}}.}}}..P..}}}.}}}}.}}..}}...}}}.}
}}}}..}}.}}..}}}}...}}}}...}}}.}}}}}.}}}}.}}}}}}.}} }}}}..}}.}}..}}}}...}}}}...}}}.}}}}}.}}}}.}}}}}}.}}
}}}...}}...}}}..}}}}}}}}}}}}.....}}}}.}}...}..}.}}} }}}...}}...}}}..}}}}}}}}}}}}.....}}}}.}}...}..}.}}}
.}}}..}}.}}}}....}}..}}}..}}.....}}}}.}}}.}....}}}. x}}}..}}.}}}}....}}..}}}..}}.....}}}}.}}}.}....}}}x
..}}}.}}}}..}}..}}..}}..}}..}}.}}}..}.}..}}}..}}}.. xx}}}.}}}}..}}..}}..}}..}}..}}.}}}..}.}..}}}..}}}xx
.}}}.}}}}....}}}}..}}....}}}}}}}...}}}....}}}}.}}}. x}}}.}}}}....}}}}..}}....}}}}}}}...}}}....}}}}.}}}x
}}}...}}}....}}}..}}}....}}}..}}...}}}....}}}...}}} }}}...}}}....}}}..}}}....}}}..}}...}}}....}}}...}}}
.}}}.}}}}}..}}}..}}}}}..}}}..}}}}}..}}}..}}}}}.}}}. x}}}.}}}}}..}}}..}}}}}..}}}..}}}}}..}}}..}}}}}.}}}x
..}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.. xx}}}}}x}}}}}x}}}}}x}}}}}x}}}}}x}}}}}x}}}}}x}}}}}xx
ENDMAP ENDMAP
# Random registers # Random registers
$monster = monster: { 'j','b','P','F' } $monster = monster: { 'j','b','P','F' }
util/lev_comp.l
+1 -1
View File
@@ -112,7 +112,7 @@ FILE *orig_yyin = NULL;
map_cnt = 0; map_cnt = 0;
return MAP_ID; return MAP_ID;
} }
<MAPC>[-|}{+xABCISHKMPLWTtFYU\\#. 0123456789]*\r?\n { <MAPC>[-|}{+xABCISHKPLWTF\\#. 0123456789]*\r?\n {
int len = yyleng; int len = yyleng;
savetoken(yytext); savetoken(yytext);
/* convert \r\n to \n */ /* convert \r\n to \n */
util/lev_main.c
+4 -4
View File
@@ -1186,15 +1186,15 @@ char c;
case 'H' : return(SCORR); case 'H' : return(SCORR);
case '{' : return(FOUNTAIN); case '{' : return(FOUNTAIN);
case '\\' : return(THRONE); case '\\' : return(THRONE);
case 'K' : case 'K' : return(SINK);
return(SINK);
case '}' : return(MOAT); case '}' : return(MOAT);
case 'P' : return(POOL); case 'P' : return(POOL);
case 'L' : return(LAVAPOOL); case 'L' : return(LAVAPOOL);
case 'I' : return(ICE); case 'I' : return(ICE);
case 'W' : return(WATER); case 'W' : return(WATER);
case 'T' : return (TREE); case 'T' : return (TREE);
case 'F' : return (IRONBARS); /* Fe = iron */ case 'F' : return (IRONBARS); /* Fe = iron */
case 'x' : return(MAX_TYPE); /* "see-through" */
} }
return(INVALID_TYPE); return(INVALID_TYPE);
} }