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

Upstream sync
obsidian-level-maker · Jul 3, 2024 · 5637d51 · 5637d51
2 parents efccd24 + 3b9cad6
commit 5637d51
Show file tree

Hide file tree

Showing 25 changed files with 96 additions and 54 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/decor/gtd_decor_tech.wad b/games/doom/fabs/decor/gtd_decor_tech.wad
diff --git a/games/doom/fabs/fence/gtd_fence_gothic.wad b/games/doom/fabs/fence/gtd_fence_gothic.wad
diff --git a/games/doom/fabs/hall/dem_conveyor_c.wad b/games/doom/fabs/hall/dem_conveyor_c.wad
diff --git a/games/doom/fabs/hall/dem_conveyorh_j.wad b/games/doom/fabs/hall/dem_conveyorh_j.wad
diff --git a/games/doom/fabs/item/dem_secret_closets_urban.lua b/games/doom/fabs/item/dem_secret_closets_urban.lua
@@ -297,9 +297,10 @@ PREFABS.Item_secret_hanging_vent_closet =
   template = "Item_secret_yard_closet1",
   map      = "MAP07",
 
+  in_porches = "never",
   jump_crouch = false,
 
-  prob  = 250,
+  prob  = 50,
 
   seed_w = 1,
   seed_h = 1,

diff --git a/games/doom/fabs/item/gtd_item_closet_hell.wad b/games/doom/fabs/item/gtd_item_closet_hell.wad
diff --git a/games/doom/fabs/joiner/armaetus_joiner_keyed_bars.wad b/games/doom/fabs/joiner/armaetus_joiner_keyed_bars.wad
diff --git a/games/doom/fabs/joiner/dem_urban_joiners.wad b/games/doom/fabs/joiner/dem_urban_joiners.wad
diff --git a/games/doom/fabs/joiner/gtd_barred.wad b/games/doom/fabs/joiner/gtd_barred.wad
diff --git a/games/doom/fabs/joiner/gtd_dem_duct_room_joiner.wad b/games/doom/fabs/joiner/gtd_dem_duct_room_joiner.wad
diff --git a/games/doom/fabs/joiner/gtd_universal_joiners.lua b/games/doom/fabs/joiner/gtd_universal_joiners.lua
@@ -64,7 +64,7 @@ PREFABS.Joiner_gtd_universal_funnel =
   over = 16,
 
   x_fit = { 120,137 },
-  y_fit = { 24,28 , 132,140 },
+  y_fit = { 20,28 , 132,140 },
 
   can_flip = true,
 }

