Upstream content sync

games/doom/fabs/decor/gtd_decor_mscottpaper_set_EPIC.lua

@@ -12,13 +12,15 @@ PREFABS.Decor_mscott_1 =
   height = 65,
 
   bound_z1 = 0,
-  bound_z2 = 64,
+  bound_z2 = 65,
 
   tex_TOFFBOX2 =
   {
     TOFFBOX1 = 4,
     TOFFBOX2 = 1
-  }
+  },
+
+  z_fit = "top"
 }
 
 PREFABS.Decor_mscott_2 =
@@ -27,7 +29,7 @@ PREFABS.Decor_mscott_2 =
   map = "MAP02",
 
   height = 57,
-  bound_z2 = 56
+  bound_z2 = 57
 }
 
 PREFABS.Decor_mscott_3 =
@@ -36,7 +38,7 @@ PREFABS.Decor_mscott_3 =
   map = "MAP03",
 
   height = 48,
-  bound_z2 = 48
+  bound_z2 = 49
 }
 
 PREFABS.Decor_mscott_4 =
@@ -49,7 +51,7 @@ PREFABS.Decor_mscott_4 =
   size = 96,
 
   height = 89,
-  bound_z2 = 88
+  bound_z2 = 89
 }
 
 PREFABS.Decor_mscott_5 =
@@ -62,7 +64,7 @@ PREFABS.Decor_mscott_5 =
   size = 96,
 
   height = 129,
-  bound_z2 = 128 
+  bound_z2 = 129
 }
 
 PREFABS.Decor_mscott_6 =
@@ -75,7 +77,7 @@ PREFABS.Decor_mscott_6 =
   size = 96,
 
   height = {129, 256},
-  bound_z2 = 128 
+  bound_z2 = 129
 }
 
 PREFABS.Decor_mscott_7 =
@@ -88,5 +90,5 @@ PREFABS.Decor_mscott_7 =
   size = 96,
 
   height = {129, 256},
-  bound_z2 = 128 
+  bound_z2 = 129
 }

games/doom/fabs/wall/gtd_wall_industrial_mscottpaper_set_EPIC.lua

@@ -0,0 +1,53 @@
+PREFABS.Wall_mscott_window_1 =
+{
+  file = "wall/gtd_wall_industrial_mscottpaper_set_EPIC.wad",
+  map = "MAP01",
+
+  prob = 50,
+  group = "gtd_mscottpaper",
+
+  where = "edge",
+  deep = 16,
+  height = 96,
+
+  bound_z1 = 0,
+  bound_z2 = 96,
+
+  z_fit = { 87,88 }
+}
+
+PREFABS.Wall_mscott_window_2 =
+{
+  template = "Wall_mscott_window_1",
+  map = "MAP02",
+
+  prob = 10
+}
+
+PREFABS.Wall_mscott_window_3 =
+{
+  template = "Wall_mscott_window_1",
+  map = "MAP03",
+
+  prob = 10
+}
+
+PREFABS.Wall_mscott_shelving_1 =
+{
+  template = "Wall_mscott_window_1",
+  map = "MAP04",
+
+  prob = 10,
+
+  z_fit = "top"
+}
+
+PREFABS.Wall_mscott_shelving_2 =
+{
+  template = "Wall_mscott_window_1",
+  map = "MAP05",
+
+  prob = 10,
+
+  z_fit = "top"
+}

modules/prefab_controller.lua

@@ -155,40 +155,32 @@ function PREFAB_CONTROL.fine_tune_filters()
     tech_o_letter_P = 3,
     tech_o_letter_Q = 3,
     --
-    gtd_mscottpaper = 2
+    gtd_mscottpaper = 3
   }
   local new_themes_multipliers =
   {
     any_copperRust = 2,
 
-    tech_AITextures = 1.25,
     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_dk_green_tech = 1.5,
-    tech_copper_steampunk = 1.5,
-    tech_wood_lab = 1.75,
-    tech_wood_comp = 1.75,
+    tech_wood_comp = 1.5,
     tech_silver_grate = 1.75,
-    tech_bumblebee = 2,
-
-    urban_dk_green_tech = 1.25,
-    urban_wood_lab = 1.25,
-    urban_wood_comp = 1.5,
-    urban_silver_grate = 1.5,
-    urban_evil_mansion = 1.75,
-    urban_kievan_rus = 2,
-    urban_new_york_art_deco = 2,
-    urban_computerCatacombs = 2,
-
-    hell_gilded_bricks = 1.2,
-    hell_copper_steampunk = 1.2,
-    hell_AztecClay = 1.25,
-    hell_babylonian = 1.25,
+    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.75,
-    hell_kievan_rus = 2,
-    hell_new_york_art_deco = 2,
-    hell_computerCatacombs = 2
+    hell_evil_mansion = 1.5,
+    hell_kievan_rus = 1.5,
+    hell_new_york_art_deco = 1.5,
+    hell_computerCatacombs = 1.75,
   }
   local themes =
   {

modules/zdoom_armaetus_materials.lua

@@ -1994,6 +1994,32 @@ OBS_RESOURCE_PACK_MATERIALS = {
   TOFFPSW1 = {t="TOFFPSW1", f="FLAT5_5"},
   TOFFPSW2 = {t="TOFFPSW2", f="FLAT5_5"},
 
+  -- aww2 tech
+  -- walls
+  S_W2WAL1 = {t="S_W2WAL1", f="S_W2WFR1"},
+  S_W2WAL2 = {t="S_W2WAL2", f="S_W2WFR2"},
+  S_W2WAL3 = {t="S_W2WAL3", f="S_W2WFR3"},
+  S_W2WAL4 = {t="S_W2WAL4", f="S_W2WFR4"},
+  S_W2WAL5 = {t="S_W2WAL5", f="S_W2WFR5"},
+  S_W2WAL6 = {t="S_W2WAL6", f="S_W2WFR6"},
+  S_W2WAL7 = {t="S_W2WAL7", f="S_W2WFR7"},
+  S_W2WAL8 = {t="S_W2WAL8", f="S_W2WFR8"},
+  S_W2WAL9 = {t="S_W2WAL9", f="S_W2WFR1"},
+  S_W2WALA = {t="S_W2WALA", f="S_W2WFR2"},
+  S_W2WALB = {t="S_W2WALB", f="S_W2WFR3"},
+  S_W2WALC = {t="S_W2WALC", f="S_W2WFR5"},
+  S_W2WALD = {t="S_W2WALD", f="S_W2WFR6"},
+  S_W2WALE = {t="S_W2WALE", f="S_W2WFR8"},
+  -- flats
+  S_W2WFR1 = {t="S_W2WAL1", f="S_W2WFR1"},
+  S_W2WFR2 = {t="S_W2WAL3", f="S_W2WFR1"},
+  S_W2WFR3 = {t="S_W2WAL5", f="S_W2WFR1"},
+  S_W2WFR4 = {t="S_W2WAL7", f="S_W2WFR1"},
+  S_W2WFR5 = {t="S_W2WAL9", f="S_W2WFR1"},
+  S_W2WFR6 = {t="S_W2WALA", f="S_W2WFR1"},
+  S_W2WFR7 = {t="S_W2WALC", f="S_W2WFR1"},
+  S_W2WFR8 = {t="S_W2WALE", f="S_W2WFR1"},
+
   -- 256-wide doors
   G8_SVDR3 = { t="G8_SVDR3", f="FLAT23"},