Use ReplaySnapshot wifescores in Replays

poco0317 · Oct 10, 2019 · 9fffd27 · 9fffd27
1 parent f3cdf3d
commit 9fffd27
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/Themes/Til Death/Graphics/Player judgment/default.lua b/Themes/Til Death/Graphics/Player judgment/default.lua
@@ -55,7 +55,7 @@ local t =
 		end
 	end,
 	JudgmentMessageCommand = function(self, param)
-		if param.HoldNoteScore then
+		if param.HoldNoteScore or param.FromReplay then
 			return
 		end
 		local iNumStates = c.Judgment:GetNumStates()

diff --git a/src/Etterna/Screen/Gameplay/ScreenGameplayReplay.cpp b/src/Etterna/Screen/Gameplay/ScreenGameplayReplay.cpp
@@ -384,20 +384,29 @@ ScreenGameplayReplay::ToggleReplayPause()
 		{
 			pss->m_iHoldNoteScores[hns] = rs.hns[hns];
 		}
+		PlayerState* ps = m_vPlayerInfo.GetPlayerState();
+		m_vPlayerInfo.m_pPlayer->curwifescore = rs.curwifescore;
+		m_vPlayerInfo.m_pPlayer->maxwifescore = rs.maxwifescore;
 
 		// Reset the wife/judge counter related visible stuff
 		FOREACH_ENUM(TapNoteScore, tns)
 		{
 			Message msg = Message("Judgment");
+			msg.SetParam("FromReplay", true);
 			msg.SetParam("Judgment", tns);
-			msg.SetParam("WifePercent", 0);
+			msg.SetParam("WifePercent",
+						 100 * rs.curwifescore / rs.maxwifescore);
 			msg.SetParam("Player", 0);
 			msg.SetParam("TapNoteScore", tns);
 			msg.SetParam("FirstTrack", 0);
-			msg.SetParam("CurWifeScore", 0);
-			msg.SetParam("MaxWifeScore", 0);
-			msg.SetParam("WifeDifferential", 0);
-			msg.SetParam("TotalPercent", 0);
+			msg.SetParam("CurWifeScore", rs.curwifescore);
+			msg.SetParam("MaxWifeScore", rs.maxwifescore);
+			msg.SetParam("WifeDifferential",
+						 rs.curwifescore -
+						   rs.maxwifescore * ps->playertargetgoal);
+			msg.SetParam("TotalPercent",
+						 100 * rs.curwifescore /
+						   m_vPlayerInfo.m_pPlayer->totalwifescore);
 			msg.SetParam("Type", RString("Tap"));
 			msg.SetParam("Val", pss->m_iTapNoteScores[tns]);
 			MESSAGEMAN->Broadcast(msg);
@@ -407,15 +416,20 @@ ScreenGameplayReplay::ToggleReplayPause()
 		for (HoldNoteScore hns = HNS_LetGo; hns <= HNS_Held;
 			 hns = static_cast<HoldNoteScore>(hns + 1)) {
 			Message msg = Message("Judgment");
+			msg.SetParam("FromReplay", true);
 			msg.SetParam("Player", 0);
 			msg.SetParam("MultiPlayer", 0);
-			msg.SetParam("WifePercent", 0);
-			msg.SetParam("Player", 0);
+			msg.SetParam("WifePercent",
+						 100 * rs.curwifescore / rs.maxwifescore);
 			msg.SetParam("FirstTrack", 0);
-			msg.SetParam("CurWifeScore", 0);
-			msg.SetParam("MaxWifeScore", 0);
-			msg.SetParam("WifeDifferential", 0);
-			msg.SetParam("TotalPercent", 0);
+			msg.SetParam("CurWifeScore", rs.curwifescore);
+			msg.SetParam("MaxWifeScore", rs.maxwifescore);
+			msg.SetParam("WifeDifferential",
+						 rs.curwifescore -
+						   rs.maxwifescore * ps->playertargetgoal);
+			msg.SetParam("TotalPercent",
+						 100 * rs.curwifescore /
+						   m_vPlayerInfo.m_pPlayer->totalwifescore);
 			msg.SetParam("FirstTrack", 0);
 			msg.SetParam(
 			  "NumTracks",