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

Upstream sync
obsidian-level-maker · Jun 22, 2024 · b09f1ac · b09f1ac
2 parents 8d12944 + 0606191
commit b09f1ac
Show file tree

Hide file tree

Showing 7 changed files with 202 additions and 33 deletions.
diff --git a/games/doom/data/ObAddon_Textures_2.wad b/games/doom/data/ObAddon_Textures_2.wad
diff --git a/games/doom/fabs/wall/gtd_wall_industrial_modwall.lua b/games/doom/fabs/wall/gtd_wall_industrial_modwall.lua
@@ -42,6 +42,8 @@ PREFABS.Wall_industrial_modwall_1_hell =
 
   prob = 50,
 
+  bound_z2 = 128,
+
   height = 128
 }
 
@@ -50,23 +52,25 @@ PREFABS.Wall_industrial_modwall_1a_hell =
   template = "Wall_industrial_modwall_1",
   map = "MAP52",
 
+  prob = 120,
   theme = "hell",
   rank = 1,
 
-  prob = 120
+  bound_z2 = 128
 }
 
 PREFABS.Wall_industrial_modwall_1a_hell_diag =
 {
   template = "Wall_industrial_modwall_1",
   map = "MAP53",
 
+  prob = 120,
   theme = "hell",
   rank = 1,
 
   where = "diagonal",
 
-  prob = 120
+  bound_z2 = 128
 }
 
 --

diff --git a/games/doom/fabs/wall/gtd_wall_industrial_modwall.wad b/games/doom/fabs/wall/gtd_wall_industrial_modwall.wad
diff --git a/modules/miscellaneous.lua b/modules/miscellaneous.lua
@@ -409,7 +409,7 @@ OB_MODULES["misc"] =
       label=_("Passable Windows"),
       choices=MISC_STUFF.WINDOW_BLOCKING_CHOICES,
       tooltip=_("Sets the preferences for passability on certain windows. On Vistas Only means only windows that look out to vistas/map border scenics have a blocking line."),
-      default="not_on_vistas",
+      default="never",
       priority = 82,
       complex_mode = true
     },
@@ -419,7 +419,7 @@ OB_MODULES["misc"] =
       choices=MISC_STUFF.RAIL_BLOCKING_CHOICES,
       tooltip=_("Sets the passability of railing junctions between full impassability or the 3D midtex flag. Occasional means 3D midtex is only used on railings between areas the player is supposed to circumvent. Always means the inclusion of cages and scenic rails, allowing flying monsters to potentially escape.\n\nNote: 3D midtex lines currently *block* projectiles as well."),
       default="never",
-      priority = 81,
+      priority = 81, 
       gap=1,
       complex_mode = true
     },

