From 863159a5fe50022f9c89b536623ab63b3df1a831 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 7 Dec 2020 18:14:58 -0600 Subject: [PATCH 1/2] Init --- core/assets/bundles/bundle.properties | 1 + core/src/mindustry/type/Weather.java | 2 +- core/src/mindustry/ui/dialogs/SettingsMenuDialog.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 28d9af3072..5a38af86a4 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -832,6 +832,7 @@ setting.chatopacity.name = Chat Opacity setting.lasersopacity.name = Power Laser Opacity setting.bridgeopacity.name = Bridge Opacity setting.playerchat.name = Display Player Bubble Chat +setting.enableweather.name = Enable Weather public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility. public.beta = Note that beta versions of the game cannot make public lobbies. uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds... diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java index 3f815f03e8..4303852b6a 100644 --- a/core/src/mindustry/type/Weather.java +++ b/core/src/mindustry/type/Weather.java @@ -314,7 +314,7 @@ public class Weather extends UnlockableContent{ @Override public void draw(){ - if(renderer.weatherAlpha() > 0.0001f){ + if(renderer.weatherAlpha() > 0.0001f && Core.settings.getBool("enableweather")){ Draw.draw(Layer.weather, () -> { weather.rand.setSeed(0); Draw.alpha(renderer.weatherAlpha() * opacity * weather.opacityMultiplier); diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 48b755c447..0eb6184484 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -404,6 +404,7 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("fps", false); graphics.checkPref("playerindicators", true); graphics.checkPref("indicators", true); + graphics.checkPref("enableweather", true); graphics.checkPref("animatedwater", true); if(Shaders.shield != null){ graphics.checkPref("animatedshields", !mobile); From 881491d151622105938702ffd67b0a22c66d5e19 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 8 Dec 2020 09:10:30 -0600 Subject: [PATCH 2/2] Requested Changes --- core/assets/bundles/bundle.properties | 2 +- core/src/mindustry/type/Weather.java | 2 +- core/src/mindustry/ui/dialogs/SettingsMenuDialog.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 5a38af86a4..ecad546a4b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -832,7 +832,7 @@ setting.chatopacity.name = Chat Opacity setting.lasersopacity.name = Power Laser Opacity setting.bridgeopacity.name = Bridge Opacity setting.playerchat.name = Display Player Bubble Chat -setting.enableweather.name = Enable Weather +setting.showweather.name = Show Weather Graphics public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility. public.beta = Note that beta versions of the game cannot make public lobbies. uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds... diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java index 4303852b6a..48a05219f5 100644 --- a/core/src/mindustry/type/Weather.java +++ b/core/src/mindustry/type/Weather.java @@ -314,7 +314,7 @@ public class Weather extends UnlockableContent{ @Override public void draw(){ - if(renderer.weatherAlpha() > 0.0001f && Core.settings.getBool("enableweather")){ + if(renderer.weatherAlpha() > 0.0001f && Core.settings.getBool("showweather")){ Draw.draw(Layer.weather, () -> { weather.rand.setSeed(0); Draw.alpha(renderer.weatherAlpha() * opacity * weather.opacityMultiplier); diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 0eb6184484..f72f8b1a9a 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -404,7 +404,7 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("fps", false); graphics.checkPref("playerindicators", true); graphics.checkPref("indicators", true); - graphics.checkPref("enableweather", true); + graphics.checkPref("showweather", true); graphics.checkPref("animatedwater", true); if(Shaders.shield != null){ graphics.checkPref("animatedshields", !mobile);