graph-games-proto 0.3.1979__py3-none-any.whl → 0.3.1983__py3-none-any.whl

graph_games_proto/fns.py

@@ -1190,7 +1190,7 @@ class LegalActionKeep(PClass):
         deck_idx = legal_action.keep.deck_idx
         card_uuids_matching_deck = [
             card_uuid for card_uuid in discard_tray 
-            if state.carduuid2deckidx[card_uuid] == deck_idx
+            if state.kernel.carduuid2deckidx[card_uuid] == deck_idx
         ]
         num_cards = len(card_uuids_matching_deck)
         actual_min = 0 if legal_action.keep.min is None else legal_action.keep.min
@@ -1231,7 +1231,7 @@ class LegalActionDiscard(PClass):
         deck_idx = legal_action.discard.deck_idx
         card_uuids_matching_deck = [
             card_uuid for card_uuid in discard_tray 
-            if state.carduuid2deckidx[card_uuid] == deck_idx
+            if state.kernel.carduuid2deckidx[card_uuid] == deck_idx
         ]
         num_cards = len(card_uuids_matching_deck)
         actual_min = 0 if legal_action.discard.min is None else legal_action.discard.min
@@ -1535,7 +1535,7 @@ class ActionDiscard(PClass):
     card_uuids = field(type=list)  # List[int]
     def get_public(self, state):
         return PublicActionDiscard(
-            deck_idxs=[state.carduuid2deckidx[card_uuid] for card_uuid in self.card_uuids]
+            deck_idxs=[state.kernel.carduuid2deckidx[card_uuid] for card_uuid in self.card_uuids]
         )
     def __todict__(self):
         return {
@@ -1565,7 +1565,7 @@ class ActionKeep(PClass):
     card_uuids = field(type=list)  # List[int])
     def get_public(self, state):
         return PublicActionKeep(
-            deck_idxs=[state.carduuid2deckidx[card_uuid] for card_uuid in self.card_uuids]
+            deck_idxs=[state.kernel.carduuid2deckidx[card_uuid] for card_uuid in self.card_uuids]
         )
     def __todict__(self):
         return {
@@ -1948,6 +1948,8 @@ class StateKernel(PClass):
     carduuid2card = field(type=dict)  # Dict[str, Card]
     edgetuple2uuid = field(type=dict)  # Dict[Tuple[int, int], str]
     nodeuuid2idx = field(type=dict)  # Dict[str, int]
+    carduuid2deckidx = field(type=dict)  # Dict[str, int]
+    bonusuuid2bonusidx = field(type=dict)  # Dict[str, int]
     def __todict__(self):
         return {
             "rng": rng2json(self.rng),
@@ -1965,6 +1967,8 @@ class StateKernel(PClass):
             "carduuid2card": {k: v.__todict__() for k, v in self.carduuid2card.items()},
             "edgetuple2uuid": [{"k": list(k), "v": v} for k, v in self.edgetuple2uuid.items()],
             "nodeuuid2idx": self.nodeuuid2idx,
+            "carduuid2deckidx": self.carduuid2deckidx,
+            "bonusuuid2bonusidx": self.bonusuuid2bonusidx,
         }
     @staticmethod
     def __fromdict__(d):
@@ -1984,6 +1988,8 @@ class StateKernel(PClass):
             carduuid2card={k: Card.__fromdict(v) for k, v in d["carduuid2card"].items()},
             edgetuple2uuid={tuple(item["k"]): item["v"] for item in d["edgetuple2uuid"]},
             nodeuuid2idx=d["nodeuuid2idx"],
+            carduuid2deckidx=d["carduuid2deckidx"],
+            bonusuuid2bonusidx=d["bonusuuid2bonusidx"],
         )
 
 
@@ -2005,11 +2011,14 @@ def init_state_kernel(**kwargs):
                 pieces = generate_pieces(piece_template, player_idx)
                 for piece in pieces:
                     pieceuuid2piece[piece.uuid] = piece
+
+    carduuid2deckidx = {}
     carduuid2card = {}
     for dek in board_config.deks:
         cards = generate_cards(dek)
         for card in cards:
             carduuid2card[card.uuid] = card
+            carduuid2deckidx[card.uuid] = dek.idx
 
     nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
     edges = get_edges(rng, board_config, nodeuuid2idx)
@@ -2019,6 +2028,9 @@ def init_state_kernel(**kwargs):
         node_2_idx = nodeuuid2idx[edge.node_2_uuid]
         edge_tuple = (min(node_1_idx, node_2_idx), max(node_1_idx, node_2_idx))
         edgetuple2uuid[edge_tuple] = edge.uuid
+
+    bonuses = game_config.fig.board_config.bonuses
+    bonusuuid2bonusidx = {bonus.uuid: idx for idx, bonus in enumerate(bonuses)}
     
     return StateKernel(
         rng=rng,
@@ -2036,6 +2048,8 @@ def init_state_kernel(**kwargs):
         pieceuuid2piece=pieceuuid2piece,
         edgetuple2uuid=edgetuple2uuid,
         nodeuuid2idx=nodeuuid2idx,
+        carduuid2deckidx=carduuid2deckidx,
+        bonusuuid2bonusidx=bonusuuid2bonusidx
     )
 
 
@@ -2043,8 +2057,6 @@ class State(PClass):
     kernel = field(type=StateKernel)
     idx2path = field(type=list)  # List[Path2]
     bonus_statuses = field(type=list)  # List[BonusStatus]
-    bonusuuid2bonusidx = field(type=dict)  # Dict[str, int]
-    carduuid2deckidx = field(type=dict)  # Dict[str, int]
     starting_decks = field(type=list)  # List[Deck]
     starting_piles = field(type=list)
     history = field(type=list)  # List[Action2]
@@ -2067,8 +2079,6 @@ class State(PClass):
             "kernel": self.kernel.__todict__(),
             "idx2path": [v.__todict__() for v in self.idx2path],
             "bonus_statuses": [status.__todict__() for status in self.bonus_statuses],
-            "bonusuuid2bonusidx": self.bonusuuid2bonusidx,
-            "carduuid2deckidx": self.carduuid2deckidx,
             "starting_decks": [deck.__todict__() for deck in self.starting_decks],
             "starting_piles": [pile.__todict__() for pile in self.starting_piles],
             "history": [x.__todict__() for x in self.history],
@@ -2093,8 +2103,6 @@ class State(PClass):
             kernel=StateKernel.__fromdict__(d["kernel"]),
             idx2path=[Path2.__fromdict__(v) for v in d["idx2path"]],
             bonus_statuses=[BonusStatus.__fromdict__(x) for x in d["bonus_statuses"]],
-            bonusuuid2bonusidx=d["bonusuuid2bonusidx"],
-            carduuid2deckidx=d["carduuid2deckidx"],
             starting_decks=[Deck.__fromdict__(x) for x in d["starting_decks"]],
             starting_piles=[Pile.__fromdict__(x) for x in d["starting_piles"]],
             history=[Action2.__fromdict__(x) for x in d["history"]],
@@ -2591,12 +2599,9 @@ def getinitialstate(game_config):
                 )
                 piles.append(pile)
 
