From 6f6a9f0687b6675dac4356aec1413370a207e9ea Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Sun, 23 Mar 2025 10:31:56 -0500 Subject: [PATCH 1/4] always do the day/night shade --- SpriteColors.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/SpriteColors.cpp b/SpriteColors.cpp index 66f3d235..d04d284d 100644 --- a/SpriteColors.cpp +++ b/SpriteColors.cpp @@ -206,9 +206,6 @@ ALLEGRO_COLOR premultiply(ALLEGRO_COLOR input) ALLEGRO_COLOR shadeAdventureMode(ALLEGRO_COLOR color, bool foggy, bool outside) { auto& contentLoader = stonesenseState.contentLoader; - if(contentLoader->gameMode.g_mode != GAMEMODE_ADVENTURE) { - return color; - } if(foggy && stonesenseState.ssConfig.config.fog_of_war) { color.r *= 0.25f; @@ -216,14 +213,12 @@ ALLEGRO_COLOR shadeAdventureMode(ALLEGRO_COLOR color, bool foggy, bool outside) color.b *= 0.25f; } - if(stonesenseState.ssConfig.config.dayNightCycle) { - if(outside) { - color = color*getDayShade(contentLoader->currentHour, contentLoader->currentTickRel); - } else { - color.r *= 0.5f; - color.g *= 0.5f; - color.b *= 0.5f; - } + if (outside) { + color = color * getDayShade(contentLoader->currentHour, contentLoader->currentTickRel); + } else { + color.r *= 0.75f; + color.g *= 0.75f; + color.b *= 0.75f; } return color; From 628382ced043311e313597dd7ab2de5a67feabc6 Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Sun, 23 Mar 2025 11:37:08 -0500 Subject: [PATCH 2/4] Always do fogOwar but only in adventure mode --- SpriteColors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpriteColors.cpp b/SpriteColors.cpp index d04d284d..f52a2b3d 100644 --- a/SpriteColors.cpp +++ b/SpriteColors.cpp @@ -207,7 +207,7 @@ ALLEGRO_COLOR shadeAdventureMode(ALLEGRO_COLOR color, bool foggy, bool outside) { auto& contentLoader = stonesenseState.contentLoader; - if(foggy && stonesenseState.ssConfig.config.fog_of_war) { + if(foggy && contentLoader->gameMode.g_mode == GAMEMODE_ADVENTURE) { color.r *= 0.25f; color.g *= 0.25f; color.b *= 0.25f; From f3608a239711df776e0a391e95d4a32f802e8ba2 Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Fri, 4 Apr 2025 17:38:30 -0500 Subject: [PATCH 3/4] Update changelog.txt --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index 1c488263..8989ffff 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -38,6 +38,7 @@ Template for new versions: # Future ## New Features +- `stonesense`: stonesense now has visible day/night cycle lighting in fortress mode ## Fixes From 23bc64361444adcf36a6916a4c82f9e4766e0dc4 Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Sun, 13 Jul 2025 10:30:20 -0500 Subject: [PATCH 4/4] Respect the day/night config --- SpriteColors.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SpriteColors.cpp b/SpriteColors.cpp index f52a2b3d..5c3f9ded 100644 --- a/SpriteColors.cpp +++ b/SpriteColors.cpp @@ -207,6 +207,10 @@ ALLEGRO_COLOR shadeAdventureMode(ALLEGRO_COLOR color, bool foggy, bool outside) { auto& contentLoader = stonesenseState.contentLoader; + if (!stonesenseState.ssConfig.config.dayNightCycle) { + return color; + } + if(foggy && contentLoader->gameMode.g_mode == GAMEMODE_ADVENTURE) { color.r *= 0.25f; color.g *= 0.25f;