allow defaulting NOTESKIN->GetMetric

this is definitely a thing somewhere and i didnt look hard enough
jameskr97 · Dec 13, 2022 · b7fa469 · b7fa469
1 parent c3e0ccf
commit b7fa469
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 0 deletions.
diff --git a/src/Etterna/Singletons/NoteSkinManager.cpp b/src/Etterna/Singletons/NoteSkinManager.cpp
@@ -349,20 +349,62 @@ NoteSkinManager::GetMetric(const std::string& sButtonName,
 	return sReturn;
 }
 
+std::string
+NoteSkinManager::GetMetric(const std::string& sButtonName,
+						   const std::string& sValue, const std::string& sFallbackValue)
+{
+	if (m_sCurrentNoteSkin.empty()) {
+		LuaHelpers::ReportScriptError(
+		  "NOTESKIN:GetMetric: No noteskin currently set.", "NOTESKIN_ERROR");
+		return "";
+	}
+	auto sNoteSkinName = make_lower(m_sCurrentNoteSkin);
+	map<std::string, NoteSkinData>::const_iterator it =
+	  g_mapNameToData.find(sNoteSkinName);
+	ASSERT_M(it != g_mapNameToData.end(),
+			 sNoteSkinName); // this NoteSkin doesn't exist!
+	const auto& data = it->second;
+
+	std::string sReturn;
+	if (data.metrics.GetValue(sButtonName, sValue, sReturn))
+		return sReturn;
+	if (!data.metrics.GetValue("NoteDisplay", sValue, sReturn)) {
+		// dont report an error
+		return sFallbackValue;
+	}
+	return sReturn;
+}
+
 int
 NoteSkinManager::GetMetricI(const std::string& sButtonName,
 							const std::string& sValueName)
 {
 	return StringToInt(GetMetric(sButtonName, sValueName));
 }
 
+int
+NoteSkinManager::GetMetricI(const std::string& sButtonName,
+							const std::string& sValueName,
+							const std::string& sDefaultValue)
+{
+	return StringToInt(GetMetric(sButtonName, sValueName, sDefaultValue));
+}
+
 float
 NoteSkinManager::GetMetricF(const std::string& sButtonName,
 							const std::string& sValueName)
 {
 	return StringToFloat(GetMetric(sButtonName, sValueName));
 }
 
+float
+NoteSkinManager::GetMetricF(const std::string& sButtonName,
+							const std::string& sValueName,
+							const std::string& sDefaultValue)
+{
+	return StringToFloat(GetMetric(sButtonName, sValueName, sDefaultValue));
+}
+
 bool
 NoteSkinManager::GetMetricB(const std::string& sButtonName,
 							const std::string& sValueName)
@@ -371,6 +413,15 @@ NoteSkinManager::GetMetricB(const std::string& sButtonName,
 	return StringToInt(GetMetric(sButtonName, sValueName)) != 0;
 }
 
+bool
+NoteSkinManager::GetMetricB(const std::string& sButtonName,
+							const std::string& sValueName,
+							const std::string& sDefaultValue)
+{
+	// Could also call GetMetricI here...hmm.
+	return StringToInt(GetMetric(sButtonName, sValueName, sDefaultValue)) != 0;
+}
+
 apActorCommands
 NoteSkinManager::GetMetricA(const std::string& sButtonName,
 							const std::string& sValueName)

diff --git a/src/Etterna/Singletons/NoteSkinManager.h b/src/Etterna/Singletons/NoteSkinManager.h
@@ -65,12 +65,24 @@ class NoteSkinManager
 
 	auto GetMetric(const std::string& sButtonName, const std::string& sValue)
 	  -> std::string;
+	auto GetMetric(const std::string& sButtonName,
+				   const std::string& sValue,
+				   const std::string& sFallbackValue) -> std::string;
 	auto GetMetricI(const std::string& sButtonName,
 					const std::string& sValueName) -> int;
+	auto GetMetricI(const std::string& sButtonName,
+				   const std::string& sValueName,
+				   const std::string& sDefaultValue) -> int;
 	auto GetMetricF(const std::string& sButtonName,
 					const std::string& sValueName) -> float;
+	auto GetMetricF(const std::string& sButtonName,
+					 const std::string& sValueName,
+					 const std::string& sDefaultValue) -> float;
 	auto GetMetricB(const std::string& sButtonName,
 					const std::string& sValueName) -> bool;
+	auto GetMetricB(const std::string& sButtonName,
+					const std::string& sValueName,
+					const std::string& sDefaultValue) -> bool;
 	auto GetMetricA(const std::string& sButtonName,
 					const std::string& sValueName) -> apActorCommands;