diff --git a/modules/prefab_controller.lua b/modules/prefab_controller.lua
@@ -142,45 +142,27 @@ function PREFAB_CONTROL.fine_tune_filters()
   }
   local new_fab_groups_multipliers =
   {
-    tech_o_letter_M = 1.5,
-    tech_o_letter_N = 1.5,
-    tech_o_letter_O = 1.5,
-    tech_o_letter_P = 1.5,
-    tech_o_letter_Q = 1.5,
-    --
     gtd_mscottpaper = 1.25,
     --
-    gtd_pools = 3
+    gtd_pools = 1.25
   }
   local new_themes_multipliers =
   {
     any_copperRust = 2,
 
-    tech_goth_tech = 1.25,
-    tech_wood_lab = 1.25,
-    tech_dk_green_tech = 1.25,
-    tech_copper_steampunk = 1.25,
-    tech_wood_lab = 1.5,
-    tech_wood_comp = 1.5,
-    tech_silver_grate = 1.75,
-    tech_bumblebee = 1.5,
-    tech_aww2 = 2.25,
-
-    urban_evil_mansion = 1.25,
-    urban_kievan_rus = 1.5,
-    urban_new_york_art_deco = 1.5,
-    urban_computerCatacombs = 1.75,
-
-    hell_green_tk = 1.25,
-    hell_evil_mansion = 1.5,
-    hell_kievan_rus = 1.5,
-    hell_new_york_art_deco = 1.5,
-    hell_computerCatacombs = 1.75,
+    tech_silver_grate = 1.25,
+    tech_bumblebee = 1.25,
+    tech_aww2 = 2,
+    tech_iStuff = 2,
+    tech_beigetownTech = 3,
+    --
 
+    urban_computerCatacombs = 1.25,
+    urban_iStuff = 2,
+    urban_beigetownTech = 3,
     --
 
-    tech_iStuff = 2.75,
-    urban_iStuff = 2.75
+    hell_computerCatacombs = 1.25
   }
   local themes =
   {

diff --git a/modules/zdoom_armaetus_materials.lua b/modules/zdoom_armaetus_materials.lua
@@ -1807,6 +1807,33 @@ OBS_RESOURCE_PACK_MATERIALS = {
   SD_TBBFC = { t="SD_TBBWC", f="SD_TBBFC"},
   SD_TBBFD = { t="SD_TBBW6", f="SD_TBBFD"},
 
+  -- bumblebee beige
+  -- walls
+  SDBGTWL1 = { t="SDBGTWL1", f="SDBGTFT1"},
+  SDBGTWL2 = { t="SDBGTWL2", f="SDBGTFT2"},
+  SDBGTWL3 = { t="SDBGTWL3", f="SDBGTFT3"},
+  SDBGTWL4 = { t="SDBGTWL4", f="SDBGTFT4"},
+  SDBGTWL5 = { t="SDBGTWL5", f="SDBGTFT5"},
+  SDBGTWL6 = { t="SDBGTWL6", f="SDBGTFT6"},
+  SDBGTWL7 = { t="SDBGTWL7", f="SDBGTFT7"},
+  SDBGTWL8 = { t="SDBGTWL8", f="SDBGTFT8"},
+  SDBGTWL9 = { t="SDBGTWL9", f="SDBGTFT1"},
+  SDBGTWLA = { t="SDBGTWLA", f="SDBGTFT2"},
+  SDBGTWLB = { t="SDBGTWLB", f="SDBGTFT3"},
+  SDBGTWLC = { t="SDBGTWLC", f="SDBGTFT4"},
+  SDBGTWLD = { t="SDBGTWLD", f="SDBGTFT5"},
+  SDBGTWLE = { t="SDBGTWLE", f="SDBGTFT6"},
+  SDBGTWLF = { t="SDBGTWLF", f="SDBGTFT8"},
+  -- floors
+  SDBGTFT1 = { t="SDBGTWL1", f="SDBGTFT1"},
+  SDBGTFT2 = { t="SDBGTWL3", f="SDBGTFT2"},
+  SDBGTFT3 = { t="SDBGTWL5", f="SDBGTFT3"},
+  SDBGTFT4 = { t="SDBGTWL7", f="SDBGTFT4"},
+  SDBGTFT5 = { t="SDBGTWL9", f="SDBGTFT5"},
+  SDBGTFT6 = { t="SDBGTWLB", f="SDBGTFT6"},
+  SDBGTFT7 = { t="SDBGTWLD", f="SDBGTFT7"},
+  SDBGTFT8 = { t="SDBGTWLF", f="SDBGTFT8"},
+
   -- MSSP-URBAN --
   -- New Yorker art deco
   SD_UADW1 = { t="SD_UADW1", f="SD_UADF1"},

diff --git a/modules/zdoom_armaetus_themes.lua b/modules/zdoom_armaetus_themes.lua
@@ -2556,6 +2556,84 @@ OBS_RESOURCE_PACK_ROOM_THEMES =
     }
   },
 
