Renames functions and adds a remove other marker function

Sebaestschjin · Apr 29, 2021 · 6bed228 · 6bed228
1 parent c2c9c51
commit 6bed228
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/Game/Scripts/automation.py b/Game/Scripts/automation.py
@@ -19,8 +19,8 @@ def on_deck_loaded(args):
 
 
 def determine_starting_player():
-    if all_players(did_bid):
-        notify("{} has bid {} burden token(s).".format(me, get_bid(me))
+    if all_players(has_bid):
+        notify("{} has bid {} burden token(s).".format(me, get_bid(me)))
 
 
 def get_bid(player):
@@ -31,12 +31,12 @@ def set_bid(player, value):
     player.setGlobalVariable(BidVariable, str(value))
 
 
-def did_bid(player):
+def has_bid(player):
     return get_bid(player) != BidDefault
 
 
-def did_not_bid(group, x=0, y=0):
-    return not did_bid(me)
+def has_not_bid(group, x=0, y=0):
+    return not has_bid(me)
 
 
 def all_players(test):

diff --git a/Game/Scripts/table_actions.py b/Game/Scripts/table_actions.py
@@ -1,6 +1,8 @@
 DamageMarker = ('Damage', 'ca152f06-41cc-476a-be27-0bdd57f4b710')
 BurdenMarker = ('Burden', 'ad150c1d-4534-456b-a4bd-58bf67a26c3b')
 TwilightMarker = ('Twilight', 'e4fe7c68-73f2-4ea6-a311-f537088965eb')
+ALL_MARKER = [DamageMarker, BurdenMarker, TwilightMarker]
+
 HighlightColor = "#ff0000"
 
 
@@ -54,6 +56,13 @@ def remove_twilight(card, x=0, y=0):
     remove_marker(card, TwilightMarker)
 
 
+def remove_other(card, x=0, y=0):
+    mute()
+    for marker in card.markers:
+        if marker not in ALL_MARKER:
+            card.markers[marker] = 0
+
+
 def remove_marker(card, marker):
     mute()
     name = marker[0]
@@ -119,7 +128,7 @@ def roll_d6(group, x=0, y=0):
 
 
 def bid_burdens(group, x=0, y=0):
-    if did_not_bid(me):
+    if has_not_bid(me):
         bid = askInteger("How much burden would you like to bid?", 0)
         if bid:
             set_bid(me, bid)

diff --git a/Game/definition.xml b/Game/definition.xml
@@ -87,9 +87,10 @@
     <table name="Middle-Earth" visibility="undefined"
            width="800" height="650"
            background="Resources/background.jpg" backgroundStyle="uniformToFill">
-        <cardaction menu="Add Default Token" shortcut="Up" execute="add_default_marker"/>
-        <cardaction menu="Remove Default Token" shortcut="Down" execute="remove_default_marker"/>
         <cardactions menu="Add...">
+            <cardaction menu="Default Token"
+                        shortcut="Up"
+                        execute="add_default_marker"/>
             <cardaction menu="Damage"
                         shortcut="f1"
                         execute="add_damage"/>
@@ -103,6 +104,9 @@
                         execute="add_other"/>
         </cardactions>
         <cardactions menu="Remove...">
+            <cardaction menu="Remove Default Token"
+                        shortcut="Down"
+                        execute="remove_default_marker"/>
             <cardaction menu="Damage"
                         shortcut="shift+f1"
                         execute="remove_damage"/>
@@ -112,6 +116,8 @@
             <cardaction menu="Twilight"
                         shortcut="shift+f3"
                         execute="remove_twilight"/>
+            <cardaction menu="All Other"
+                        execute="remove_other"/>
         </cardactions>
         <!-- standard card actions -->
         <cardactions menu="Change Cards">
@@ -131,7 +137,7 @@
             <groupaction menu="Roll a 6-sided Die"
                          execute="roll_d6"/>
         </groupactions>
-        <groupaction menu="Bid Burdens for First Player" execute="bid_burdens"/>
+        <groupaction menu="Bid Burdens for First Player" execute="bid_burdens" showIf="has_not_bid"/>
     </table>
 
     <player summary="Hand:{#Hand} | Threats:{#Threats}">