graph-games-proto 0.3.1788__py3-none-any.whl → 0.3.1790__py3-none-any.whl

graph_games_proto/fns.py

@@ -15,7 +15,7 @@ from functools import cmp_to_key
 from itertools import combinations as itertools_combinations, chain
 from collections import deque
 
-DEFAULT_ALLOTTED_SECONDS = 30 #60
+DEFAULT_ALLOTTED_SECONDS = 10 #60
 INITIAL_ALLOTTED_SECONDS = 20 #120
 
 class NoAction(PClass):
@@ -3233,6 +3233,50 @@ def default_after_accept_action(game, action):
     )
 
 
+def recycle_decks_if_needed(game):
+    for deck_idx in range(len(game.decks)):
+        game = recycle_if_needed(game, deck_idx)
+    return game
+
+
+def replenish_faceup_spot_if_needed(game, deck_idx, spot_idx):
+    deck = game.decks[deck_idx]
+
+    if deck.faceup_spots[spot_idx] is not None:
+        return game
+    
+    if len(deck.facedown_stack) == 0:
+        return game
+    
+    deck.faceup_spots[spot_idx] = deck.facedown_stack.pop()
+
+    game = ensure_faceup_spots_valid(game)
+
+    return game.set(
+        decks=game.decks,
+    )
+
+
+def replenish_faceup_if_needed(game, deck_idx):
+    deck = game.decks[deck_idx]
+    for spot_idx in range(len(deck.faceup_spots)):
+        game = replenish_faceup_spot_if_needed(game, deck_idx, spot_idx)
+    return game
+
+
+def recycle_if_needed(game, deck_idx):
+    deck = game.decks[deck_idx]
+    if len(deck.facedown_stack) == 0:
+        shuffled_discards = list(deck.discard)
+        game.rng.shuffle(shuffled_discards)
+        deck = deck.set(
+            facedown_stack = shuffled_discards,
+            discard = []
+        )
+        game = set_deck(game, deck.idx, deck)
+    return game
+
+
 def handle_draw_action(game, action):
     if not game or not action or not action.legal_action or not action.legal_action.draw:
         return game
@@ -3247,14 +3291,7 @@ def handle_draw_action(game, action):
     for _ in range(draw.quantity):
         drawn_card = deck.facedown_stack.pop()
         player.cards.append(drawn_card)
-        if len(deck.facedown_stack) == 0:
-            shuffled_discards = list(deck.discard)
-            game.rng.shuffle(shuffled_discards)
-            deck = deck.set(
-                facedown_stack = shuffled_discards,
-                discard = []
-            )
-            game = set_deck(game, deck.idx, deck)
+        game = recycle_if_needed(game, draw.deck_idx)
 
     game = game.set(
         players=game.players,
@@ -3394,12 +3431,9 @@ def handle_faceup_draw_action(game, action):
     drawn_card = deck.faceup_spots[spot_idx] if spot_idx is not None else None
     player.cards.append(drawn_card)
     
-    if len(deck.facedown_stack) > 0:
-        deck.faceup_spots[spot_idx] = deck.facedown_stack.pop()
-    else:
-        deck.faceup_spots[spot_idx] = None
-
-    game = ensure_faceup_spots_valid(game)
+    deck.faceup_spots[spot_idx] = None
+    game = game.set(decks=game.decks)
+    game = replenish_faceup_spot_if_needed(game, faceup_draw.deck_idx, spot_idx)
 
     # Prevent an extra draw if last draw was a face-wild-draw
     if not game.carduuid2card[drawn_card].is_wild:
@@ -3408,7 +3442,6 @@ def handle_faceup_draw_action(game, action):
 
     return game.set(
         players=game.players,
-        decks=game.decks,
     )
 
 
@@ -3595,6 +3628,8 @@ def handle_move_pieces_to_path_action(game, action):
             # add to discard
             game.decks[game.carduuid2card[card_uuid].deck_idx].discard.append(card_uuid)
 
+    game = recycle_decks_if_needed(game)
+    game = replenish_faceup_if_needed(game)
     game = game.set(players=game.players)
     game = game.set(idx2path=game.idx2path)
     game = game.set(player_graphs=calc_player_graphs(game)) #

{graph_games_proto-0.3.1788.dist-info → graph_games_proto-0.3.1790.dist-info}/METADATA

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

{graph_games_proto-0.3.1788.dist-info → graph_games_proto-0.3.1790.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=dxCpZO1Pw6KTrnh2qqy-HLV1pv0irMWbbLxLEh1JFyQ,240942
+graph_games_proto/fns.py,sha256=3kNaljeFJgh2FJrUfo8B8fUlIyT8D9jA0t36c7Z1_2Y,241832
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1788.dist-info/METADATA,sha256=ToNnoSa7Ukg_CNhHXs4VTfuHsPxZvDiETsM9zBKx6ug,188
-graph_games_proto-0.3.1788.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1788.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1788.dist-info/RECORD,,
+graph_games_proto-0.3.1790.dist-info/METADATA,sha256=PR9TvSxR9-K7FpaGHcRGxlL3yh7w_MM71k7QdHKVKCc,188
+graph_games_proto-0.3.1790.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1790.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1790.dist-info/RECORD,,