New Oracle level with vents.

elunna · Aug 3, 2023 · 3323867 · 3323867
1 parent 0044e8a
commit 3323867
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 3 deletions.
diff --git a/dat/dungeon.def b/dat/dungeon.def
@@ -20,7 +20,7 @@ BRANCH:		    "The Gnomish Mines" @ (2, 3)
 RNDLEVEL:	    "mall" "T" @ (5, 2) 75 2
 LEVALIGN:	    lawful
 LEVELDESC:	    town
-RNDLEVEL:	    "oracle" "O" @ (7, 3) 3
+RNDLEVEL:	    "oracle" "O" @ (7, 3) 4
 LEVALIGN:	    neutral
 CHAINBRANCH:	"Sokoban" "oracle" + (1, 0) up
 CHAINBRANCH:	"Town" "oracle" + (2, 0) up

diff --git a/dat/oracle.des b/dat/oracle.des
@@ -249,3 +249,75 @@ ROOM: "ordinary" , random, random, random, random {
 OBJECT:('`',"statue"),random,montype:"woodchuck",1
 
 RANDOM_CORRIDORS
+
+
+
+
+
+LEVEL: "oracle-4"
+
+ROOM: "delphi" , lit, (3,3), (center,center), (11,9) {
+  FOUNTAIN:(5,2)
+  FOUNTAIN:(3,4)
+  FOUNTAIN:(7,4)
+  FOUNTAIN:(5,6)
+
+  # four vents
+  TERRAIN:(02,02),'V'
+  TERRAIN:(02,06),'V'
+  TERRAIN:(08,02),'V'
+  TERRAIN:(08,06),'V'
+
+  REPLACE_TERRAIN:(0,0,11,9),'.',',', 30%
+
+  $statuelocs = { (0,0),(10,0),(0,8),(10,8) }
+  SHUFFLE:$statuelocs
+  OBJECT:('`',"statue"),$statuelocs[0],montype:"air elemental",1
+  OBJECT:('`',"statue"),$statuelocs[1],montype:"earth elemental",1
+  OBJECT:('`',"statue"),$statuelocs[2],montype:"fire elemental",1
+  OBJECT:('`',"statue"),$statuelocs[3],montype:"water elemental",1
+
+  MONSTER: ('@', "Oracle"), (5,4) {
+        OBJECT: ('(', "eight ball"), uncursed
+  }
+
+  MONSTER: random, random
+  MONSTER: random, random
+}
+
+ROOM: "ordinary" , random, random, random, random {
+  STAIR: random, up
+  OBJECT: random,random
+}
+
+ROOM: "ordinary" , random, random, random, random {
+  STAIR: random, down
+  OBJECT: random, random
+  TRAP: random, random
+  MONSTER: random, random
+  MONSTER: random, random
+}
+
+ROOM: "ordinary" , random, random, random, random {
+  OBJECT: random, random
+  OBJECT: random, random
+  MONSTER: random, random
+}
+
+ROOM: "ordinary" , random, random, random, random {
+  OBJECT: random, random
+  TRAP: random, random
+  MONSTER: random, random
+}
+
+ROOM: "ordinary" , random, random, random, random {
+  OBJECT: random, random
+  TRAP: random, random
+  MONSTER: random, random
+}
+
+# Keep thy enemies close...
+OBJECT:('`',"statue"),random,montype:"woodchuck",1
+
+RANDOM_CORRIDORS
+
diff --git a/src/sp_lev.c b/src/sp_lev.c
@@ -4434,6 +4434,11 @@ genericptr_t arg;
         if (x && (IS_WALL(levl[x - 1][y].typ) || levl[x - 1][y].horizontal))
             levl[x][y].horizontal = 1;
     }
+
+    /* Vents need to be manually started. */
+    if (IS_VENT(levl[x][y].typ))
+        (void) start_timer((long) rnd(10), TIMER_LEVEL, FIXTURE_ACTIVATE,
+                           long_to_any(((long) x << 16) | (long) y));
 }
 
 void

diff --git a/sys/mac/Files.r b/sys/mac/Files.r
@@ -115,6 +115,7 @@ read 'File' (1067,"options") "options";
 read 'File' (1068,"oracle-1.lev") "oracle-1.lev";
 read 'File' (1069,"oracle-2.lev") "oracle-3.lev";
 read 'File' (1070,"oracle-3.lev") "oracle-3.lev";
+read 'File' (1070,"oracle-4.lev") "oracle-4.lev";
 read 'File' (1071,"oracles") "oracles";
 read 'File' (1072,"orcus.lev") "orcus.lev";
 //read 'File' (1073,"quest.dat") "quest.dat";
@@ -331,6 +332,7 @@ read 'File' (1067,"options") ":lib:options";
 read 'File' (1068,"oracle-1.lev") ":lib:oracle-1.lev";
 read 'File' (1069,"oracle-2.lev") ":lib:oracle-2.lev";
 read 'File' (1070,"oracle-3.lev") ":lib:oracle-3.lev";
+read 'File' (1070,"oracle-4.lev") ":lib:oracle-4.lev";
 read 'File' (1071,"oracles") ":lib:oracles";
 read 'File' (1072,"orcus.lev") ":lib:orcus.lev";
 read 'File' (1073,"quest.dat") ":lib:quest.dat";

diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj
@@ -1615,6 +1615,7 @@
 				"$(NH_DAT_DIR)/oracle-1.lev",
 				"$(NH_DAT_DIR)/oracle-2.lev",
 				"$(NH_DAT_DIR)/oracle-3.lev",
