Merge pull request #669 from obsidian-level-maker/GTD-Carthage-conten…

…t-unstable

Upstream sync

games/doom/fabs/decor/gtd_decor_AI_sets.lua

@@ -0,0 +1,87 @@
+PREFABS.Decor_AI_goth_comp_yellow_computer_2x =
+{
+  file   = "decor/gtd_decor_AI_sets.wad",
+  map    = "MAP01",
+
+  prob   = 5000,
+
+  group = "gtd_AI_goth_comp_yellow_stained_glass",
+
+  height = 161,
+  where  = "point",
+  size   = 108,
+
+  bound_z1 = 0
+}
+
+PREFABS.Decor_AI_goth_comp_yellow_computer =
+{
+  template = "Decor_AI_goth_comp_yellow_computer_2x",
+  map    = "MAP02",
+
+  prob   = 2500,
+
+  height = 152,
+  size   = 76
+}
+
+--
+
+PREFABS.Decor_AI_boiler_tank_1 =
+{
+  template = "Decor_AI_goth_comp_yellow_computer_2x",
+  map    = "MAP20",
+
+  group = "gtd_AI_boiler_room",
+
+  height = 128,
+  size = 80
+}
+
+--
+
+PREFABS.Decor_AI_boiler_machine_A =
+{
+  template = "Decor_AI_goth_comp_yellow_computer_2x",
+  map    = "MAP20",
+
+  group = "gtd_AI_boiler_control_unit",
+
+  height = 128,
+  size = 72
+}
+
+PREFABS.Decor_AI_boiler_machine_B =
+{
+  template = "Decor_AI_goth_comp_yellow_computer_2x",
+  map    = "MAP21",
+
+  group = "gtd_AI_boiler_control_unit",
+
+  height = 128,
+  size = 76
+}
+
+--
+
+PREFABS.Decor_AI_corpse_inset_pillar =
+{
+  template = "Decor_AI_goth_comp_yellow_computer_2x",
+  map    = "MAP30",
+
+  group = "gtd_AI_corpse_inset",
+
+  height = 128,
+  size = 96,
+
+  z_fit = "top",
+  bound_z2 = 128,
+
+  tex_SDPBBWLA =
+  {
+    SDPBBWL8 = 1,
+    SDPBBWL9 = 1,
+    SDPBBWLA = 4,
+    SDPBBWLB = 4
+  }
+}

games/doom/fabs/item/dem_secret_closets_urban.lua

@@ -300,7 +300,7 @@ PREFABS.Item_secret_hanging_vent_closet =
   in_porches = "never",
   jump_crouch = false,
 
-  prob  = 50,
+  prob  = 20,
 
   seed_w = 1,
   seed_h = 1,

games/doom/fabs/item/scionox_secrets_hell.lua

@@ -25,6 +25,9 @@ PREFABS.Item_hell_alcove_window_secret =
 {
   template = "Item_hell_alcove_tomb_secret",
   map = "MAP02",
+
+  prob = 150,
   port = "zdoom",
-  seed_w = 3,
+
+  seed_w = 3
 }

games/doom/fabs/item/scionox_secrets_tech.lua

@@ -122,7 +122,7 @@ PREFABS.Item_wallmachines_secret_5 =
   file   = "item/scionox_secrets_tech.wad",
   map    = "MAP06",
 
-  prob   = 7,
+  prob   = 4,
   skip_prob = 50,
 
   port = "!zdoom",

games/doom/fabs/picture/gtd_pic_AI_sets.lua

@@ -0,0 +1,51 @@
+PREFABS.Pic_goth_comp_yellow_stained_glass =
+{
+  file   = "picture/gtd_pic_AI_sets.wad",
+  map    = "MAP01",
+
+  prob   = 50,
+  group = "gtd_AI_goth_comp_yellow_stained_glass",
+
+  texture_pack = "armaetus",
+
+  seed_w = 2,
+  seed_h = 1,
+
+  where  = "seeds",
+  deep   = 16,
+
+  height = 128,
+
+  x_fit  = {104,108 , 148,152},
+  y_fit  = "top",
+  z_fit  = {53,95},
+
+  bound_z1 = 0,
+  bound_z2 = 128
+}
+
+PREFABS.Pic_goth_comp_yellow_stained_glass_3x =
+{
+  template = "Pic_goth_comp_yellow_stained_glass",
+  map      = "MAP02",
+
+  rank = 2,
+
+  seed_w = 3,
+
+  x_fit = { 84,108 , 276,300 }
+}
+
+--
+
+PREFABS.Pic_AI_boiler_room_pipes =
+{
+  template = "Pic_goth_comp_yellow_stained_glass",
+  map = "MAP10",
+
+  group = "gtd_AI_boiler_room",
+
+  x_fit  = "frame",
+  y_fit  = "top",
+  z_fit  = {39,41 , 79,81}
+}

games/doom/fabs/wall/gtd_wall_AI_sets.lua

