Merge pull request #683 from GTD-Carthage/content-unstable

Upstream sync
obsidian-level-maker · Feb 23, 2025 · d702557 · d702557
2 parents 88b096a + bd01497
commit d702557
Show file tree

Hide file tree

Showing 13 changed files with 126 additions and 20 deletions.
diff --git a/games/doom/data/invisible_wall.wad b/games/doom/data/invisible_wall.wad
diff --git a/games/doom/data/vine_dude.wad b/games/doom/data/vine_dude.wad
diff --git a/games/doom/fabs/joiner/gtd_infestation_simple.lua b/games/doom/fabs/joiner/gtd_infestation_simple.lua
@@ -26,7 +26,7 @@ PREFABS.Joiner_infestation_caveout =
   tex_MIDVINE2 =
   {
     MIDVINE2 = 1,
-    ZZWOLF10 = 10 -- invisibility tex
+    O_INVIST = 10 -- invisibility tex
   },
 }
 
@@ -54,6 +54,6 @@ PREFABS.Joiner_natural_caveout =
   tex_MIDVINE2 =
   {
     MIDVINE2 = 1,
-    ZZWOLF10 = 10 -- invisibility tex
+    O_INVIST = 10 -- invisibility tex
   },
 }
diff --git a/games/doom/fabs/wall/gtd_wall_hell_engraving_set.lua b/games/doom/fabs/wall/gtd_wall_hell_engraving_set.lua
@@ -186,7 +186,8 @@ PREFABS.Wall_hell_engraving_top_band =
 
   height = 96,
 
-  bound_z2 = {22,24 , 88,89},
+  z_fit = {22,24 , 88,89},
+  bound_z2 = 96,
 
   group = "gtd_wall_hell_engraving_top_band"
 }
diff --git a/games/doom/fabs/wall/gtd_wall_hell_exterior_wall_groups.lua b/games/doom/fabs/wall/gtd_wall_hell_exterior_wall_groups.lua
@@ -320,7 +320,7 @@ PREFABS.Wall_hell_outdoor_torch_fenced = --#
 
   z_fit = { 28,32 },
 
-  tex_FENCE4 = "ZZWOLF10",
+  tex_FENCE4 = "O_INVIST",
   tex_METL02 = "METAL",
 }
 

diff --git a/games/doom/fabs/wall/gtd_wall_neonsigns.lua b/games/doom/fabs/wall/gtd_wall_neonsigns.lua
@@ -31,8 +31,8 @@ PREFABS.Wall_urban_neon_sign_scrolling_tall =
 
   tex_CEMENT1 =
   {
-    CEMENT2 = 5,
-    CEMENT4 = 5,
+    O_BOLT = 5,
+    O_CARVE = 5,
   },
 
   line_1 =
@@ -56,8 +56,8 @@ PREFABS.Wall_urban_neon_sign_id =
 
   tex_O_RELIEF =
   {
-    CEMENT2 = 50,
-    CEMENT4 = 50,
+    O_BOLT = 50,
+    O_CARVE = 50,
   },
 }
 

diff --git a/games/doom/materials.lua b/games/doom/materials.lua
@@ -376,15 +376,15 @@ DOOM.MATERIALS =
 
   -- other --
 
-  O_PILL   = { t="CEMENT1",  f="O_PILL",   sane=1 },
-  O_BOLT   = { t="CEMENT2",  f="O_BOLT",   sane=1 },
-  O_RELIEF = { t="CEMENT3",  f="O_RELIEF", sane=1 },
-  O_CARVE  = { t="CEMENT4",  f="O_CARVE",  sane=1 },
-  O_NEON   = { t="CEMENT6",  f="O_NEON",  sane=1 },
+  O_PILL   = { t="O_PILL",  f="O_PILL",   sane=1 }, -- CEMENT1
+  O_BOLT   = { t="O_BOLT",  f="O_BOLT",   sane=1 }, -- CEMENT2
+  O_RELIEF = { t="O_RELIEF",  f="O_RELIEF", sane=1 }, -- CEMENT3
+  O_CARVE  = { t="O_CARVE",  f="O_CARVE",  sane=1 }, -- CEMENT4
+  O_NEON   = { t="O_NEON",  f="O_NEON",  sane=1 }, -- CEMENT6
 
-  O_BLACK  = { t="CEMENT5",  f="O_BLACK",  sane=1 },
+  O_BLACK  = { t="CEMENT5",  f="O_BLACK",  sane=1 }, -- CEMENT5
 
-  O_INVIST = { t="ZZWOLF10",  f="O_INVIST", sane=1 },
+  O_INVIST = { t="O_INVIST",  f="O_INVIST", sane=1 }, -- ZZWOLF10
 
   -- new flat, added by data/lift_flat.wad
   LIFTFLAT = { f="LIFTFLAT", t="SUPPORT2" },

diff --git a/games/doom/resources.lua b/games/doom/resources.lua
@@ -942,4 +942,8 @@ function DOOM.all_done()
   else
     gui.wad_insert_file("data/endoom/ENDOOM.bin", "ENDOOM")
   end
+
+  gui.wad_merge_sections("games/doom/data/invisible_wall.wad")
+  gui.wad_merge_sections("games/doom/data/lift_flat.wad")
+  gui.wad_merge_sections("games/doom/data/vine_dude.wad")
 end
diff --git a/modules/procedural_gotcha.lua b/modules/procedural_gotcha.lua
@@ -73,7 +73,7 @@ OB_MODULES["procedural_gotcha"] =
       name="gotcha_frequency",
       label=_("Gotcha Frequency"),
       choices=PROCEDURAL_GOTCHA_FINE_TUNE.PROC_GOTCHA_CHOICES,
