From 816b562e999c9fac22eb82bfb20de671a08fb83a Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sat, 2 May 2015 22:10:07 +0300 Subject: [PATCH 1/7] Replace some pools in Hea quest home with floor --- dat/Healer.des | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dat/Healer.des b/dat/Healer.des index dcbb01b2a..e5e006d6b 100644 --- a/dat/Healer.des +++ b/dat/Healer.des @@ -35,6 +35,9 @@ PP...............PPPPP................................PPPP...PPPP........PPP PPP.............PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP....PPPPPP PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP ENDMAP + +REPLACE_TERRAIN:(01,01,74,18), 'P', '.', 10% + # Dungeon Description REGION:(00,00,75,19),lit,"ordinary" # Stairs From 5d116a892a71b3907c289bc468b5b0b59ef1eaa5 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sat, 2 May 2015 22:17:47 +0300 Subject: [PATCH 2/7] Minor variation for Earth and Astral planes --- dat/endgame.des | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dat/endgame.des b/dat/endgame.des index 4f2cbd9de..8cf84ed75 100644 --- a/dat/endgame.des +++ b/dat/endgame.des @@ -45,6 +45,9 @@ MAP .. ENDMAP + +REPLACE_TERRAIN:(0,0,75,19), ' ', ('.', unlit), 5% + # Since there are no stairs, this forces the hero's initial placement TELEPORT_REGION:(69,16,69,16),(0,0,0,0) PORTAL:(0,0,75,19),(65,13,75,19),"air" @@ -503,6 +506,19 @@ MAP |...............| ----------------- ENDMAP + +IF [75%] { + TERRAIN:fillrect (17,14, 30,18),'.' + TERRAIN:fillrect (44,14, 57,18),'.' + WALLIFY + + $hall = selection:floodfill(37,18) + LOOP [6 + 3d4] { + MONSTER:('A',"Angel"),rndcoord($hall),noalign,hostile + [50%]: MONSTER:random,rndcoord($hall),hostile + } +} + # Rider locations $place = { (23,9),(37,14),(51,9) } SHUFFLE: $place From 862c78530b4c06215ebdb5bf6a0d131c060dfa27 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sat, 2 May 2015 23:04:13 +0300 Subject: [PATCH 3/7] More variations for bigrm-1 --- dat/bigroom.des | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dat/bigroom.des b/dat/bigroom.des index 83a852e96..d8fd0a319 100644 --- a/dat/bigroom.des +++ b/dat/bigroom.des @@ -30,6 +30,32 @@ MAP |.........................................................................| --------------------------------------------------------------------------- ENDMAP + +$terrains = TERRAIN:{'-', 'F', 'L', 'T', 'C'} +SHUFFLE:$terrains + +[50%]: SWITCH [ 4 ] { + CASE 0: + TERRAIN:line (10,8),(65, 8), $terrains[0] + BREAK + CASE 1: + TERRAIN:line (15,4),(15, 13), $terrains[0] + TERRAIN:line (59,4),(59, 13), $terrains[0] + BREAK + CASE 2: + TERRAIN:line (10,8),(38, 8), $terrains[0] + TERRAIN:line (37,8),(65, 8), $terrains[0] + TERRAIN:line (37,3),(37, 8), $terrains[0] + TERRAIN:line (37,8),(37,14), $terrains[0] + BREAK + CASE 3: + TERRAIN:rect (4,4,70,13), $terrains[0] + TERRAIN:line (25, 4),(50, 4), '.' + TERRAIN:line (25,13),(50,13), '.' + BREAK + DEFAULT: +} + # Dungeon Description REGION:(01,01,73,16),lit,"ordinary" # Stairs From b950031f55be399f5b8a565db4efcfad98e54dd4 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sat, 2 May 2015 23:19:38 +0300 Subject: [PATCH 4/7] Occasionally fog maze bigrm is not made of fog --- dat/bigroom.des | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dat/bigroom.des b/dat/bigroom.des index d8fd0a319..62937e8e7 100644 --- a/dat/bigroom.des +++ b/dat/bigroom.des @@ -680,6 +680,15 @@ MAP ....................................................................... ENDMAP +IF [33%] { + # occasionally it's not a fog maze + $terrain = TERRAIN:{ 'L', '}', 'T', '-', 'F' } + SHUFFLE:$terrain + # break it up a bit + REPLACE_TERRAIN:(0,0,70,18),'C', '.', 5% + REPLACE_TERRAIN:(0,0,70,18),'C', $terrain[0], 100% +} + REGION:(00,00,70,18),lit,"ordinary" # when falling down on this level, never end up in the fog maze From d44e55b9a2c9e7c5ce3479161f30d45f4ad3d333 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sat, 2 May 2015 23:23:04 +0300 Subject: [PATCH 5/7] Make the slanted bigrm have more variance --- dat/bigroom.des | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dat/bigroom.des b/dat/bigroom.des index 62937e8e7..381e95e85 100644 --- a/dat/bigroom.des +++ b/dat/bigroom.des @@ -587,6 +587,12 @@ MAP ---------------------------------------------- ENDMAP +IF [40%] { + $terrain = TERRAIN:{ 'L', '}', 'T', '.', '-', 'C' } + SHUFFLE:$terrain + REPLACE_TERRAIN:(0,0,74,17),'F', $terrain[0], 100% +} + REGION:(01,01,73,16),lit,"ordinary" STAIR:random,up From be643386c5387cee88308e365f174e285c867335 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 2 May 2015 18:04:20 -0400 Subject: [PATCH 6/7] permanent wiz_identify correction wiz_identify (^I) is supposed to bring up the inventory list with the items identified, in contrast to the regular (I) inventory, but only for that inventory display. It is intended that if you then hit ^I again while at that wiz_identify inventory menu, you'll trigger permanent identification of itemsand any other key is supposed to leave them as they were. In tty however, was doing the same thing as the second ^I, and permanently identifying everything. So, for those that like to through menus (like me) this makes it work as originally intended and requires a deliberate second ^I at the menu to permanently identify. (It might also allow trigger permanent ID if you hit underscore, but nobody "underscores" through menus, so that's ok.) --- src/invent.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/invent.c b/src/invent.c index 1a2a3b2dd..3d9ac0843 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1912,9 +1912,8 @@ long* out_cnt; any.a_char = -1; /* wiz_identify stuffed the wiz_identify cmd character into iflags.override_ID */ - Sprintf(prompt, "Debug Identify (%s to permanently identify)", - visctrl(iflags.override_ID)); - add_menu(win, NO_GLYPH, &any,' ', iflags.override_ID, ATR_NONE, + Sprintf(prompt, "Debug Identify (%s to permanently identify)",visctrl(iflags.override_ID)); + add_menu(win, NO_GLYPH, &any,'.', iflags.override_ID, ATR_NONE, prompt, MENU_UNSELECTED); } nextclass: From 02de9d1313365ad09441c106402ad141c48f0bb1 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 2 May 2015 18:16:11 -0400 Subject: [PATCH 7/7] commit the latest update for wiz_identify git add mistake on my part --- src/invent.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/invent.c b/src/invent.c index 3d9ac0843..a23c92166 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1912,8 +1912,9 @@ long* out_cnt; any.a_char = -1; /* wiz_identify stuffed the wiz_identify cmd character into iflags.override_ID */ - Sprintf(prompt, "Debug Identify (%s to permanently identify)",visctrl(iflags.override_ID)); - add_menu(win, NO_GLYPH, &any,'.', iflags.override_ID, ATR_NONE, + Sprintf(prompt, "Debug Identify (%s to permanently identify)", + visctrl(iflags.override_ID)); + add_menu(win, NO_GLYPH, &any,'_', iflags.override_ID, ATR_NONE, prompt, MENU_UNSELECTED); } nextclass: