Merge pull request #19 from cwtickle/develop

[ti-8.2] FUJIさんスコア計算式でフリーズコンボ分が考慮されていなかった問題を修正
cwtickle · Nov 28, 2020 · 4085b80 · 4085b80
2 parents 6dcd4f0 + 08a1f03
commit 4085b80
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/js/danoni_custom.js b/js/danoni_custom.js
@@ -39,7 +39,7 @@ function customLoadingProgress(_event) {
 function customTitleInit() {
 
 	// バージョン表記
-	g_localVersion = `ti-8.1`;
+	g_localVersion = `ti-8.2`;
 
 	// 製作者のデフォルトアドレス
 	if (g_headerObj.creatorUrl === location.href) {
@@ -253,11 +253,12 @@ const calcArrowRcv = {
 	},
 	Type3: (difFrame, rate = 0, plus = 0) => {
 		let coeff;
-		if (g_resultObj.combo > g_headerObj.cutCombo) {
-			coeff = 2 + (g_resultObj.combo - g_headerObj.cutCombo) / g_headerObj.cutCombo / 6;
-		}
-		else {
-			coeff = 1 + g_resultObj.combo / g_headerObj.cutCombo;
+		// FUJIさんソースはコンボ更新前にスコア計算を行うためその補正
+		const comboTotal = g_resultObj.combo + g_resultObj.fCombo - 1;
+		if (comboTotal > g_headerObj.cutCombo) {
+			coeff = 2 + (comboTotal - g_headerObj.cutCombo) / g_headerObj.cutCombo / 6;
+		} else {
+			coeff = 1 + comboTotal / g_headerObj.cutCombo;
 		}
 
 		// スコア更新