diff --git a/games/doom/fabs/joiner/gtd_universal_joiners.wad b/games/doom/fabs/joiner/gtd_universal_joiners.wad
diff --git a/games/doom/fabs/picture/craneo_pic_bunkerbeds.wad b/games/doom/fabs/picture/craneo_pic_bunkerbeds.wad
diff --git a/games/doom/fabs/picture/dem_pic_urban_downtown_yards.wad b/games/doom/fabs/picture/dem_pic_urban_downtown_yards.wad
diff --git a/games/doom/fabs/skybox/gtd_skybox_char_EPIC.wad b/games/doom/fabs/skybox/gtd_skybox_char_EPIC.wad
diff --git a/games/doom/fabs/stairs/gtd_standing_stairs_32.wad b/games/doom/fabs/stairs/gtd_standing_stairs_32.wad
diff --git a/games/doom/fabs/stairs/gtd_standing_stairs_64.wad b/games/doom/fabs/stairs/gtd_standing_stairs_64.wad
diff --git a/games/doom/fabs/switch/dem_switch_closet.wad b/games/doom/fabs/switch/dem_switch_closet.wad
diff --git a/games/doom/fabs/teleporter/scionox_dual_teleport.wad b/games/doom/fabs/teleporter/scionox_dual_teleport.wad
diff --git a/modules/prefab_controller.lua b/modules/prefab_controller.lua
@@ -148,21 +148,20 @@ function PREFAB_CONTROL.fine_tune_filters()
   }
   local new_themes_multipliers =
   {
-    any_copperRust = 2,
+    any_copperRust = 1.25,
 
-    tech_silver_grate = 1.25,
     tech_bumblebee = 2,
-    tech_aww2 = 2,
-    tech_iStuff = 2,
+    tech_aww2 = 1.5,
+    tech_iStuff = 1.5,
     tech_beigetownTech = 3,
     --
 
-    urban_computerCatacombs = 1.25,
-    urban_iStuff = 2,
+    urban_computerCatacombs = 1.75,
+    urban_iStuff = 1.5,
     urban_beigetownTech = 3,
     --
 
-    hell_computerCatacombs = 1.25
+    hell_computerCatacombs = 1.75
   }
   local themes =
   {

diff --git a/modules/zdoom_armaetus_materials.lua b/modules/zdoom_armaetus_materials.lua
@@ -1720,6 +1720,9 @@ OBS_RESOURCE_PACK_MATERIALS = {
   SD_TWDF3 = { t="SD_TWDW3", f="SD_TWDF3"},
   SD_TWDF4 = { t="SD_TWDW6", f="SD_TWDF4"},
   SD_TWDF5 = { t="SD_TWDW5", f="SD_TWDF5"},
+  SD_TWDF6 = { t="SD_TWDW6", f="SD_TWDF1"},
+  SD_TWDF7 = { t="SD_TWDW7", f="SD_TWDF3"},
+  SD_TWDF8 = { t="SD_TWDW8", f="SD_TWDF5"},
   -- lights
   SD_TWDL1 = { t="SD_TWDL1", f="SD_TWDF6"},
   SD_TWDL2 = { t="SD_TWDL2", f="SD_TWDF5"},
@@ -2003,17 +2006,15 @@ OBS_RESOURCE_PACK_MATERIALS = {
   SD_HCCWA = { t="SD_HCCWA", f="SD_HCCF4"},
   SD_HCCWB = { t="SD_HCCWB", f="SD_HCCF6"},
   SD_HCCWC = { t="SD_HCCWC", f="SD_HCCF8"},
-  SD_HCCWD = { t="SD_HCCWD", f="SD_HCCF3"},
-  SD_HCCWE = { t="SD_HCCWE", f="SD_HCCF5"},
   -- flats
   SD_HCCF1 = { t="SD_HCCW1", f="SD_HCCF1"},
-  SD_HCCF2 = { t="SD_HCCW3", f="SD_HCCF2"},
-  SD_HCCF3 = { t="SD_HCCW5", f="SD_HCCF3"},
-  SD_HCCF4 = { t="SD_HCCW7", f="SD_HCCF4"},
-  SD_HCCF5 = { t="SD_HCCW9", f="SD_HCCF5"},
-  SD_HCCF6 = { t="SD_HCCWB", f="SD_HCCF6"},
-  SD_HCCF7 = { t="SD_HCCWD", f="SD_HCCF7"},
-  SD_HCCF8 = { t="SD_HCCWE", f="SD_HCCF8"},
+  SD_HCCF2 = { t="SD_HCCW2", f="SD_HCCF2"},
+  SD_HCCF3 = { t="SD_HCCW3", f="SD_HCCF3"},
+  SD_HCCF4 = { t="SD_HCCW5", f="SD_HCCF4"},
+  SD_HCCF5 = { t="SD_HCCW7", f="SD_HCCF5"},
+  SD_HCCF6 = { t="SD_HCCW9", f="SD_HCCF6"},
+  SD_HCCF7 = { t="SD_HCCWA", f="SD_HCCF7"},
+  SD_HCCF8 = { t="SD_HCCWC", f="SD_HCCF8"},
 
   --
   TOFFBOX1 = {t="TOFFBOX1", f="FLAT23"},
@@ -3104,6 +3105,41 @@ brightmap texture S_W2WALE
   map SW2WLEBR
 }
 
+brightmap texture SD_HCCW1
+{
+  map SDBRHCW1
+}
+
+brightmap texture SD_HCCW2
+{
+  map SDBRHCW2
+}
+  
+brightmap texture SD_HCCW3
+{
+  map SDBRHCW3
+}
+  
+brightmap texture SD_HCCW7
+{
+  map SDBRHCW7
+}
+  
+brightmap texture SD_HCCW8
+{
+  map SDBRHCW8
+}
+
+brightmap texture SD_HCCW9
+{
+  map SDBRHCW9
+}
+
+brightmap texture SD_HCCWC
+{
+  map SDBRHCWC
+}
+
 ]]
 
 -- aliases - when you're too lazy to write down wall and flat names in every

