revise strategies order

Also, fixed bug with try_to_call_meld previous shanten calculation.

Author: bogachev-pa

project/game/ai/first_version/main.py

@@ -100,15 +100,15 @@ def discard_tile(self, discard_tile, print_log=True):
         )
 
     def try_to_call_meld(self, tile_136, is_kamicha_discard):
-        tiles_136 = self.player.tiles[:] + [tile_136]
+        tiles_136_previous = self.player.tiles[:]
+        tiles_136 = tiles_136_previous + [tile_136]
         self.determine_strategy(tiles_136)
 
         if not self.current_strategy:
             return None, None
 
-        tiles_34 = TilesConverter.to_34_array(tiles_136)
-
-        previous_shanten, _ = self.hand_builder.calculate_shanten(tiles_34, self.player.meld_34_tiles)
+        tiles_34_previous = TilesConverter.to_34_array(tiles_136_previous)
+        previous_shanten, _ = self.hand_builder.calculate_shanten(tiles_34_previous, self.player.meld_34_tiles)
 
         if previous_shanten == Shanten.AGARI_STATE and not self.current_strategy.can_meld_into_agari():
             return None, None
@@ -133,22 +133,23 @@ def determine_strategy(self, tiles_136):
         old_strategy = self.current_strategy
         self.current_strategy = None
 
-        # order is important
-        strategies = [
-            ChinitsuStrategy(BaseStrategy.CHINITSU, self.player),
-            HonitsuStrategy(BaseStrategy.HONITSU, self.player),
-            YakuhaiStrategy(BaseStrategy.YAKUHAI, self.player),
-        ]
+        # order is important, we add strategies with the highest priority first
+        strategies = []
 
         if self.player.table.has_open_tanyao:
             strategies.append(TanyaoStrategy(BaseStrategy.TANYAO, self.player))
 
+        strategies.append(YakuhaiStrategy(BaseStrategy.YAKUHAI, self.player))
+        strategies.append(HonitsuStrategy(BaseStrategy.HONITSU, self.player))
+        strategies.append(ChinitsuStrategy(BaseStrategy.CHINITSU, self.player))
+
         strategies.append(ChiitoitsuStrategy(BaseStrategy.CHIITOITSU, self.player))
         strategies.append(FormalTempaiStrategy(BaseStrategy.FORMAL_TEMPAI, self.player))
 
         for strategy in strategies:
             if strategy.should_activate_strategy(tiles_136):
                 self.current_strategy = strategy
+                break
 
         if self.current_strategy:
             if not old_strategy or self.current_strategy.type != old_strategy.type:

project/game/ai/first_version/tests/strategies/tests_chiitoitsu.py

@@ -62,3 +62,35 @@ def test_keep_chiitoitsu_tempai(self):
 
         discard = player.discard_tile()
         self.assertEqual(self._to_string([discard]), '6m')
+
+    def test_5_pairs_yakuhai_not_chiitoitsu(self):
+        table = Table()
+        player = table.player
+
+        table.add_dora_indicator(self._string_to_136_tile(sou='9'))
+        table.add_dora_indicator(self._string_to_136_tile(sou='1'))
+
+        tiles = self._string_to_136_array(sou='112233', pin='16678', honors='66')
+        player.init_hand(tiles)
+
+        tile = self._string_to_136_tile(honors='6')
+        meld, _ = player.try_to_call_meld(tile, True)
+
+        self.assertNotEqual(player.ai.current_strategy.type, BaseStrategy.CHIITOITSU)
+
+        self.assertEqual(player.ai.current_strategy.type, BaseStrategy.YAKUHAI)
+
+        self.assertNotEqual(meld, None)
+
+    def chiitoitsu_tanyao_tempai(self):
+        table = Table()
+        player = table.player
+
+        tiles = self._string_to_136_array(sou='223344', pin='788', man='4577')
+        player.init_hand(tiles)
+
+        player.draw_tile(self._string_to_136_tile(man='4'))
+
+        discard = player.discard_tile()
+        discard_correct = self._to_string([discard]) == '7p' or self._to_string([discard]) == '5m'
+        self.assertEqual(discard_correct, True)