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

Upstream sync

games/doom/fabs/decor/gtd_decor_urban_pools_set.lua

@@ -0,0 +1,67 @@
+PREFABS.Decor_urban_pools_pillar =
+{
+  file   = "decor/gtd_decor_urban_pools_set.wad",
+  map    = "MAP01",
+
+  prob   = 5000,
+  group = "gtd_pools",
+
+  where  = "point",
+  size   = 64,
+  height = 96,
+
+  bound_z1 = 0,
+  bound_z2 = 96,
+
+  z_fit = "top"
+}
+
+PREFABS.Decor_urban_pools_square =
+{
+  template = "Decor_urban_pools_pillar",
+  map = "MAP02",
+
+  size = 96,
+
+  delta = 32
+}
+
+PREFABS.Decor_urban_pools_round =
+{
+  template = "Decor_urban_pools_pillar",
+  map = "MAP03",
+
+  size = 96,
+
+  delta = 8
+}
+
+PREFABS.Decor_urban_pools_square_L =
+{
+  template = "Decor_urban_pools_pillar",
+  map = "MAP04",
+
+  size = 128,
+
+  delta = 32
+}
+
+PREFABS.Decor_urban_pools_seating =
+{
+  template = "Decor_urban_pools_pillar",
+  map = "MAP05",
+
+  size = 88
+}
+
+PREFABS.Decor_urban_pools_square_L =
+{
+  template = "Decor_urban_pools_pillar",
+  map = "MAP06",
+
+  height = 96+100,
+
+  size = 128,
+
+  delta = 32
+}

games/doom/fabs/door/key_tall.lua

@@ -3,7 +3,7 @@ PREFABS.Locked_tall_key_1 =
   file   = "door/key_tall.wad",
   map    = "MAP01",
 
-  prob   = 50,
+  prob   = 5,
 
   where  = "edge",
   key    = "k_red",
@@ -21,7 +21,7 @@ PREFABS.Locked_tall_key_2 =
   file   = "door/key_tall.wad",
   map    = "MAP02",
 
-  prob   = 50,
+  prob   = 5,
 
   where  = "edge",
   key    = "k_yellow",
@@ -39,7 +39,7 @@ PREFABS.Locked_tall_key_3 =
   file   = "door/key_tall.wad",
   map    = "MAP03",
 
-  prob   = 50,
+  prob   = 5,
 
   where  = "edge",
   key    = "k_blue",

games/doom/fabs/joiner/key_triple.lua

@@ -11,7 +11,7 @@ PREFABS.Locked_joiner_triple =
 
 
   key    = "k_ALL",
-  prob   = 100,
+  prob   = 25,
 
   seed_w = 2,
   seed_h = 1,

games/doom/fabs/joiner/key_triple_tall.lua

@@ -9,7 +9,7 @@ PREFABS.Locked_joiner_triple_tall =
   shape  = "I",
 
   key    = "k_ALL",
-  prob   = 25,
+  prob   = 5,
 
   seed_w = 1,
   seed_h = 2,
@@ -25,7 +25,6 @@ PREFABS.Locked_joiner_triple_tall =
   flat_FLOOR7_1 = "BIGDOOR4",
 
   sector_1  = { [0]=70, [1]=15, [2]=5, [3]=5, [8]=10, [12]=7, [13]=7 },
-
 }
 
 PREFABS.Locked_joiner_triple2_tall =

games/doom/fabs/picture/gtd_pic_urban_pools_set.lua

@@ -0,0 +1,33 @@
+PREFABS.Pic_urban_pools_1 =
+{
+  file   = "picture/gtd_pic_urban_pools_set.wad",
+  map    = "MAP01",
+
+  prob   = 50,
+
+  where  = "seeds",
+  group = "gtd_pools",
+
+  height = 96,
+
+  seed_w = 2,
+  seed_h = 1,
+
+  bound_z1 = 0,
+  bound_z2 = 96,
+
+  deep   =  16,
+
+  x_fit = { 40,216 },
+  y_fit = { 56,104 },
+  z_fit = "top"
+}
+
+PREFABS.Pic_urban_pools_2 =
+{
+  template = "Pic_urban_pools_1",
+  map = "MAP02",
+
+  x_fit = { 104,512 },
+  y_fit = { 24,56}
+}

games/doom/fabs/wall/gtd_wall_urban_pools_set.lua

