graph-games-proto 0.3.1701__py3-none-any.whl → 0.3.1708__py3-none-any.whl

graph_games_proto/fns.py

@@ -1514,34 +1514,34 @@ class ActionMovePiecesToPathOptional(PClass):
     
 
 class PublicLegalActionMovePiecesToPath(PClass):
-    path_idx = field(type=int)
+    path_uuid = field(type=str)
     def __todict__(self):
         return {
-            "path_idx": self.path_idx
+            "path_uuid": self.path_uuid,
         }
     @staticmethod
     def __fromdict__(d):
         return PublicLegalActionMovePiecesToPath(
-            path_idx=d["path_idx"]
+            path_uuid=d["path_uuid"]
         )
 
 
 class LegalActionMovePiecesToPath(PClass):
-    path_idx = field(type=int)
+    path_uuid = field(type=str)
     default = field(type=ActionMovePiecesToPathOptional)  # Optional[MovePiecesToPathAction]
     def get_public(self, state):
         return PublicLegalActionMovePiecesToPath(
-            path_idx=self.path_idx,
+            path_uuid=self.path_uuid,
         )
     def __todict__(self):
         return {
-            "path_idx": self.path_idx,
+            "path_uuid": self.path_uuid,
             "default": self.default.__todict__(),
         }
     @staticmethod
     def __fromdict__(d):
         return LegalActionMovePiecesToPath(
-            path_idx=d["path_idx"],
+            path_uuid=d["path_uuid"],
             default=ActionMovePiecesToPathOptional.__fromdict__(d["default"])
         )
     @staticmethod
@@ -1988,16 +1988,19 @@ class Pile(PClass):
 
 class Segment2(PClass):
     uuid = field(type=str)
+    unit_uuid = field(type=(str, type(None)), initial=None)  # Optional[str]
     pieces = field(type=list)  # List[Piece]
     def __todict__(self):
         return {
             "uuid": self.uuid,
+            "unit_uuid": self.unit_uuid,
             "pieces": self.pieces,
         }
     @staticmethod
     def __fromdict__(d):
         return Segment2(
             uuid=d["uuid"],
+            unit_uuid=d["unit_uuid"],
             pieces=d["pieces"],
         )
 
@@ -2713,7 +2716,7 @@ def get_edges(rng, board_config, nodeuuid2idx):
         for matching_board_path in matching_board_paths:
             path_idx = matching_board_path.num - 1
             segments = [
-                Segment2(uuid=s.uuid, pieces=[]) for s in matching_board_path.path.segments
+                Segment2(uuid=s.uuid, unit_uuid=s.unit_uuid, pieces=[]) for s in matching_board_path.path.segments
             ]
             path = Path2(uuid=str(generate_uuid_with_rng(rng)), idx=path_idx, segments=segments)
             paths.append(path)
@@ -3501,8 +3504,8 @@ def handle_move_pieces_to_path_action(game, action):
     if not player or not player.pieces:
         return game
 
-    path_idx = move_pieces_to_path.path_idx
-    path = get_path_by_idx(game, path_idx)
+    path_uuid = move_pieces_to_path.path_uuid
+    path = game.uuid2path[path_uuid]
 
     if path is None or not path.segments:
         return game
@@ -3525,8 +3528,8 @@ def handle_move_pieces_to_path_action(game, action):
             game.decks[game.carduuid2card[card_uuid].deck_idx].discard.append(card_uuid)
 
     game = game.set(players=game.players)
-    game = game.set(edges=game.edges)
-    game = game.set(player_graphs=calc_player_graphs(game)) # 
+    game = game.set(uuid2path=game.uuid2path)
+    game = game.set(player_graphs=calc_player_graphs(game)) #
 
     return game
 
@@ -3791,11 +3794,11 @@ def is_move_pieces_to_path_action_legal(game, action):
     # print("******************************1234 is_move_pieces_to_path_action_legal 1")
     player_idx = action.legal_action.player_idx
     proposed_cards_uuids = action.move_pieces_to_path.card_uuids
-    path_idx = action.legal_action.move_pieces_to_path.path_idx
-    path = game.game_config.fig.board_config.board_paths[path_idx]
+    path_uuid = action.legal_action.move_pieces_to_path.path_uuid
+    path = game.uuid2path[path_uuid]
     proposed_cards = [card_uuid for card_uuid in game.players[player_idx].cards if card_uuid in proposed_cards_uuids]
     proposed_pieces = [piece_uuid for piece_uuid in game.players[player_idx].pieces if piece_uuid in action.move_pieces_to_path.piece_uuids]
-    remaining_segments = path.path.segments
+    remaining_segments = path.segments
 
     # print("******************************1234 is_move_pieces_to_path_action_legal 1b: ", proposed_cards)
     # print("******************************1234 is_move_pieces_to_path_action_legal 1c: ", proposed_pieces)
@@ -3894,15 +3897,15 @@ def get_total_path_count(game):
     return len(game.uuid2path.values())
 
 
-def get_legal_actions_for_path(game, player_idx, path_idx):
-    if path_idx < 0 or path_idx >= get_total_path_count(game):
+def get_legal_actions_for_path(game, player_idx, path_uuid):
+    if path_uuid not in game.uuid2path:
         return []
