Add more tests and rename chankan to shouminkan in comments

Author: Nihisil

project/game/ai/base/main.py

@@ -58,7 +58,7 @@ def should_call_riichi(self):
 
     def should_call_kan(self, tile, is_open_kan, from_riichi=False):
         """
-        When bot can call kan or chankan this method will be called
+        When bot can call kan or shouminkan this method will be called
         :param tile: 136 tile format
         :param is_open_kan: boolean
         :param from_riichi: boolean

project/game/ai/first_version/main.py

@@ -248,11 +248,11 @@ def should_call_kan(self, tile, open_kan, from_riichi=False):
 
         # let's check can we upgrade opened pon to the kan
         pon_melds = [x for x in self.player.meld_34_tiles if is_pon(x)]
-        has_chankan_candidate = False
+        has_shouminkan_candidate = False
         for meld in pon_melds:
             # tile is equal to our already opened pon
             if tile_34 in meld:
-                has_chankan_candidate = True
+                has_shouminkan_candidate = True
 
                 tiles.append(tile)
                 closed_hand_tiles.append(tile)
@@ -272,7 +272,7 @@ def should_call_kan(self, tile, open_kan, from_riichi=False):
                 )
                 new_waits_count = self.hand_builder.count_tiles(new_waiting, tiles_34)
 
-        if not has_chankan_candidate:
+        if not has_shouminkan_candidate:
             # we don't have enough tiles in the hand
             if closed_hand_34[tile_34] != 3:
                 return None
@@ -312,7 +312,7 @@ def should_call_kan(self, tile, open_kan, from_riichi=False):
             assert new_waits_count <= previous_waits_count
 
             if new_waits_count == previous_waits_count:
-                return has_chankan_candidate and Meld.CHANKAN or Meld.KAN
+                return has_shouminkan_candidate and Meld.CHANKAN or Meld.KAN
 
         return None
 

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

@@ -395,7 +395,7 @@ def test_using_tiles_of_different_suit_for_chi(self):
         meld, _ = player.try_to_call_meld(tile, True)
         self.assertIsNotNone(meld)
 
-    def test_call_chankan_and_bad_ukeire_after_call(self):
+    def test_call_upgrade_pon_and_bad_ukeire_after_call(self):
         table = Table()
         table.count_of_remaining_tiles = 10
 
@@ -411,9 +411,10 @@ def test_call_chankan_and_bad_ukeire_after_call(self):
         self.assertEqual(len(table.player.tiles), 13)
         self.assertEqual(table.player.should_call_kan(tile, False), None)
 
-    def test_call_chankan_and_bad_ukeire_after_call_second(self):
+    def test_call_upgrade_pon_and_bad_ukeire_after_call_second_case(self):
         table = Table()
         table.count_of_remaining_tiles = 10
+        player = table.player
 
         tiles = self._string_to_136_array(man='3455567', sou='222', honors='666')
         table.player.init_hand(tiles)
@@ -424,7 +425,31 @@ def test_call_chankan_and_bad_ukeire_after_call_second(self):
 
         self.assertEqual(table.player.should_call_kan(tile, False), None)
 
-    def test_upgrade_opened_pon_to_kan(self):
+        player.draw_tile(tile)
+        discarded_tile = player.discard_tile()
+
+        self.assertEqual(self._to_string([discarded_tile]), '3m')
+
+    def test_call_upgrade_pon_and_bad_ukeire_after_call_third_case(self):
+        table = Table()
+        table.count_of_remaining_tiles = 10
+        player = table.player
+
+        tiles = self._string_to_136_array(man='67', pin='6', sou='1344478999')
+        table.player.init_hand(tiles)
+        table.player.add_called_meld(self._make_meld(Meld.PON, sou='444'))
+
+        tile = self._string_to_136_tile(sou='4')
+
+        # we don't want to call shouminkan here
+        self.assertEqual(table.player.should_call_kan(tile, False), None)
+
+        player.draw_tile(tile)
+        discarded_tile = player.discard_tile()
+
+        self.assertEqual(self._to_string([discarded_tile]), '6p')
+
+    def test_call_shouminkan(self):
         table = Table()
         table.count_of_remaining_tiles = 10
 
@@ -476,8 +501,7 @@ def test_opened_kan(self):
         tile = self._string_to_136_tile(sou='1')
         self.assertEqual(table.player.should_call_kan(tile, True), None)
 
-        # test case 2
-
+    def test_opened_kan_second_case(self):
         table = Table()
         table.count_of_remaining_tiles = 10
 
@@ -493,7 +517,7 @@ def test_opened_kan(self):
         tile = self._string_to_136_tile(sou='1')
         self.assertEqual(table.player.should_call_kan(tile, True), Meld.KAN)
 
-        # test case 3
+    def test_opened_kan_third_case(self):
         # we are in tempai already and there was a crash on 5s meld suggestion
 
         table = Table()

project/game/player.py

@@ -65,13 +65,13 @@ def erase_state(self):
         self.round_step = 0
 
     def add_called_meld(self, meld: Meld):
-        # we already added chankan as a pon set
+        # we already added shouminkan as a pon set
         if meld.type == Meld.CHANKAN:
             tile_34 = meld.tiles[0] // 4
 
             pon_set = [x for x in self.melds if x.type == Meld.PON and (x.tiles[0] // 4) == tile_34]
 
-            # when we are doing reconnect and we have called chankan set
+            # when we are doing reconnect and we have called shouminkan set
             # we will not have called pon set in the hand
             if pon_set:
                 self.melds.remove(pon_set[0])

project/game/table.py

@@ -108,7 +108,7 @@ def add_called_meld(self, player_seat, meld):
         else:
             # can't have a pon or chi from the hand
             assert meld.type == Meld.KAN or meld.type == meld.CHANKAN
-            # player draws additional tile from the wall in case of closed kan or chankan
+            # player draws additional tile from the wall in case of closed kan or shouminkan
             self.count_of_remaining_tiles -= 1
 
         self.get_player(player_seat).add_called_meld(meld)
@@ -119,7 +119,7 @@ def add_called_meld(self, player_seat, meld):
         if meld.called_tile is not None:
             tiles.remove(meld.called_tile)
 
-        # for chankan we already added 3 tiles
+        # for shouminkan we already added 3 tiles
         if meld.type == meld.CHANKAN:
             tiles = [meld.tiles[0]]
 

project/tenhou/client.py

@@ -281,11 +281,13 @@ def start_game(self):
 
                         if kan_type == Meld.CHANKAN:
                             meld_type = 5
+                            logger.info('We upgraded pon to kan!')
                         else:
                             meld_type = 4
+                            logger.info('We called a closed kan set!')
 
                         self._send_message('<N type="{}" hai="{}" />'.format(meld_type, drawn_tile))
-                        logger.info('We called a closed kan\chankan set!')
+
                         continue
 
                     if not main_player.in_riichi:
@@ -345,7 +347,7 @@ def start_game(self):
                 ]
                 # we win by other player's discard
                 if any(i in message for i in win_suggestions):
-                    # enemy called chankan and we can win there
+                    # enemy called shouminkan and we can win there
                     if self.decoder.is_opened_set_message(message):
                         meld = self.decoder.parse_meld(message)
                         tile = meld.called_tile