account for insert/transforms on score save, invalidate >100% scores

get owned

Author: poco0317

src/Etterna/Models/Misc/StageStats.cpp

@@ -16,6 +16,8 @@
 #include "Core/Services/Locator.hpp"
 #include "GamePreferences.h"
 #include "Etterna/Singletons/ReplayManager.h"
+#include "Etterna/Singletons/GameManager.h"
+#include "Etterna/Models/NoteData/NoteDataUtil.h"
 
 #ifndef _WIN32
 #include <cpuid.h>
@@ -531,7 +533,8 @@ FillInHighScore(const PlayerStageStats& pss,
 			asModifiers.push_back(sSongOptions);
 		}
 	}
-	hs.SetModifiers(join(", ", asModifiers));
+	const auto modstr = join(", ", asModifiers);
+	hs.SetModifiers(modstr);
 
 	hs.SetDateTime(DateTime::GetNowDateTime());
 	hs.SetPlayerGuid(sPlayerGuid);
@@ -589,8 +592,39 @@ FillInHighScore(const PlayerStageStats& pss,
 
 		// for this we need the actual totalpoints values, so we need steps data
 		auto steps = GAMESTATE->m_pCurSteps;
+		auto st = steps->m_StepsType;
+		auto* style = GAMEMAN->GetStyleForStepsType(st);
 		auto nd = steps->GetNoteData();
 		auto* td = steps->GetTimingData();
+
+		// transform the notedata by style if necessary
+		if (style != nullptr) {
+			NoteData ndo;
+			style->GetTransformedNoteDataForStyle(PLAYER_1, nd, ndo);
+			nd = ndo;
+		}
+
+		// Have to account for mirror and shuffle
+		if (style != nullptr && td != nullptr) {
+			PlayerOptions po;
+			po.Init();
+			po.SetForReplay(true);
+			po.FromString(modstr);
+			auto tmpSeed = GAMESTATE->m_iStageSeed;
+
+			// if rng was not saved, only apply non shuffle mods
+			if (hs.GetStageSeed() == 0) {
+				po.m_bTurns[PlayerOptions::TURN_SHUFFLE] = false;
+				po.m_bTurns[PlayerOptions::TURN_SOFT_SHUFFLE] = false;
+				po.m_bTurns[PlayerOptions::TURN_SUPER_SHUFFLE] = false;
+				po.m_bTurns[PlayerOptions::TURN_HRAN_SHUFFLE] = false;
+			} else {
+				GAMESTATE->m_iStageSeed = hs.GetStageSeed();
+			}
+
+			NoteDataUtil::TransformNoteData(nd, *td, po, style->m_StepsType);
+			GAMESTATE->m_iStageSeed = tmpSeed;
+		}
 		auto maxpoints = static_cast<float>(nd.WifeTotalScoreCalc(td));
 
 		// i _think_ an assert is ok here.. if this can happen we probably want

src/Etterna/Singletons/ScoreManager.cpp

@@ -528,6 +528,7 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld)
 				// this function handles skip logic if not necessary
 				hs->NormalizeJudgments();
 
+				// rescore wife2 to wife3 for eligible scores
 				auto remarried = false;
 				if (hs->GetWifeVersion() != 3 && !hs->GetChordCohesion() &&
 					hs->HasReplayData()) {
@@ -540,8 +541,13 @@ ScoreManager::RecalculateSSRs(LoadingWindow* ld)
 					  hs->RescoreToWife3(static_cast<float>(maxpoints));
 				}
 
-				// don't waste time on <= 0%s
-				if (ssrpercent <= 0.f || !steps->IsRecalcValid()) {
+				// don't waste time on <= 0%s or > 100%s
+				if (ssrpercent <= 0.f || ssrpercent > 1.f || !steps->IsRecalcValid()) {
+					if (ssrpercent > 1.f) {
+						hs->SetSSRNormPercent(0.f);
+						hs->SetWifeScore(0.f);
+						hs->SetGrade(Grade_Failed);
+					}
 					hs->ResetSkillsets();
 					continue;
 				}
@@ -1197,14 +1203,18 @@ ScoresAtRate::LoadFromNode(const XNode* node,
 		  scores[sk].IsEmptyNormalized() &&
 		  (scores[sk].HasReplayData() || scores[sk].GetJudgeScale() == 1.F);
 
+		// oops (adding this to the recalc list will reset the score to 0)
+		const auto broke = scores[sk].GetSSRNormPercent() > 1.F ||
+						   scores[sk].GetWifeScore() > 1.F;
+
 		/* technically we don't need to have charts loaded to rescore to
 		 * wife3, however trying to do this might be quite a bit of work (it
 		 * would require making a new lambda loop) and while it would be
 		 * nice to have at some point it's not worth it just at this moment,
 		 * and while it sort of makes sense from a user convenience aspect
 		 * to allow this, it definitely does not make sense from a clarity
 		 * or consistency perspective */
-		if ((oldcalc || getremarried || notnormalized) && SONGMAN->IsChartLoaded(ck)) {
+		if ((oldcalc || getremarried || notnormalized || broke) && SONGMAN->IsChartLoaded(ck)) {
 			SCOREMAN->scorestorecalc.emplace_back(&scores[sk]);
 		}
 	}