Set wifeversion given by server for OnlineScores

etternagame · Dec 19, 2020 · f95912a · f95912a
1 parent 3ea10c8
commit f95912a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/src/Etterna/Models/Misc/HighScore.cpp b/src/Etterna/Models/Misc/HighScore.cpp
@@ -1068,6 +1068,11 @@ HighScore::GetValidationKey(ValidationKey vk) const -> const std::string&
 	return m_Impl->ValidationKeys[vk];
 }
 void
+HighScore::SetWifeVersion(int i)
+{
+	m_Impl->WifeVersion = i;
+}
+void
 HighScore::SetRadarValues(const RadarValues& rv)
 {
 	m_Impl->radarValues = rv;

diff --git a/src/Etterna/Models/Misc/HighScore.h b/src/Etterna/Models/Misc/HighScore.h
@@ -175,6 +175,7 @@ struct HighScore
 	auto GenerateValidationKeys() -> std::string;
 	[[nodiscard]] auto GetValidationKey(ValidationKey vk) const
 	  -> const std::string&;
+	void SetWifeVersion(int i);
 	auto GetRescoreJudgeVector(int x) -> std::vector<int>;
 	// laazy
 	std::string scoreid;

diff --git a/src/Etterna/Singletons/DownloadManager.cpp b/src/Etterna/Singletons/DownloadManager.cpp
@@ -1639,7 +1639,10 @@ DownloadManager::RequestChartLeaderBoard(const string& chartkey,
 					StringBuffer buffer;
 					Writer<StringBuffer> writer(buffer);
 					score_obj.Accept(writer);
-					Locator::getLogger()->trace("Malformed score in chart leaderboard (chart: {}): {}", chartkey, buffer.GetString());
+					Locator::getLogger()->trace(
+					  "Malformed score in chart leaderboard (chart: {}): {}",
+					  chartkey,
+					  buffer.GetString());
 					continue;
 				}
 				auto& score = score_obj["attributes"];
@@ -1762,6 +1765,16 @@ DownloadManager::RequestChartLeaderBoard(const string& chartkey,
 					tmp.valid = score["valid"].GetBool();
 				else
 					tmp.valid = false;
+				if (score.HasMember("wifeVersion") &&
+					score["wifeVersion"].IsInt()) {
+					auto v = score["wifeVersion"].GetInt();
+					if (v == 3)
+						tmp.wifeversion = 3;
+					else
+						tmp.wifeversion = 2;
+				}
+				else
+					tmp.wifeversion = 2;
 
 				auto& ssrs = score["skillsets"];
 				FOREACH_ENUM(Skillset, ss)
@@ -1803,6 +1816,7 @@ DownloadManager::RequestChartLeaderBoard(const string& chartkey,
 				hs.SetModifiers(tmp.modifiers);
 				hs.SetChordCohesion(tmp.nocc);
 				hs.SetWifeScore(tmp.wife);
+				hs.SetWifeVersion(tmp.wifeversion);
 				hs.SetSSRNormPercent(tmp.wife);
 				hs.SetMusicRate(tmp.rate);
 				hs.SetChartKey(chartkey);
@@ -2539,6 +2553,8 @@ class LunaDownloadManager : public Luna<DownloadManager>
 		lua_setfield(L, -2, "rate");
 		lua_pushnumber(L, score.wife);
 		lua_setfield(L, -2, "wife");
+		lua_pushnumber(L, score.wifeversion);
+		lua_setfield(L, -2, "wifeversion");
 		lua_pushnumber(L, score.miss);
 		lua_setfield(L, -2, "miss");
 		lua_pushnumber(L, score.marvelous);

diff --git a/src/Etterna/Singletons/DownloadManager.h b/src/Etterna/Singletons/DownloadManager.h
@@ -132,6 +132,7 @@ class OnlineScore
 	std::map<Skillset, float> SSRs;
 	float rate{ 0.0f };
 	float wife{ 0.0f };
+	int wifeversion{ 0 };
 	int maxcombo{ 0 };
 	int miss{ 0 };
 	int bad{ 0 };