Added new fields from Communication Mod 0.7.0

spirecomm/spire/game.py

@@ -44,6 +44,7 @@ def __init__(self):
         self.discard_pile = []
         self.exhaust_pile = []
         self.hand = []
+        self.limbo = []
 
         # Current Screen
 
@@ -105,6 +106,7 @@ def from_json(cls, json_state, available_commands):
             game.discard_pile = [spirecomm.spire.card.Card.from_json(json_card) for json_card in combat_state.get("discard_pile")]
             game.exhaust_pile = [spirecomm.spire.card.Card.from_json(json_card) for json_card in combat_state.get("exhaust_pile")]
             game.hand = [spirecomm.spire.card.Card.from_json(json_card) for json_card in combat_state.get("hand")]
+            game.limbo = [spirecomm.spire.card.Card.from_json(json_card) for json_card in combat_state.get("limbo", [])]
 
         # Available Commands
 

spirecomm/spire/power.py

@@ -1,13 +1,29 @@
+import spirecomm.spire.card
+
+
 class Power:
 
-    def __init__(self, power_id, name, amount):
+    def __init__(self, power_id, name, amount, damage=0, misc=0, just_applied=False, card=None):
         self.power_id = power_id
         self.power_name = name
         self.amount = amount
+        self.damage = damage
+        self.misc = misc
+        self.just_applied = just_applied
+        self.card = card
 
     @classmethod
     def from_json(cls, json_object):
-        return cls(json_object["id"], json_object["name"], json_object["amount"])
+        power_id = json_object["id"]
+        name = json_object["name"]
+        amount = json_object["amount"]
+        damage = json_object.get("damage", 0)
+        misc = json_object.get("misc", 0)
+        just_applied = json_object.get("just_applied", False)
+        card = json_object.get("card", None)
+        if card is not None:
+            card = spirecomm.spire.card.Card.from_json(card)
+        return cls(power_id, name, amount, damage, misc, just_applied, card)
 
     def __eq__(self, other):
         return self.power_id == other.power_id and self.amount == other.amount