fix 3p meta

shinkuan · Mar 28, 2024 · e00a186 · e00a186
1 parent ea2c36c
commit e00a186
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/client.py b/client.py
@@ -162,10 +162,11 @@ def refresh_log(self) -> None:
                     logger.log("CLICK", self.app.mjai_msg_dict[self.flow_id][-1])
                     self.app.set_timer(2, self.autoplay)
             if self.mjai_msg_idx < len(self.app.mjai_msg_dict[self.flow_id]):
-                self.app.mjai_msg_dict[self.flow_id][-1]['meta'] = meta_to_recommend(self.app.mjai_msg_dict[self.flow_id][-1]['meta'])
+                bridge = self.app.bridge[self.flow_id]
+                self.app.mjai_msg_dict[self.flow_id][-1]['meta'] = meta_to_recommend(self.app.mjai_msg_dict[self.flow_id][-1]['meta'], bridge.is_3p)
                 latest_mjai_msg = self.app.mjai_msg_dict[self.flow_id][-1]
                 # Update tehai
-                player_state = self.app.bridge[self.flow_id].mjai_client.bot.state()
+                player_state = bridge.mjai_client.bot.state()
                 tehai, tsumohai = state_to_tehai(player_state)
                 for idx, tehai_label in enumerate(self.tehai_labels):
                     tehai_label.update(TILE_2_UNICODE_ART_RICH[tehai[idx]])
@@ -199,6 +200,8 @@ def refresh_log(self) -> None:
                 for akagi_pai_class in self.akagi_pai.classes:
                     self.akagi_pai.remove_class(akagi_pai_class)
                 self.akagi_pai.add_class("pai_"+latest_mjai_msg["type"])
+                for consume_id in self.consume_ids:
+                    self.query_one(consume_id).remove()
                 if "consumed" in latest_mjai_msg:
                     self.akagi_pai.label = str(latest_mjai_msg["consumed"])
                     if "pai" in latest_mjai_msg:
@@ -211,8 +214,6 @@ def refresh_log(self) -> None:
                         self.consume_ids.append("#"+"consumed_"+c+str(i))
                         i+=1
                 elif "pai" in latest_mjai_msg:
-                    for consume_id in self.consume_ids:
-                        self.query_one(consume_id).remove()
                     self.consume_ids = []
                     self.akagi_pai.label = str(latest_mjai_msg["pai"])
                     self.pai_unicode_art.update(TILE_2_UNICODE_ART_RICH[latest_mjai_msg["pai"]])

diff --git a/libriichi_helper.py b/libriichi_helper.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-def meta_to_recommend(meta: dict) -> dict:
+def meta_to_recommend(meta: dict, is_3p=False) -> dict:
     # """
     # {
     #     "q_values":[
@@ -25,14 +25,26 @@ def meta_to_recommend(meta: dict) -> dict:
 
     recommend = []
 
-    mask_unicode = [
+    mask_unicode_4p = [
         "1m", "2m", "3m", "4m", "5m", "6m", "7m", "8m", "9m",
         "1p", "2p", "3p", "4p", "5p", "6p", "7p", "8p", "9p",
         "1s", "2s", "3s", "4s", "5s", "6s", "7s", "8s", "9s",
          "E",  "S",  "W",  "N",  "P",  "F",  "C",
         '5mr', '5pr', '5sr', 
         'reach', 'chi_low', 'chi_mid', 'chi_high', 'pon', 'kan_select', 'hora', 'ryukyoku', 'none'
     ]
+    mask_unicode_3p = [
+        "1m", "2m", "3m", "4m", "5m", "6m", "7m", "8m", "9m",
+        "1p", "2p", "3p", "4p", "5p", "6p", "7p", "8p", "9p",
+        "1s", "2s", "3s", "4s", "5s", "6s", "7s", "8s", "9s",
+         "E",  "S",  "W",  "N",  "P",  "F",  "C",
+        '5mr', '5pr', '5sr', 
+        'reach', 'pon', 'kan_select', 'nukidora', 'hora', 'ryukyoku', 'none'
+    ]
+    if is_3p:
+        mask_unicode = mask_unicode_3p
+    else:
+        mask_unicode = mask_unicode_4p
 
     def mask_bits_to_binary_string(mask_bits):
         binary_string = bin(mask_bits)[2:]