Issue #34. Tsumogiri tile when it possible

Author: Nihisil

project/game/ai/discard.py

@@ -48,12 +48,14 @@ def find_tile_in_hand(self, closed_hand):
         """
 
         if self.player.table.has_aka_dora:
+            tiles_five_of_suits = [4, 13, 22]
             # special case, to keep aka dora in hand
-            if self.tile_to_discard in [4, 13, 22]:
+            if self.tile_to_discard in tiles_five_of_suits:
                 aka_closed_hand = closed_hand[:]
                 while True:
                     tile = TilesConverter.find_34_tile_in_136_array(self.tile_to_discard, aka_closed_hand)
-                    # we have only aka dora in the hand
+
+                    # we have only aka dora in the hand, without simple five
                     if not tile:
                         break
 

project/game/ai/first_version/main.py

@@ -74,7 +74,8 @@ def discard_tile(self, discard_tile):
         if discard_tile is not None:
             if not self.last_discard_option:
                 return discard_tile
-            return self.process_discard_option(self.last_discard_option, self.player.closed_hand)
+
+            return self.process_discard_option(self.last_discard_option, self.player.closed_hand, True)
 
         results, shanten = self.calculate_outs(self.player.tiles,
                                                self.player.closed_hand,
@@ -261,11 +262,20 @@ def sorting(x):
 
         return selected_tile
 
-    def process_discard_option(self, discard_option, closed_hand):
+    def process_discard_option(self, discard_option, closed_hand, force_discard=False):
         self.waiting = discard_option.waiting
         self.player.ai.previous_shanten = discard_option.shanten
         self.player.in_tempai = self.player.ai.previous_shanten == 0
-        return discard_option.find_tile_in_hand(closed_hand)
+
+        # when we called meld we don't need "smart" discard
+        if force_discard:
+            return discard_option.find_tile_in_hand(closed_hand)
+
+        last_draw_34 = self.player.last_draw  and self.player.last_draw // 4 or None
+        if self.player.last_draw not in AKA_DORA_LIST and last_draw_34 == discard_option.tile_to_discard:
+            return self.player.last_draw
+        else:
+            return discard_option.find_tile_in_hand(closed_hand)
 
     def estimate_hand_value(self, win_tile, tiles=None, call_riichi=False):
         """

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import unittest
 
-from mahjong.constants import EAST, SOUTH, WEST, NORTH, HAKU, HATSU, CHUN, FIVE_RED_SOU
+from mahjong.constants import EAST, SOUTH, WEST, NORTH, HAKU, HATSU, CHUN, FIVE_RED_SOU, FIVE_RED_PIN
 from mahjong.tests_mixin import TestMixin
 
 from game.ai.discard import DiscardOption
@@ -38,6 +38,30 @@ def test_discard_tile(self):
         self.assertEqual(self._to_string([discarded_tile]), '5m')
         self.assertEqual(player.ai.previous_shanten, 0)
 
+    def test_discard_tile_force_tsumogiri(self):
+        table = Table()
+        table.has_aka_dora = True
+        player = table.player
+
+        tiles = self._string_to_136_array(sou='11134567', pin='456', man='45')
+        tile = 57 # 6p
+
+        player.init_hand(tiles)
+        player.draw_tile(tile)
+
+        discarded_tile = player.discard_tile()
+        self.assertEqual(discarded_tile, tile)
+
+        tiles = self._string_to_136_array(sou='11134567', pin='46', man='45') + [53] # simple five pin
+        tile = FIVE_RED_PIN
+
+        player.init_hand(tiles)
+        player.draw_tile(tile)
+
+        discarded_tile = player.discard_tile()
+        # WE DON'T NEED TO DISCARD RED FIVE
+        self.assertNotEqual(discarded_tile, tile)
+
     def test_calculate_suit_tiles_value(self):
         table = Table()
         player = table.player