Merge pull request #14 from cwtickle/develop

[ti-7.3] スコアレート計算の誤りを修正
cwtickle · Mar 22, 2020 · 9775645 · 9775645
2 parents 2f39361 + ca88edd
commit 9775645
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/js/danoni_custom.js b/js/danoni_custom.js
@@ -47,7 +47,7 @@ function customLoadingProgress(_event) {
 function customTitleInit() {
 
 	// バージョン表記
-	g_localVersion = `ti-7.2`;
+	g_localVersion = `ti-7.3`;
 
 	// 製作者のデフォルトアドレス
 	if (g_headerObj.creatorUrl === location.href) {
@@ -218,8 +218,8 @@ function customJudgeIi(difFrame) {
 		const multi = (g_resultObj.combo > 100 ? 100 : g_resultObj.combo);
 		const absDifFrame = Math.abs(difFrame);
 		if (absDifFrame <= 5) {
-			g_resultObj.realScore += Math.floor(g_headerObj.calcFirstTerm +
-				g_headerObj.calcDifference * multi * g_headerObj.calcScoreRates[absDifFrame] / 100);
+			g_resultObj.realScore += Math.floor((g_headerObj.calcFirstTerm +
+				g_headerObj.calcDifference * multi) * g_headerObj.calcScoreRates[absDifFrame] / 100);
 		}
 	}
 }
@@ -230,8 +230,8 @@ function customJudgeShakin(difFrame) {
 		const multi = (g_resultObj.combo > 100 ? 100 : g_resultObj.combo);
 		const absDifFrame = Math.abs(difFrame);
 		if (absDifFrame <= 5) {
-			g_resultObj.realScore += Math.floor(g_headerObj.calcFirstTerm +
-				g_headerObj.calcDifference * multi * g_headerObj.calcScoreRates[absDifFrame] / 100);
+			g_resultObj.realScore += Math.floor((g_headerObj.calcFirstTerm +
+				g_headerObj.calcDifference * multi) * g_headerObj.calcScoreRates[absDifFrame] / 100);
 		}
 	}
 }
@@ -242,8 +242,8 @@ function customJudgeMatari(difFrame) {
 		const multi = (g_resultObj.combo > 100 ? 100 : g_resultObj.combo);
 		const absDifFrame = Math.abs(difFrame);
 		if (absDifFrame <= 5) {
-			g_resultObj.realScore += Math.floor(g_headerObj.calcFirstTerm +
-				g_headerObj.calcDifference * multi * g_headerObj.calcScoreRates[absDifFrame] / 100);
+			g_resultObj.realScore += Math.floor((g_headerObj.calcFirstTerm +
+				g_headerObj.calcDifference * multi) * g_headerObj.calcScoreRates[absDifFrame] / 100);
 		}
 	}
 }