graph-games-proto 0.3.1756__py3-none-any.whl → 0.3.1758__py3-none-any.whl

graph_games_proto/fns.py

@@ -15,8 +15,8 @@ from functools import cmp_to_key
 from itertools import combinations as itertools_combinations, chain
 from collections import deque
 
-DEFAULT_ALLOTTED_SECONDS = 20
-INITIAL_ALLOTTED_SECONDS = 30
+DEFAULT_ALLOTTED_SECONDS = 60
+INITIAL_ALLOTTED_SECONDS = 120
 
 class NoAction(PClass):
     pass
@@ -1669,7 +1669,7 @@ class LegalAction(PClass):
     name = field(type=str)
     title = field(type=(str, type(None)), initial=None)  # Optional[str]
     instruction = field(type=(str, type(None)), initial=None)  # Optional[str]
-    allotted_seconds = field(type=int, initial=120)  # int
+    allotted_seconds = field(type=int, initial=INITIAL_ALLOTTED_SECONDS)  # int
     allotted_since_action_idx = field(type=int, initial=-1)  # int
     btn_text = field(type=(str, type(None)), initial=None)  # Optional[str]
     discard = field(type=(LegalActionDiscard, type(None)), initial=None)  # LegalActionDiscard
@@ -2361,6 +2361,35 @@ class PublicPlayerScore(PClass):
             items=[ScoreItem2.__fromdict__(x) for x in d["items"]],
             total=d["total"]
         )
+
+
+class ScoreItemBonus(PClass):
+    bonus_uuid = field(type=str)
+    def __todict__(self):
+        return {
+            "bonus_uuid": self.bonus_uuid,
+        }
+    @staticmethod
+    def __fromdict__(d):
+        return ScoreItemBonus(
+            bonus_uuid=d["bonus_uuid"],
+        )
+
+
+class ScoreItemGoal(PClass):
+    goal_uuid = field(type=str)
+    complete = field(type=bool)
+    def __todict__(self):
+        return {
+            "goal_uuid": self.goal_uuid,
+            "complete": self.complete,
+        }
+    @staticmethod
+    def __fromdict__(d):
+        return ScoreItemGoal(
+            goal_uuid=d["goal_uuid"],
+            complete=d["complete"],
+        )
     
 
 class ScoreItemOwnsPath(PClass):
@@ -2386,18 +2415,24 @@ class ScoreItem2(PClass):
     amount = field(type=int)
     description = field(type=(str, type(None)), initial=None)
     owns_path = field(type=(ScoreItemOwnsPath, type(None)), initial=None)  # Optional[ScoreItemOwnsPath]
+    goal = field(type=(ScoreItemGoal, type(None)), initial=None)  # Optional[FrozenGoal]
+    bonus = field(type=(ScoreItemBonus, type(None)), initial=None)  # Optional[FrozenGoal] 
     def __todict__(self):
         return {
             "amount": self.amount,
             "description": self.description,
             "owns_path": self.owns_path.__todict__() if self.owns_path else None,
+            "goal": self.goal.__todict__() if self.goal else None,
+            "bonus": self.bonus.__todict__() if self.bonus else None,
         }
     @staticmethod
     def __fromdict__(d):
         return ScoreItem2(
             amount=d["amount"],
             description=d.get("description"),  # Handle None case
-            owns_path=ScoreItemOwnsPath.__fromdict__(d["owns_path"]) if d.get("owns_path") else None
+            owns_path=ScoreItemOwnsPath.__fromdict__(d["owns_path"]) if d.get("owns_path") else None,
+            goal=ScoreItemGoal.__fromdict__(d["goal"]) if d.get("goal") else None,
+            bonus=ScoreItemBonus.__fromdict__(d["bonus"]) if d.get("bonus") else None,
         )
 
 
@@ -3026,6 +3061,7 @@ def score_public_items(game, player_idx):
                     ScoreItem2(
                         amount=bonus.score, 
                         description="Player {} wins bonus {}".format(player_idx, bonus.code),
+                        bonus=ScoreItemBonus(bonus_uuid=bonus.uuid),
                     )
                 )
     return items
