diff --git a/games/doom/data/ObAddon_Textures_2.wad b/games/doom/data/ObAddon_Textures_2.wad index f3f0c3652c..8de1f655db 100644 Binary files a/games/doom/data/ObAddon_Textures_2.wad and b/games/doom/data/ObAddon_Textures_2.wad differ diff --git a/games/doom/data/ObAddon_Textures_Brightmaps.wad b/games/doom/data/ObAddon_Textures_Brightmaps.wad index 94e98a8fcc..13baedb965 100644 Binary files a/games/doom/data/ObAddon_Textures_Brightmaps.wad and b/games/doom/data/ObAddon_Textures_Brightmaps.wad differ diff --git a/games/doom/fabs/decor/gtd_decor_tech.wad b/games/doom/fabs/decor/gtd_decor_tech.wad index 6609064818..edf59278f1 100644 Binary files a/games/doom/fabs/decor/gtd_decor_tech.wad and b/games/doom/fabs/decor/gtd_decor_tech.wad differ diff --git a/games/doom/fabs/fence/gtd_fence_gothic.wad b/games/doom/fabs/fence/gtd_fence_gothic.wad index 89cd3d29f7..29a214092b 100644 Binary files a/games/doom/fabs/fence/gtd_fence_gothic.wad and b/games/doom/fabs/fence/gtd_fence_gothic.wad differ diff --git a/games/doom/fabs/hall/dem_conveyor_c.wad b/games/doom/fabs/hall/dem_conveyor_c.wad index 4c481bac21..08e9e4c66c 100644 Binary files a/games/doom/fabs/hall/dem_conveyor_c.wad and b/games/doom/fabs/hall/dem_conveyor_c.wad differ diff --git a/games/doom/fabs/hall/dem_conveyorh_j.wad b/games/doom/fabs/hall/dem_conveyorh_j.wad index f02cfa5e42..e9c550f541 100644 Binary files a/games/doom/fabs/hall/dem_conveyorh_j.wad and b/games/doom/fabs/hall/dem_conveyorh_j.wad differ diff --git a/games/doom/fabs/item/dem_secret_closets_urban.lua b/games/doom/fabs/item/dem_secret_closets_urban.lua index 8e613f9c84..a4cf779dd2 100644 --- a/games/doom/fabs/item/dem_secret_closets_urban.lua +++ b/games/doom/fabs/item/dem_secret_closets_urban.lua @@ -297,9 +297,10 @@ PREFABS.Item_secret_hanging_vent_closet = template = "Item_secret_yard_closet1", map = "MAP07", + in_porches = "never", jump_crouch = false, - prob = 250, + prob = 50, seed_w = 1, seed_h = 1, diff --git a/games/doom/fabs/item/gtd_item_closet_hell.wad b/games/doom/fabs/item/gtd_item_closet_hell.wad index 2c9b28d72f..bbb2fc6a65 100644 Binary files a/games/doom/fabs/item/gtd_item_closet_hell.wad and b/games/doom/fabs/item/gtd_item_closet_hell.wad differ diff --git a/games/doom/fabs/joiner/armaetus_joiner_keyed_bars.wad b/games/doom/fabs/joiner/armaetus_joiner_keyed_bars.wad index 2671ba4c9d..1663fb5f17 100644 Binary files a/games/doom/fabs/joiner/armaetus_joiner_keyed_bars.wad and b/games/doom/fabs/joiner/armaetus_joiner_keyed_bars.wad differ diff --git a/games/doom/fabs/joiner/dem_urban_joiners.wad b/games/doom/fabs/joiner/dem_urban_joiners.wad index b250750fa9..97f4170c16 100644 Binary files a/games/doom/fabs/joiner/dem_urban_joiners.wad and b/games/doom/fabs/joiner/dem_urban_joiners.wad differ diff --git a/games/doom/fabs/joiner/gtd_barred.wad b/games/doom/fabs/joiner/gtd_barred.wad index 1a2a75bc12..139c219876 100644 Binary files a/games/doom/fabs/joiner/gtd_barred.wad and b/games/doom/fabs/joiner/gtd_barred.wad differ diff --git a/games/doom/fabs/joiner/gtd_dem_duct_room_joiner.wad b/games/doom/fabs/joiner/gtd_dem_duct_room_joiner.wad index 8a5b6b95f8..c36d690002 100644 Binary files a/games/doom/fabs/joiner/gtd_dem_duct_room_joiner.wad and b/games/doom/fabs/joiner/gtd_dem_duct_room_joiner.wad differ diff --git a/games/doom/fabs/joiner/gtd_universal_joiners.lua b/games/doom/fabs/joiner/gtd_universal_joiners.lua index dc80055fdf..ea1ab870c2 100644 --- a/games/doom/fabs/joiner/gtd_universal_joiners.lua +++ b/games/doom/fabs/joiner/gtd_universal_joiners.lua @@ -64,7 +64,7 @@ PREFABS.Joiner_gtd_universal_funnel = over = 16, x_fit = { 120,137 }, - y_fit = { 24,28 , 132,140 }, + y_fit = { 20,28 , 132,140 }, can_flip = true, } diff --git a/games/doom/fabs/joiner/gtd_universal_joiners.wad b/games/doom/fabs/joiner/gtd_universal_joiners.wad index 5a8ba2c3e7..7ab248a5e7 100644 Binary files a/games/doom/fabs/joiner/gtd_universal_joiners.wad and b/games/doom/fabs/joiner/gtd_universal_joiners.wad differ diff --git a/games/doom/fabs/picture/craneo_pic_bunkerbeds.wad b/games/doom/fabs/picture/craneo_pic_bunkerbeds.wad index 620546a979..78173760a5 100644 Binary files a/games/doom/fabs/picture/craneo_pic_bunkerbeds.wad and b/games/doom/fabs/picture/craneo_pic_bunkerbeds.wad differ diff --git a/games/doom/fabs/picture/dem_pic_urban_downtown_yards.wad b/games/doom/fabs/picture/dem_pic_urban_downtown_yards.wad index 398bd0dbef..fe2dfdaf0b 100644 Binary files a/games/doom/fabs/picture/dem_pic_urban_downtown_yards.wad and b/games/doom/fabs/picture/dem_pic_urban_downtown_yards.wad differ diff --git a/games/doom/fabs/skybox/gtd_skybox_char_EPIC.wad b/games/doom/fabs/skybox/gtd_skybox_char_EPIC.wad index f9860fbdb1..5e68b98a8d 100644 Binary files a/games/doom/fabs/skybox/gtd_skybox_char_EPIC.wad and b/games/doom/fabs/skybox/gtd_skybox_char_EPIC.wad differ diff --git a/games/doom/fabs/stairs/gtd_standing_stairs_32.wad b/games/doom/fabs/stairs/gtd_standing_stairs_32.wad index 32ff677955..c07ff0ae92 100644 Binary files a/games/doom/fabs/stairs/gtd_standing_stairs_32.wad and b/games/doom/fabs/stairs/gtd_standing_stairs_32.wad differ diff --git a/games/doom/fabs/stairs/gtd_standing_stairs_64.wad b/games/doom/fabs/stairs/gtd_standing_stairs_64.wad index 72781ca3c9..6bcba87db0 100644 Binary files a/games/doom/fabs/stairs/gtd_standing_stairs_64.wad and b/games/doom/fabs/stairs/gtd_standing_stairs_64.wad differ diff --git a/games/doom/fabs/switch/dem_switch_closet.wad b/games/doom/fabs/switch/dem_switch_closet.wad index 5da873d3eb..b37a1bb8fa 100644 Binary files a/games/doom/fabs/switch/dem_switch_closet.wad and b/games/doom/fabs/switch/dem_switch_closet.wad differ diff --git a/games/doom/fabs/teleporter/scionox_dual_teleport.wad b/games/doom/fabs/teleporter/scionox_dual_teleport.wad index f70b096c09..e6b1d294b2 100644 Binary files a/games/doom/fabs/teleporter/scionox_dual_teleport.wad and b/games/doom/fabs/teleporter/scionox_dual_teleport.wad differ diff --git a/modules/prefab_controller.lua b/modules/prefab_controller.lua index 38d3df0ba0..3a9a4dff61 100644 --- a/modules/prefab_controller.lua +++ b/modules/prefab_controller.lua @@ -148,21 +148,20 @@ function PREFAB_CONTROL.fine_tune_filters() } local new_themes_multipliers = { - any_copperRust = 2, + any_copperRust = 1.25, - tech_silver_grate = 1.25, tech_bumblebee = 2, - tech_aww2 = 2, - tech_iStuff = 2, + tech_aww2 = 1.5, + tech_iStuff = 1.5, tech_beigetownTech = 3, -- - urban_computerCatacombs = 1.25, - urban_iStuff = 2, + urban_computerCatacombs = 1.75, + urban_iStuff = 1.5, urban_beigetownTech = 3, -- - hell_computerCatacombs = 1.25 + hell_computerCatacombs = 1.75 } local themes = { diff --git a/modules/zdoom_armaetus_materials.lua b/modules/zdoom_armaetus_materials.lua index b11dbe4c18..48403d0e71 100644 --- a/modules/zdoom_armaetus_materials.lua +++ b/modules/zdoom_armaetus_materials.lua @@ -1720,6 +1720,9 @@ OBS_RESOURCE_PACK_MATERIALS = { SD_TWDF3 = { t="SD_TWDW3", f="SD_TWDF3"}, SD_TWDF4 = { t="SD_TWDW6", f="SD_TWDF4"}, SD_TWDF5 = { t="SD_TWDW5", f="SD_TWDF5"}, + SD_TWDF6 = { t="SD_TWDW6", f="SD_TWDF1"}, + SD_TWDF7 = { t="SD_TWDW7", f="SD_TWDF3"}, + SD_TWDF8 = { t="SD_TWDW8", f="SD_TWDF5"}, -- lights SD_TWDL1 = { t="SD_TWDL1", f="SD_TWDF6"}, SD_TWDL2 = { t="SD_TWDL2", f="SD_TWDF5"}, @@ -2003,17 +2006,15 @@ OBS_RESOURCE_PACK_MATERIALS = { SD_HCCWA = { t="SD_HCCWA", f="SD_HCCF4"}, SD_HCCWB = { t="SD_HCCWB", f="SD_HCCF6"}, SD_HCCWC = { t="SD_HCCWC", f="SD_HCCF8"}, - SD_HCCWD = { t="SD_HCCWD", f="SD_HCCF3"}, - SD_HCCWE = { t="SD_HCCWE", f="SD_HCCF5"}, -- flats SD_HCCF1 = { t="SD_HCCW1", f="SD_HCCF1"}, - SD_HCCF2 = { t="SD_HCCW3", f="SD_HCCF2"}, - SD_HCCF3 = { t="SD_HCCW5", f="SD_HCCF3"}, - SD_HCCF4 = { t="SD_HCCW7", f="SD_HCCF4"}, - SD_HCCF5 = { t="SD_HCCW9", f="SD_HCCF5"}, - SD_HCCF6 = { t="SD_HCCWB", f="SD_HCCF6"}, - SD_HCCF7 = { t="SD_HCCWD", f="SD_HCCF7"}, - SD_HCCF8 = { t="SD_HCCWE", f="SD_HCCF8"}, + SD_HCCF2 = { t="SD_HCCW2", f="SD_HCCF2"}, + SD_HCCF3 = { t="SD_HCCW3", f="SD_HCCF3"}, + SD_HCCF4 = { t="SD_HCCW5", f="SD_HCCF4"}, + SD_HCCF5 = { t="SD_HCCW7", f="SD_HCCF5"}, + SD_HCCF6 = { t="SD_HCCW9", f="SD_HCCF6"}, + SD_HCCF7 = { t="SD_HCCWA", f="SD_HCCF7"}, + SD_HCCF8 = { t="SD_HCCWC", f="SD_HCCF8"}, -- TOFFBOX1 = {t="TOFFBOX1", f="FLAT23"}, @@ -3104,6 +3105,41 @@ brightmap texture S_W2WALE map SW2WLEBR } +brightmap texture SD_HCCW1 +{ + map SDBRHCW1 +} + +brightmap texture SD_HCCW2 +{ + map SDBRHCW2 +} + +brightmap texture SD_HCCW3 +{ + map SDBRHCW3 +} + +brightmap texture SD_HCCW7 +{ + map SDBRHCW7 +} + +brightmap texture SD_HCCW8 +{ + map SDBRHCW8 +} + +brightmap texture SD_HCCW9 +{ + map SDBRHCW9 +} + +brightmap texture SD_HCCWC +{ + map SDBRHCWC +} + ]] -- aliases - when you're too lazy to write down wall and flat names in every diff --git a/modules/zdoom_armaetus_themes.lua b/modules/zdoom_armaetus_themes.lua index 6191da2972..180e9f5149 100644 --- a/modules/zdoom_armaetus_themes.lua +++ b/modules/zdoom_armaetus_themes.lua @@ -2123,11 +2123,14 @@ OBS_RESOURCE_PACK_ROOM_THEMES = floors = { - SD_TWDW1 = 30, - SD_TWDW2 = 30, - SD_TWDW3 = 30, - SD_TWDW4 = 30, - SD_TWDW5 = 30, -- deliberate use of this material for floors + SD_TWDF1 = 30, + SD_TWDF2 = 30, + SD_TWDF3 = 30, + SD_TWDF4 = 30, + SD_TWDF5 = 30, + SD_TWDF6 = 30, + SD_TWDF7 = 30, + SD_TWDF8 = 30, FLAT1 = 5, FLAT20 = 2, @@ -2180,11 +2183,14 @@ OBS_RESOURCE_PACK_ROOM_THEMES = ceilings = { - SD_TWDW1 = 30, - SD_TWDW2 = 30, - SD_TWDW3 = 30, - SD_TWDW4 = 30, - SD_TWDW5 = 30, -- deliberate use of this material for floors + SD_TWDF1 = 30, + SD_TWDF2 = 30, + SD_TWDF3 = 30, + SD_TWDF4 = 30, + SD_TWDF5 = 30, + SD_TWDF6 = 30, + SD_TWDF7 = 30, + SD_TWDF8 = 30, FLAT1 = 5, FLAT20 = 2, @@ -5109,9 +5115,7 @@ OBS_RESOURCE_PACK_ROOM_THEMES = SD_HCCW9 = 25, SD_HCCWA = 25, SD_HCCWB = 25, - SD_HCCWC = 25, - SD_HCCWD = 25, - SD_HCCWE = 25 + SD_HCCWC = 25 }, floors = @@ -6699,12 +6703,14 @@ OBS_RESOURCE_PACK_ROOM_THEMES = floors = { - SD_TWDW1 = 30, - SD_TWDW2 = 30, - SD_TWDW3 = 30, - SD_TWDW4 = 30, - SD_TWDW5 = 30, -- deliberate use of this material for floors - SD_TWDW6 = 30, + SD_TWDF1 = 30, + SD_TWDF2 = 30, + SD_TWDF3 = 30, + SD_TWDF4 = 30, + SD_TWDF5 = 30, + SD_TWDF6 = 30, + SD_TWDF7 = 30, + SD_TWDF8 = 30, FLAT1 = 5, FLAT20 = 2, @@ -6757,12 +6763,14 @@ OBS_RESOURCE_PACK_ROOM_THEMES = ceilings = { - SD_TWDW1 = 30, - SD_TWDW2 = 30, - SD_TWDW3 = 30, - SD_TWDW4 = 30, - SD_TWDW5 = 30, -- deliberate use of this material for floors - SD_TWDW6 = 30, + SD_TWDF1 = 30, + SD_TWDF2 = 30, + SD_TWDF3 = 30, + SD_TWDF4 = 30, + SD_TWDF5 = 30, + SD_TWDF6 = 30, + SD_TWDF7 = 30, + SD_TWDF8 = 30, FLAT1 = 5, FLAT20 = 2, @@ -7690,9 +7698,7 @@ OBS_RESOURCE_PACK_ROOM_THEMES = SD_HCCW9 = 25, SD_HCCWA = 25, SD_HCCWB = 25, - SD_HCCWC = 25, - SD_HCCWD = 25, - SD_HCCWE = 25 + SD_HCCWC = 25 }, floors = diff --git a/scripts/shapes.lua b/scripts/shapes.lua index 18a6820996..8e02ccd917 100644 --- a/scripts/shapes.lua +++ b/scripts/shapes.lua @@ -4896,8 +4896,8 @@ GROW_LIQUID_POOL_WIDE_COLONNADED_TRIPLE = diagonals = { - "1A","1A","A1","1A", - "1A","1A","A1","1A" + "A1","1A","A1","1A", + "A1","1A","A1","1A" } }, @@ -5627,10 +5627,10 @@ GROW_OVAL_SPLIT_NEW_AREA = diagonals = { - ".1",".A","A.", + ".1","1A","A.", ".1","1.",".A","A.", ".1","1.",".A","A.", - ".1","1.","A." + ".1","1A","A." } }, @@ -5657,12 +5657,12 @@ GROW_OVAL_SPLIT_NEW_AREA_BIG = diagonals = { - ".1",".A","A.", + ".1","1A","A.", ".1","1.",".A","A.", "1.",".A", "1.",".A", ".1","1.",".A","A.", - ".1","1.","A." + ".1","1A","A." } }, @@ -8838,7 +8838,7 @@ GROW_MAZE_SIDE_BUMP = diagonals = { "1.", - ".1" + "1." } }, @@ -8865,7 +8865,7 @@ GROW_MAZE_SIDE_BUMP_CAGE = diagonals = { "1.", - ".1" + "1." } },