Calculate verified suji count based on enemy safe tiles, not on all revealed tiles

Author: Nihisil

project/game/ai/defence/enemy_analyzer.py

@@ -7,7 +7,7 @@
 from game.ai.helpers.possible_forms import PossibleFormsAnalyzer
 from mahjong.tile import TilesConverter
 from mahjong.utils import is_aka_dora, plus_dora
-from utils.general import suits_tiles
+from utils.general import separate_tiles_by_suits
 
 
 class EnemyAnalyzer:
@@ -102,8 +102,7 @@ def assumed_hand_cost(self) -> int:
     def number_of_unverified_suji(self) -> int:
         maximum_number_of_suji = 18
         verified_suji = 0
-        closed_hand_34 = TilesConverter.to_34_array(self.main_player.closed_hand)
-        suits = suits_tiles(self.main_player, closed_hand_34)
+        suits = separate_tiles_by_suits(TilesConverter.to_34_array([x * 4 for x in self.enemy.all_safe_tiles]))
         for suit in suits:
             # indices started from 0
             suji_indices = [[0, 3, 6], [1, 4, 7], [2, 5, 8]]

project/game/ai/helpers/kabe.py

@@ -1,4 +1,4 @@
-from utils.general import suits_tiles
+from utils.general import revealed_suits_tiles
 
 
 class Kabe:
@@ -39,7 +39,7 @@ def find_all_kabe(self, tiles_34):
         kabe_tiles_weak = []
         kabe_tiles_partial = []
 
-        suits = suits_tiles(self.player, tiles_34)
+        suits = revealed_suits_tiles(self.player, tiles_34)
         for x in range(0, 3):
             suit = suits[x]
 

project/game/ai/helpers/possible_forms.py

@@ -1,7 +1,7 @@
 from game.ai.helpers.defence import TileDanger
 from mahjong.constants import EAST
 from mahjong.tile import TilesConverter
-from utils.general import suits_tiles
+from utils.general import revealed_suits_tiles
 
 
 class PossibleFormsAnalyzer:
@@ -20,7 +20,7 @@ def calculate_possible_forms(self, safe_tiles):
         closed_hand_34 = TilesConverter.to_34_array(self.player.closed_hand)
 
         # first of all let's find suji for suits tiles
-        suits = suits_tiles(self.player, closed_hand_34)
+        suits = revealed_suits_tiles(self.player, closed_hand_34)
         for x in range(0, 3):
             suit = suits[x]
 

project/utils/general.py

@@ -10,31 +10,47 @@ def make_random_letters_and_digit_string(length=15):
     return "".join(random.choice(random_chars) for _ in range(length))
 
 
-def suits_tiles(player, tiles_34):
+def revealed_suits_tiles(player, tiles_34):
     """
-    Return tiles separated by suits
+    Return all reviled tiles separated by suits for provided tiles list
+    """
+    return _suits_tiles_helper(
+        tiles_34, lambda _tile_34_index, _tiles_34: player.number_of_revealed_tiles(_tile_34_index, _tiles_34)
+    )
+
+
+def separate_tiles_by_suits(tiles_34):
+    """
+    Return tiles separated by suits for provided tiles list
+    """
+    return _suits_tiles_helper(tiles_34, lambda _tile_34_index, _tiles_34: _tiles_34[_tile_34_index])
+
+
+def _suits_tiles_helper(tiles_34, total_tiles_lambda):
+    """
+    Separate tiles by suit
     """
     suits = [
         [0] * 9,
         [0] * 9,
         [0] * 9,
     ]
 
-    for tile in range(0, EAST):
-        total_tiles = player.number_of_revealed_tiles(tile, tiles_34)
+    for tile_34_index in range(0, EAST):
+        total_tiles = total_tiles_lambda(tile_34_index, tiles_34)
         if not total_tiles:
             continue
 
         suit_index = None
-        simplified_tile = simplify(tile)
+        simplified_tile = simplify(tile_34_index)
 
-        if is_man(tile):
+        if is_man(tile_34_index):
             suit_index = 0
 
-        if is_pin(tile):
+        if is_pin(tile_34_index):
             suit_index = 1
 
-        if is_sou(tile):
+        if is_sou(tile_34_index):
             suit_index = 2
 
         suits[suit_index][simplified_tile] += total_tiles