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

Upstream sync

games/doom/fabs/item/dem_secret_closets.lua

@@ -321,6 +321,8 @@ PREFABS.Pic_dem_lakeN1_secretcloset =
 {
   template  = "Pic_dem_waterfallN1_secretcloset",
   map    = "MAP21",
+
+  jump_crouch = true
 }
 
 ---- Jumpy natural closet fabs ----

games/doom/stories.lua

@@ -2769,5 +2769,7 @@ DOOM.STORIES.QUIT_MESSAGES =
   [[I was weak. That's why I needed you, needed someone to punish me for my sins. But that's all over now, I know the truth. Now it's time to end this.]], -- Silent Hill 2
   [[It's too soon to give up. This Craziness can't go on forever.]], -- Silent Hill 3
   [[The fear of blood tends to create fear for the flesh.]], -- Silent Hill
-  [[...This is no time to be looking at a stupid quit message.]] -- Based on Silent Hill 2, in Brookhaven Hospital looking at a pin-up where "quit message" is "poster"
+  [[...This is no time to be looking at a stupid quit message.]], -- Based on Silent Hill 2, in Brookhaven Hospital looking at a pin-up where "quit message" is "poster"
+  [[If you leave now... You condemn all of humanity!]], -- Dead Space
+  [[Stick sround. I'm full of bad ideas.]] -- Dead Space 2
 }

modules/prefab_controller.lua

@@ -150,18 +150,17 @@ function PREFAB_CONTROL.fine_tune_filters()
   {
     any_copperRust = 1.25,
 
-    tech_bumblebee = 2,
-    tech_aww2 = 1.5,
-    tech_iStuff = 1.5,
-    tech_beigetownTech = 3,
+    tech_iStuff = 1.125,
+    tech_wood_lab = 2.25,
+    tech_bunker = 2.5,
     --
 
-    urban_computerCatacombs = 1.75,
-    urban_iStuff = 1.5,
-    urban_beigetownTech = 3,
+    urban_computerCatacombs = 1.125,
+    urban_wood_lab = 2.25,
+    urban_bunker = 2.5,
     --
 
-    hell_computerCatacombs = 1.75
+    hell_computerCatacombs = 1.5
   }
   local themes =
   {

modules/zdoom_armaetus_epic_textures.lua

@@ -26,6 +26,8 @@ gui.import("zdoom_armaetus_doom1_themes.lua")
 
 gui.import("zdoom_armaetus_epic_texturex_lump.lua")
 
+gui.import("zdoom_orp_generative_resources.lua")
+
 -- Rename to OBSIDIAN_TEXTURES? I am not the only author putting the
 -- texture pack together, includes MSSP and Craneo as well.
 OBS_RESOURCE_PACK_EPIC_TEXTURES = { }
@@ -657,7 +659,7 @@ function OBS_RESOURCE_PACK_EPIC_TEXTURES.setup(self)
 
   PARAM.obsidian_resource_pack_active = true
   module_param_up(self)
-  OBS_RESOURCE_PACK_EPIC_TEXTURES.put_new_materials()  
+  OBS_RESOURCE_PACK_EPIC_TEXTURES.put_new_materials()
 
 end
 
@@ -1027,6 +1029,12 @@ function OBS_RESOURCE_PACK_EPIC_TEXTURES.put_new_materials()
     GAME.THEMES.hell.wide_halls = OBS_RESOURCE_PACK_HELL_WIDE_HALLS
     GAME.THEMES.flesh.wide_halls = OBS_RESOURCE_PACK_HELL_WIDE_HALLS
   end
+
+  if PARAM.bool_include_generative_AI_textures == 1 then
+    GAME.MATERIALS = table.deep_merge(GAME.MATERIALS, OBS_RESOURCE_PACK_GENAI_MATERIALS, 2)
+    GAME.ROOM_THEMES = table.deep_merge(GAME.ROOM_THEMES, OBS_RESOURCE_PACK_GENAI_ROOM_THEMES, 2)
+    GAME.THEMES = table.deep_merge(GAME.THEMES, OBS_RESOURCE_PACK_GENAI_THEMES, 2)
+  end
 end
 
 function OBS_RESOURCE_PACK_EPIC_TEXTURES.put_the_texture_wad_in()
@@ -1118,7 +1126,6 @@ function OBS_RESOURCE_PACK_EPIC_TEXTURES.put_the_texture_wad_in()
     gui.wad_merge_sections(wad_file)
   end
 
-  -- TO-DO: Create UI switch for this
   if PARAM.bool_include_custom_actors == 1 then
     SCRIPTS.decorate = ScriptMan_combine_script(SCRIPTS.decorate, ORP_ENTITIES.DECORATE)
     wad_file = "games/doom/data/blood_pack.wad"
@@ -1197,6 +1204,17 @@ OB_MODULES["armaetus_epic_textures"] =
       default = 1,
       tooltip = _("Allows the trimming down of resulting WAD by not merging the custom texture WAD.\n\nThis will require you to extract and load up the WAD manually in your preferred sourceport installation.\n\nThis is the preferrable option for multiplayer situations and server owners and have each client obtain a copy of the texture pack instead.\n"),
       priority=1
+
+
+    },
+    {
+      name = "bool_include_generative_AI_textures",
+      label = _("AI Textures"),
+      valuator = "button",
+      default = 1,
+      tooltip = _("Whether to include textures fully or partially created through generative AI software."),
+      priority = 0,
+      gap = 1,
     },
 
 
@@ -1206,7 +1224,7 @@ OB_MODULES["armaetus_epic_textures"] =
       valuator = "button",
       default = 1,
       tooltip = _("Allows merging Obsidian Textures brightmaps into the WAD. Does not include brightmaps for base resources from any of the games."),
-      priority = 0
+      priority = -1
     },
 
 
@@ -1216,17 +1234,17 @@ OB_MODULES["armaetus_epic_textures"] =
       valuator = "button",
       default = 1,
       tooltip = _("Merges some custom sprites and replacers for various decorations."),
-      priority = 0
+      priority = -2
     },
-
+  
 
     {
       name = "bool_no_env_theme_for_hell",
       label = _("No Hell Environment Themes"),
       valuator = "button",
       default = 0,
       tooltip = _("Renders hell theme maps to never use snow or desert environment themes regardless of theme assignment."),
-      priority=-1
+      priority= -3
     }
   }
 }