@@ -0,0 +1,58 @@
+PREFABS.Wall_urban_pools_1 =
+{
+  file = "wall/gtd_wall_urban_pools_set.wad",
+  map = "MAP01",
+
+  prob = 50,
+
+  where = "edge",
+  height = 96,
+
+  group = "gtd_pools",
+
+  deep = 16,
+
+  bound_z1 = 0,
+  bound_z2 = 96,
+
+  x_fit = "frame",
+  z_fit = "top"
+}
+
+PREFABS.Wall_urban_pools_2 =
+{
+  template = "Wall_urban_pools_1",
+  map = "MAP02",
+
+  prob = 10
+}
+
+PREFABS.Wall_urban_pools_3a =
+{
+  template = "Wall_urban_pools_1",
+  map = "MAP03",
+
+  prob = 5,
+
+  z_fit = "top"
+}
+
+PREFABS.Wall_urban_pools_3b =
+{
+  template = "Wall_urban_pools_1",
+  map = "MAP03",
+
+  prob = 5,
+
+  z_fit = "bottom"
+}
+
+PREFABS.Wall_urban_pools_3c =
+{
+  template = "Wall_urban_pools_1",
+  map = "MAP03",
+
+  prob = 5,
+
+  z_fit = "frame"
+}

modules/prefab_controller.lua

@@ -142,20 +142,15 @@ function PREFAB_CONTROL.fine_tune_filters()
   }
   local new_fab_groups_multipliers =
   {
-    tech_o_letter_F = 1.25,
-    tech_o_letter_G = 1.25,
-    tech_o_letter_H = 1.25,
-    tech_o_letter_I = 1.25,
-    tech_o_letter_J = 1.25,
-    tech_o_letter_K = 1.5,
-    tech_o_letter_L = 1.5,
     tech_o_letter_M = 1.5,
-    tech_o_letter_N = 3,
-    tech_o_letter_O = 3,
-    tech_o_letter_P = 3,
-    tech_o_letter_Q = 3,
+    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 = 3
+    gtd_mscottpaper = 1.25,
+    --
+    gtd_pools = 3
   }
   local new_themes_multipliers =
   {
@@ -181,6 +176,11 @@ function PREFAB_CONTROL.fine_tune_filters()
     hell_kievan_rus = 1.5,
     hell_new_york_art_deco = 1.5,
     hell_computerCatacombs = 1.75,
+
+    --
+
+    tech_iStuff = 2.75,
+    urban_iStuff = 2.75
   }
   local themes =
   {

modules/zdoom_armaetus_materials.lua

@@ -2020,6 +2020,28 @@ OBS_RESOURCE_PACK_MATERIALS = {
   S_W2WFR7 = {t="S_W2WALC", f="S_W2WFR1"},
   S_W2WFR8 = {t="S_W2WALE", f="S_W2WFR1"},
 
+  -- iStuff theme
+  -- walls
+  SDIPHWL1 = {t="SDIPHWL1", f="SDIPHFT1"},
+  SDIPHWL2 = {t="SDIPHWL2", f="SDIPHFT1"},
+  SDIPHWL3 = {t="SDIPHWL3", f="SDIPHFT2"},
+  SDIPHWL4 = {t="SDIPHWL4", f="SDIPHFT2"},
+  SDIPHWL5 = {t="SDIPHWL5", f="SDIPHFT3"},
+  SDIPHWL6 = {t="SDIPHWL6", f="SDIPHFT4"},
+  SDIPHWL7 = {t="SDIPHWL7", f="SDIPHFT4"},
+  SDIPHWL8 = {t="SDIPHWL8", f="SDIPHFT5"},
+  SDIPHWL9 = {t="SDIPHWL9", f="SDIPHFT6"},
+  SDIPHWLA = {t="SDIPHWLA", f="SDIPHFT6"},
+  SDIPHWLB = {t="SDIPHWLB", f="SDIPHFT7"},
+  -- flats
+  SDIPHFT1 = {t="SDIPHWL1", f="SDIPHFT1"},
+  SDIPHFT2 = {t="SDIPHWL2", f="SDIPHFT2"},
+  SDIPHFT3 = {t="SDIPHWL3", f="SDIPHFT3"},
+  SDIPHFT4 = {t="SDIPHWL4", f="SDIPHFT4"},
+  SDIPHFT5 = {t="SDIPHWL5", f="SDIPHFT5"},
+  SDIPHFT6 = {t="SDIPHWL6", f="SDIPHFT6"},
+  SDIPHFT7 = {t="SDIPHWL7", f="SDIPHFT7"},
+
   -- 256-wide doors
   G8_SVDR3 = { t="G8_SVDR3", f="FLAT23"},