graph-games-proto 0.3.1902__py3-none-any.whl → 0.3.1905__py3-none-any.whl

graph_games_proto/fns.py

@@ -2972,6 +2972,49 @@ def handle_draw_discard_action(game, action):
     )
 
 
+def get_follow_up_draw_legal_actions(game, action):
+    to_return = []
+    legal_action = action.legal_action
+    if len(game.history) >= 2:
+        last_action = game.history[-2]
+        if (last_action.legal_action.player_idx != legal_action.player_idx) or last_action.legal_action.name == "INITIAL-GOAL-KEEP":
+            
+            if len(game.decks[0].facedown_stack) >= 1:
+                to_return.append(
+                    LegalAction(
+                        auto_preferred=True,
+                        player_idx=legal_action.player_idx,
+                        name="DRAW",
+                        instruction="draw a unit",
+                        allotted_seconds=DEFAULT_ALLOTTED_SECONDS,
+                        allotted_since_action_idx=(len(game.history) - 1),
+                        draw=LegalActionDraw(
+                            deck_idx=0,
+                            quantity=1,
+                        )
+                    )
+                )
+            
+            for card_uuid in game.decks[0].faceup_spots:
+                if card_uuid:
+                    if not game.carduuid2card[card_uuid].is_wild:
+                        to_return.append(
+                            LegalAction(
+                                player_idx=legal_action.player_idx,
+                                name="FACEUP-DRAW",
+                                instruction="draw a faceup unit",
+                                allotted_seconds=DEFAULT_ALLOTTED_SECONDS,
+                                allotted_since_action_idx=(len(game.history) - 1),
+                                faceup_draw=LegalActionFaceupDraw(
+                                    deck_idx=0,
+                                    card_uuid=card_uuid,
+                                )
+                            )
+                        )
+    
+    return to_return
+
+
 def append_follow_up_draw_legal_actions(game, action):
     legal_action = action.legal_action
     if len(game.history) >= 2:
@@ -4036,9 +4079,9 @@ def isactionlegal2(s, a):
 
 def calc_legal_actions3(state_kernal):
     history = state_kernal.history
+    last_action = history[-1] if len(history) > 0 else None
 
-    if len(history) == 0:
-        # Initial
+    if last_action is None:
         return [
             LegalAction(
                 player_idx=player.idx,
@@ -4054,19 +4097,48 @@ def calc_legal_actions3(state_kernal):
             for player in state_kernal.players
         ]
     
-    if False:
-        pass
-    elif True:
-        last_action = history[-1]
-        if last_action.legal_action.name == "INITIAL-GOAL-KEEP":
-            return get_default_legal_actions(state_kernal, state_kernal.player_idxs[0])
-        else:
-            last_player_idx = last_action.legal_action.player_idx
-            last_player_shuffled_idx = last_action.player_idxs.index(last_player_idx)
-            next_player_shuffled_idx = (last_player_shuffled_idx + 1) % len(last_action.player_idxs)
-            return get_default_legal_actions(state_kernal, state_kernal.player_idxs[next_player_shuffled_idx])
+    elif last_action.legal_action.faceup_draw:
+        faceup_draw = last_action.legal_action.faceup_draw
+        deck = state_kernal.decks[faceup_draw.deck_idx]
+        spot_idx = next((i for i, card_uuid in enumerate(deck.faceup_spots) if card_uuid == faceup_draw.card_uuid), None)
+        drawn_card = deck.faceup_spots[spot_idx] if spot_idx is not None else None
+        if not state_kernal.carduuid2card[drawn_card].is_wild:
+            return get_follow_up_draw_legal_actions(state_kernal, last_action)
     
-    return []
+    elif last_action.legal_action.draw:
+        if last_action.legal_action.draw.quantity == 1:
+            return get_follow_up_draw_legal_actions(state_kernal, last_action)
+    
+    elif last_action.legal_action.draw_discard:
+        draw_discard = last_action.legal_action.draw_discard
+        player = state_kernal.players[last_action.legal_action.player_idx]
+        return [
+            LegalAction(
+                player_idx=player.idx,
+                name="GOAL-KEEP",
+                instruction="Your move. Please select the routes you want to keep.",
+                allotted_seconds=INITIAL_ALLOTTED_SECONDS,
+                allotted_since_action_idx=(len(state_kernal.history) - 1),
+                keep=LegalActionKeep(
+                    deck_idx=draw_discard.deck_idx,
+                    min=draw_discard.min,
+                    max=draw_discard.max,
+                )
+            )
+        ]
+    
+    if last_action.legal_action.name == "INITIAL-GOAL-KEEP":
+        return get_default_legal_actions(state_kernal, state_kernal.player_idxs[0])
+    
+    next_player_idx = get_next_player_shuffled_idx(state_kernal, last_action)
+    return get_default_legal_actions(state_kernal, state_kernal.player_idxs[next_player_idx])
+
+
+def get_next_player_shuffled_idx(state_kernal, last_action):
+    last_player_idx = last_action.legal_action.player_idx
+    last_player_shuffled_idx = state_kernal.player_idxs.index(last_player_idx)
+    next_player_shuffled_idx = (last_player_shuffled_idx + 1) % len(state_kernal.player_idxs)
+    return next_player_shuffled_idx
 
 
 class StateKernal(PClass):

{graph_games_proto-0.3.1902.dist-info → graph_games_proto-0.3.1905.dist-info}/METADATA

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

{graph_games_proto-0.3.1902.dist-info → graph_games_proto-0.3.1905.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=2KcO1B2jFlcwcddwGFzkjV5d9nxZz9m5sm0kOmZ9NkI,188787
+graph_games_proto/fns.py,sha256=_NOoU958Q_W5w40CBDIhaeg-h3V1E253NTvjOw2cii4,192148
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1902.dist-info/METADATA,sha256=gvmEGj3QttF1wrG5ynpGKh3fOsSr6tBeRmWDSFElNIo,188
-graph_games_proto-0.3.1902.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1902.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1902.dist-info/RECORD,,
+graph_games_proto-0.3.1905.dist-info/METADATA,sha256=lnlzJE-qXiGmg9zk1VnkdSlnKHHzVwEJ1t1kcTZDTjM,188
+graph_games_proto-0.3.1905.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1905.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1905.dist-info/RECORD,,