+				"$(NH_DAT_DIR)/oracle-4.lev",
 				"$(NH_DAT_DIR)/oracles",
 				"$(NH_DAT_DIR)/orcus.lev",
 				"$(NH_DAT_DIR)/quest.dat",
@@ -1700,9 +1701,9 @@
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 <<<<<<< HEAD
-			shellScript = "cd ${NH_DAT_DIR}\n${NH_UTIL_DIR}/dlb cf nhdat help hh cmdhelp keyhelp history opthelp wizhelp dungeon tribute bigrm-*.lev castle-?.lev fakewiz?.lev hella-?.lev hellb-?.lev hellc-?.lev hellfill.lev knox-?.lev medusa-?.lev minend-?.lev minefill.lev minetn-?.lev oracle-1.lev oracle-2.lev oracle-3.lev orcus.lev sanctum.lev soko?-*.lev tower?.lev valley.lev vlt-????.lev wizard?.lev astral.lev air.lev earth.lev fire.lev water.lev ???-goal.lev ???-fil?.lev ???-loca.lev ???-strt.lev cavefill.lev bogusmon data engrave epitaph oracles options quest.dat rumors vaults.dat\n\n";
+			shellScript = "cd ${NH_DAT_DIR}\n${NH_UTIL_DIR}/dlb cf nhdat help hh cmdhelp keyhelp history opthelp wizhelp dungeon tribute bigrm-*.lev castle-?.lev fakewiz?.lev hella-?.lev hellb-?.lev hellc-?.lev hellfill.lev knox-?.lev medusa-?.lev minend-?.lev minefill.lev minetn-?.lev oracle-1.lev oracle-2.lev oracle-3.lev oracle-4.lev orcus.lev sanctum.lev soko?-*.lev tower?.lev valley.lev vlt-????.lev wizard?.lev astral.lev air.lev earth.lev fire.lev water.lev ???-goal.lev ???-fil?.lev ???-loca.lev ???-strt.lev cavefill.lev bogusmon data engrave epitaph oracles options quest.dat rumors vaults.dat\n\n";
 =======
-			shellScript = "cd ${NH_DAT_DIR}\n${NH_UTIL_DIR}/dlb cf nhdat help hh cmdhelp keyhelp history opthelp wizhelp dungeon tribute bigrm-*.lev castle-?.lev fakewiz?.lev hella-?.lev hellb-?.lev hellc-?.lev hellfill.lev knox-?.lev medusa-?.lev minend-?.lev minefill.lev minetn-?.lev nymph.lev oracle-1.lev oracle-2.lev oracle-3.lev orcus.lev sanctum.lev soko?-?.lev tower?.lev valley.lev vlt-????.lev wizard?.lev astral.lev air.lev earth.lev fire.lev water.lev ???-goal.lev ???-fil?.lev ???-loca.lev ???-strt.lev cavefill.lev bogusmon data engrave epitaph oracles options quest.dat rumors vaults.dat\n\n";
+			shellScript = "cd ${NH_DAT_DIR}\n${NH_UTIL_DIR}/dlb cf nhdat help hh cmdhelp keyhelp history opthelp wizhelp dungeon tribute bigrm-*.lev castle-?.lev fakewiz?.lev hella-?.lev hellb-?.lev hellc-?.lev hellfill.lev knox-?.lev medusa-?.lev minend-?.lev minefill.lev minetn-?.lev nymph.lev oracle-1.lev oracle-2.lev oracle-3.lev oracle-4.lev orcus.lev sanctum.lev soko?-?.lev tower?.lev valley.lev vlt-????.lev wizard?.lev astral.lev air.lev earth.lev fire.lev water.lev ???-goal.lev ???-fil?.lev ???-loca.lev ???-strt.lev cavefill.lev bogusmon data engrave epitaph oracles options quest.dat rumors vaults.dat\n\n";
 >>>>>>> parent of 2a3f81bf8 (Consolidated nymph and jermlaine levels into the rats levels.)
 		};
 		3192867021A39F6A00325BEB /* Install */ = {

diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
@@ -1377,6 +1377,7 @@ ifneq "$(W_DAT)" ""
 	if exist $(W_DAT)\oracle-1.lev     del $(W_DAT)\oracle-1.lev
 	if exist $(W_DAT)\oracle-2.lev     del $(W_DAT)\oracle-2.lev
 	if exist $(W_DAT)\oracle-3.lev     del $(W_DAT)\oracle-3.lev
+	if exist $(W_DAT)\oracle-4.lev     del $(W_DAT)\oracle-4.lev
 	if exist $(W_DAT)\oracles          del $(W_DAT)\oracles
 	if exist $(W_DAT)\orcus.lev	   del $(W_DAT)\orcus.lev
 	if exist $(W_DAT)\rumors           del $(W_DAT)\rumors

diff --git a/util/lev_main.c b/util/lev_main.c
@@ -1391,6 +1391,8 @@ char c;
         return (SINK);
     case 'Z':
         return (TOILET);
+    case 'V':
+        return (VENT);
     case '}':
         return (MOAT);
     case 'w':

diff --git a/win/win32/vs2017/files.props b/win/win32/vs2017/files.props
@@ -181,6 +181,7 @@
     <Levfiles Include = "oracle-1.lev"/>
     <Levfiles Include = "oracle-2.lev"/>
     <Levfiles Include = "oracle-3.lev"/>
+    <Levfiles Include = "oracle-4.lev"/>
     <Levfiles Include = "qchaos.lev"/>
     <Levfiles Include = "qlawful.lev"/>
     <Levfiles Include = "qneutral.lev"/>