+  tech_beigetownTech = -- 40
+  {
+    env = "building",
+    prob = 40,
+
+    is_generative = true,
+
+    walls =
+    {
+      BROWN1 = 8,
+      BROWNPIP = 8,
+      STUCCO = 8,
+      STUCCO1 = 8,
+      STARTAN2 = 8,
+      STARTAN3 = 8,
+
+      SDBGTWL1 = 25,
+      SDBGTWL2 = 25,
+      SDBGTWL3 = 25,
+      SDBGTWL4 = 25,
+      SDBGTWL5 = 25,
+      SDBGTWL6 = 25,
+      SDBGTWL7 = 25,
+      SDBGTWL8 = 25,
+      SDBGTWL9 = 25,
+      SDBGTWLA = 25,
+      SDBGTWLB = 25,
+      SDBGTWLC = 25,
+      SDBGTWLD = 25,
+      SDBGTWLE = 25,
+      SDBGTWLF = 25
+    },
+
+    floors =
+    {
+      FLAT20 = 5,
+      FLAT3 = 5,
+      FLOOR0_3 = 5,
+      FLOOR0_5 = 5,
+      SLIME14 = 5,
+      GRATE1 = 5,
+      GRATE5 = 5,
+      GRATE6 = 5,
+      GRATE7 = 5,
+
+      SDBGTFT1 = 25,
+      SDBGTFT2 = 25,
+      SDBGTFT3 = 25,
+      SDBGTFT4 = 25,
+      SDBGTFT5 = 25,
+      SDBGTFT6 = 25,
+      SDBGTFT7 = 25,
+      SDBGTFT8 = 25
+    },
+
+    ceilings =
+    {
+      FLAT20 = 5,
+      FLAT3 = 5,
+      FLOOR0_3 = 5,
+      FLOOR0_5 = 5,
+      SLIME14 = 5,
+      GRATE1 = 5,
+      GRATE5 = 5,
+      GRATE6 = 5,
+      GRATE7 = 5,
+
+      SDBGTFT1 = 25,
+      SDBGTFT2 = 25,
+      SDBGTFT3 = 25,
+      SDBGTFT4 = 25,
+      SDBGTFT5 = 25,
+      SDBGTFT6 = 25,
+      SDBGTFT7 = 25,
+      SDBGTFT8 = 25
+    }
+  },
+
   tech_aww2 = --50
   {
     env = "building",
@@ -7745,6 +7823,84 @@ OBS_RESOURCE_PACK_ROOM_THEMES =
       FLOOR0_5 = 4,
       SLIME14 = 3
     }
+  },
+
+  urban_beigetownTech = --30
+  {
+    env = "building",
+    prob = 30,
+
+    is_generative = true,
+
+    walls =
+    {
+      BROWN1 = 8,
+      BROWNPIP = 8,
+      STUCCO = 8,
+      STUCCO1 = 8,
+      STARTAN2 = 8,
+      STARTAN3 = 8,
+
+      SDBGTWL1 = 25,
+      SDBGTWL2 = 25,
+      SDBGTWL3 = 25,
+      SDBGTWL4 = 25,
+      SDBGTWL5 = 25,
+      SDBGTWL6 = 25,
+      SDBGTWL7 = 25,
+      SDBGTWL8 = 25,
+      SDBGTWL9 = 25,
+      SDBGTWLA = 25,
+      SDBGTWLB = 25,
+      SDBGTWLC = 25,
+      SDBGTWLD = 25,
+      SDBGTWLE = 25,
+      SDBGTWLF = 25
+    },
+
+    floors =
+    {
+      FLAT20 = 5,
+      FLAT3 = 5,
+      FLOOR0_3 = 5,
+      FLOOR0_5 = 5,
+      SLIME14 = 5,
+      GRATE1 = 5,
+      GRATE5 = 5,
+      GRATE6 = 5,
+      GRATE7 = 5,
+
+      SDBGTFT1 = 25,
+      SDBGTFT2 = 25,
+      SDBGTFT3 = 25,
+      SDBGTFT4 = 25,
+      SDBGTFT5 = 25,
+      SDBGTFT6 = 25,
+      SDBGTFT7 = 25,
+      SDBGTFT8 = 25
+    },
+
+    ceilings =
+    {
+      FLAT20 = 5,
+      FLAT3 = 5,
+      FLOOR0_3 = 5,
+      FLOOR0_5 = 5,
+      SLIME14 = 5,
+      GRATE1 = 5,
+      GRATE5 = 5,
+      GRATE6 = 5,
+      GRATE7 = 5,
+
+      SDBGTFT1 = 25,
+      SDBGTFT2 = 25,
+      SDBGTFT3 = 25,
+      SDBGTFT4 = 25,
+      SDBGTFT5 = 25,
+      SDBGTFT6 = 25,
+      SDBGTFT7 = 25,
+      SDBGTFT8 = 25
+    }
   }
 -- END OF THEMES TABLES
 }