fix ukeire2 calculation when we are doing a meld

Author: bogachev-pa

project/game/ai/first_version/hand_builder.py

@@ -505,7 +505,7 @@ def choose_tile_to_discard(self, tiles, closed_hand, melds, print_log=True):
         if first_option.shanten in [1, 2, 3]:
             ukeire_field = 'ukeire_second'
             for x in possible_options:
-                self.calculate_second_level_ukeire(x)
+                self.calculate_second_level_ukeire(x, tiles, melds)
 
             possible_options = sorted(possible_options, key=lambda x: -getattr(x, ukeire_field))
 
@@ -621,7 +621,7 @@ def process_discard_option(self, discard_option, closed_hand, force_discard=Fals
         else:
             return discard_option.find_tile_in_hand(closed_hand)
 
-    def calculate_second_level_ukeire(self, discard_option):
+    def calculate_second_level_ukeire(self, discard_option, tiles, melds):
         not_suitable_tiles = self.ai.current_strategy and self.ai.current_strategy.not_suitable_tiles or []
         call_riichi = not self.player.is_open_hand
 
@@ -630,6 +630,8 @@ def calculate_second_level_ukeire(self, discard_option):
         player_tiles_original = self.player.tiles.copy()
 
         tile_in_hand = discard_option.find_tile_in_hand(self.player.closed_hand)
+
+        self.player.tiles = tiles.copy()
         self.player.tiles.remove(tile_in_hand)
 
         sum_tiles = 0
@@ -650,7 +652,7 @@ def calculate_second_level_ukeire(self, discard_option):
             results, shanten = self.find_discard_options(
                 self.player.tiles,
                 self.player.closed_hand,
-                self.player.melds
+                melds
             )
             results = [x for x in results if x.shanten == discard_option.shanten - 1]
 

project/game/ai/first_version/tests/tests_discards.py

@@ -762,30 +762,72 @@ def test_calculate_second_level_ukeire(self):
 
         tile = self._string_to_136_tile(man='4')
         discard_option = [x for x in discard_options if x.tile_to_discard == tile // 4][0]
-        player.ai.hand_builder.calculate_second_level_ukeire(discard_option)
+        player.ai.hand_builder.calculate_second_level_ukeire(discard_option, player.tiles, player.melds)
         self.assertEqual(discard_option.ukeire_second, 108)
 
         tile = self._string_to_136_tile(man='3')
         discard_option = [x for x in discard_options if x.tile_to_discard == tile // 4][0]
-        player.ai.hand_builder.calculate_second_level_ukeire(discard_option)
+        player.ai.hand_builder.calculate_second_level_ukeire(discard_option, player.tiles, player.melds)
         self.assertEqual(discard_option.ukeire_second, 108)
 
         tile = self._string_to_136_tile(pin='2')
         discard_option = [x for x in discard_options if x.tile_to_discard == tile // 4][0]
-        player.ai.hand_builder.calculate_second_level_ukeire(discard_option)
+        player.ai.hand_builder.calculate_second_level_ukeire(discard_option, player.tiles, player.melds)
         self.assertEqual(discard_option.ukeire_second, 96)
 
         tile = self._string_to_136_tile(pin='3')
         discard_option = [x for x in discard_options if x.tile_to_discard == tile // 4][0]
-        player.ai.hand_builder.calculate_second_level_ukeire(discard_option)
+        player.ai.hand_builder.calculate_second_level_ukeire(discard_option, player.tiles, player.melds)
         self.assertEqual(discard_option.ukeire_second, 96)
 
         tile = self._string_to_136_tile(pin='5')
         discard_option = [x for x in discard_options if x.tile_to_discard == tile // 4][0]
-        player.ai.hand_builder.calculate_second_level_ukeire(discard_option)
+        player.ai.hand_builder.calculate_second_level_ukeire(discard_option, player.tiles, player.melds)
         self.assertEqual(discard_option.ukeire_second, 96)
 
         tile = self._string_to_136_tile(pin='6')
         discard_option = [x for x in discard_options if x.tile_to_discard == tile // 4][0]
-        player.ai.hand_builder.calculate_second_level_ukeire(discard_option)
+        player.ai.hand_builder.calculate_second_level_ukeire(discard_option, player.tiles, player.melds)
         self.assertEqual(discard_option.ukeire_second, 96)
+
+    def test_choose_1_shanten_with_cost_possibility_draw(self):
+        table = Table()
+        player = table.player
+        table.add_dora_indicator(self._string_to_136_tile(sou='4'))
+
+        tiles = self._string_to_136_array(man='557', pin='468', sou='55577', honors='66')
+        player.init_hand(tiles)
+
+        meld = self._make_meld(Meld.PON, sou='555')
+        player.add_called_meld(meld)
+
+        tile = self._string_to_136_tile(sou='7')
+        player.draw_tile(tile)
+        discarded_tile = player.discard_tile()
+        self.assertNotEqual(player.ai.current_strategy, None)
+        self.assertEqual(player.ai.current_strategy.type, BaseStrategy.YAKUHAI)
+        self.assertEqual(self._to_string([discarded_tile]), '7m')
+
+    def test_choose_1_shanten_with_cost_possibility_meld(self):
+        table = Table()
+        player = table.player
+        table.add_dora_indicator(self._string_to_136_tile(sou='4'))
+
+        tiles = self._string_to_136_array(man='557', pin='468', sou='55577', honors='66')
+        player.init_hand(tiles)
+
+        meld = self._make_meld(Meld.PON, sou='555')
+        player.add_called_meld(meld)
+
+        tile = self._string_to_136_tile(sou='7')
+        meld, discard_option = player.try_to_call_meld(tile, False)
+        self.assertNotEqual(meld, None)
+        self.assertEqual(meld.type, Meld.PON)
+        self.assertEqual(self._to_string(meld.tiles), '777s')
+
+        self.assertNotEqual(player.ai.current_strategy, None)
+        self.assertEqual(player.ai.current_strategy.type, BaseStrategy.YAKUHAI)
+
+        discarded_tile = discard_option.find_tile_in_hand(player.closed_hand)
+
+        self.assertEqual(self._to_string([discarded_tile]), '7m')