Merge branch '0.55.2'

Author: MinaciousGrace

CMake/SMDefs.cmake

@@ -1,7 +1,7 @@
 # Set up version numbers according to the new scheme.
 set(SM_VERSION_MAJOR 0)
 set(SM_VERSION_MINOR 55)
-set(SM_VERSION_PATCH 1)
+set(SM_VERSION_PATCH 2)
 set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
 
 execute_process(COMMAND git rev-parse --short HEAD

extern/MinaCalc/MinaCalc.a

@@ -213,7 +213,7 @@ class GameState
 	bool		m_bLoadingNextSong;
 	int		GetLoadingCourseSongIndex() const;
 
-	RString GetEtternaVersion() { return "0.55.1"; }
+	RString GetEtternaVersion() { return "0.55.2"; }
 	bool isplaylistcourse = false;
 	bool IsPlaylistCourse() { return isplaylistcourse; }
 	bool CountNotesSeparately();

extern/MinaCalc/MinaCalc.lib

@@ -810,6 +810,7 @@ XNode* HighScore::CreateEttNode() const
 	return m_Impl->CreateEttNode();
 }
 
+// Used for importing from stats.xml -mina
 void HighScore::LoadFromNode( const XNode* pNode ) 
 {
 	m_Impl->LoadFromNode( pNode );
@@ -835,9 +836,20 @@ void HighScore::LoadFromNode( const XNode* pNode )
 	}
 }
 
+// Used to load from etterna.xml -mina
 void HighScore::LoadFromEttNode(const XNode* pNode)
 {
 	m_Impl->LoadFromEttNode(pNode);
+
+	if (m_Impl->fSSRNormPercent > 1000.f) {
+		if (m_Impl->grade != Grade_Failed)
+			m_Impl->fSSRNormPercent = RescoreToWifeJudgeDuringLoad(4);
+		else
+			m_Impl->fSSRNormPercent = m_Impl->fWifeScore;
+
+		m_Impl->vNoteRowVector.clear();
+		m_Impl->vOffsetVector.clear();
+	}
 }
 
 string HighScore::GetDisplayName() const

src/GameState.h

@@ -6,7 +6,7 @@
 
 !define PRODUCT_ID "Etterna"
 ; TODO: This needs to be updated with the git rev hash
-!define PRODUCT_VER "v0.55.1"
+!define PRODUCT_VER "v0.55.2"
 !define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "ett"
 

src/HighScore.cpp

@@ -1528,7 +1528,7 @@ XNode* Profile::SaveEttGeneralDataCreateNode() const {
 	pGeneralDataNode->AppendChild("CharacterID", m_sCharacterID);
 	pGeneralDataNode->AppendChild("Guid", m_sGuid);
 	pGeneralDataNode->AppendChild("SortOrder", SortOrderToString(m_SortOrder));
-	pGeneralDataNode->AppendChild("LastDifficulty", DifficultyToString(m_LastDifficulty));
+	pGeneralDataNode->AppendChild("LastDifficulty", DifficultyToString(Difficulty_Invalid));
 	if (m_LastStepsType != StepsType_Invalid)
 		pGeneralDataNode->AppendChild("LastStepsType", GAMEMAN->GetStepsTypeInfo(m_LastStepsType).szName);
 	pGeneralDataNode->AppendChild(m_lastSong.CreateNode());

src/ProductInfo.inc

@@ -46,9 +46,14 @@ void ScoresAtRate::AddScore(HighScore& hs) {
 	bestGrade = min(hs.GetWifeGrade(), bestGrade);
 	scores.emplace(key, hs);
 
-	if(!PBptr || PBptr->GetWifeScore() < hs.GetWifeScore())
+	if(!PBptr || PBptr->GetSSRNormPercent() < hs.GetSSRNormPercent())
 		PBptr = &scores.find(key)->second;
 
+	if (hs.GetChordCohesion() == 0) {
+		if(!noccPBptr || noccPBptr->GetSSRNormPercent() < hs.GetSSRNormPercent())
+			noccPBptr = &scores.find(key)->second;
+	}
+
 	SCOREMAN->RegisterScore(&scores.find(key)->second);
 	SCOREMAN->AddToKeyedIndex(&scores.find(key)->second);
 }
@@ -220,7 +225,7 @@ void ScoreManager::RecalculateSSRs(LoadingWindow *ld) {
 		++scoreindex;
 
 		HighScore* hs = AllScores[i];
-		if (hs->GetSSRCalcVersion() == 236) // temp hack
+		if (hs->GetSSRCalcVersion() == GetCalcVersion())
 			continue;
 
 		Steps* steps = SONGMAN->GetStepsByChartkey(hs->GetChartKey());
@@ -253,7 +258,7 @@ void ScoreManager::RecalculateSSRs(LoadingWindow *ld) {
 		auto dakine = MinaSDCalc(serializednd, steps->GetNoteData().GetNumTracks(), musicrate, ssrpercent, 1.f, td->HasWarps());
 		FOREACH_ENUM(Skillset, ss)
 			hs->SetSkillsetSSR(ss, dakine[ss]);
-		hs->SetSSRCalcVersion(236); // temp hack
+		hs->SetSSRCalcVersion(GetCalcVersion());
 
 		td->UnsetEtaner();
 		nd.UnsetNerv();
@@ -324,7 +329,7 @@ float ScoreManager::AggregateSSRs(Skillset ss, float rating, float res, int iter
 		rating += res;
 		sum = 0.0;
 		for (int i = 0; i < static_cast<int>(TopSSRs.size()); i++) {
-			if(TopSSRs[i]->GetSSRCalcVersion() == 236 && TopSSRs[i]->GetEtternaValid()) // temp hack
+			if(TopSSRs[i]->GetSSRCalcVersion() == GetCalcVersion() && TopSSRs[i]->GetEtternaValid())
 				sum += max(0.0, 2.f / erfc(0.1*(TopSSRs[i]->GetSkillsetSSR(ss) - rating)) - 1.5);
 		}
 	} while (pow(2, rating * 0.1) < sum);
@@ -440,7 +445,7 @@ void ScoresAtRate::LoadFromNode(const XNode* node, const string& ck, const float
 			PBptr = &scores.find(sk)->second;
 		else {
 			// update pb if a better score is found
-			if (PBptr->GetWifeScore() < scores[sk].GetWifeScore())
+			if (PBptr->GetSSRNormPercent() < scores[sk].GetSSRNormPercent())
 				PBptr = &scores.find(sk)->second;
 		}
 

src/Profile.cpp

@@ -43,7 +43,7 @@
 
 	; don't forget to change this before releasing a new version.
 	; wish this could be automated, but it requires "X.Y.Z.a" format. -aj
-	VIProductVersion "0.55.1.0"
+	VIProductVersion "0.55.2.0"
 	VIAddVersionKey "ProductName" "${PRODUCT_ID}"
 	VIAddVersionKey "FileVersion" "${PRODUCT_VER}"
 	VIAddVersionKey "FileDescription" "${PRODUCT_ID} Installer"