Migrate to mahjong library with 1.0.3 version

Author: Nihisil

project/game/ai/discard.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from mahjong.constants import AKA_DORA_LIST
 from mahjong.tile import TilesConverter
-from mahjong.utils import is_honor, simplify, plus_dora
+from mahjong.utils import is_honor, simplify, plus_dora, is_aka_dora
 
 
 class DiscardOption(object):
@@ -87,9 +87,10 @@ def calculate_value(self, shanten=None):
             simplified_tile = simplify(self.tile_to_discard)
             value += suit_tile_grades[simplified_tile]
 
-        count_of_dora = plus_dora(self.tile_to_discard * 4,
-                                  self.player.table.dora_indicators,
-                                  self.player.table.has_aka_dora)
+        count_of_dora = plus_dora(self.tile_to_discard * 4, self.player.table.dora_indicators)
+        if is_aka_dora(self.tile_to_discard * 4, self.player.table.has_open_tanyao):
+            count_of_dora += 1
+
         value += 50 * count_of_dora
 
         if is_honor(self.tile_to_discard):

project/game/ai/first_version/defence/enemy_analyzer.py

@@ -1,5 +1,5 @@
 from mahjong.tile import TilesConverter
-from mahjong.utils import plus_dora, count_tiles_by_suits
+from mahjong.utils import plus_dora, count_tiles_by_suits, is_aka_dora
 
 
 class EnemyAnalyzer(object):
@@ -61,6 +61,8 @@ def is_threatening(self):
         meld_tiles_34 = TilesConverter.to_34_array(meld_tiles)
         if meld_tiles:
             dora_count = sum([plus_dora(x, self.table.dora_indicators) for x in meld_tiles])
+            # aka dora
+            dora_count += sum([1 for x in meld_tiles if is_aka_dora(x, self.table.has_open_tanyao)])
             # enemy has a lot of dora tiles in his opened sets
             # so better to fold against him
             if dora_count >= 3:

project/game/ai/first_version/defence/main.py

@@ -1,5 +1,5 @@
 from mahjong.tile import TilesConverter
-from mahjong.utils import plus_dora, is_honor
+from mahjong.utils import plus_dora, is_honor, is_aka_dora
 
 from game.ai.first_version.defence.defence import DefenceTile
 from game.ai.first_version.defence.enemy_analyzer import EnemyAnalyzer
@@ -60,7 +60,9 @@ def should_go_to_defence_mode(self, discard_candidate=None):
 
         if shanten == 1:
             # TODO calculate all possible hand costs for 1-2 shanten
-            dora_count = sum([plus_dora(x, self.table.dora_indicators, self.table.has_aka_dora) for x in self.player.tiles])
+            dora_count = sum([plus_dora(x, self.table.dora_indicators) for x in self.player.tiles])
+            # aka dora
+            dora_count += sum([1 for x in self.player.tiles if is_aka_dora(x, self.table.has_open_tanyao)])
             # we had 3+ dora in our almost done hand,
             # we can try to push it
             if dora_count >= 3:

project/game/ai/first_version/defence/suji.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from mahjong.utils import is_man, simplify, is_pin, is_sou, plus_dora
+from mahjong.utils import is_man, simplify, is_pin, is_sou, plus_dora, is_aka_dora
 
 from game.ai.first_version.defence.defence import Defence, DefenceTile
 
@@ -108,7 +108,7 @@ def _suji_tiles(self, suji):
 
         # mark dora tiles as dangerous tiles to discard
         for tile in result:
-            if plus_dora(tile.value * 4, self.table.dora_indicators, False):
+            if plus_dora(tile.value * 4, self.table.dora_indicators) or is_aka_dora(tile.value * 4, self.table.has_open_tanyao):
                 tile.danger += 100
 
         return result

project/game/table.py

@@ -114,7 +114,7 @@ def add_dora_indicator(self, tile):
         self._add_revealed_tile(tile)
 
     def is_dora(self, tile):
-        return plus_dora(tile, self.dora_indicators) or is_aka_dora(tile)
+        return plus_dora(tile, self.dora_indicators) or is_aka_dora(tile, self.has_open_tanyao)
 
     def set_players_scores(self, scores, uma=None):
         for i in range(0, len(scores)):

project/game/tests/tests_table.py

@@ -156,6 +156,8 @@ def test_is_dora(self):
         table.dora_indicators = [self._string_to_136_tile(pin='1')]
         self.assertFalse(table.is_dora(self._string_to_136_tile(sou='2')))
 
+        table.has_open_tanyao = True
+
         # red five man
         self.assertTrue(table.is_dora(FIVE_RED_MAN))
 

project/requirements.txt

@@ -1,2 +1,2 @@
-mahjong==1.0.2
+mahjong==1.0.3
 requests==2.18.4