From eef7fab1e9aae50f62a722bb83f91d352e863250 Mon Sep 17 00:00:00 2001 From: MsrSgtShooterPerson Date: Tue, 21 Jan 2025 11:12:50 +0800 Subject: [PATCH 1/7] New moat-ish shape rules, with platforms circumferenced by liquid. --- scripts/shapes.lua | 102 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/scripts/shapes.lua b/scripts/shapes.lua index 69cb92bbf..ae8b371ee 100644 --- a/scripts/shapes.lua +++ b/scripts/shapes.lua @@ -10382,6 +10382,56 @@ GROW_FEATURES_RECT_MOATED_PLATFORM_STAIRS = }, }, +GROW_FEATURES_ROUND_PLATFORM_MOAT = +{ + prob = 10, + skip_prob = 80, + + structure = + { + "11xxxxxx","11xxxxxx", + "........","11111111", + "........","11111111", + "........","11/~~%11", + "........","11~AA~11", + "........","11~AA~11", + "........","11%~A/11", + "........","11111111", + "........","11111111" + }, + + diagonals = + { + "1~","~1", + "1~","~1" + } +}, + +GROW_FEATURES_RAISED_RAISED_PLATFORM_MOAT = +{ + prob = 10, + skip_prob = 80, + + structure = + { + "11xxxxxx","11xxxxxx", + "........","11111111", + "........","11111111", + "........","11/~~%11", + "........","11~AA~11", + "........","11~AA~11", + "........","11%~^/11", + "........","11111111", + "........","11111111" + }, + + diagonals = + { + "1~","~1", + "1~","~1" + } +}, + GROW_ELEVATED_PILLAR_ROUND = { prob = 35, @@ -15692,6 +15742,32 @@ GROW_JAGGED_LIQUID_STEEPNESS = } }, +GROW_JAGGED_LIQUID_STEEPNESS_DOUBLE = +{ + prob = 15, + skip_prob = 80, + + structure = + { + "11xxxx","11xxxx", + "......","vv~~AA", + "......","AA%%AA", + "......","AA//AA", + "......","AA~AAA", + "......","AA%%AA", + "......","AA//AA", + "......","AA~AAA" + }, + + diagonals = + { + "A~","~A", + "A~","~A", + "A~","~A", + "A~","~A" + } +}, + GROW_JAGGED_LIQUID_EXTENDED = { prob = 20, @@ -15718,6 +15794,32 @@ GROW_JAGGED_LIQUID_EXTENDED = } }, +GROW_JAGGED_LIQUID_EXTENDED_DOUBLE = +{ + prob = 15, + skip_prob = 80, + + structure = + { + "11xxxxxx","11xxxxxx", + "........","11~~~~11", + "........","111%%111", + "........","111//111", + "........","111~~111", + "........","111%%111", + "........","111//111", + "........","11~~1111" + }, + + diagonals = + { + "1~","~1", + "1~","~1", + "1~","~1", + "1~","~1" + } +}, + GROW_JAGGED_LIQUID_3X = { prob = 25, From 97a198f558f67622125de12c216b1aba036702e2 Mon Sep 17 00:00:00 2001 From: MsrSgtShooterPerson Date: Tue, 4 Feb 2025 21:18:20 +0800 Subject: [PATCH 2/7] Invisible wall material now uses a non-overriding version. --- games/doom/data/invisible_wall.wad | Bin 148 -> 148 bytes .../doom/fabs/joiner/gtd_infestation_simple.lua | 2 +- .../wall/gtd_wall_hell_exterior_wall_groups.lua | 2 +- games/doom/materials.lua | 2 +- games/doom/resources.lua | 2 ++ scripts/render.lua | 3 +-- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/games/doom/data/invisible_wall.wad b/games/doom/data/invisible_wall.wad index ea0f80ea99ce06d720959b0796373c480dddcd0a..1b7717f6959552c028ace0b5654364c3d837edd5 100644 GIT binary patch delta 47 wcmbQjIE8USjz&mCd~k?kPzVnL149H5`^S6wg?R>tqyX6<0F-z2b75cr02NIN9RL6T delta 47 wcmbQjIE8USjz&O0d~k?kPzVnL149H5hx_}u85%J#qyX6<0F-z2b75cr00IOF6#xJL diff --git a/games/doom/fabs/joiner/gtd_infestation_simple.lua b/games/doom/fabs/joiner/gtd_infestation_simple.lua index 0fbff922d..cca7091be 100644 --- a/games/doom/fabs/joiner/gtd_infestation_simple.lua +++ b/games/doom/fabs/joiner/gtd_infestation_simple.lua @@ -26,7 +26,7 @@ PREFABS.Joiner_infestation_caveout = tex_MIDVINE2 = { MIDVINE2 = 1, - ZZWOLF10 = 10 -- invisibility tex + O_INVIST = 10 -- invisibility tex }, } diff --git a/games/doom/fabs/wall/gtd_wall_hell_exterior_wall_groups.lua b/games/doom/fabs/wall/gtd_wall_hell_exterior_wall_groups.lua index 66a2dab5c..436485b71 100644 --- a/games/doom/fabs/wall/gtd_wall_hell_exterior_wall_groups.lua +++ b/games/doom/fabs/wall/gtd_wall_hell_exterior_wall_groups.lua @@ -320,7 +320,7 @@ PREFABS.Wall_hell_outdoor_torch_fenced = --# z_fit = { 28,32 }, - tex_FENCE4 = "ZZWOLF10", + tex_FENCE4 = "O_INVIST", tex_METL02 = "METAL", } diff --git a/games/doom/materials.lua b/games/doom/materials.lua index 02a33c5c4..db2d75ecf 100644 --- a/games/doom/materials.lua +++ b/games/doom/materials.lua @@ -384,7 +384,7 @@ DOOM.MATERIALS = O_BLACK = { t="CEMENT5", f="O_BLACK", sane=1 }, - O_INVIST = { t="ZZWOLF10", f="O_INVIST", sane=1 }, + O_INVIST = { t="O_INVIST", f="O_INVIST", sane=1 }, -- new flat, added by data/lift_flat.wad LIFTFLAT = { f="LIFTFLAT", t="SUPPORT2" }, diff --git a/games/doom/resources.lua b/games/doom/resources.lua index b8f802092..85f992cc6 100644 --- a/games/doom/resources.lua +++ b/games/doom/resources.lua @@ -942,4 +942,6 @@ function DOOM.all_done() else gui.wad_insert_file("data/endoom/ENDOOM.bin", "ENDOOM") end + + gui.wad_merge_sections("games/doom/data/invisible_wall.wad") end diff --git a/scripts/render.lua b/scripts/render.lua index a2a818d01..93a0d0bdf 100644 --- a/scripts/render.lua +++ b/scripts/render.lua @@ -491,8 +491,7 @@ function Render_edge(LEVEL, E, SEEDS) local side_props = { - tex = "ZZWOLF10", -- currently patch-replaced as an invisible wall - -- TO-DO: Add a generic invisible texture for all games + tex = "O_INVIST", blocked = 1, } From 321e9d281a5088277bf49a877f0f55acb90199aa Mon Sep 17 00:00:00 2001 From: MsrSgtShooterPerson Date: Fri, 7 Feb 2025 00:35:04 +0800 Subject: [PATCH 3/7] Some internal resources now readded as non patches. --- games/doom/data/vine_dude.wad | Bin 10088 -> 10061 bytes games/doom/resources.lua | 2 ++ 2 files changed, 2 insertions(+) diff --git a/games/doom/data/vine_dude.wad b/games/doom/data/vine_dude.wad index ef41e4ff268e74eba96f0517bf880a45e03900c3..d14a4662a1afaf475e44d25793b8dac77681b093 100644 GIT binary patch delta 70 zcmaFich-+5Al%V~nSp^pR-J)iql%!q0S}M^0wEFc!6A-8At1gWP%_NZ&($T=#TBFw M1c36cel83Q0OXepaR2}S delta 97 zcmX@>_rgylAl%V~nSp`9LY;v@!6mgcB(*}pM9)Oe(!fYzhrgGvf~ASVMjk Date: Sat, 8 Feb 2025 01:04:08 +0800 Subject: [PATCH 4/7] Fixed wrong z_fit declaration on new fab --- games/doom/fabs/wall/gtd_wall_hell_engraving_set.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/games/doom/fabs/wall/gtd_wall_hell_engraving_set.lua b/games/doom/fabs/wall/gtd_wall_hell_engraving_set.lua index 9702c6bcb..0fb933948 100644 --- a/games/doom/fabs/wall/gtd_wall_hell_engraving_set.lua +++ b/games/doom/fabs/wall/gtd_wall_hell_engraving_set.lua @@ -186,7 +186,8 @@ PREFABS.Wall_hell_engraving_top_band = height = 96, - bound_z2 = {22,24 , 88,89}, + z_fit = {22,24 , 88,89}, + bound_z2 = 96, group = "gtd_wall_hell_engraving_top_band" } From 1322ffe86927d8ee7aa87982d5ff742d187a6e0e Mon Sep 17 00:00:00 2001 From: MsrSgtShooterPerson Date: Fri, 14 Feb 2025 02:16:05 +0800 Subject: [PATCH 5/7] Set some Oblige-only materials to no longer replace vanilla materials. --- games/doom/fabs/joiner/gtd_infestation_simple.lua | 2 +- games/doom/materials.lua | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/games/doom/fabs/joiner/gtd_infestation_simple.lua b/games/doom/fabs/joiner/gtd_infestation_simple.lua index cca7091be..6a0afd25c 100644 --- a/games/doom/fabs/joiner/gtd_infestation_simple.lua +++ b/games/doom/fabs/joiner/gtd_infestation_simple.lua @@ -54,6 +54,6 @@ PREFABS.Joiner_natural_caveout = tex_MIDVINE2 = { MIDVINE2 = 1, - ZZWOLF10 = 10 -- invisibility tex + O_INVIST = 10 -- invisibility tex }, } diff --git a/games/doom/materials.lua b/games/doom/materials.lua index db2d75ecf..723f36a6f 100644 --- a/games/doom/materials.lua +++ b/games/doom/materials.lua @@ -376,15 +376,15 @@ DOOM.MATERIALS = -- other -- - O_PILL = { t="CEMENT1", f="O_PILL", sane=1 }, - O_BOLT = { t="CEMENT2", f="O_BOLT", sane=1 }, - O_RELIEF = { t="CEMENT3", f="O_RELIEF", sane=1 }, - O_CARVE = { t="CEMENT4", f="O_CARVE", sane=1 }, - O_NEON = { t="CEMENT6", f="O_NEON", sane=1 }, + O_PILL = { t="O_PILL", f="O_PILL", sane=1 }, -- CEMENT1 + O_BOLT = { t="O_BOLT", f="O_BOLT", sane=1 }, -- CEMENT2 + O_RELIEF = { t="O_RELIEF", f="O_RELIEF", sane=1 }, -- CEMENT3 + O_CARVE = { t="O_CARVE", f="O_CARVE", sane=1 }, -- CEMENT4 + O_NEON = { t="O_NEON", f="O_NEON", sane=1 }, -- CEMENT6 - O_BLACK = { t="CEMENT5", f="O_BLACK", sane=1 }, + O_BLACK = { t="CEMENT5", f="O_BLACK", sane=1 }, -- CEMENT5 - O_INVIST = { t="O_INVIST", f="O_INVIST", sane=1 }, + O_INVIST = { t="O_INVIST", f="O_INVIST", sane=1 }, -- ZZWOLF10 -- new flat, added by data/lift_flat.wad LIFTFLAT = { f="LIFTFLAT", t="SUPPORT2" }, From 6e40fdfe5f98ca49cd5d3d638b231595912327d6 Mon Sep 17 00:00:00 2001 From: MsrSgtShooterPerson Date: Thu, 20 Feb 2025 11:24:12 +0800 Subject: [PATCH 6/7] Boss map frequency now defaults to every end of episode. --- modules/procedural_gotcha.lua | 2 +- modules/procedural_gotcha_edge.lua | 2 +- modules/procedural_gotcha_zdoom.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/procedural_gotcha.lua b/modules/procedural_gotcha.lua index 82e6cab23..6856114e4 100644 --- a/modules/procedural_gotcha.lua +++ b/modules/procedural_gotcha.lua @@ -73,7 +73,7 @@ OB_MODULES["procedural_gotcha"] = name="gotcha_frequency", label=_("Gotcha Frequency"), choices=PROCEDURAL_GOTCHA_FINE_TUNE.PROC_GOTCHA_CHOICES, - default="final", + default="epi", tooltip = _("Procedural Gotchas are two room maps, where the second is an immediate but immensely-sized exit room with gratitiously intensified monster strength. Essentially an arena - prepare for a tough, tough fight!\n\nNotes:\n\n5% of levels may create at least 1 or 2 gotcha maps in a standard full game."), priority = 100, randomize_group="monsters", diff --git a/modules/procedural_gotcha_edge.lua b/modules/procedural_gotcha_edge.lua index 154be18cd..fcaf49888 100644 --- a/modules/procedural_gotcha_edge.lua +++ b/modules/procedural_gotcha_edge.lua @@ -121,7 +121,7 @@ OB_MODULES["procedural_gotcha_edge"] = name="gotcha_frequency", label=_("Gotcha Frequency"), choices=PROCEDURAL_GOTCHA_FINE_TUNE_EDGE.PROC_GOTCHA_CHOICES, - default="final", + default="epi", tooltip = _("Procedural Gotchas are two room maps, where the second is an immediate but immensely-sized exit room with gratitiously intensified monster strength. Essentially an arena - prepare for a tough, tough fight!\n\nNotes:\n\n5% of levels may create at least 1 or 2 gotcha maps in a standard full game."), priority = 106, randomize_group="monsters", diff --git a/modules/procedural_gotcha_zdoom.lua b/modules/procedural_gotcha_zdoom.lua index 0736f2832..c7fbcd2a1 100644 --- a/modules/procedural_gotcha_zdoom.lua +++ b/modules/procedural_gotcha_zdoom.lua @@ -1807,7 +1807,7 @@ OB_MODULES["procedural_gotcha_zdoom"] = name="gotcha_frequency", label=_("Gotcha Frequency"), choices=PROCEDURAL_GOTCHA_FINE_TUNE_ZDOOM.PROC_GOTCHA_CHOICES, - default="final", + default="epi", tooltip = _("Procedural Gotchas are two room maps, where the second is an immediate but immensely-sized exit room with gratitiously intensified monster strength. Essentially an arena - prepare for a tough, tough fight!\n\nNotes:\n\n5% of levels may create at least 1 or 2 gotcha maps in a standard full game."), priority = 106, randomize_group="monsters", From bd01497b83171cc431918908155a6dcf5614752a Mon Sep 17 00:00:00 2001 From: MsrSgtShooterPerson Date: Sat, 22 Feb 2025 00:07:51 +0800 Subject: [PATCH 7/7] Changed some texture assignment on some signs to reflect proper names. --- games/doom/fabs/wall/gtd_wall_neonsigns.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games/doom/fabs/wall/gtd_wall_neonsigns.lua b/games/doom/fabs/wall/gtd_wall_neonsigns.lua index 63a71826a..965ee56d4 100644 --- a/games/doom/fabs/wall/gtd_wall_neonsigns.lua +++ b/games/doom/fabs/wall/gtd_wall_neonsigns.lua @@ -31,8 +31,8 @@ PREFABS.Wall_urban_neon_sign_scrolling_tall = tex_CEMENT1 = { - CEMENT2 = 5, - CEMENT4 = 5, + O_BOLT = 5, + O_CARVE = 5, }, line_1 = @@ -56,8 +56,8 @@ PREFABS.Wall_urban_neon_sign_id = tex_O_RELIEF = { - CEMENT2 = 50, - CEMENT4 = 50, + O_BOLT = 50, + O_CARVE = 50, }, }