@@ -3040,12 +3076,20 @@ def score_private_items(game, player_idx):
     for complete_goal_uuid in complete_goal_uuids:
         goal = goaluuid2goal[complete_goal_uuid]
         items.append(
-            ScoreItem2(amount=goal.score, description="Player {} completed goal {}".format(player_idx, complete_goal_uuid))
+            ScoreItem2(
+                amount=goal.score, 
+                description="Player {} completed goal {}".format(player_idx, complete_goal_uuid),
+                goal=ScoreItemGoal(goal_uuid=complete_goal_uuid, complete=True)
+            )
         )
     for incomplete_goal_uuid in incomplete_goal_uuids:
         goal = goaluuid2goal[incomplete_goal_uuid]
         items.append(
-            ScoreItem2(amount=(-1*goal.score), description="Player {} incomplete goal {}".format(player_idx, incomplete_goal_uuid))
+            ScoreItem2(
+                amount=(-1*goal.score), 
+                description="Player {} incomplete goal {}".format(player_idx, incomplete_goal_uuid),
+                goal=ScoreItemGoal(goal_uuid=incomplete_goal_uuid, complete=False)
+            )
         )
     return items
 
@@ -3240,7 +3284,7 @@ def handle_draw_discard_action(game, action):
             player_idx=player.idx,
             name="GOAL-KEEP",
             instruction="Your move. Please select the routes you want to keep.",
-            allotted_seconds=120,
+            allotted_seconds=INITIAL_ALLOTTED_SECONDS,
             allotted_since_action_idx=(len(game.history) - 1),
             keep=LegalActionKeep(
                 deck_idx=draw_discard.deck_idx,
@@ -4408,16 +4452,16 @@ def get_max_allotted_times(s):
 
 
 def get_player_max_allotted_time(s, player_idx):
-    max_alotted_seconds = 0
+    max_allotted_seconds = 0
     since_action_idx_of_max = -1
     for legal_action in s.legal_actions_2:
         if legal_action.player_idx == player_idx:
-            if legal_action.allotted_seconds > max_alotted_seconds:
-                max_alotted_seconds = legal_action.allotted_seconds
+            if legal_action.allotted_seconds > max_allotted_seconds:
+                max_allotted_seconds = legal_action.allotted_seconds
                 since_action_idx_of_max = legal_action.allotted_since_action_idx
-    if max_alotted_seconds:
+    if max_allotted_seconds:
         return AllottedTime(
-            seconds=max_alotted_seconds,
+            seconds=max_allotted_seconds,
             since_action_idx=since_action_idx_of_max,
         )
     return None

{graph_games_proto-0.3.1756.dist-info → graph_games_proto-0.3.1758.dist-info}/METADATA

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

{graph_games_proto-0.3.1756.dist-info → graph_games_proto-0.3.1758.dist-info}/RECORD

@@ -1,9 +1,9 @@
 graph_games_proto/__init__.py,sha256=O5XjRfe3DlxbJn4zezDvvy7cXvL4IzIRPZCL3Y-n7s8,776
 graph_games_proto/all_types.py,sha256=IpbwftEcHS5Ewz-saFNk0lO9FvcbuHG36odRTayCXUk,54911
-graph_games_proto/fns.py,sha256=9eEpZsQCdHcRGNp1K-cfbpztqDEHxAA8pnleeRRAovE,238084
+graph_games_proto/fns.py,sha256=LBH9OQXasGZwW9v6zh_PXD0rhlbXM21Cd9yxsHZDi10,239619
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1756.dist-info/METADATA,sha256=FyQgp8JTxy5-lL1ictgC3444TV6pe2kWpDSC_FJYthg,188
-graph_games_proto-0.3.1756.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1756.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1756.dist-info/RECORD,,
+graph_games_proto-0.3.1758.dist-info/METADATA,sha256=buOZtp39_TtX2ab0LyvDvQ6cVTHPI3qIoJklh4D4Zos,188
+graph_games_proto-0.3.1758.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1758.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1758.dist-info/RECORD,,