From: Pasi Kallinen Date: Fri, 10 Apr 2015 13:47:29 +0000 (+0300) Subject: Minor special level and compiler tweakage X-Git-Tag: NetHack-3.6.0_RC01~480^2~18^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c266d05680927202f652946c3f79cd97862d2b65;p=nethack Minor special level and compiler tweakage Fix allowed map characters. Make some predefined MAPs blend in better with randomly generated parts. --- diff --git a/dat/Knight.des b/dat/Knight.des index 5e22f43a9..dd55bd4e2 100644 --- a/dat/Knight.des +++ b/dat/Knight.des @@ -112,18 +112,18 @@ FLAGS: hardfloor INIT_MAP: mines, '.' , 'P' , false , true , lit , false GEOMETRY:center,center MAP -...PPP.........PPPP..............PPPP... -.PPPP...........PP................PPPP.. -PP.................................PPP.. -....................................PPP. -.....................................PP. -.......................................P +xxxxxxxxx......xxxx...........xxxxxxxxxx +xxxxxxx.........xxx.............xxxxxxxx +xxxx..............................xxxxxx +xx.................................xxxxx +....................................xxxx +.......................................x ........................................ -PP...................................PPP -.PPP...............................PPP.. -..PP.............................PPPP... -..PPP...........................PPPPPP.. -....PPPP.........PPP.........PPPP..PP... +xx...................................xxx +xxxx..............................xxxxxx +xxxxxx..........................xxxxxxxx +xxxxxxxx.........xx..........xxxxxxxxxxx +xxxxxxxxx.......xxxxxx.....xxxxxxxxxxxxx ENDMAP # Dungeon Description # The Isle of Glass is a Tor rising out of the swamps surrounding it. diff --git a/dat/Monk.des b/dat/Monk.des index 155b37040..cb87649e2 100644 --- a/dat/Monk.des +++ b/dat/Monk.des @@ -203,17 +203,17 @@ MAZE: "Mon-goal", ' ' INIT_MAP: mines, 'L' , '.' , false , false , unlit , false GEOMETRY:center,center MAP -.L......L.LLL.......LL.... -.LLL.......L......LL...... -LL.LL.............L.LL.... -.......................... -......................LL.. -......................LLL. -LL........................ -.LL....................... -.LL................LL.L... -..LL.....L.LL.......LLL... -.........LLL.........L.... +xxxxxx..xxxxxx...xxxxxxxxx +xxxx......xx......xxxxxxxx +xx.xx.............xxxxxxxx +x....................xxxxx +......................xxxx +......................xxxx +xx........................ +xxx......................x +xxx................xxxxxxx +xxxx.....x.xx.......xxxxxx +xxxxx...xxxxxx....xxxxxxxx ENDMAP # Dungeon Description $place = { (14,04),(13,07) } diff --git a/dat/Priest.des b/dat/Priest.des index 21fd71600..f8d3d4b75 100644 --- a/dat/Priest.des +++ b/dat/Priest.des @@ -186,17 +186,17 @@ MAZE: "Pri-goal", ' ' INIT_MAP: mines, 'L' , '.' , false , false , unlit , false GEOMETRY:center,center MAP -.L......L.LLL.......LL.... -.LLL.......L......LL...... -LL.LL.............L.LL.... -.......................... -......................LL.. -......................LLL. -LL........................ -.LL....................... -.LL................LL.L... -..LL.....L.LL.......LLL... -.........LLL.........L.... +xxxxxx..xxxxxx...xxxxxxxxx +xxxx......xx......xxxxxxxx +xx.xx.............xxxxxxxx +x....................xxxxx +......................xxxx +......................xxxx +xx........................ +xxx......................x +xxx................xxxxxxx +xxxx.....x.xx.......xxxxxx +xxxxx...xxxxxx....xxxxxxxx ENDMAP # Dungeon Description $place = { (14,04),(13,07) } diff --git a/dat/Valkyrie.des b/dat/Valkyrie.des index 0dbd3bd05..ad9c942bf 100644 --- a/dat/Valkyrie.des +++ b/dat/Valkyrie.des @@ -94,19 +94,19 @@ FLAGS: hardfloor,icedpools INIT_MAP: mines, '.', 'I', true, true, lit, false GEOMETRY:center,center MAP -PPPP.... ....PPPPP. -PLP... .PPLLLPP +PPPPxxxx xxxxPPPPPx +PLPxxx xPPLLLPP PPP ....................... PPPLLP -.. ............................ PPPP -. ............................... .... - ................................. .. -.................................... . +xx ............................ PPPP +x ............................... xxxx + ................................. xx +.................................... x ................................... -. .................................. . -.. .............................. PP -.PPP .......................... PLP -.PLLP ..PLLP -.PPPP.. ....PPPP +x .................................. x +xx .............................. PP +xPPP .......................... PLP +xPLLP xxPLLP +xPPPPxx xxxxPPPP ENDMAP # Dungeon Description REGION:(00,00,39,12),lit,"ordinary" @@ -180,23 +180,23 @@ FLAGS: icedpools INIT_MAP: mines, '.', 'L', true, true, lit, false GEOMETRY:center,center MAP -.L............................LLLLL -LLL.........LLLLL.LLLLL.........LLL -.LLL......LLLLLLLLLLLLLLL.......LL. -.LLL.....LLL|---------|LLL.....L... -..LL....LL|--.........--|LL.....LLL -.......LL|-...LLLLLLL...-|LL.....L. -.......LL|...LL.....LL...|LL....... +xxxxxx.....................xxxxxxxx +xxxxx.......LLLLL.LLLLL......xxxxxx +xxxx......LLLLLLLLLLLLLLL......xxxx +xxxx.....LLL|---------|LLL.....xxxx +xxxx....LL|--.........--|LL.....xxx +x......LL|-...LLLLLLL...-|LL.....xx +.......LL|...LL.....LL...|LL......x ......LL|-..LL.......LL..-|LL...... ......LL|.................|LL...... ......LL|-..LL.......LL..-|LL...... .......LL|...LL.....LL...|LL....... -.......LL|-...LLLLLLL...-|LL....... -..L.....LL|--.........--|LL.....LL. -..LL.....LLL|---------|LLL....LLLL. -..LLL.....LLLLLLLLLLLLLLL...LLLLL.. -.LLLL.......LLLLL.LLLLL.....LLLL... -..LL............................... +xx.....LL|-...LLLLLLL...-|LL......x +xxx.....LL|--.........--|LL.....xxx +xxxx.....LLL|---------|LLL...xxxxxx +xxxxx.....LLLLLLLLLLLLLLL...xxxxxxx +xxxxxx......LLLLL.LLLLL.....xxxxxxx +xxxxxxxxx..................xxxxxxxx ENDMAP # Dungeon Description REGION:(00,00,34,16),lit,"ordinary" diff --git a/dat/gehennom.des b/dat/gehennom.des index 625255db8..470d0dea0 100644 --- a/dat/gehennom.des +++ b/dat/gehennom.des @@ -163,43 +163,43 @@ INIT_MAP:mines,'.','}',true,true,unlit,false # guarantee at least one open spot to ensure successful stair placement GEOMETRY:left,bottom MAP -}}}}}}}} -}}...}}} -}}}...}} -}}}}.}}} -}}}}}}}} +xxxxxxxx +xx...xxx +xxx...xx +xxxx.xxx +xxxxxxxx ENDMAP OBJECT:('`',"boulder"),random GEOMETRY:right,top MAP -}}}}}}}} -}}}}.}}} -}}}...}} -}}...}}} -}}}}}}}} +xxxxxxxx +xxxx.xxx +xxx...xx +xx...xxx +xxxxxxxx ENDMAP OBJECT:('`',"boulder"),random # lair GEOMETRY:center,center 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..}}}.}}}.}}..}}...}}}}x +x}}}}.}}}}....}}}}}.}}}..P..}}}.}}}}.}}..}}...}}}.} }}}}..}}.}}..}}}}...}}}}...}}}.}}}}}.}}}}.}}}}}}.}} }}}...}}...}}}..}}}}}}}}}}}}.....}}}}.}}...}..}.}}} -.}}}..}}.}}}}....}}..}}}..}}.....}}}}.}}}.}....}}}. -..}}}.}}}}..}}..}}..}}..}}..}}.}}}..}.}..}}}..}}}.. -.}}}.}}}}....}}}}..}}....}}}}}}}...}}}....}}}}.}}}. +x}}}..}}.}}}}....}}..}}}..}}.....}}}}.}}}.}....}}}x +xx}}}.}}}}..}}..}}..}}..}}..}}.}}}..}.}..}}}..}}}xx +x}}}.}}}}....}}}}..}}....}}}}}}}...}}}....}}}}.}}}x }}}...}}}....}}}..}}}....}}}..}}...}}}....}}}...}}} -.}}}.}}}}}..}}}..}}}}}..}}}..}}}}}..}}}..}}}}}.}}}. -..}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.}}}}}.. +x}}}.}}}}}..}}}..}}}}}..}}}..}}}}}..}}}..}}}}}.}}}x +xx}}}}}x}}}}}x}}}}}x}}}}}x}}}}}x}}}}}x}}}}}x}}}}}xx ENDMAP # Random registers $monster = monster: { 'j','b','P','F' } diff --git a/util/lev_comp.l b/util/lev_comp.l index 8192621cb..e649873c9 100644 --- a/util/lev_comp.l +++ b/util/lev_comp.l @@ -112,7 +112,7 @@ FILE *orig_yyin = NULL; map_cnt = 0; return MAP_ID; } -[-|}{+xABCISHKMPLWTtFYU\\#. 0123456789]*\r?\n { +[-|}{+xABCISHKPLWTF\\#. 0123456789]*\r?\n { int len = yyleng; savetoken(yytext); /* convert \r\n to \n */ diff --git a/util/lev_main.c b/util/lev_main.c index edd16c021..5d18c36df 100644 --- a/util/lev_main.c +++ b/util/lev_main.c @@ -1186,15 +1186,15 @@ char c; case 'H' : return(SCORR); case '{' : return(FOUNTAIN); case '\\' : return(THRONE); - case 'K' : - return(SINK); + case 'K' : return(SINK); case '}' : return(MOAT); case 'P' : return(POOL); case 'L' : return(LAVAPOOL); case 'I' : return(ICE); case 'W' : return(WATER); - case 'T' : return (TREE); - case 'F' : return (IRONBARS); /* Fe = iron */ + case 'T' : return (TREE); + case 'F' : return (IRONBARS); /* Fe = iron */ + case 'x' : return(MAX_TYPE); /* "see-through" */ } return(INVALID_TYPE); }