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

Upstream sync
obsidian-level-maker · Aug 22, 2024 · d45dadb · d45dadb
2 parents 3a68899 + 00d56b9
commit d45dadb
Show file tree

Hide file tree

Showing 11 changed files with 271 additions and 17 deletions.
diff --git a/games/doom/data/ObAddon_Textures_2.wad b/games/doom/data/ObAddon_Textures_2.wad
diff --git a/games/doom/data/ObAddon_Textures_Brightmaps.wad b/games/doom/data/ObAddon_Textures_Brightmaps.wad
diff --git a/games/doom/fabs/joiner/gtd_barred.lua b/games/doom/fabs/joiner/gtd_barred.lua
@@ -1,12 +1,13 @@
 PREFABS.Joiner_gtd_barred1 =
 {
   file   = "joiner/gtd_barred.wad",
+  map    = "MAP01",
   where  = "seeds",
   shape  = "I",
 
   key    = "barred",
 
-  prob   = 70,
+  prob   = 50,
 
   seed_w = 2,
   seed_h = 1,
@@ -20,3 +21,11 @@ PREFABS.Joiner_gtd_barred1 =
   tag_1  = "?door_tag",
   door_action = "S1_OpenDoor",
 }
+
+PREFABS.Joiner_gtd_barred2 =
+{
+  template = "Joiner_gtd_barred1",
+  map = "MAP02",
+
+  x_fit = {32,40 , 62,72 , 124,132 , 184,192 , 216,224}
+}
diff --git a/games/doom/fabs/joiner/gtd_barred.wad b/games/doom/fabs/joiner/gtd_barred.wad
diff --git a/games/doom/fabs/wall/gtd_wall_hell_vaults.wad b/games/doom/fabs/wall/gtd_wall_hell_vaults.wad
diff --git a/games/doom/fabs/window/gtd_window_chainlinks.wad b/games/doom/fabs/window/gtd_window_chainlinks.wad
diff --git a/games/doom/fabs/window/gtd_window_low.wad b/games/doom/fabs/window/gtd_window_low.wad
diff --git a/games/doom/fabs/window/gtd_window_tech_abstract.wad b/games/doom/fabs/window/gtd_window_tech_abstract.wad
diff --git a/modules/zdoom_armaetus_epic_textures.lua b/modules/zdoom_armaetus_epic_textures.lua
@@ -665,6 +665,10 @@ end
 
 
 function OBS_RESOURCE_PACK_EPIC_TEXTURES.synthesize_procedural_themes()
+  if PARAM.bool_orp_room_theme_synthesizer == false then
+    return
+  end
+
   local function pick_element(lev_theme, texture_type)
     local t, RT = {}
     local result
@@ -702,7 +706,7 @@ function OBS_RESOURCE_PACK_EPIC_TEXTURES.synthesize_procedural_themes()
     end
 
     t.env = "building"
-    t.prob = rand.pick({20,30,40,50,60})
+    t.prob = rand.pick({20,30,40,50,60}) * PARAM.float_orp_room_theme_synth_mult
 
     t.floors[pick_element(theme, "floors")] = 5
     t.floors[pick_element(theme, "floors")] = 5
@@ -1314,7 +1318,29 @@ OB_MODULES["armaetus_epic_textures"] =
       valuator = "button",
       default = 0,
       tooltip = _("Renders hell theme maps to never use snow or desert environment themes regardless of theme assignment."),
-      priority= -3
+      priority= -3,
+      gap = 1
+    },
+
+    {
+      name = "bool_orp_room_theme_synthesizer",
+      label = _("Room Theme Synthesizer [Experimental]"),
+      valuator = "button",
+      default = 1,
+      priority = -4,
+      tooltip = _("Creates synthetic room themes by combining walls and flats from existing entries.")
+    },
+    {
+      name = "float_orp_room_theme_synth_mult",
+      label = _("Synth Room Theme Multiplier"),
+      valuator = "slider",
+      units="x",
+      min=0,
+      max=20,
+      increment = 0.1,
+      default = 1,
+      tooltip = _("Multiplier for all synthesized Resource Pack room themes."),
+      priority = -5,
     }
   }
 }
diff --git a/modules/zdoom_armaetus_materials.lua b/modules/zdoom_armaetus_materials.lua
@@ -2303,6 +2303,40 @@ brightmap texture GOTH21
 {
   map OBRGT21
 }
+brightmap texture GOTH04
+{
+  map GOTH04BR
+}
+brightmap texture GOTH19
+{
+  map GOTH19BR
+}
+brightmap texture GOTH20
+{
+  map GOTH20BR
+}
+brightmap texture GOTH33
+{
+  map GOTH33BR
+}
+
+// gothic lavafalls
+brightmap texture MFALL1
+{
+  map MFALLBR
+}
+brightmap texture MFALL2
+{
+  map MFALLBR
+}
+brightmap texture MFALL3
+{
+  map MFALLBR
+}
+brightmap texture MFALL4
+{
+  map MFALLBR
+}
 
 // gothic switches
 brightmap texture SW2SKUL1
@@ -2616,6 +2650,11 @@ brightmap texture SD_TSGWB
   map STGSWBBR
 }
 
+brightmap texture SD_TSGWC
+{
+  map STGSWCBR
+}
+
 brightmap texture S_W2WALE
 {
   map SW2WLEBR