Fix shop

Author: miketwo

shop.py

@@ -1,4 +1,3 @@
-
 # The shop contains:
 # 5 Colored cards:
 #  - 2 Attack cards, 2 skill cards, and 1 Power card
@@ -31,7 +30,7 @@
 from definitions import CardCategory, Rarity
 from helper import Displayer, get_attribute
 from items import cards, potions, relics
-from message_bus_tools import Relic, Potion
+from message_bus_tools import Relic, Potion, Card
 
 
 # Helper functions for displaying cards, potions, and relics.
@@ -141,20 +140,20 @@ def __init__(self, player, items=None):
     def initialize_items(self) -> list[SellableItem]:
       # TODO: Make this class-specific and include relics and potions
       items = []
-      all_cards = list(cards)
-      attack_cards = [c for c in all_cards if c["Type"] == "Attack" and c["Class"] != "Colorless"]
-      skill_cards = [c for c in all_cards if c["Type"] == "Skill" and c["Class"] != "Colorless"]
-      power_cards = [c for c in all_cards if c["Type"] == "Power" and c["Class"] != "Colorless"]
+      all_cards:list[Card] = list(cards)
+      attack_cards = [c for c in all_cards if c.type == "Attack" and c.player_class != "Colorless"]
+      skill_cards = [c for c in all_cards if c.type == "Skill" and c.player_class != "Colorless"]
+      power_cards = [c for c in all_cards if c.type == "Power" and c.player_class != "Colorless"]
       if len(attack_cards) >= 2:
         items.extend(random.sample(attack_cards, 2))
       if len(skill_cards) >= 2:
         items.extend(random.sample(skill_cards, 2))
       if len(power_cards) >= 1:
         items.extend(random.sample(power_cards, 1))
 
-      colorless_cards = [c for c in all_cards if "Class" in c and c["Class"] == "Colorless"]
-      colorless_uncommon = [c for c in colorless_cards if c["Rarity"] == Rarity.UNCOMMON]
-      colorless_rare = [c for c in colorless_cards if c["Rarity"] == Rarity.RARE]
+      colorless_cards = [c for c in all_cards if c.player_class == "Colorless"]
+      colorless_uncommon = [c for c in colorless_cards if c.rarity == Rarity.UNCOMMON]
+      colorless_rare = [c for c in colorless_cards if c.rarity == Rarity.RARE]
       if len(colorless_uncommon) >= 1:
         items.extend(random.sample(colorless_uncommon, 1))
       if len(colorless_rare) >= 1:

tests/test_shop.py

@@ -11,7 +11,6 @@ class TestSellableItems():
   def test_cards(self):
     '''See that we can make sellable items out of all cards and that they display correctly'''
     all_sellable_cards = list(items.cards)
-    # all_sellable_cards = [card for card in all_sellable_cards if card["Type"] in ("Attack", "Skill", "Power") and card["Rarity"] not in ("Special")]
     for card in all_sellable_cards:
       sellable = SellableItem(card)
       ansiprint(sellable.valid_string())