Rename to player_freqdeck_subtract

bcollazo · Aug 27, 2022 · 8dee575 · 8dee575
1 parent 5c9e15d
commit 8dee575
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/catanatron_core/catanatron/state.py b/catanatron_core/catanatron/state.py
@@ -53,7 +53,7 @@
     player_deck_draw,
     player_deck_random_draw,
     player_deck_replenish,
-    player_deck_subtract,
+    player_freqdeck_subtract,
     player_deck_to_array,
     player_key,
     player_num_resource_cards,
@@ -480,7 +480,7 @@ def apply_action(state: State, action: Action):
             discarded = action.value  # for replay functionality
         to_discard = freqdeck_from_listdeck(discarded)
 
-        player_deck_subtract(state, action.color, to_discard)
+        player_freqdeck_subtract(state, action.color, to_discard)
         state.resource_freqdeck = freqdeck_add(state.resource_freqdeck, to_discard)
         action = Action(action.color, action.action_type, discarded)
 
@@ -583,7 +583,7 @@ def apply_action(state: State, action: Action):
             raise ValueError("Trying to trade without money")
         if not freqdeck_contains(state.resource_freqdeck, asking):
             raise ValueError("Bank doenst have those cards")
-        player_deck_subtract(state, action.color, offering)
+        player_freqdeck_subtract(state, action.color, offering)
         state.resource_freqdeck = freqdeck_add(state.resource_freqdeck, offering)
         player_freqdeck_add(state, action.color, asking)
         state.resource_freqdeck = freqdeck_subtract(state.resource_freqdeck, asking)

diff --git a/catanatron_core/catanatron/state_functions.py b/catanatron_core/catanatron/state_functions.py
@@ -217,6 +217,15 @@ def player_freqdeck_add(state, color, freqdeck):
     state.player_state[f"{key}_ORE_IN_HAND"] += freqdeck[4]
 
 
+def player_freqdeck_subtract(state, color, freqdeck):
+    key = player_key(state, color)
+    state.player_state[f"{key}_WOOD_IN_HAND"] -= freqdeck[0]
+    state.player_state[f"{key}_BRICK_IN_HAND"] -= freqdeck[1]
+    state.player_state[f"{key}_SHEEP_IN_HAND"] -= freqdeck[2]
+    state.player_state[f"{key}_WHEAT_IN_HAND"] -= freqdeck[3]
+    state.player_state[f"{key}_ORE_IN_HAND"] -= freqdeck[4]
+
+
 def buy_dev_card(state, color, dev_card):
     key = player_key(state, color)
 
@@ -269,15 +278,6 @@ def player_deck_to_array(state, color):
     )
 
 
-def player_deck_subtract(state, color, freqdeck):
-    key = player_key(state, color)
-    state.player_state[f"{key}_WOOD_IN_HAND"] -= freqdeck[0]
-    state.player_state[f"{key}_BRICK_IN_HAND"] -= freqdeck[1]
-    state.player_state[f"{key}_SHEEP_IN_HAND"] -= freqdeck[2]
-    state.player_state[f"{key}_WHEAT_IN_HAND"] -= freqdeck[3]
-    state.player_state[f"{key}_ORE_IN_HAND"] -= freqdeck[4]
-
-
 def player_deck_draw(state, color, card, amount=1):
     key = player_key(state, color)
     assert state.player_state[f"{key}_{card}_IN_HAND"] >= amount