@@ -0,0 +1,148 @@
+PREFABS.Wall_AI_goth_comp_yellow_stained_glass_1 =
+{
+  file   = "wall/gtd_wall_AI_sets.wad",
+  map    = "MAP01",
+
+  prob   = 50,
+  group  = "gtd_AI_goth_comp_yellow_stained_glass",
+
+  where  = "edge",
+  deep   = 16,
+  height = 96,
+
+  bound_z1 = 0,
+  bound_z2 = 96,
+
+  z_fit  = {8,9}
+}
+
+PREFABS.Wall_AI_goth_comp_yellow_stained_glass_1_stretchable =
+{
+  template = "Wall_AI_goth_comp_yellow_stained_glass_1",
+  map = "MAP02",
+
+  rank = 2,
+
+  height = {96,9001},
+
+  bound_z2 = 148,
+
+  z_fit  = {139,140}
+}
+
+PREFABS.Wall_AI_goth_comp_yellow_stained_glass_1_lite_pillar =
+{
+  template = "Wall_AI_goth_comp_yellow_stained_glass_1",
+  map = "MAP03",
+
+  prob = 5,
+
+  z_fit = {86,87}
+}
+
+PREFABS.Wall_AI_goth_comp_yellow_stained_glass_1_lite_pillar_stretchable =
+{
+  template = "Wall_AI_goth_comp_yellow_stained_glass_1",
+  map = "MAP03",
+
+  height = {96,9001},
+
+  prob = 5,
+  rank = 2,
+
+  z_fit = {86,87}
+}
+
+--
+-- boiler room
+--
+
+PREFABS.Wall_AI_boiler_room_pipes =
+{
+  file   = "wall/gtd_wall_AI_sets.wad",
+  map    = "MAP10",
+
+  prob   = 50,
+  group  = "gtd_AI_boiler_room",
+
+  where  = "edge",
+  deep   = 16,
+  height = 96,
+
+  bound_z1 = 0,
+  bound_z2 = 96,
+
+  z_fit = "top"
+}
+
+PREFABS.Wall_AI_boiler_room_dashboards =
+{
+  template = "Wall_AI_boiler_room_pipes",
+  map = "MAP11",
+
+  prob = 8
+}
+
+PREFABS.Wall_AI_boiler_room_pipes_diag =
+{
+  template = "Wall_AI_boiler_room_pipes",
+  map = "MAP19",
+
+  where = "diagonal"
+}
+
+--
+--
+--
+
+PREFABS.Wall_AI_boiler_control_unit =
+{
+  file   = "wall/gtd_wall_AI_sets.wad",
+  map    = "MAP20",
+
+  prob   = 50,
+  group  = "gtd_AI_boiler_control_unit",
+
+  where  = "edge",
+  deep   = 16,
+  height = 96,
+
+  bound_z1 = 0,
+  bound_z2 = 96,
+
+  z_fit = {71,73}
+}
+
+PREFABS.Wall_AI_boiler_control_box =
+{
+  template = "Wall_AI_boiler_control_unit",
+  map    = "MAP21",
+
+  prob   = 10,
+  group  = "gtd_AI_boiler_control_unit",
+
+  z_fit = {71,73}
+}
+
+--
+
+PREFABS.Wall_AI_corpse_inset_variable =
+{
+  template = "Wall_AI_goth_comp_yellow_stained_glass_1",
+  map    = "MAP30",
+
+  group = "gtd_AI_corpse_inset",
+
+  height = 128,
+
+  z_fit = "top",
+  bound_z2 = 128,
+
+  tex_SDPBBWLA =
+  {
+    SDPBBWL8 = 1,
+    SDPBBWL9 = 1,
+    SDPBBWLA = 4,
+    SDPBBWLB = 4,
+  }
+}

games/doom/names.lua

@@ -3682,10 +3682,12 @@ DOOM.NAMES =
         ["Stranglehold"]=10,
         ["Suicide Mission"]=10,
         ["Tears in the Rain"]=10,
+        ["Too Late to Make a Difference"]=10,
         ["Time to Kill"]=10,
         ["Tip of the Spear"]=10,
         ["The Fate of All Things"]=10,
         ["The Game Is On"]=10,
+        ["These Are the Last Days, Are They Not?"]=10,
         ["Pulling the Short Straw"]=10,
         ["The Part Where He Gets You"]=10,
         ["The Sentinel's Playground"]=10,

modules/prefab_controller.lua

@@ -142,25 +142,21 @@ function PREFAB_CONTROL.fine_tune_filters()
   }
   local new_fab_groups_multipliers =
   {
-    gtd_mscottpaper = 1.25,
-    --
-    gtd_pools = 1.25
+    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
   }
   local new_themes_multipliers =
   {
-    any_copperRust = 1.25,
-
-    tech_iStuff = 1.125,
-    tech_wood_lab = 2.25,
-    tech_bunker = 2.5,
+    tech_wood_lab = 1.25,
+    tech_bunker = 1.5,
+    tech_cableSocketCatacombs = 2,
     --
-
-    urban_computerCatacombs = 1.125,
-    urban_wood_lab = 2.25,
-    urban_bunker = 2.5,
+    urban_wood_lab = 1.25,
+    urban_bunker = 1.5,
     --
-
-    hell_computerCatacombs = 1.5
+    hell_cableSocketCatacombs = 2
   }
   local themes =
   {