-    
-    if not is_path_open_to_player(game, path_idx, player_idx):
+
+    if not is_path_open_to_player(game, path_uuid, player_idx):
         return []
 
     legal_actions = []
-    default = get_sample_actionclaimpath(game, player_idx, path_idx)
+    default = get_sample_actionclaimpath(game, player_idx, path_uuid)
     if default:
         legal_actions.append(
             LegalAction(
@@ -3914,7 +3917,7 @@ def get_legal_actions_for_path(game, player_idx, path_idx):
                 allotted_since_action_idx=(len(game.history) - 1),
                 btn_text="Claim path",
                 move_pieces_to_path=LegalActionMovePiecesToPath(
-                    path_idx=path_idx,
+                    path_uuid=path_uuid,
                     default=default
                 )
             )
@@ -3926,9 +3929,8 @@ def get_legal_actions_for_path(game, player_idx, path_idx):
 def get_legal_actions_for_paths(game, player_idx):
     legal_actions = []
     
-    for path in game.game_config.fig.board_config.board_paths:
-        path_idx = path.num - 1
-        legal_actions_for_path = get_legal_actions_for_path(game, player_idx, path_idx)
+    for path_uuid in game.uuid2path.keys():
+        legal_actions_for_path = get_legal_actions_for_path(game, player_idx, path_uuid)
         if legal_actions_for_path:
             legal_actions.extend(legal_actions_for_path)
         # else:
@@ -3937,16 +3939,16 @@ def get_legal_actions_for_paths(game, player_idx):
     return legal_actions
 
 
-def is_path_open_to_player(game, path_idx, player_idx):
+def is_path_open_to_player(game, path_uuid, player_idx):
 
-    if not game or path_idx < 0 or path_idx >= get_total_path_count(game):
+    if not game or path_uuid not in game.uuid2path:
         return False
     
     # Check if edge is too crowded for the number of players
     
     
     # Check if any segment of the path has pieces from any player
-    path = get_path_by_idx(game, path_idx)
+    path = game.uuid2path[path_uuid]
     if path.segments[0].pieces:
         return False
 
@@ -4116,8 +4118,8 @@ def does_fulfill_path(game, player_idx, path_idx, fulfillment):
     return False
 
 
-def get_sample_actionclaimpath(game, player_idx, path_idx):
-    card_fulfillment, piece_fulfillment = get_sample_path_fulfillment(game, player_idx, path_idx)
+def get_sample_actionclaimpath(game, player_idx, path_uuid):
+    card_fulfillment, piece_fulfillment = get_sample_path_fulfillment(game, player_idx, path_uuid)
     if not card_fulfillment or not piece_fulfillment:
         return None
 
@@ -4127,22 +4129,20 @@ def get_sample_actionclaimpath(game, player_idx, path_idx):
     )
 
 
-def get_sample_path_fulfillment(game, player_idx, path_idx):
-    log = path_idx == 3 and player_idx == 1
-    path = game.game_config.fig.board_config.board_paths[path_idx]
+def get_sample_path_fulfillment(game, player_idx, path_uuid):
+    path = game.uuid2path[path_uuid]
     remaining_card_uuids = [card_uuid for card_uuid in game.players[player_idx].cards if game.carduuid2card[card_uuid].deck_idx == 0]
     remaining_pieces = [
         piece_uuid 
         for piece_uuid in game.players[player_idx].pieces 
         if game.pieceuuid2piece[piece_uuid].piece_template_idx == 0
     ]
-    remaining_segments = path.path.segments
+    remaining_segments = path.segments
     return get_path_fulfillment_from_resources(
         game,
         remaining_card_uuids,
         remaining_pieces,
         remaining_segments,
-        log,
     )
 
 

{graph_games_proto-0.3.1701.dist-info → graph_games_proto-0.3.1708.dist-info}/METADATA

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

{graph_games_proto-0.3.1701.dist-info → graph_games_proto-0.3.1708.dist-info}/RECORD

@@ -1,9 +1,9 @@
 graph_games_proto/__init__.py,sha256=LOpk1mGZxPWMRGrPNoXDENn7JPG6rNfhieehItW8bEA,881
 graph_games_proto/all_types.py,sha256=IpbwftEcHS5Ewz-saFNk0lO9FvcbuHG36odRTayCXUk,54911
-graph_games_proto/fns.py,sha256=VhyabYcA34Oo4QNUHLPVXCnf050jj3PI3pP1IYz6-aU,264543
+graph_games_proto/fns.py,sha256=C8KNhuDQLg2u_ws2HgQd0a8WdhiHIQRQ0wHL1hDxY48,264516
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1701.dist-info/METADATA,sha256=72HOO9KiT8Eg17THvFR0FNTXLo1WL2JjD_6FN64m_gE,188
-graph_games_proto-0.3.1701.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1701.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1701.dist-info/RECORD,,
+graph_games_proto-0.3.1708.dist-info/METADATA,sha256=zZOXaYZxDQlvgx1a7NOa__WGhiNBeKn0w9ZQmgtrL8c,188
+graph_games_proto-0.3.1708.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1708.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1708.dist-info/RECORD,,