diff --git a/modules/zdoom_armaetus_themes.lua b/modules/zdoom_armaetus_themes.lua
@@ -2123,11 +2123,14 @@ OBS_RESOURCE_PACK_ROOM_THEMES =
 
     floors =
     {
-      SD_TWDW1 = 30,
-      SD_TWDW2 = 30,
-      SD_TWDW3 = 30,
-      SD_TWDW4 = 30,
-      SD_TWDW5 = 30, -- deliberate use of this material for floors
+      SD_TWDF1 = 30,
+      SD_TWDF2 = 30,
+      SD_TWDF3 = 30,
+      SD_TWDF4 = 30,
+      SD_TWDF5 = 30,
+      SD_TWDF6 = 30,
+      SD_TWDF7 = 30,
+      SD_TWDF8 = 30,
 
       FLAT1 = 5,
       FLAT20 = 2,
@@ -2180,11 +2183,14 @@ OBS_RESOURCE_PACK_ROOM_THEMES =
 
     ceilings =
     {
-      SD_TWDW1 = 30,
-      SD_TWDW2 = 30,
-      SD_TWDW3 = 30,
-      SD_TWDW4 = 30,
-      SD_TWDW5 = 30, -- deliberate use of this material for floors
+      SD_TWDF1 = 30,
+      SD_TWDF2 = 30,
+      SD_TWDF3 = 30,
+      SD_TWDF4 = 30,
+      SD_TWDF5 = 30,
+      SD_TWDF6 = 30,
+      SD_TWDF7 = 30,
+      SD_TWDF8 = 30,
 
       FLAT1 = 5,
       FLAT20 = 2,
@@ -5109,9 +5115,7 @@ OBS_RESOURCE_PACK_ROOM_THEMES =
       SD_HCCW9 = 25,
       SD_HCCWA = 25,
       SD_HCCWB = 25,
-      SD_HCCWC = 25,
-      SD_HCCWD = 25,
-      SD_HCCWE = 25
+      SD_HCCWC = 25
     },
 
     floors =
@@ -6699,12 +6703,14 @@ OBS_RESOURCE_PACK_ROOM_THEMES =
 
     floors =
     {
-      SD_TWDW1 = 30,
-      SD_TWDW2 = 30,
-      SD_TWDW3 = 30,
-      SD_TWDW4 = 30,
-      SD_TWDW5 = 30, -- deliberate use of this material for floors
-      SD_TWDW6 = 30,
+      SD_TWDF1 = 30,
+      SD_TWDF2 = 30,
+      SD_TWDF3 = 30,
+      SD_TWDF4 = 30,
+      SD_TWDF5 = 30,
+      SD_TWDF6 = 30,
+      SD_TWDF7 = 30,
+      SD_TWDF8 = 30,
 
       FLAT1 = 5,
       FLAT20 = 2,
@@ -6757,12 +6763,14 @@ OBS_RESOURCE_PACK_ROOM_THEMES =
 
     ceilings =
     {
-      SD_TWDW1 = 30,
-      SD_TWDW2 = 30,
-      SD_TWDW3 = 30,
-      SD_TWDW4 = 30,
-      SD_TWDW5 = 30, -- deliberate use of this material for floors
-      SD_TWDW6 = 30,
+      SD_TWDF1 = 30,
+      SD_TWDF2 = 30,
+      SD_TWDF3 = 30,
+      SD_TWDF4 = 30,
+      SD_TWDF5 = 30,
+      SD_TWDF6 = 30,
+      SD_TWDF7 = 30,
+      SD_TWDF8 = 30,
 
       FLAT1 = 5,
       FLAT20 = 2,
@@ -7690,9 +7698,7 @@ OBS_RESOURCE_PACK_ROOM_THEMES =
       SD_HCCW9 = 25,
       SD_HCCWA = 25,
       SD_HCCWB = 25,
-      SD_HCCWC = 25,
-      SD_HCCWD = 25,
-      SD_HCCWE = 25
+      SD_HCCWC = 25
     },
 
     floors =

diff --git a/scripts/shapes.lua b/scripts/shapes.lua
@@ -4896,8 +4896,8 @@ GROW_LIQUID_POOL_WIDE_COLONNADED_TRIPLE =
 
   diagonals =
   {
-    "1A","1A","A1","1A",
-    "1A","1A","A1","1A"
+    "A1","1A","A1","1A",
+    "A1","1A","A1","1A"
   }
 },
 
@@ -5627,10 +5627,10 @@ GROW_OVAL_SPLIT_NEW_AREA =
 
   diagonals =
   {
-      ".1",".A","A.",
+      ".1","1A","A.",
     ".1","1.",".A","A.",
     ".1","1.",".A","A.",
-      ".1","1.","A."
+      ".1","1A","A."
   }
 },
 
@@ -5657,12 +5657,12 @@ GROW_OVAL_SPLIT_NEW_AREA_BIG =
 
   diagonals =
   {
-      ".1",".A","A.",
+      ".1","1A","A.",
     ".1","1.",".A","A.",
           "1.",".A",
           "1.",".A",
     ".1","1.",".A","A.",
-      ".1","1.","A."
+      ".1","1A","A."
   }
 },
 
@@ -8838,7 +8838,7 @@ GROW_MAZE_SIDE_BUMP =
   diagonals =
   {
     "1.",
-    ".1"
+    "1."
   }
 },
 
@@ -8865,7 +8865,7 @@ GROW_MAZE_SIDE_BUMP_CAGE =
   diagonals =
   {
     "1.",
-    ".1"
+    "1."
   }
 },