Add avenue to reset all of Filterman and use it in Til Death

etternagame · Jul 16, 2020 · f12ce12 · f12ce12
1 parent 8b5b489
commit f12ce12
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/filters.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/filters.lua
@@ -171,6 +171,9 @@ local f =
 			end,
 			MaxFilterRateChangedMessageCommand = function(self)
 				self:queuecommand("Set")
+			end,
+			ResetFilterMessageCommand = function(self)
+				self:queuecommand("Set")
 			end
 		},
 	Def.Quad {
@@ -202,6 +205,9 @@ local f =
 			end,
 			MaxFilterRateChangedMessageCommand = function(self)
 				self:queuecommand("Set")
+			end,
+			ResetFilterMessageCommand = function(self)
+				self:queuecommand("Set")
 			end
 		},
 	Def.Quad {
@@ -237,6 +243,9 @@ local f =
 			end,
 			FilterModeChangedMessageCommand = function(self)
 				self:queuecommand("Set")
+			end,
+			ResetFilterMessageCommand = function(self)
+				self:queuecommand("Set")
 			end
 		},
 	Def.Quad {
@@ -270,6 +279,9 @@ local f =
 			end,
 			FilterModeChangedMessageCommand = function(self)
 				self:queuecommand("Set")
+			end,
+			ResetFilterMessageCommand = function(self)
+				self:queuecommand("Set")
 			end
 		},
 	Def.Quad {
@@ -315,6 +327,9 @@ local f =
 			end,
 			FilterModeChangedMessageCommand = function(self)
 				self:queuecommand("Set")
+			end,
+			ResetFilterMessageCommand = function(self)
+				self:queuecommand("Set")
 			end
 		}
 }
@@ -457,14 +472,15 @@ f[#f + 1] =
 	end,
 	MouseLeftClickMessageCommand = function(self)
 		if isOver(self) and active then
-			FILTERMAN:ResetSSFilters()
+			FILTERMAN:ResetAllFilters()
 			for i = 1, #ms.SkillSets do
 				SSQuery[0][i] = "0"
 				SSQuery[1][i] = "0"
 			end
 			activebound = 0
 			ActiveSS = 0
 			MESSAGEMAN:Broadcast("UpdateFilter")
+			MESSAGEMAN:Broadcast("ResetFilter")
 			MESSAGEMAN:Broadcast("NumericInputEnded")
 			SCREENMAN:set_input_redirected(PLAYER_1, false)
 			whee:SongSearch("")

diff --git a/src/Etterna/Singletons/FilterManager.cpp b/src/Etterna/Singletons/FilterManager.cpp
@@ -58,6 +58,19 @@ FilterManager::ResetSSFilters()
 	}
 }
 
+void
+FilterManager::ResetAllFilters()
+{
+	ResetSSFilters();
+	ExclusiveFilter = false;
+	HighestSkillsetsOnly = false;
+
+	if (m_pPlayerState != nullptr)
+		m_pPlayerState->wtFFF = 1.F;
+	MaxFilterRate = 1.F;
+
+}
+
 // tmp filter stuff - mina
 bool
 FilterManager::AnyActiveFilter()
@@ -110,6 +123,11 @@ class LunaFilterManager : public Luna<FilterManager>
 		p->ResetSSFilters();
 		return 0;
 	}
+	static int ResetAllFilters(T* p, lua_State* L)
+	{
+		p->ResetAllFilters();
+		return 0;
+	}
 	static int SetMaxFilterRate(T* p, lua_State* L)
 	{
 		float mfr = FArg(1);
@@ -201,6 +219,7 @@ class LunaFilterManager : public Luna<FilterManager>
 		ADD_METHOD(SetSSFilter);
 		ADD_METHOD(GetSSFilter);
 		ADD_METHOD(ResetSSFilters);
+		ADD_METHOD(ResetAllFilters);
 		ADD_METHOD(AnyActiveFilter);
 		ADD_METHOD(SetMaxFilterRate);
 		ADD_METHOD(GetMaxFilterRate);

diff --git a/src/Etterna/Singletons/FilterManager.h b/src/Etterna/Singletons/FilterManager.h
@@ -22,6 +22,7 @@ class FilterManager
 	float GetSSFilter(Skillset ss, int bound);
 	void SetSSFilter(float v, Skillset ss, int bound);
 	void ResetSSFilters(); // reset button for filters
+	void ResetAllFilters();
 	bool HighestSkillsetsOnly = false;
 	bool AnyActiveFilter();