-    carduuid2deckidx = {}
     decks = []
     for dek in board_config.deks:
         cards = generate_cards(dek)
-        for card in cards:
-            carduuid2deckidx[card.uuid] = dek.idx
         deck_obj = Deck(
             uuid=dek.uuid,
             idx=dek.idx,
@@ -2617,7 +2622,6 @@ def getinitialstate(game_config):
             idx2path.append(path)
 
     bonuses = game_config.fig.board_config.bonuses
-    bonusuuid2bonusidx = {bonus.uuid: idx for idx, bonus in enumerate(bonuses)}
     bonus_statuses = [
         BonusStatus(
             bonus_uuid=bonus.uuid, 
@@ -2637,8 +2641,6 @@ def getinitialstate(game_config):
     state = State(
         idx2path=idx2path,
         bonus_statuses=bonus_statuses,
-        bonusuuid2bonusidx=bonusuuid2bonusidx,
-        carduuid2deckidx=carduuid2deckidx,
         starting_decks=[
             Deck.__fromdict__(x.__todict__()) for x in decks
         ],
@@ -2736,7 +2738,7 @@ def score_public_items(state, player_idx):
                             )
                         )
     for bonus_status in state.bonus_statuses:
-        bonus_idx = state.bonusuuid2bonusidx.get(bonus_status.bonus_uuid)
+        bonus_idx = state.kernel.bonusuuid2bonusidx.get(bonus_status.bonus_uuid)
         bonus = state.kernel.game_config.fig.board_config.bonuses[bonus_idx] if bonus_idx is not None else None
         if bonus:
             if player_idx in bonus_status.winners:

{graph_games_proto-0.3.1979.dist-info → graph_games_proto-0.3.1983.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graph_games_proto
-Version: 0.3.1979
+Version: 0.3.1983
 Requires-Dist: multipledispatch==1.0.0
 Requires-Dist: pyrsistent==0.20.0
 Requires-Dist: numpy==2.2.4

{graph_games_proto-0.3.1979.dist-info → graph_games_proto-0.3.1983.dist-info}/RECORD

@@ -1,9 +1,9 @@
 graph_games_proto/__init__.py,sha256=_EVQR-51XehfH45XZlba1WPdx3omS3Gm1nTwrgGyn2Q,667
 graph_games_proto/all_types.py,sha256=IpbwftEcHS5Ewz-saFNk0lO9FvcbuHG36odRTayCXUk,54911
-graph_games_proto/fns.py,sha256=UmMYsHE-hSIYp7yY97Ymw2slYoiksCnlyOSmh2IAXB0,182175
+graph_games_proto/fns.py,sha256=yB1kxoIYiYt6D_Xx9A6Vp6CVTPe3m30M3GDVULVF7SI,182235
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1979.dist-info/METADATA,sha256=SpZKxq-eiPOe7pvaqflou0pEJSMT7kpJvi5m7N9C5Co,188
-graph_games_proto-0.3.1979.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1979.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1979.dist-info/RECORD,,
+graph_games_proto-0.3.1983.dist-info/METADATA,sha256=GbtVYo6tdOH0n-whQiol1hXhN0SOA3khUr8SuSk-SAQ,188
+graph_games_proto-0.3.1983.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1983.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1983.dist-info/RECORD,,