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

Upstream sync

games/doom/fabs/picture/dem_pic_fake_windows.lua

@@ -557,7 +557,7 @@ PREFABS.Pic_dem_windows_deco19 =
 
   port = "zdoom",
 
-  prob   = 40,
+  prob   = 0,
 
   theme  = "hell",
 

modules/prefab_controller.lua

@@ -142,21 +142,22 @@ function PREFAB_CONTROL.fine_tune_filters()
   }
   local new_fab_groups_multipliers =
   {
-    gtd_AI_goth_comp_yellow_stained_glass = 1.12,
+    --[[gtd_AI_goth_comp_yellow_stained_glass = 1.12,
     gtd_AI_boiler_room = 1.25,
     gtd_AI_boiler_control_unit = 1.25,
-    gtd_AI_corpse_inset = 1.5
+    gtd_AI_corpse_inset = 1.5]]
   }
   local new_themes_multipliers =
   {
-    tech_wood_lab = 1.25,
-    tech_bunker = 1.5,
-    tech_cableSocketCatacombs = 2,
+    tech_cableSocketCatacombs = 1,
+    tech_bumblebee = 1.5,
+    tech_aww2 = 1.5,
+    tech_iStuff = 1.5,
     --
-    urban_wood_lab = 1.25,
-    urban_bunker = 1.5,
+    urban_beigetownTech = 1.5,
+    urban_iStuff = 1.5,
     --
-    hell_cableSocketCatacombs = 2
+    hell_cableSocketCatacombs = 1.25
   }
   local themes =
   {

modules/zdoom_armaetus_materials.lua

@@ -2060,6 +2060,57 @@ brightmap texture COMPCT07
   map OBRCPCT2
 }
 
+brightmap texture COMPFUZ1
+{
+  map CMPFUZBR
+}
+brightmap texture COMPFUZ2
+{
+  map CMPFUZBR
+}
+brightmap texture COMPFUZ3
+{
+  map CMPFUZBR
+}
+brightmap texture COMPFUZ4
+{
+  map CMPFUZBR
+}
+
+brightmap texture CGCANI00
+{
+  map CGANIBR
+}
+brightmap texture CGCANI01
+{
+  map CGANIBR
+}
+brightmap texture CGCANI02
+{
+  map CGANIBR
+}
+brightmap texture CGCANI03
+{
+  map CGANIBR
+}
+brightmap texture CGCANI04
+{
+  map CGANIBR
+}
+brightmap texture CGCANI05
+{
+  map CGANIBR
+}
+brightmap texture CGCANI06
+{
+  map CGANIBR
+}
+brightmap texture CGCANI07
+{
+  map CGANIBR
+}
+
+
 // silver light variations
 brightmap texture SILVER2R
 {
@@ -2171,6 +2222,10 @@ brightmap texture COMPSD4
 {
   map OBRCPSD1
 }
+brightmap texture COMPSD5
+{
+  map OBRCPSD1
+}
 brightmap texture COMPSD6
 {
   map OBRCPSD1
@@ -2555,6 +2610,11 @@ brightmap texture SDOM_WL2
   map SDMWL2BR
 }
 
+brightmap texture SDOM_WL5
+{
+  map SDMWL5BR
+}
+
 brightmap texture SD_GTHW1
 {
   map SDGHW1BR
@@ -2655,9 +2715,9 @@ brightmap texture SD_TSGWC
   map STGSWCBR
 }
 
-brightmap texture S_W2WALE
+brightmap texture S_W2WAL4
 {
-  map SW2WLEBR
+  map SW2WBR4
 }
 
 brightmap texture SD_HCCW1
@@ -2829,6 +2889,37 @@ brightmap texture SDHCCBWC
 {
   map SDHCCBRC
 }
+
+// iStuff wall brightmaps
+brightmap texture SDIPHWL2
+{
+  map SDIPHBR2
+}
+
+brightmap texture SDIPHWL5
+{
+  map SDIPHBR5
+}
+
+brightmap texture SDIPHWL7
+{
+  map SDIPHBR7
+}
+
+brightmap texture SDIPHWL8
+{
+  map SDIPHBR8
+}
+
+brightmap texture SDIPHWL9
+{
+  map SDIPHBR9
+}
+
+brightmap texture SDIPHWLA
+{
+  map SDIPHBRA
+}
 ]]
 
 -- aliases - when you're too lazy to write down wall and flat names in every

modules/zdoom_orp_generative_resources.lua

@@ -539,6 +539,7 @@ OBS_RESOURCE_PACK_GENAI_MATERIALS =
   SDIPHWL9 = {t="SDIPHWL9", f="SDIPHFT6"},
   SDIPHWLA = {t="SDIPHWLA", f="SDIPHFT6"},
   SDIPHWLB = {t="SDIPHWLB", f="SDIPHFT7"},
+  SDIPHWLC = {t="SDIPHWLC", f="SDIPHFT7"},
   -- flats
   SDIPHFT1 = {t="SDIPHWL1", f="SDIPHFT1"},
   SDIPHFT2 = {t="SDIPHWL2", f="SDIPHFT2"},
@@ -755,7 +756,8 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SDIPHWL8 = 4,
       SDIPHWL9 = 4,
       SDIPHWLA = 4,
-      SDIPHWLB = 4
+      SDIPHWLB = 4,
+      SDIPHWLC = 4
     },
 
     floors =
@@ -1780,6 +1782,7 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SDIPHWL9 = 20,
       SDIPHWLA = 20,
       SDIPHWLB = 20,
+      SDIPHWLC = 20,
 
       BROWN2 = 5,
       BROWN3 = 5,
@@ -4440,6 +4443,7 @@ OBS_RESOURCE_PACK_GENAI_ROOM_THEMES =
       SDIPHWL9 = 20,
       SDIPHWLA = 20,
       SDIPHWLB = 20,
+      SDIPHWLC = 20,
 
       BROWN2 = 5,
       BROWN3 = 5,