Cleaned up a bit, finished sort tests, refactored cardbase adding and removing, need to write tests urgently

1 files changed, 0 insertions, 1 deletions

diff --git a/control.cbd b/control.cbd
deleted file mode 100644
index d137028..0000000
--- a/control.cbd
+++ /dev/null
@@ -1 +0,0 @@
-{"cards":[{"name":"Psychic Spiral","layout":"normal","manaCost":"{4}{U}","cmc":5,"type":"Instant","rarity":"Uncommon","text":"Shuffle all cards from your graveyard into your library. Target player puts that many cards from the top of his or her library into his or her graveyard.","flavor":"An elocutor forces criminals to confess to the laws they merely intended to break.","artist":"Ryan Pancoast","number":"47","power":null,"toughness":null,"loyalty":null,"multiverseid":270794,"imageName":"psychic spiral","border":null,"watermark":null,"setCode":"RTR","imageCode":"rtr","count":1},{"name":"Paralyzing Grasp","layout":"normal","manaCost":"{2}{U}","cmc":3,"type":"Enchantment — Aura","rarity":"Common","text":"Enchant creature\nEnchanted creature doesn't untap during its controller's untap step.","flavor":"\"Obviously, the Firemind's mission is worth more than a few goblins.\"\n—Pelener, chamberlain of Niv-Mizzet","artist":"Scott Chou","number":"46","power":null,"toughness":null,"loyalty":null,"multiverseid":270955,"imageName":"paralyzing grasp","border":null,"watermark":null,"setCode":"RTR","imageCode":"rtr","count":1},{"name":"Tome Scour","layout":"normal","manaCost":"{U}","cmc":1,"type":"Sorcery","rarity":"Common","text":"Target player puts the top five cards of his or her library into his or her graveyard.","flavor":"\"I hope none of those were important!\"","artist":"Steven Belledin","number":"75","power":null,"toughness":null,"loyalty":null,"multiverseid":370706,"imageName":"tome scour","border":null,"watermark":null,"setCode":"M14","imageCode":"m14","count":2},{"name":"Pacifism","layout":"normal","manaCost":"{1}{W}","cmc":2,"type":"Enchantment — Aura","rarity":"Common","text":"Enchant creature\nEnchanted creature can't attack or block.","flavor":"For the first time in his life, Grakk felt a little warm and fuzzy inside.","artist":"Robert Bliss","number":"25","power":null,"toughness":null,"loyalty":null,"multiverseid":370812,"imageName":"pacifism","border":null,"watermark":null,"setCode":"M14","imageCode":"m14","count":2},{"name":"Spear of Heliod","layout":"normal","manaCost":"{1}{W}{W}","cmc":3,"type":"Legendary Enchantment Artifact","rarity":"Rare","text":"Creatures you control get +1/+1.\n{1}{W}{W}, {T}: Destroy target creature that dealt damage to you this turn.","flavor":"Legend speaks of the Sun Spear, the mighty weapon that can strike any point in Theros, even the depths of the Underworld.","artist":"Yeong-Hao Han","number":"33","power":null,"toughness":null,"loyalty":null,"multiverseid":373717,"imageName":"spear of heliod","border":null,"watermark":null,"setCode":"THS","imageCode":"ths","count":1},{"name":"Lost in a Labyrinth","layout":"normal","manaCost":"{U}","cmc":1,"type":"Instant","rarity":"Common","text":"Target creature gets -3/-0 until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)","flavor":"Even those who leave the labyrinth never escape it, forever dreaming of their time trapped within.","artist":"Winona Nelson","number":"52","power":null,"toughness":null,"loyalty":null,"multiverseid":373629,"imageName":"lost in a labyrinth","border":null,"watermark":null,"setCode":"THS","imageCode":"ths","count":1},{"name":"Voyage's End","layout":"normal","manaCost":"{1}{U}","cmc":2,"type":"Instant","rarity":"Common","text":"Return target creature to its owner's hand. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)","flavor":"Philosophers say those lost at sea ascended to a more perfect realm. Sailors say they drowned.","artist":"Chris Rahn","number":"73","power":null,"toughness":null,"loyalty":null,"multiverseid":373527,"imageName":"voyage's end","border":null,"watermark":null,"setCode":"THS","imageCode":"ths","count":1},{"name":"Nullify","layout":"normal","manaCost":"{U}{U}","cmc":2,"type":"Instant","rarity":"Common","text":"Counter target creature or Aura spell.","flavor":"\"Those who incur Thassa's anger will be swallowed whole by her waves, or torn asunder by her bident.\"\n—Thrasios, triton hero","artist":"Adam Paquette","number":"45","power":null,"toughness":null,"loyalty":null,"multiverseid":378417,"imageName":"nullify","border":null,"watermark":null,"setCode":"BNG","imageCode":"bng","count":1},{"name":"Pin to the Earth","layout":"normal","manaCost":"{1}{U}","cmc":2,"type":"Enchantment — Aura","rarity":"Common","text":"Enchant creature\nEnchanted creature gets -6/-0.","flavor":"\"Mortal strength, like mortal hope, is so easily crushed.\"\n—Thassa, god of the sea","artist":"Johann Bodin","number":"45","power":null,"toughness":null,"loyalty":null,"multiverseid":380473,"imageName":"pin to the earth","border":null,"watermark":null,"setCode":"JOU","imageCode":"jou","count":1},{"name":"Nyx-Fleece Ram","layout":"normal","manaCost":"{1}{W}","cmc":2,"type":"Enchantment Creature — Sheep","rarity":"Uncommon","text":"At the beginning of your upkeep, you gain 1 life.","flavor":"The gods are fascinated by innocence, perhaps because it's a quality they themselves lack.","artist":"Terese Nielsen","number":"18","power":"0","toughness":"5","loyalty":null,"multiverseid":380463,"imageName":"nyx-fleece ram","border":null,"watermark":null,"setCode":"JOU","imageCode":"jou","count":1},{"name":"Divine Verdict","layout":"normal","manaCost":"{3}{W}","cmc":4,"type":"Instant","rarity":"Common","text":"Destroy target attacking or blocking creature.","flavor":"\"Guilty.\"","artist":"Kev Walker","number":"271","power":null,"toughness":null,"loyalty":null,"multiverseid":383163,"imageName":"divine verdict","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":2},{"name":"Evolving Wilds","layout":"normal","manaCost":null,"cmc":null,"type":"Land","rarity":"Common","text":"{T}, Sacrifice Evolving Wilds: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library.","flavor":"Without the interfering hands of civilization, nature will always shape itself to its own needs.","artist":"Steven Belledin","number":"243","power":null,"toughness":null,"loyalty":null,"multiverseid":383235,"imageName":"evolving wilds","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":2},{"name":"Frost Lynx","layout":"normal","manaCost":"{2}{U}","cmc":3,"type":"Creature — Elemental Cat","rarity":"Common","text":"When Frost Lynx enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.","flavor":"It readily attacks much larger prey, knowing retaliation is impossible.","artist":"Izzy","number":"55","power":"2","toughness":"2","loyalty":null,"multiverseid":383248,"imageName":"frost lynx","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":2},{"name":"Cancel","layout":"normal","manaCost":"{1}{U}{U}","cmc":3,"type":"Instant","rarity":"Common","text":"Counter target spell.","flavor":"\"What you are attempting is not against the law. It is, however, extremely foolish.\"","artist":"David Palumbo","number":"274","power":null,"toughness":null,"loyalty":null,"multiverseid":383161,"imageName":"cancel","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":1},{"name":"Mind Sculpt","layout":"normal","manaCost":"{1}{U}","cmc":2,"type":"Sorcery","rarity":"Common","text":"Target opponent puts the top seven cards of his or her library into his or her graveyard.","flavor":"\"Your mind was a curious mix of madness and genius. I just took away the genius.\"\n—Jace Beleren","artist":"Michael C. Hayes","number":"70","power":null,"toughness":null,"loyalty":null,"multiverseid":383313,"imageName":"mind sculpt","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":1},{"name":"Mahamoti Djinn","layout":"normal","manaCost":"{4}{U}{U}","cmc":6,"type":"Creature — Djinn","rarity":"Rare","text":"Flying (This creature can't be blocked except by creatures with flying or reach.)","flavor":"Of royal blood among the spirits of the air, the Mahamoti djinn rides on the wings of the winds. As dangerous in the gambling hall as he is in battle, he is a master of trickery and misdirection.","artist":"Greg Staples","number":"275","power":"5","toughness":"6","loyalty":null,"multiverseid":383167,"imageName":"mahamoti djinn","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":1},{"name":"Aegis Angel","layout":"normal","manaCost":"{4}{W}{W}","cmc":6,"type":"Creature — Angel","rarity":"Rare","text":"Flying (This creature can't be blocked except by creatures with flying or reach.)\nWhen Aegis Angel enters the battlefield, another target permanent gains indestructible for as long as you control Aegis Angel. (Effects that say \"destroy\" don't destroy it. A creature with indestructible can't be destroyed by damage.)","flavor":null,"artist":"Aleksi Briclot","number":"270","power":"5","toughness":"5","loyalty":null,"multiverseid":383160,"imageName":"aegis angel","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":1},{"name":"Heliod's Pilgrim","layout":"normal","manaCost":"{2}{W}","cmc":3,"type":"Creature — Human Cleric","rarity":"Common","text":"When Heliod's Pilgrim enters the battlefield, you may search your library for an Aura card, reveal it, put it into your hand, then shuffle your library.","flavor":"The blessings of Heliod are apparent for all to see.","artist":"Izzy","number":"14","power":"1","toughness":"2","loyalty":null,"multiverseid":383265,"imageName":"heliod's pilgrim","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":1},{"name":"Meditation Puzzle","layout":"normal","manaCost":"{3}{W}{W}","cmc":5,"type":"Instant","rarity":"Common","text":"Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nYou gain 8 life.","flavor":"Find your center, and you will find your way.","artist":"Mark Winters","number":"19","power":null,"toughness":null,"loyalty":null,"multiverseid":383306,"imageName":"meditation puzzle","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":1},{"name":"Serra Angel","layout":"normal","manaCost":"{3}{W}{W}","cmc":5,"type":"Creature — Angel","rarity":"Uncommon","text":"Flying (This creature can't be blocked except by creatures with flying or reach.)\nVigilance (Attacking doesn't cause this creature to tap.)","flavor":"Follow the light. In its absence, follow her.","artist":"Greg Staples","number":"273","power":"4","toughness":"4","loyalty":null,"multiverseid":383171,"imageName":"serra angel","border":null,"watermark":null,"setCode":"M15","imageCode":"m15","count":1},{"name":"Stubborn Denial","layout":"normal","manaCost":"{U}","cmc":1,"type":"Instant","rarity":"Uncommon","text":"Counter target noncreature spell unless its controller pays {1}.\nFerocious — If you control a creature with power 4 or greater, counter that spell instead.","flavor":"The Temur have no patience for subtlety.","artist":"James Ryman","number":"56","power":null,"toughness":null,"loyalty":null,"multiverseid":386673,"imageName":"stubborn denial","border":null,"watermark":"Temur","setCode":"KTK","imageCode":"ktk","count":2},{"name":"Cancel","layout":"normal","manaCost":"{1}{U}{U}","cmc":3,"type":"Instant","rarity":"Common","text":"Counter target spell.","flavor":"\"Even the greatest inferno begins as a spark. And anyone can snuff out a spark.\"\n—Chanyi, mistfire sage","artist":"Slawomir Maniak","number":"33","power":null,"toughness":null,"loyalty":null,"multiverseid":386502,"imageName":"cancel","border":null,"watermark":null,"setCode":"KTK","imageCode":"ktk","count":1},{"name":"Sandblast","layout":"normal","manaCost":"{2}{W}","cmc":3,"type":"Instant","rarity":"Common","text":"Sandblast deals 5 damage to target attacking or blocking creature.","flavor":"In the Shifting Wastes, more are killed by sand than by steel.","artist":"Min Yum","number":"24","power":null,"toughness":null,"loyalty":null,"multiverseid":391912,"imageName":"sandblast","border":null,"watermark":null,"setCode":"FRF","imageCode":"frf","count":2},{"name":"Rakshasa's Disdain","layout":"normal","manaCost":"{2}{U}","cmc":3,"type":"Instant","rarity":"Common","text":"Counter target spell unless its controller pays {1} for each card in your graveyard.","flavor":"\"Every failure, every death only makes my strength greater.\"","artist":"Seb McKinnon","number":"45","power":null,"toughness":null,"loyalty":null,"multiverseid":391900,"imageName":"rakshasa's disdain","border":null,"watermark":null,"setCode":"FRF","imageCode":"frf","count":1},{"name":"Wardscale Dragon","layout":"normal","manaCost":"{4}{W}{W}","cmc":6,"type":"Creature — Dragon","rarity":"Uncommon","text":"Flying\nAs long as Wardscale Dragon is attacking, defending player can't cast spells.","flavor":"Dromoka's brood emerge from the dragon tempests covered with tough scales that protect them from most clan weapons and magic.","artist":"Jason Rainville","number":"30","power":"4","toughness":"4","loyalty":null,"multiverseid":391955,"imageName":"wardscale dragon","border":null,"watermark":"Dromoka","setCode":"FRF","imageCode":"frf","count":1},{"name":"Monastery Siege","layout":"normal","manaCost":"{2}{U}","cmc":3,"type":"Enchantment","rarity":"Rare","text":"As Monastery Siege enters the battlefield, choose Khans or Dragons.\n• Khans — At the beginning of your draw step, draw an additional card, then discard a card.\n• Dragons — Spells your opponents cast that target you or a permanent you control cost {2} more to cast.","flavor":null,"artist":"Mark Winters","number":"43","power":null,"toughness":null,"loyalty":null,"multiverseid":391884,"imageName":"monastery siege","border":null,"watermark":null,"setCode":"FRF","imageCode":"frf","count":1},{"name":"Ojutai's Breath","layout":"normal","manaCost":"{2}{U}","cmc":3,"type":"Instant","rarity":"Common","text":"Tap target creature. It doesn't untap during its controller's next untap step.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)","flavor":null,"artist":"Kev Walker","number":"67","power":null,"toughness":null,"loyalty":null,"multiverseid":394641,"imageName":"ojutai's breath","border":null,"watermark":"Ojutai","setCode":"DTK","imageCode":"dtk","count":2},{"name":"Reduce in Stature","layout":"normal","manaCost":"{2}{U}","cmc":3,"type":"Enchantment — Aura","rarity":"Common","text":"Enchant creature\nEnchanted creature has base power and toughness 0/2.","flavor":"A dragon learns humility only in the moments before its death.","artist":"Dan Scott","number":"72","power":null,"toughness":null,"loyalty":null,"multiverseid":394662,"imageName":"reduce in stature","border":null,"watermark":null,"setCode":"DTK","imageCode":"dtk","count":1},{"name":"Illusory Gains","layout":"normal","manaCost":"{3}{U}{U}","cmc":5,"type":"Enchantment — Aura","rarity":"Rare","text":"Enchant creature\nYou control enchanted creature.\nWhenever a creature enters the battlefield under an opponent's control, attach Illusory Gains to that creature.","flavor":null,"artist":"Kev Walker","number":"59","power":null,"toughness":null,"loyalty":null,"multiverseid":394599,"imageName":"illusory gains","border":null,"watermark":null,"setCode":"DTK","imageCode":"dtk","count":1}],"plains":11,"islands":12,"swamps":0,"mountains":0,"forests":0,"name":"Blue-white Control"}
\ No newline at end of file