-      default="final",
+      default="epi",
       tooltip = _("Procedural Gotchas are two room maps, where the second is an immediate but immensely-sized exit room with gratitiously intensified monster strength. Essentially an arena - prepare for a tough, tough fight!\n\nNotes:\n\n5% of levels may create at least 1 or 2 gotcha maps in a standard full game."),
       priority = 100,
       randomize_group="monsters",

diff --git a/modules/procedural_gotcha_edge.lua b/modules/procedural_gotcha_edge.lua
@@ -121,7 +121,7 @@ OB_MODULES["procedural_gotcha_edge"] =
       name="gotcha_frequency",
       label=_("Gotcha Frequency"),
       choices=PROCEDURAL_GOTCHA_FINE_TUNE_EDGE.PROC_GOTCHA_CHOICES,
-      default="final",
+      default="epi",
       tooltip = _("Procedural Gotchas are two room maps, where the second is an immediate but immensely-sized exit room with gratitiously intensified monster strength. Essentially an arena - prepare for a tough, tough fight!\n\nNotes:\n\n5% of levels may create at least 1 or 2 gotcha maps in a standard full game."),
       priority = 106,
       randomize_group="monsters",

diff --git a/modules/procedural_gotcha_zdoom.lua b/modules/procedural_gotcha_zdoom.lua
@@ -1807,7 +1807,7 @@ OB_MODULES["procedural_gotcha_zdoom"] =
       name="gotcha_frequency",
       label=_("Gotcha Frequency"),
       choices=PROCEDURAL_GOTCHA_FINE_TUNE_ZDOOM.PROC_GOTCHA_CHOICES,
-      default="final",
+      default="epi",
       tooltip = _("Procedural Gotchas are two room maps, where the second is an immediate but immensely-sized exit room with gratitiously intensified monster strength. Essentially an arena - prepare for a tough, tough fight!\n\nNotes:\n\n5% of levels may create at least 1 or 2 gotcha maps in a standard full game."),
       priority = 106,
       randomize_group="monsters",

diff --git a/scripts/render.lua b/scripts/render.lua
@@ -491,8 +491,7 @@ function Render_edge(LEVEL, E, SEEDS)
 
     local side_props =
     {
-      tex = "ZZWOLF10", -- currently patch-replaced as an invisible wall
-      -- TO-DO: Add a generic invisible texture for all games
+      tex = "O_INVIST",
 
       blocked = 1,
     }

diff --git a/scripts/shapes.lua b/scripts/shapes.lua
@@ -10382,6 +10382,56 @@ GROW_FEATURES_RECT_MOATED_PLATFORM_STAIRS =
   },
 },
 
+GROW_FEATURES_ROUND_PLATFORM_MOAT =
+{
+  prob = 10,
+  skip_prob = 80,
+
+  structure =
+  {
+    "11xxxxxx","11xxxxxx",
+    "........","11111111",
+    "........","11111111",
+    "........","11/~~%11",
+    "........","11~AA~11",
+    "........","11~AA~11",
+    "........","11%~A/11",
+    "........","11111111",
+    "........","11111111"
+  },
+
+  diagonals =
+  {
+    "1~","~1",
+    "1~","~1"
+  }
+},
+
+GROW_FEATURES_RAISED_RAISED_PLATFORM_MOAT =
+{
+  prob = 10,
+  skip_prob = 80,
+
+  structure =
+  {
+    "11xxxxxx","11xxxxxx",
+    "........","11111111",
+    "........","11111111",
+    "........","11/~~%11",
+    "........","11~AA~11",
+    "........","11~AA~11",
+    "........","11%~^/11",
+    "........","11111111",
+    "........","11111111"
+  },
+
+  diagonals =
+  {
+    "1~","~1",
+    "1~","~1"
+  }
+},
+
 GROW_ELEVATED_PILLAR_ROUND =
 {
   prob = 35,
@@ -15692,6 +15742,32 @@ GROW_JAGGED_LIQUID_STEEPNESS =
   }
 },
 
+GROW_JAGGED_LIQUID_STEEPNESS_DOUBLE =
+{
+  prob = 15,
+  skip_prob = 80,
+
+  structure =
+  {
+    "11xxxx","11xxxx",
+    "......","vv~~AA",
+    "......","AA%%AA",
+    "......","AA//AA",
+    "......","AA~AAA",
+    "......","AA%%AA",
+    "......","AA//AA",
+    "......","AA~AAA"
+  },
+
+  diagonals =
+  {
+    "A~","~A",
+    "A~","~A",
+    "A~","~A",
+    "A~","~A"
+  }
+},
+
 GROW_JAGGED_LIQUID_EXTENDED =
 {
   prob = 20,
@@ -15718,6 +15794,32 @@ GROW_JAGGED_LIQUID_EXTENDED =
   }
 },
 
+GROW_JAGGED_LIQUID_EXTENDED_DOUBLE =
+{
+  prob = 15,
+  skip_prob = 80,
+
+  structure =
+  {
+    "11xxxxxx","11xxxxxx",
+    "........","11~~~~11",
+    "........","111%%111",
+    "........","111//111",
+    "........","111~~111",
+    "........","111%%111",
+    "........","111//111",
+    "........","11~~1111"
+  },
+
+  diagonals =
+  {
+    "1~","~1",
+    "1~","~1",
+    "1~","~1",
+    "1~","~1"
+  }
+},
+
 GROW_JAGGED_LIQUID_3X =
 {
   prob = 25,