From e20c4ad3e7681d51a4185928960572fe45b3eee0 Mon Sep 17 00:00:00 2001 From: Sterling Parker Date: Sat, 15 Jan 2022 08:55:18 -0700 Subject: [PATCH] Menu adjustments --- menudef.txt | 9 ++++++--- readme.md | 2 +- zscript.zsc | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/menudef.txt b/menudef.txt index 2d3d3f3..c3d5c60 100644 --- a/menudef.txt +++ b/menudef.txt @@ -40,8 +40,12 @@ OptionValue "Nice_Flashlight_Position" { 3, "Helmet" } +OptionValue "Nice_Sector_Effects" { + 0, "Remove" + 1, "Keep" +} + AddOptionMenu "OptionsMenu" { - StaticText " " Submenu "DarkDoomZ Settings", "DarkDoomZ_Settings" } @@ -84,7 +88,7 @@ OptionMenu "DarkDoomZ_Advanced_Settings" { StaticText "may still be affected.", "darkgrey" StaticText " " - Option "Sector Effects", "ddz_lighting", "OnOff" + Option "Sector Light Effects", "ddz_lighting", "Nice_Sector_Effects" StaticText "Enables or disables sector light effects", "darkgrey" StaticText "such as flickering or pulsing. Requires", "darkgrey" StaticText "reloading the game or map.", "darkgrey" @@ -94,7 +98,6 @@ OptionMenu "DarkDoomZ_Advanced_Settings" { OptionMenu "DarkDoomZ_Fog_Settings" { Class "DarkDoomZ_OptionMenu" Title "Fog Settings" - StaticText "-- OpenGL only --", "grey" StaticText " " Option "$GLPREFMNU_FOGMODE", gl_fogmode, "FogMode" diff --git a/readme.md b/readme.md index 2fcf8d0..5507b97 100644 --- a/readme.md +++ b/readme.md @@ -15,7 +15,7 @@ A settings menu is provided to adjust the effect. The following settings are ava ## Advanced Settings * **Pre-Gain** - Adjust the level brightness *before* applying adjustments. * **Post-Gain** - Adjust the level brightness *after* applying adjustments. -* **Min. Lightlevel** - Clamps the minimum light level for both "Subtract" and "Compress" modes. +* **Min. Lightlevel** - Enforces a minimum light level regardless of other settings. * **Sky Sectors** - Adjust how much effect is applied to sectors with a sky. * `0.0` = No effect (sky sectors are not adjusted) * `0.5` = Half (sky sectors get half adjustment of other sectors) diff --git a/zscript.zsc b/zscript.zsc index a59919b..c062716 100644 --- a/zscript.zsc +++ b/zscript.zsc @@ -102,8 +102,8 @@ class DarkDoomZ_Handler : EventHandler { break; } - Level.Sectors[i].Lightlevel = max(Level.Sectors[i].Lightlevel, MinLight); Level.Sectors[i].Lightlevel += PostGain; + Level.Sectors[i].Lightlevel = max(Level.Sectors[i].Lightlevel, MinLight); double FinalFogDensity = FogDensity; if(IsSky) { FinalFogDensity *= SkyMode; }