Fix score calculation in 3 player mode

Jimboom7 · May 22, 2022 · 1e7f65c · 1e7f65c
1 parent 3c3843f
commit 1e7f65c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/ai_offense.js b/src/ai_offense.js
@@ -408,6 +408,11 @@ function getHandValues(hand, discardedTile) {
 	var waits = 0; //Waits when in Tenpai (Or fractions of it when 1 shanten)
 	var fu = 0;
 
+	var kita = 0;
+	if (getNumberOfPlayers() == 3) {
+		kita = getNumberOfKitaOfPlayer(0) * getTileDoraValue({ index: 4, type: 3 });
+	}
+
 	var waitTiles = [];
 	var tileCombinations = []; //List of combinations for second step to save calculation time
 
@@ -559,12 +564,12 @@ function getHandValues(hand, discardedTile) {
 				doraValue += thisDora * factor;
 				yaku.open += thisYaku.open * factor;
 				yaku.closed += thisYaku.closed * factor;
-				expectedScore.open += calculateScore(0, thisYaku.open + thisDora, thisFu) * factor;
-				expectedScore.closed += calculateScore(0, thisYaku.closed + thisDora, thisFu) * factor;
+				expectedScore.open += calculateScore(0, thisYaku.open + thisDora + kita, thisFu) * factor;
+				expectedScore.closed += calculateScore(0, thisYaku.closed + thisDora + kita, thisFu) * factor;
 				numberOfTotalCombinations += factor;
 			}
 
-			expectedScore.riichi += calculateScore(0, thisYaku.closed + thisDora + 1 + 0.2 + getUradoraChance(), thisFu) * thisWait * factor;
+			expectedScore.riichi += calculateScore(0, thisYaku.closed + thisDora + kita + 1 + 0.2 + getUradoraChance(), thisFu) * thisWait * factor;
 			numberOfTotalWaitCombinations += factor * thisWait;
 			if (!tile1Furiten) {
 				hand.pop();
@@ -657,8 +662,8 @@ function getHandValues(hand, discardedTile) {
 				doraValue += thisDora * combFactor;
 				yaku.open += thisYaku.open * combFactor;
 				yaku.closed += thisYaku.closed * combFactor;
-				expectedScore.open += calculateScore(0, thisYaku.open + thisDora) * combFactor;
-				expectedScore.closed += calculateScore(0, thisYaku.closed + thisDora) * combFactor;
+				expectedScore.open += calculateScore(0, thisYaku.open + thisDora + kita) * combFactor;
+				expectedScore.closed += calculateScore(0, thisYaku.closed + thisDora + kita) * combFactor;
 				numberOfTotalCombinations += combFactor;
 			}
 
@@ -692,12 +697,7 @@ function getHandValues(hand, discardedTile) {
 	}
 
 	if (baseShanten > 0) { //When not tenpai
-		expectedScore.riichi = calculateScore(0, yaku.closed + doraValue + 1 + 0.2 + getUradoraChance());
-	}
-
-	if (getNumberOfPlayers() == 3) {
-		var kita = getNumberOfKitaOfPlayer(0) * getTileDoraValue({ index: 4, type: 3 });
-		doraValue += kita;
+		expectedScore.riichi = calculateScore(0, yaku.closed + doraValue + kita + 1 + 0.2 + getUradoraChance());
 	}
 
 	var danger = 0;

diff --git a/src/utils.js b/src/utils.js
@@ -564,6 +564,10 @@ function calculateScore(player, han, fu = 30) {
 		score *= 1.5;
 	}
 
+	if (getNumberOfPlayers() == 3) {
+		score *= 0.75;
+	}
+
 	return score;
 }