1-1

Author: MinaciousGrace

src/Etterna/Actor/Gameplay/Player.cpp

@@ -2992,7 +2992,7 @@ Player::SetMineJudgment(TapNoteScore tns, int iTrack)
 
 		// Ms scoring implemenation - Mina
 		if (tns == TNS_HitMine)
-			curwifescore -= 8.f;
+			curwifescore -= wife3_miss_weight;
 
 		if (m_pPlayerStageStats != nullptr) {
 			if (maxwifescore == 0.f)
@@ -3074,10 +3074,10 @@ Player::SetJudgment(int iRow,
 
 		if (m_pPlayerStageStats != nullptr) {
 			if (tns == TNS_Miss)
-				curwifescore -= 8;
+				curwifescore -= wife3_miss_weight;
 			else
 				curwifescore +=
-				  wife2(tn.result.fTapNoteOffset, m_fTimingWindowScale);
+				  wife3(tn.result.fTapNoteOffset, m_fTimingWindowScale);
 			maxwifescore += 2;
 
 			msg.SetParam("WifePercent", 100 * curwifescore / maxwifescore);
@@ -3187,7 +3187,7 @@ Player::SetHoldJudgment(TapNote& tn, int iTrack, int iRow)
 			// Ms scoring implemenation - Mina
 			if (tn.HoldResult.hns == HNS_LetGo ||
 				tn.HoldResult.hns == HNS_Missed)
-				curwifescore -= 6.f;
+				curwifescore -= wife3_hold_drop_weight;
 
 			msg.SetParam("WifePercent", 100 * curwifescore / maxwifescore);
 			msg.SetParam("CurWifeScore", curwifescore);

src/Etterna/Models/Misc/HighScore.cpp

@@ -1526,12 +1526,12 @@ HighScore::ConvertDpToWife()
 	float ts = 1.f;
 	float estpoints = 0.f;
 	float maxpoints = 0.f;
-	estpoints += m_Impl->iTapNoteScores[TNS_W1] * wife2(.01125f, ts);
-	estpoints += m_Impl->iTapNoteScores[TNS_W2] * wife2(.03375f, ts);
-	estpoints += m_Impl->iTapNoteScores[TNS_W3] * wife2(.0675f, ts);
-	estpoints += m_Impl->iTapNoteScores[TNS_W4] * wife2(.1125f, ts);
-	estpoints += m_Impl->iTapNoteScores[TNS_W5] * wife2(.1575f, ts);
-	estpoints += m_Impl->iTapNoteScores[TNS_Miss] * -8;
+	estpoints += m_Impl->iTapNoteScores[TNS_W1] * wife3(.01125f, ts);
+	estpoints += m_Impl->iTapNoteScores[TNS_W2] * wife3(.03375f, ts);
+	estpoints += m_Impl->iTapNoteScores[TNS_W3] * wife3(.0675f, ts);
+	estpoints += m_Impl->iTapNoteScores[TNS_W4] * wife3(.1125f, ts);
+	estpoints += m_Impl->iTapNoteScores[TNS_W5] * wife3(.1575f, ts);
+	estpoints += m_Impl->iTapNoteScores[TNS_Miss] * wife3_miss_weight;
 
 	FOREACH_ENUM(TapNoteScore, tns)
 	maxpoints += 2 * m_Impl->iTapNoteScores[tns];

src/Etterna/Models/Misc/PlayerStageStats.cpp

@@ -1003,7 +1003,7 @@ LuaFunction(GetGradeFromPercent, GetGradeFromPercent(FArg(1)))
 
 	static int WifeScoreOffset(T* p, lua_State* L)
 	{
-		lua_pushnumber(L, wife2(FArg(1), p->GetTimingScale()));
+		lua_pushnumber(L, wife3(FArg(1), p->GetTimingScale()));
 		return 1;
 	}