Move NoGlow from Metrics to Preferences

jameskr97 · Jun 1, 2019 · df47749 · df47749
1 parent 12515ef
commit df47749
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
@@ -432,6 +432,7 @@ MusicWheelSwitchSpeed=Adjusts the speed of the music wheel.
 MusicWheelUsesSections=&oq;Always&cq; means sections in group + ABC; &oq;Never&cq; means no sections; &oq;Title Only&cq; shows sections in ABC order.
 Network Options=Connect to a server or change server options.
 No Memory Card=No USB memory card was found.
+NoGlow = Toggle the white glow on the Hidden/Sudden Gameplay mods.
 NoteSkins=NoteSkins
 NumBackgrounds=Choose the maximum number of random backgrounds to be loaded simultaneously.
 OnlyDedicatedMenuButtons=Choose between allowing game buttons (dance pad, etc.) and Menu* buttons for menu movement. Be sure to map the Menu* set of buttons before setting this to &oq;Only dedicated buttons&cq;!
@@ -1235,6 +1236,7 @@ Sub title=Sub title
 Sub title transliteration=Sub title transliteration
 SuperGrowth=Super Growth
 FullTapExplosions=Tap Explosion Animation
+NoGlow=Tap Glow
 Tap Steps=Tap Steps
 Tempo=Tempo
 Test Input=Test Input

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
@@ -152,7 +152,6 @@ TinyPercentBase=0.5
 TinyPercentGate=1
 DizzyHoldHeads=false
 QuantizeArrowYPosition=false
-NoGlow=false
 
 [Background]
 # Background stuff. again, its usually a better idea to leave this alone
@@ -2379,7 +2378,7 @@ LineOsuLifts="conf,LiftsOnOsuHolds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsDisplaySub"
 PrevScreen="ScreenOptionsDisplaySub"
-LineNames="1,2,3,4,NSA,14,15,SB,17,19"
+LineNames="1,2,3,4,NSA,NG,14,15,SB,17,19"
 Line1="conf,Language"
 Line2="conf,Announcer"
 Line3="conf,Theme"
@@ -2390,6 +2389,7 @@ LineSB="conf,BackgroundFitMode"
 Line17="conf,ShowDancingCharacters"
 Line19="conf,NumBackgrounds"
 LineNSA="conf,FullTapExplosions"
+LineNG="conf,NoGlow"
 
 [ScreenOptionsUI]
 # user interface options that aren't related to themes, etc.

diff --git a/src/Etterna/Actor/Gameplay/ArrowEffects.cpp b/src/Etterna/Actor/Gameplay/ArrowEffects.cpp
@@ -4,6 +4,7 @@
 #include "Etterna/Singletons/GameState.h"
 #include "NoteDisplay.h"
 #include "Etterna/Models/Misc/PlayerState.h"
+#include "Etterna/Singletons/PrefsManager.h"
 #include "RageUtil/Misc/RageMath.h"
 #include "RageUtil/Misc/RageTimer.h"
 #include "Etterna/Models/Misc/ScreenDimensions.h"
@@ -104,7 +105,6 @@ static ThemeMetric<float> BEAT_PI_HEIGHT("ArrowEffects", "BeatPIHeight");
 static ThemeMetric<float> TINY_PERCENT_BASE("ArrowEffects", "TinyPercentBase");
 static ThemeMetric<float> TINY_PERCENT_GATE("ArrowEffects", "TinyPercentGate");
 static ThemeMetric<bool> DIZZY_HOLD_HEADS("ArrowEffects", "DizzyHoldHeads");
-static ThemeMetric<bool> NO_GLOW("ArrowEffects", "NoGlow");
 
 static const PlayerOptions* curr_options = nullptr;
 
@@ -883,7 +883,7 @@ ArrowEffects::GetGlow(int iCol,
 
 	const float fDistFromHalf = fabsf(fPercentVisible - 0.5f);
 
-	if (!NO_GLOW) {
+	if (!PREFSMAN->m_bNoGlow) {
 		return SCALE(fDistFromHalf, 0, 0.5f, 1.3f, 0);
 	} else {
 		return 0;

diff --git a/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp b/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp
@@ -742,6 +742,7 @@ InitializeConfOptions()
 
 	ADD(ConfOption("Announcer", Announcer, AnnouncerChoices));
 	ADD(ConfOption("DefaultNoteSkin", DefaultNoteSkin, DefaultNoteSkinChoices));
+	ADD(ConfOption("NoGlow", MovePref<bool>, "On", "Off"));
 	ADD(ConfOption("FullTapExplosions", MovePref<bool>, "Short", "Full"));
 	ADD(ConfOption("EnablePitchRates", MovePref<bool>, "Off", "On"));
 	ADD(ConfOption("LiftsOnOsuHolds", MovePref<bool>, "Off", "On"));

diff --git a/src/Etterna/Singletons/PrefsManager.cpp b/src/Etterna/Singletons/PrefsManager.cpp
@@ -175,6 +175,7 @@ PrefsManager::PrefsManager()
   , m_bShowInstructions("ShowInstructions", false)
   , m_bShowCaution("ShowCaution", false)
   , m_bFullTapExplosions("FullTapExplosions", true)
+  , m_bNoGlow("NoGlow", false)
   , m_bShowNativeLanguage("ShowNativeLanguage", true)
   , m_iArcadeOptionsNavigation("ArcadeOptionsNavigation", 0)
   , m_ThreeKeyNavigation("ThreeKeyNavigation", false)

diff --git a/src/Etterna/Singletons/PrefsManager.h b/src/Etterna/Singletons/PrefsManager.h
@@ -180,6 +180,7 @@ class PrefsManager
 	Preference<bool> m_bShowCaution;
 	Preference<bool> m_bShowNativeLanguage;
 	Preference<bool> m_bFullTapExplosions;
+	Preference<bool> m_bNoGlow;
 	Preference<int> m_iArcadeOptionsNavigation;
 	Preference<bool> m_ThreeKeyNavigation;
 	Preference<MusicWheelUsesSections> m_MusicWheelUsesSections;