Use logging instead of raw print

README.md

@@ -1,4 +1,14 @@
 # Python MTGA
+
+## kelesi fork
+
+If you're reading this, it means you obtained this package from [kelesi' fork](https://github.com/kelesi/python-mtga)
+of the [original](https://github.com/mtgatracker/python-mtga). This
+fork has potentially breaking changes, please do not file any issues
+found with this fork on the original.
+
+## Introduction
+
 MTGA tools & set data for python. Original cardset generated with MTGJSON and scryfall,
 with initial set of  MTGA grpId's collected by Fugi & Spencatro.
 (Now we just use the data already present in your MTGA installation.)
@@ -22,4 +32,4 @@ Because I always forget:
 python setup.py sdist bdist_wheel
 twine check dist/*  # check for readme issues (e.g. line endings MUST BE LF, not CRLF lol)
 twine upload dist/MTGA-<version>*
-```
+```

source/allcards.py

@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+
+import mtga
+
+all_styles = [set(card.styles) for card in mtga.all_mtga_cards.cards]
+print(set().union(*all_styles))

source/mtga/__init__.py

@@ -1,5 +1,5 @@
 from .models import card, card_set
 from .models.card_set import Pool
-from .set_data import xln, dom, rix, m19, grn, rna, war, m20, eld, akh, arenasup, bfz, mi, roe, rtr, all_mtga_cards
+from .set_data import all_mtga_cards
 from ._version import __version__
 version = _version = __version = __version__

source/mtga/models/card.py

@@ -9,9 +9,12 @@
 class Card(object):
 
     def __init__(self, name="", pretty_name="", cost=None, color_identity=None, card_type="", sub_types="",
-                 abilities=None, set_id="", rarity="", collectible=True, set_number=-1, mtga_id=-1):
+                 abilities=None, set_id="", digital_set_id=None, rarity="", artist="",
+                 collectible=True, set_number=-1, mtga_id=-1, power=None, toughness=None,
+                 styles=[]):
         self.name = name
         self.set = set_id
+        self.digital_set = digital_set_id
         self.pretty_name = pretty_name
         if cost is None:
             cost = []
@@ -24,10 +27,16 @@ def __init__(self, name="", pretty_name="", cost=None, color_identity=None, card
         self.set_number = set_number
         self.mtga_id = mtga_id
         self.rarity = rarity
+        self.artist = artist
         self.collectible = collectible
         if abilities is None:
             abilities = []
         self.abilities = abilities
+        self.power = power
+        self.toughness = toughness
+        if styles is None:
+            styles = []
+        self.styles = styles
 
     @property
     def abilities_decoded(self):
@@ -104,8 +113,8 @@ def __str__(self):
 
 class GameCard(Card):
 
-    def __init__(self, name, pretty_name, cost, color_identity, card_type, sub_types, set_id, rarity, set_number, mtga_id, owner_seat_id, game_id=-1):
-        super().__init__(name, pretty_name, cost, color_identity, card_type, sub_types, set_id, rarity, set_number, mtga_id)
+    def __init__(self, name, pretty_name, cost, color_identity, card_type, sub_types, set_id, rarity, set_number, mtga_id, owner_seat_id, game_id=-1, power=None, toughness=None):
+        super().__init__(name, pretty_name, cost, color_identity, card_type, sub_types, set_id, rarity, set_number, mtga_id, power, toughness)
         self.game_id = game_id
         self.previous_iids = []
         self.owner_seat_id = owner_seat_id

source/mtga/set_data/__init__.py

@@ -1,5 +1,8 @@
 from mtga.models.card_set import Pool
-try:
+import logging
+
+
+def get_all_mtga_cards_dynamic():
     from mtga.set_data import dynamic
     dynamic_sets = []
     all_mtga_abilities = {}
@@ -12,22 +15,12 @@
         all_mtga_cards = Pool.from_sets("mtga_cards",
                                         sets=[*dynamic_sets],
                                         abilities=all_mtga_abilities)
-except:
-    print("WARNING! Could not dynamically generate card sets. Do you have Arena installed?")
-    from mtga.set_data import xln, dom, rix, m19, ana, grn, rna, war, m20, eld, akh, arenasup, bfz, mi, roe, rtr
+    return all_mtga_cards, all_mtga_abilities
 
-    all_mtga_abilities = {**rix.set_ability_map, **xln.set_ability_map, **dom.set_ability_map, **m19.set_ability_map,
-                          **ana.set_ability_map, **grn.set_ability_map, **rna.set_ability_map, **war.set_ability_map,
-                          **m20.set_ability_map, **eld.set_ability_map, **akh.set_ability_map, **arenasup.set_ability_map,
-                          **bfz.set_ability_map, **mi.set_ability_map, **roe.set_ability_map, **rtr.set_ability_map}
 
-
-
-    all_mtga_cards = Pool.from_sets("mtga_cards",
-                                sets=[rix.RivalsOfIxalan, xln.Ixalan, dom.Dominaria, m19.CoreSet2019,
-                                      ana.ArenaExclusives, grn.GuildsOfRavnica, rna.RavnicaAllegiance,
-                                      war.WarOfTheSpark, m20.CoreSet2020, eld.ThroneOfEldraine, akh.Amonkhet,
-                                      arenasup.ArenaSup, bfz.BattleForZendikar, mi.Mirage, roe.RiseOfEldrazi,
-                                      rtr.ReturnToRavnica],
-                                abilities=all_mtga_abilities)
+try:
+    all_mtga_cards, all_mtga_abilities = get_all_mtga_cards_dynamic()
+except Exception as e:
+    logging.error("Could not dynamically generate card sets. Do you have Arena installed?")
+    raise Exception("FATAL ERROR: could not dynamically generate card sets. Arena must be installed.")