diff --git a/resources/magic/data/Extended_cube.txt b/resources/magic/data/Extended_cube.txt deleted file mode 100644 index 65b171e9a0..0000000000 --- a/resources/magic/data/Extended_cube.txt +++ /dev/null @@ -1,475 +0,0 @@ -Accorder's Shield -Acidic Slime -Affa Guard Hound -Air Elemental -Air Servant -Akoum Refuge -Akrasan Squire -Alpha Tyrranax -Arcane Sanctum -Archon of Justice -Archon of Redemption -Armored Cancrix -Asceticism -Ashenmoor Gouger -Assassinate -Assault Griffin -Aven Mimeomancer -Aven Squire -Avian Changeling -Awakening Zone -Axegrinder Giant -Azure Drake -Balefire Liege -Baneslayer Angel -Bant Sureblade -Barony Vampire -Basilisk Collar -Battle Hurda -Battlegrace Angel -Behemoth Sledge -Bellowing Tanglewurm -Berserkers of Blood Ridge -Bestial Menace -Birds of Paradise -Black Knight -Blackcleave Cliffs -Bladed Pinions -Bladetusk Boar -Blightning -Bloodmark Mentor -Boar Umbra -Boartusk Liege -Bog Raiders -Bog Tatters -Bog Wraith -Boggart Ram-Gang -Brigid, Hero of Kinsbaile -Brion Stoutarm -Brittle Effigy -Broodmate Dragon -Bull Cerodon -Burst Lightning -Butcher of Malakir -Cairn Wanderer -Canyon Minotaur -Captain of the Watch -Caravan Hurda -Carnifex Demon -Celestial Colonnade -Centaur Courser -Cerodon Yearling -Chain Reaction -Chameleon Colossus -Chandra's Spitfire -Changeling Sentinel -Child of Night -Chimeric Mass -Cliff Threader -Cloud Crusader -Cloud Elemental -Cloudcrown Oak -Colossal Might -Copperline Gorge -Coral Merfolk -Corpsehatch -Countersquall -Court Archers -Craw Wurm -Creakwood Liege -Creeping Tar Pit -Crumbling Necropolis -Cumber Stone -Cunning Sparkmage -Curse of Chains -Cursecatcher -Cylian Elf -Daggerback Basilisk -Darkslick Drake -Darkslick Shores -Darksteel Myr -Darksteel Sentinel -Dauntless Escort -Day of Judgment -Deadly Recluse -Deathbringer Liege -Deathless Angel -Deft Duelist -Diminish -Disfigure -Disperse -Dissipation Field -Divination -Doom Blade -Doomgape -Double Cleave -Dragonmaster Outcast -Dragonskull Summit -Drake Umbra -Drana, Kalastria Bloodchief -Dread -Dreg Reaver -Drowned Catacomb -Duskdale Wurm -Earthquake -Echo Mage -Eel Umbra -Eldrazi Monument -Elite Vanguard -Elvish Warrior -Ember Hauler -Emerald Oryx -Empyrial Archangel -Enormous Baloth -Epic Proportions -Esper Battlemage -Esper Cormorants -Esper Stormblade -Essence Scatter -Ethercaste Knight -Ethersworn Adjudicator -Fire Servant -Flame Slash -Flameblast Dragon -Flameborn Hellion -Forest -Fume Spitter -Fusion Elemental -Game-Trail Changeling -Garruk's Companion -Giant Growth -Giant Scorpion -Giant Spider -Glacial Fortress -Glen Elendra Archmage -Glen Elendra Liege -Gloomhunter -Gloomwidow -Glorious Charge -Glory Seeker -Glory of Warfare -Goblin Artillery -Goblin Bushwhacker -Goblin Chieftain -Goblin Deathraiders -Goblin Gaveleer -Goblin Mountaineer -Goblin Outlander -Goblin Piker -Goblin Roughrider -Goblin Ruinblaster -Goblin Shortcutter -Goblin War Paint -Godhead of Awe -Godsire -Goliath Sphinx -Gorgon Flail -Grappler Spider -Grasp of Darkness -Grave Titan -Gravelgill Axeshark -Graypelt Refuge -Great Sable Stag -Greater Basilisk -Griffin Sentinel -Grixis Grimblade -Grizzled Leotau -Guard Gomazoa -Guardian Seraph -Guardians of Akrasa -Guul Draz Specter -Guul Draz Vampire -Harvest Gwyllion -Hateflayer -Hearthfire Hobgoblin -Hellkite Overlord -Hideous End -Hillcomber Giant -Hobgoblin Dragoon -Horned Turtle -Hungry Spriggan -Hyena Umbra -Hypnotic Specter -Incurable Ogre -Indomitable Ancients -Infest -Inkfathom Infiltrator -Inkwell Leviathan -Into the Roil -Island -Jagwasp Swarm -Jhessian Balmgiver -Jhessian Infiltrator -Jhessian Lookout -Jund Hackblade -Jungle Shrine -Juvenile Gloomwidow -Jwar Isle Refuge -Jwari Scuttler -Kalonian Behemoth -Kazandu Refuge -Kazuul, Tyrant of the Cliffs -Kelinore Bat -Kindled Fury -Kinsbaile Cavalier -Kiss of the Amesha -Kitchen Finks -Kitesail -Kitesail Apprentice -Knight of Meadowgrain -Kraken Hatchling -Kulrath Knight -Lagac Lizard -Leatherback Baloth -Levitation -Lightkeeper of Emeria -Lightning Bolt -Lightning Elemental -Lightning Reaver -Lightning Talons -Liliana's Specter -Lingering Tormentor -Llanowar Elves -Loamdragger Giant -Lone Missionary -Lord of Extinction -Lord of Shatterskull Pass -Loxodon Wayfarer -Madrush Cyclops -Maelstrom Pulse -Mage Slayer -Makindi Griffin -Mana Leak -Marisi's Twinclaws -Maritime Guard -Marsh Casualties -Marsh Threader -Martial Coup -Mask of Riddles -Meglonoth -Memnite -Merfolk Seastalkers -Messenger Falcons -Midnight Banshee -Might of Oaks -Mighty Leap -Mind Spring -Mirror Entity -Mist Leopard -Mnemonic Wall -Moonglove Extract -Moonglove Winnower -Mordant Dragon -Moriok Reaver -Mountain -Murderous Redcap -Murkfiend Liege -Mycoid Shepherd -Nacatl Outlander -Nantuko Shade -Narcolepsy -Naturalize -Nema Siltlurker -Nemesis of Reason -Nether Horror -Nightshade Stinger -Nip Gwyllion -Nirkana Cutthroat -Noble Hierarch -Novablast Wurm -Nulltread Gargantuan -Oakgnarl Warrior -Offering to Asha -Ogre Sentry -Ogre's Cleaver -Old Ghastbark -Oona's Gatewarden -Oracle of Nectars -Ornithopter -Outrider of Jhess -Overwhelming Stampede -Pacifism -Pelakka Wurm -Perimeter Captain -Phantom Warrior -Pillarfield Ox -Plains -Plated Seastrider -Platinum Angel -Plover Knights -Plumeveil -Plummet -Predator Dragon -Prickly Boggart -Protective Bubble -Puncture Blast -Puppeteer Clique -Putrid Leech -Qasali Pridemage -Quest for the Gemblades -Quest for the Gravelord -Quietus Spike -Rafiq of the Many -Rage Nimbus -Raging Goblin -Raging Ravine -Raking Canopy -Rampaging Baloths -Razorfield Thresher -Razorfoot Griffin -Razorverge Thicket -Rendclaw Trow -Retaliator Griffin -Rhox Brute -Rhox Charger -Rhox War Monk -Rip-Clan Crasher -Rise of the Hobgoblins -Rite of Replication -River Boa -Rootbound Crag -Runeclaw Bear -Rupture Spire -Rustrazor Butcher -Ruthless Cullblade -Safe Passage -Safehold Elite -Savage Lands -Scar -Scattershot Archer -Scoria Elemental -Scuzzback Marauders -Scuzzback Scrapper -Seachrome Coast -Seaside Citadel -Sejiri Refuge -Sentinels of Glen Elendra -Serra Angel -Sewn-Eye Drake -Shatterskull Giant -Shepherd of the Lost -Shield of the Righteous -Sickle Ripper -Siege Mastodon -Siege-Gang Commander -Sigil Blessing -Sigiled Behemoth -Sigiled Paladin -Sign in Blood -Silkbind Faerie -Silvercoat Lion -Skinrender -Sky Ruin Drake -Slave of Bolas -Sleep -Smash to Smithereens -Smoldering Butcher -Smother -Snake Umbra -Snapping Drake -Solemn Offering -Soul's Majesty -Soul's Might -Soulbound Guardians -Sphinx of Lost Truths -Sphinx of Magosi -Sphinx of the Steel Wind -Spider Umbra -Spidersilk Net -Spined Wurm -Spirit of the Hearth -Spitemare -Sporecap Spider -Sprouting Thrinax -Stalker Hag -Stampeding Rhino -Steppe Lynx -Steward of Valeron -Stirring Wildwood -Stomper Cub -Stone Golem -Stonework Puma -Stormfront Pegasus -Strider Harness -Student of Warfare -Stun Sniper -Sunblast Angel -Sunpetal Grove -Swamp -Sword of Body and Mind -Sword of Vengeance -Sylvok Lifestaff -Talon Trooper -Tattermunge Maniac -Taurean Mauler -Terminate -Terra Stomper -Thoughtweft Gambit -Thunder Strike -Tidehollow Strix -Time Warp -Titanic Ultimatum -Torpor Dust -Tower Gargoyle -Trapjaw Kelpie -Trip Noose -True Conviction -Trumpet Blast -Trusty Machete -Tuktuk the Explorer -Turn to Mist -Twinblade Slasher -Twincast -Unmake -Unsummon -Valeron Outlander -Valiant Guard -Vampire Hexmage -Vampire Nighthawk -Vastwood Gorger -Vault Skyward -Vedalken Outlander -Veteran's Reflexes -Viashino Spearhunter -Vigor -Vines of Vastwood -Vivid Crag -Vivid Creek -Vivid Grove -Vivid Marsh -Vivid Meadow -Volcanic Fallout -Volcanic Strength -Vulshok Berserker -Wall of Bone -Wall of Denial -Wall of Frost -Wall of Reverence -Wall of Vines -Warpath Ghoul -Wasp Lancer -Waveskimmer Aven -Weakness -Welkin Tern -Whispersilk Cloak -White Knight -Wild Griffin -Wildslayer Elves -Wilt-Leaf Cavaliers -Wind Drake -Windbrisk Raptor -Winged Coatl -Withstand Death -Wolfbriar Elemental -Woodland Changeling -Woolly Thoctar -Wort, Boggart Auntie -Wrexial, the Risen Deep -Wurmcoil Engine -Yavimaya Wurm -Zealous Guardian -Zealous Persecution -Zendikar Farguide -Zephyr Sprite -Zombie Goliath -Zombie Outlander diff --git a/resources/magic/data/Standard_cube.txt b/resources/magic/data/Standard_cube.txt deleted file mode 100644 index fa44addbe9..0000000000 --- a/resources/magic/data/Standard_cube.txt +++ /dev/null @@ -1,225 +0,0 @@ -Accorder's Shield -Acidic Slime -Affa Guard Hound -Air Servant -Akoum Refuge -Alpha Tyrranax -Archon of Redemption -Armored Cancrix -Asceticism -Assassinate -Assault Griffin -Awakening Zone -Azure Drake -Baneslayer Angel -Barony Vampire -Basilisk Collar -Battle Hurda -Bellowing Tanglewurm -Berserkers of Blood Ridge -Bestial Menace -Birds of Paradise -Black Knight -Blackcleave Cliffs -Bladed Pinions -Bladetusk Boar -Boar Umbra -Bog Raiders -Bog Tatters -Brittle Effigy -Burst Lightning -Butcher of Malakir -Canyon Minotaur -Caravan Hurda -Carnifex Demon -Celestial Colonnade -Chain Reaction -Chandra's Spitfire -Child of Night -Chimeric Mass -Cliff Threader -Cloud Crusader -Cloud Elemental -Copperline Gorge -Corpsehatch -Creeping Tar Pit -Cunning Sparkmage -Daggerback Basilisk -Darkslick Drake -Darkslick Shores -Darksteel Myr -Darksteel Sentinel -Day of Judgment -Deathless Angel -Diminish -Disfigure -Disperse -Dissipation Field -Doom Blade -Dragonmaster Outcast -Dragonskull Summit -Drake Umbra -Drana, Kalastria Bloodchief -Drowned Catacomb -Duskdale Wurm -Echo Mage -Eel Umbra -Eldrazi Monument -Elite Vanguard -Ember Hauler -Fire Servant -Flame Slash -Flameborn Hellion -Forest -Fume Spitter -Garruk's Companion -Giant Growth -Giant Scorpion -Giant Spider -Glacial Fortress -Gloomhunter -Glory Seeker -Goblin Bushwhacker -Goblin Chieftain -Goblin Gaveleer -Goblin Piker -Goblin Roughrider -Goblin Ruinblaster -Goblin Shortcutter -Goblin War Paint -Goliath Sphinx -Grappler Spider -Grasp of Darkness -Grave Titan -Graypelt Refuge -Greater Basilisk -Guard Gomazoa -Guul Draz Specter -Guul Draz Vampire -Hideous End -Hyena Umbra -Into the Roil -Island -Jagwasp Swarm -Jwar Isle Refuge -Jwari Scuttler -Kazandu Refuge -Kazuul, Tyrant of the Cliffs -Kitesail -Kitesail Apprentice -Kraken Hatchling -Lagac Lizard -Leatherback Baloth -Lightkeeper of Emeria -Lightning Bolt -Liliana's Specter -Llanowar Elves -Lone Missionary -Lord of Shatterskull Pass -Loxodon Wayfarer -Makindi Griffin -Mana Leak -Maritime Guard -Marsh Casualties -Marsh Threader -Memnite -Merfolk Seastalkers -Mighty Leap -Mnemonic Wall -Mordant Dragon -Moriok Reaver -Mountain -Nantuko Shade -Narcolepsy -Naturalize -Nema Siltlurker -Nether Horror -Nirkana Cutthroat -Novablast Wurm -Ogre Sentry -Ogre's Cleaver -Ornithopter -Overwhelming Stampede -Pacifism -Pelakka Wurm -Perimeter Captain -Pillarfield Ox -Plains -Plated Seastrider -Platinum Angel -Plummet -Quest for the Gemblades -Quest for the Gravelord -Rage Nimbus -Raging Ravine -Rampaging Baloths -Razorfield Thresher -Razorverge Thicket -Rite of Replication -River Boa -Rootbound Crag -Runeclaw Bear -Ruthless Cullblade -Safe Passage -Scoria Elemental -Seachrome Coast -Sejiri Refuge -Serra Angel -Shatterskull Giant -Shepherd of the Lost -Siege Mastodon -Sign in Blood -Silvercoat Lion -Skinrender -Sky Ruin Drake -Sleep -Smother -Snake Umbra -Solemn Offering -Soulbound Guardians -Sphinx of Lost Truths -Sphinx of Magosi -Spider Umbra -Spidersilk Net -Spined Wurm -Sporecap Spider -Steppe Lynx -Stirring Wildwood -Stomper Cub -Stone Golem -Stonework Puma -Stormfront Pegasus -Strider Harness -Student of Warfare -Sunblast Angel -Sunpetal Grove -Swamp -Sword of Body and Mind -Sword of Vengeance -Sylvok Lifestaff -Terra Stomper -Thunder Strike -True Conviction -Trusty Machete -Tuktuk the Explorer -Unsummon -Vampire Hexmage -Vampire Nighthawk -Vastwood Gorger -Vault Skyward -Veteran's Reflexes -Vines of Vastwood -Volcanic Strength -Vulshok Berserker -Wall of Frost -Wall of Vines -Welkin Tern -Whispersilk Cloak -White Knight -Wild Griffin -Withstand Death -Wolfbriar Elemental -Wrexial, the Risen Deep -Wurmcoil Engine -Yavimaya Wurm -Zendikar Farguide diff --git a/resources/magic/data/Vintage_cube.txt b/resources/magic/data/Vintage_cube.txt deleted file mode 100644 index 6e7d3029e6..0000000000 --- a/resources/magic/data/Vintage_cube.txt +++ /dev/null @@ -1,830 +0,0 @@ -Absorb -Accorder's Shield -Acidic Slime -Affa Guard Hound -Air Elemental -Air Servant -Akoum Refuge -Akrasan Squire -Akroma's Memorial -Akroma, Angel of Wrath -Alpha Myr -Alpha Tyrranax -Anaba Bodyguard -Anaconda -Ancient Spider -Angel of Despair -Angel of Retribution -Angelic Shield -Angelic Wall -Anurid Murkdiver -Arachnoid -Arcane Sanctum -Archon of Justice -Archon of Redemption -Ardent Militia -Armadillo Cloak -Armored Cancrix -Asceticism -Ashcoat Bear -Ashen Monstrosity -Ashenmoor Gouger -Assassinate -Assault Griffin -Assault Zeppelid -Aven Envoy -Aven Mimeomancer -Aven Smokeweaver -Aven Squire -Avian Changeling -Awakening Zone -Axegrinder Giant -Azure Drake -Backlash -Balduvian Barbarians -Balefire Liege -Baneslayer Angel -Bant Sureblade -Barony Vampire -Basilisk Collar -Battle Hurda -Battlegrace Angel -Beacon of Destruction -Beacon of Unrest -Behemoth Sledge -Bellowing Tanglewurm -Beloved Chaplain -Benalish Knight -Benthic Behemoth -Berserkers of Blood Ridge -Bestial Menace -Birds of Paradise -Black Knight -Blackcleave Cliffs -Blade of the Sixth Pride -Bladed Pinions -Bladetusk Boar -Blaze -Blazing Specter -Blightning -Blind Phantasm -Blood Crypt -Blood Knight -Bloodmark Mentor -Bloodrock Cyclops -Blurred Mongoose -Boar Umbra -Boartusk Liege -Bog Imp -Bog Raiders -Bog Tatters -Bog Wraith -Boggart Ram-Gang -Bonesplitter -Border Patrol -Boros Guildmage -Boros Recruit -Boros Swiftblade -Bottle Gnomes -Breeding Pool -Brigid, Hero of Kinsbaile -Brion Stoutarm -Brittle Effigy -Broodmate Dragon -Bull Cerodon -Bull Hippo -Burst Lightning -Butcher of Malakir -Cairn Wanderer -Canopy Spider -Canyon Minotaur -Canyon Wildcat -Captain of the Watch -Caravan Hurda -Carnifex Demon -Celestial Colonnade -Centaur Courser -Cerodon Yearling -Chain Reaction -Chameleon Colossus -Chandra's Spitfire -Changeling Sentinel -Char -Charging Troll -Chastise -Child of Night -Chimeric Mass -Cinder Elemental -Cliff Threader -Clinging Darkness -Cloud Crusader -Cloud Elemental -Cloud Sprite -Cloudcrown Oak -Coast Watcher -Colossal Might -Commander Eesha -Copperline Gorge -Coral Eel -Coral Merfolk -Corpsehatch -Counterspell -Countersquall -Courier Hawk -Court Archers -Covert Operative -Craw Wurm -Crazed Goblin -Creakwood Liege -Creeping Tar Pit -Cruel Edict -Crumbling Necropolis -Cumber Stone -Cunning Sparkmage -Curse of Chains -Cursecatcher -Cylian Elf -Daggerback Basilisk -Daggerclaw Imp -Dancing Scimitar -Darkslick Drake -Darkslick Shores -Darksteel Gargoyle -Darksteel Myr -Darksteel Sentinel -Dauntless Escort -Day of Judgment -Deadly Recluse -Death Grasp -Deathbringer Liege -Deathless Angel -Debtors' Knell -Defiant Elf -Deft Duelist -Deluge -Diminish -Disfigure -Dismal Failure -Disperse -Dissipation Field -Divination -Diving Griffin -Doom Blade -Doomgape -Double Cleave -Douse in Gloom -Dragon Roost -Dragonmaster Outcast -Dragonskull Summit -Dragonstalker -Draining Whelk -Drake Umbra -Drana, Kalastria Bloodchief -Dread -Dreg Reaver -Dromar, the Banisher -Dross Crocodile -Dross Prowler -Drowned Catacomb -Drudge Reavers -Dusk Imp -Duskdale Wurm -Dust Corona -Dwarven Grunt -Eager Cadet -Earth Elemental -Earthquake -Echo Mage -Eel Umbra -Eldrazi Monument -Elephant Guide -Elite Vanguard -Elvish Archers -Elvish Warrior -Ember Hauler -Emerald Oryx -Empyrial Archangel -Enormous Baloth -Epic Proportions -Esper Battlemage -Esper Cormorants -Esper Stormblade -Essence Scatter -Ethercaste Knight -Ethersworn Adjudicator -Evacuation -Exhaustion -Fallen Angel -Fangren Hunter -Femeref Archers -Fervent Charge -Fighting Drake -Fire Elemental -Fire Servant -Fires of Yavimaya -Fireshrieker -Fireslinger -Fists of Ironwood -Fists of the Anvil -Flame Slash -Flame-Kin Zealot -Flameblast Dragon -Flameborn Hellion -Flametongue Kavu -Flight of Fancy -Followed Footsteps -Fomori Nomad -Foot Soldiers -Force Spike -Force of Savagery -Forest -Foul Imp -Frenzied Goblin -Frost Ogre -Fugitive Wizard -Fume Spitter -Furnace Whelp -Fusion Elemental -Gaea's Skyfolk -Galina's Knight -Galvanic Arc -Game-Trail Changeling -Garruk's Companion -Ghost Council of Orzhova -Ghostway -Giant Cockroach -Giant Growth -Giant Octopus -Giant Scorpion -Giant Solifuge -Giant Spider -Giant Warthog -Glacial Fortress -Glacial Wall -Glass Golem -Glen Elendra Archmage -Glen Elendra Liege -Gloomhunter -Gloomwidow -Glorious Anthem -Glorious Charge -Glory Seeker -Glory of Warfare -Gluttonous Zombie -Gnarled Mass -Goblin Artillery -Goblin Brigand -Goblin Bushwhacker -Goblin Chariot -Goblin Chieftain -Goblin Deathraiders -Goblin Gaveleer -Goblin Glider -Goblin Mountaineer -Goblin Outlander -Goblin Piker -Goblin Raider -Goblin Roughrider -Goblin Ruinblaster -Goblin Shortcutter -Goblin Sky Raider -Goblin Spelunkers -Goblin Striker -Goblin War Paint -Godhead of Awe -Godless Shrine -Godsire -Goliath Sphinx -Goliath Spider -Gorgon Flail -Grappler Spider -Grasp of Darkness -Grave Titan -Gravelgill Axeshark -Graypelt Refuge -Grayscaled Gharial -Great Sable Stag -Greater Basilisk -Griffin Guide -Griffin Sentinel -Grixis Grimblade -Grizzled Leotau -Grizzly Bears -Gruul War Plow -Guard Gomazoa -Guardian Seraph -Guardian of the Guildpact -Guardians of Akrasa -Guul Draz Specter -Guul Draz Vampire -Halberdier -Halcyon Glaze -Hallowed Fountain -Harmonize -Harvest Gwyllion -Hateflayer -Havenwood Wurm -Hearthfire Hobgoblin -Hellkite Overlord -Heroes' Reunion -Hideous End -Hill Giant -Hillcomber Giant -Hissing Miasma -Hobgoblin Dragoon -Horned Cheetah -Horned Turtle -Hoverguard Observer -Hulking Cyclops -Humble Budoka -Hungry Spriggan -Hurricane -Hyena Umbra -Hypnotic Specter -Incinerate -Incurable Ogre -Indomitable Ancients -Infest -Inkfathom Infiltrator -Inkwell Leviathan -Inspirit -Into the Roil -Iridescent Angel -Iron-Barb Hellion -Isamaru, Hound of Konda -Island -Jagwasp Swarm -Jhessian Balmgiver -Jhessian Infiltrator -Jhessian Lookout -Jukai Messenger -Jund Hackblade -Jungle Shrine -Juvenile Gloomwidow -Jwar Isle Refuge -Jwari Scuttler -Kabuto Moth -Kaervek the Merciless -Kalonian Behemoth -Kami of Old Stone -Kavu Titan -Kazandu Refuge -Kazuul, Tyrant of the Cliffs -Keening Banshee -Keiga, the Tide Star -Kelinore Bat -Kiki-Jiki, Mirror Breaker -Kindled Fury -King Cheetah -Kinsbaile Cavalier -Kiss of the Amesha -Kitchen Finks -Kitesail -Kitesail Apprentice -Knight Errant -Knight of Meadowgrain -Kodama of the North Tree -Kokusho, the Evening Star -Kraken Hatchling -Kulrath Knight -Lagac Lizard -Lantern Kami -Last Gasp -Lavaborn Muse -Leaf Dancer -Leatherback Baloth -Leonin Scimitar -Leonin Skyhunter -Levitation -Lightkeeper of Emeria -Lightning Angel -Lightning Bolt -Lightning Elemental -Lightning Helix -Lightning Reaver -Lightning Talons -Liliana's Specter -Lingering Tormentor -Llanowar Elves -Llanowar Knight -Loamdragger Giant -Lone Missionary -Longbow Archer -Lord of Extinction -Lord of Shatterskull Pass -Lotus Petal -Loxodon Hierarch -Loxodon Warhammer -Loxodon Wayfarer -Lumengrid Warden -Madrush Cyclops -Maelstrom Pulse -Mage Slayer -Mahamoti Djinn -Makindi Griffin -Man-o'-War -Mana Leak -Marisi's Twinclaws -Maritime Guard -Marsh Casualties -Marsh Threader -Martial Coup -Mask of Memory -Mask of Riddles -Mass of Ghouls -Meglonoth -Memnite -Merfolk Seastalkers -Merfolk of the Pearl Trident -Messenger Falcons -Midnight Banshee -Might of Oaks -Mighty Leap -Mind Spring -Mind Stone -Mire Boa -Mirri the Cursed -Mirri, Cat Warrior -Mirror Entity -Mist Leopard -Mistral Charger -Mnemonic Wall -Mogg Fanatic -Moonglove Extract -Moonglove Winnower -Mordant Dragon -Moriok Reaver -Moroii -Mortify -Moss Kami -Moss Monster -Mountain -Mourning Thrull -Murderous Redcap -Murkfiend Liege -Mycoid Shepherd -Mystic Snake -Nacatl Outlander -Nantuko Shade -Narcolepsy -Naturalize -Needlepeak Spider -Needleshot Gourna -Nema Siltlurker -Nemesis of Reason -Nessian Courser -Nether Horror -Nezumi Cutthroat -Nightguard Patrol -Nightshade Stinger -Nip Gwyllion -Nirkana Cutthroat -Noble Hierarch -Norwood Ranger -Novablast Wurm -Nulltread Gargantuan -Oakgnarl Warrior -Offering to Asha -Ogre Sentry -Ogre Taskmaster -Ogre's Cleaver -Old Ghastbark -Omega Myr -Omnibian -Oona's Gatewarden -Oracle of Nectars -Order of the Sacred Bell -Ornithopter -Oros, the Avenger -Outrider of Jhess -Overgrown Tomb -Overwhelming Stampede -Pacifism -Paladin en-Vec -Pegasus Charger -Pelakka Wurm -Perimeter Captain -Phantom Warrior -Phyrexian Arena -Phyrexian Hulk -Pillarfield Ox -Pillory of the Sleepless -Pincher Beetles -Plague Beetle -Plains -Plasma Elemental -Plated Seastrider -Platinum Angel -Plover Knights -Plumeveil -Plummet -Pongify -Predator Dragon -Prickly Boggart -Promise of Bunrei -Protective Bubble -Pulse of the Tangle -Puncture Blast -Puppeteer Clique -Putrefy -Putrid Leech -Qasali Pridemage -Quest for the Gemblades -Quest for the Gravelord -Quietus Spike -Rafiq of the Many -Rage Nimbus -Raging Goblin -Raging Kavu -Raging Ravine -Rakdos Guildmage -Raking Canopy -Rampaging Baloths -Rancor -Ravenous Baloth -Razorfield Thresher -Razorfoot Griffin -Razorjaw Oni -Razortooth Rats -Razorverge Thicket -Reanimate -Recover -Redwood Treefolk -Remand -Rendclaw Trow -Repulse -Retaliator Griffin -Rhox Brute -Rhox Charger -Rhox War Monk -Ridgetop Raptor -Rip-Clan Crasher -Rise of the Hobgoblins -Rite of Replication -Rith, the Awakener -River Bear -River Boa -River Kaijin -Rock Badger -Ronin Warclub -Rootbound Crag -Rootbreaker Wurm -Rootwater Commando -Rorix Bladewing -Rumbling Slum -Runeclaw Bear -Rupture Spire -Rushwood Dryad -Rustrazor Butcher -Ruthless Cullblade -Sabertooth Nishoba -Sabretooth Tiger -Sacred Foundry -Safe Passage -Safehold Elite -Savage Lands -Savage Twister -Savannah Lions -Scaled Wurm -Scar -Scathe Zombies -Scattershot Archer -Scavenging Scarab -Scoria Elemental -Scuzzback Marauders -Scuzzback Scrapper -Sea Eagle -Seachrome Coast -Seal of Doom -Seal of Fire -Seaside Citadel -Sejiri Refuge -Sentinels of Glen Elendra -Serendib Efreet -Serra Angel -Serra Sphinx -Serra's Embrace -Serrated Arrows -Severed Legion -Sewn-Eye Drake -Shadowmage Infiltrator -Shanodin Dryads -Shatterskull Giant -Shepherd of the Lost -Shield of the Righteous -Shivan Wurm -Shivan Zombie -Sickle Ripper -Siege Mastodon -Siege-Gang Commander -Sift -Sigil Blessing -Sigiled Behemoth -Sigiled Paladin -Sign in Blood -Silhana Ledgewalker -Silkbind Faerie -Silver Knight -Silverback Ape -Silvercoat Lion -Simic Sky Swallower -Skeletal Vampire -Skinrender -Skullcage -Skullclamp -Sky Ruin Drake -Skyknight Legionnaire -Skyshroud Falcon -Slagwurm Armor -Slave of Bolas -Sleep -Slinking Serpent -Smash to Smithereens -Smoldering Butcher -Smother -Snake Umbra -Snapping Drake -Sokenzan Bruiser -Solemn Offering -Soul Feast -Soul Link -Soul's Majesty -Soul's Might -Soulbound Guardians -Souls of the Faultless -Specter's Shroud -Sphinx of Lost Truths -Sphinx of Magosi -Sphinx of the Steel Wind -Spider Umbra -Spidersilk Net -Spiketail Hatchling -Spined Wurm -Spineless Thug -Spirit of the Hearth -Spiritmonger -Spitemare -Sporecap Spider -Sprouting Thrinax -Stalker Hag -Stampeding Rhino -Standing Troops -Steadfast Guard -Steam Vents -Steel Wall -Steppe Lynx -Steward of Valeron -Stirring Wildwood -Stomper Cub -Stomping Ground -Stone Golem -Stonebrow, Krosan Hero -Stonework Puma -Storm Crow -Stormfront Pegasus -Stratozeppelid -Streetbreaker Wurm -Strider Harness -Student of Warfare -Stuffy Doll -Stun Sniper -Stupor -Sunblast Angel -Sunpetal Grove -Suntail Hawk -Surveilling Sprite -Swamp -Sword of Body and Mind -Sword of Fire and Ice -Sword of Light and Shadow -Sword of Vengeance -Swords to Plowshares -Sylvok Lifestaff -Szadek, Lord of Secrets -Talon Trooper -Tangle Spider -Tattermunge Maniac -Taurean Mauler -Temple Garden -Teneb, the Harvester -Terminate -Terra Stomper -Thieving Magpie -Thornweald Archer -Thoughtweft Gambit -Thunder Strike -Thundering Giant -Thundersong Trumpeter -Tidal Kraken -Tidehollow Strix -Time Ebb -Time Warp -Titanic Ultimatum -To Arms! -Tolsimir Wolfblood -Torpor Dust -Tower Gargoyle -Trained Armodon -Trained Orgg -Tranquility -Trapjaw Kelpie -Tree Monkey -Treetop Scout -Treetop Sentinel -Treva, the Renewer -Trip Noose -Troll Ascetic -True Conviction -Trumpet Blast -Trusty Machete -Trygon Predator -Tuktuk the Explorer -Tundra Wolves -Turn to Mist -Twinblade Slasher -Twincast -Undermine -Unmake -Unsummon -Urborg Drake -Ursapine -Utvara Scalper -Valeron Outlander -Valiant Guard -Vampire Hexmage -Vampire Nighthawk -Vastwood Gorger -Vault Skyward -Vedalken Outlander -Venser's Sliver -Venser, Shaper Savant -Veteran Armorer -Veteran Cavalier -Veteran's Reflexes -Viashino Spearhunter -Vigor -Vine Trellis -Vines of Vastwood -Vivid Crag -Vivid Creek -Vivid Grove -Vivid Marsh -Vivid Meadow -Vizzerdrix -Vodalian Zombie -Volcanic Fallout -Volcanic Strength -Vorosh, the Hunter -Vulshok Battlegear -Vulshok Berserker -Vulshok Morningstar -Wall of Air -Wall of Bone -Wall of Denial -Wall of Frost -Wall of Reverence -Wall of Spears -Wall of Stone -Wall of Swords -Wall of Vines -Wall of Wood -Wandering Ones -Warpath Ghoul -Wasp Lancer -Watchwolf -Watery Grave -Waveskimmer Aven -Weakness -Welkin Tern -Whispersilk Cloak -White Knight -Wild Griffin -Wildsize -Wildslayer Elves -Wilt-Leaf Cavaliers -Wind Drake -Windbrisk Raptor -Winged Coatl -Withstand -Withstand Death -Wolfbriar Elemental -Woodland Changeling -Woodland Druid -Woolly Thoctar -Wort, Boggart Auntie -Wrap in Vigor -Wrecking Ball -Wrexial, the Risen Deep -Wurmcoil Engine -Yavimaya Barbarian -Yavimaya Wurm -Yotian Soldier -Youthful Knight -Zealous Guardian -Zealous Persecution -Zendikar Farguide -Zephyr Sprite -Zodiac Monkey -Zombie Goliath -Zombie Outlander -Zombify diff --git a/resources/magic/data/cards.txt b/resources/magic/data/cards.txt index ac56d235e8..9472cb6c51 100644 --- a/resources/magic/data/cards.txt +++ b/resources/magic/data/cards.txt @@ -5732,16 +5732,6 @@ converted=5 cost={3}{G}{G} timing=enchantment ->Disperse -value=3 -removal=2 -rarity=2 -type=Instant -color=u -converted=2 -cost={1}{U} -timing=removal - >Elite Vanguard value=2 rarity=2 @@ -5754,26 +5744,6 @@ power=2 toughness=1 timing=main ->Curse of Chains -value=3 -removal=2 -rarity=2 -type=Enchantment -subtype=Aura -color=wu -converted=2 -cost={1}{W/U} -timing=nextturn - ->Gruul War Plow -value=3 -rarity=2 -type=Artifact -converted=4 -cost={4} -static=player -timing=artifact - >Accorder Paladin value=2 rarity=1 @@ -7605,19 +7575,6 @@ power=1 toughness=2 timing=main ->Horned Cheetah -value=2 -ability=lifelink -rarity=2 -type=Creature -subtype=Cat -color=gw -converted=4 -cost={2}{G}{W} -power=2 -toughness=2 -timing=main - >Horned Turtle value=1 rarity=1 diff --git a/resources/magic/data/images.txt b/resources/magic/data/images.txt index bbf6c597f3..0ca9b4c9b6 100644 --- a/resources/magic/data/images.txt +++ b/resources/magic/data/images.txt @@ -168,7 +168,6 @@ Crumbling Necropolis.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multive Cumber Stone.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=180322&type=card Cunning Sparkmage.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=201563&type=card Cursecatcher.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=158763&type=card -Curse of Chains.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=146079&type=card Daggerclaw Imp.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=197022&type=card Darkslick Drake.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=194217&type=card Darkslick Shores.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=209400&type=card @@ -183,7 +182,6 @@ Deluge.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=135223&t Diminish.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=208226&type=card Disfigure.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=180115&type=card Dismal Failure.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=129022&type=card -Disperse.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=212242&type=card Dissipation Field.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=202635&type=card Divination.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=190172&type=card Doom Blade.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=205088&type=card @@ -269,7 +267,6 @@ Grave Titan.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=205 Graypelt Refuge.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=220467&type=card Great Sable Stag.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=193759&type=card Griffin Guide.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=110514&type=card -Gruul War Plow.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=107098&type=card Grixis Grimblade.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=188976&type=card Guard Gomazoa.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=193602&type=card Guardian Seraph.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=193766&type=card @@ -743,7 +740,6 @@ Hearthfire Hobgoblin.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multive Hill Giant.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=129591&type=card Hillcomber Giant.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=145971&type=card Hobgoblin Dragoon.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=151090&type=card -Horned Cheetah.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=23163&type=card Horned Turtle.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=190178&type=card Hoverguard Observer.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=49020&type=card Hulking Cyclops.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=45371&type=card @@ -834,7 +830,7 @@ Rootwater Commando.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multivers Runeclaw Bear.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=207337&type=card Rushwood Dryad.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=136285&type=card Sabretooth Tiger.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=45347&type=card -Savannah Lions.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=221577&type=card +Savannah Lions.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=83246&type=card Scaled Wurm.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=83272&type=card Scathe Zombies.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=129718&type=card Scavenging Scarab.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=46093&type=card @@ -842,7 +838,7 @@ Scoria Elemental.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiversei Scuzzback Scrapper.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=142052&type=card Sea Eagle.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=47786&type=card Sentinels of Glen Elendra.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=139426&type=card -Serra Angel.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=202561&type=card +Serra Angel.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=196999&type=card Serra Sphinx.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=125873&type=card Severed Legion.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=129693&type=card Sewn-Eye Drake.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=179594&type=card @@ -1009,7 +1005,6 @@ Crumbling Necropolis.jpg;http://magiccards.info/scans/en/ala/222.jpg Cumber Stone.jpg;http://magiccards.info/scans/en/cfx/24.jpg Cunning Sparkmage.jpg;http://magiccards.info/scans/en/wwk/79.jpg Cursecatcher.jpg;http://magiccards.info/scans/en/shm/34.jpg -Curse of Chains.jpg;http://magiccards.info/scans/en/shm/139.jpg Daggerclaw Imp.jpg;http://magiccards.info/scans/en/dvd/33.jpg Darkslick Drake.jpg;http://magiccards.info/scans/en/som/30.jpg Darkslick Shores.jpg;http://magiccards.info/scans/en/som/226.jpg @@ -1024,7 +1019,6 @@ Deluge.jpg;http://magiccards.info/scans/en/10e/79.jpg Diminish.jpg;http://magiccards.info/scans/en/m11/52.jpg Disfigure.jpg;http://magiccards.info/scans/en/zen/87.jpg Dismal Failure.jpg;http://magiccards.info/scans/en/pc/39.jpg -Disperse.jpg;http://magiccards.info/scans/en/som/31.jpg Dissipation Field.jpg;http://magiccards.info/scans/en/som/32.jpg Divination.jpg;http://magiccards.info/scans/en/m10/49.jpg Doom Blade.jpg;http://magiccards.info/scans/en/m11/95.jpg @@ -1111,7 +1105,6 @@ Graypelt Refuge.jpg;http://magiccards.info/scans/en/arc/125.jpg Great Sable Stag.jpg;http://magiccards.info/scans/en/m10/186.jpg Griffin Guide.jpg;http://magiccards.info/scans/en/ts/21.jpg Grixis Grimblade.jpg;http://magiccards.info/scans/en/arb/134.jpg -Gruul War Plow.jpg;http://magiccards.info/scans/en/gp/151.jpg Guard Gomazoa.jpg;http://magiccards.info/scans/en/roe/70.jpg Guardian Seraph.jpg;http://magiccards.info/scans/en/m10/13.jpg Guardian of the Guildpact.jpg;http://magiccards.info/scans/en/di/10.jpg @@ -1584,7 +1577,6 @@ Hearthfire Hobgoblin.jpg;http://magiccards.info/scans/en/pch/102.jpg Hill Giant.jpg;http://magiccards.info/scans/en/dpa/47.jpg Hillcomber Giant.jpg;http://magiccards.info/scans/en/lw/20.jpg Hobgoblin Dragoon.jpg;http://magiccards.info/scans/en/eve/142.jpg -Horned Cheetah.jpg;http://magiccards.info/scans/en/in/251.jpg Horned Turtle.jpg;http://magiccards.info/scans/en/m10/55.jpg Hoverguard Observer.jpg;http://magiccards.info/scans/en/ds/22.jpg Hulking Cyclops.jpg;http://magiccards.info/scans/en/8e/195.jpg @@ -1675,7 +1667,7 @@ Rootwater Commando.jpg;http://magiccards.info/scans/en/10e/102.jpg Runeclaw Bear.jpg;http://magiccards.info/scans/en/dpa/82.jpg Rushwood Dryad.jpg;http://magiccards.info/scans/en/10e/294.jpg Sabretooth Tiger.jpg;http://magiccards.info/scans/en/8e/217.jpg -Savannah Lions.jpg;http://magiccards.info/scans/en/me4/24.jpg +Savannah Lions.jpg;http://magiccards.info/scans/en/9e/41.jpg Scaled Wurm.jpg;http://magiccards.info/scans/en/9e/269.jpg Scathe Zombies.jpg;http://magiccards.info/scans/en/10e/175.jpg Scavenging Scarab.jpg;http://magiccards.info/scans/en/ds/51.jpg @@ -1683,7 +1675,7 @@ Scoria Elemental.jpg;http://magiccards.info/scans/en/som/102.jpg Scuzzback Scrapper.jpg;http://magiccards.info/scans/en/shm/217.jpg Sea Eagle.jpg;http://magiccards.info/scans/en/8eb/4.jpg Sentinels of Glen Elendra.jpg;http://magiccards.info/scans/en/lw/84.jpg -Serra Angel.jpg;http://magiccards.info/scans/en/m11/27.jpg +Serra Angel.jpg;http://magiccards.info/scans/en/dvd/10.jpg Serra Sphinx.jpg;http://magiccards.info/scans/en/pc/62.jpg Severed Legion.jpg;http://magiccards.info/scans/en/dpa/33.jpg Sewn-Eye Drake.jpg;http://magiccards.info/scans/en/arb/135.jpg diff --git a/resources/magic/data/keywords.txt b/resources/magic/data/keywords.txt index d9a7c2cf5a..9f4538097c 100644 --- a/resources/magic/data/keywords.txt +++ b/resources/magic/data/keywords.txt @@ -4,21 +4,21 @@ Whenever this creature attacks, each other attacking creature gets +1/+0 until e This card is every creature type at all times. *deathtouch Creatures dealt damage by this creature are destroyed. -You can divide this creature’s combat damage among any of the creatures blocking or blocked by it. +You can divide this creature's combat damage among any of the creatures blocking or blocked by it. *defender -This creature can’t attack. +This creature can't attack. *double strike This creature deals both first-strike and regular combat damage. *exalted Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn. *fear -This creature can’t be blocked except by artifact creatures and/or black creatures. +This creature can't be blocked except by artifact creatures and/or black creatures. *first strike This creature deals combat damage before creatures without first strike. *flash You may cast this spell any time you could cast an instant. *flying -This creature can’t be blocked except by creatures with flying or reach. +This creature can't be blocked except by creatures with flying or reach. *haste This creature can attack and tap the turn it comes under your control. *forestwalk @@ -35,7 +35,7 @@ Damage dealt by this creature also causes you to gain that much life. This creature is unblockable as long as defending player controls a Mountain. *persist When this creature is put into a graveyard from the battlefield, if it had no -1/-1 counters on it, -return it to the battlefield under its owner’s control with a -1/-1 counter on it. +return it to the battlefield under its owner's control with a -1/-1 counter on it. *plainswalk This creature is unblockable as long as defending player controls a Plains. *protection from ~ @@ -43,10 +43,10 @@ This creature can't be blocked, targeted, dealt damage, equipped or enchanted by *reach This creature can block creatures with flying. *regenerate -The next time this creature would be destroyed this turn, it isn’t. +The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat. *shroud -This can’t be the target of spells or abilities. +This can't be the target of spells or abilities. *swampwalk This creature is unblockable as long as defending player controls a Swamp. *totem armor @@ -55,6 +55,6 @@ If enchanted creature would be destroyed, instead remove all damage from it and If this creature would deal enough damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player. *vigilance -Attacking doesn’t cause this creature to tap. +Attacking doesn't cause this creature to tap. *wither This deals damage to creatures in the form of -1/-1 counters. \ No newline at end of file diff --git a/resources/magic/data/Legacy_cube.txt b/resources/magic/data/singularita_cube.txt similarity index 99% rename from resources/magic/data/Legacy_cube.txt rename to resources/magic/data/singularita_cube.txt index 784498120f..deccac7c14 100644 --- a/resources/magic/data/Legacy_cube.txt +++ b/resources/magic/data/singularita_cube.txt @@ -141,7 +141,6 @@ Cruel Edict Crumbling Necropolis Cumber Stone Cunning Sparkmage -Curse of Chains Cursecatcher Cylian Elf Daggerback Basilisk @@ -165,7 +164,6 @@ Deluge Diminish Disfigure Dismal Failure -Disperse Dissipation Field Divination Diving Griffin @@ -310,7 +308,6 @@ Griffin Sentinel Grixis Grimblade Grizzled Leotau Grizzly Bears -Gruul War Plow Guard Gomazoa Guardian Seraph Guardian of the Guildpact @@ -332,7 +329,6 @@ Hill Giant Hillcomber Giant Hissing Miasma Hobgoblin Dragoon -Horned Cheetah Horned Turtle Hoverguard Observer Hulking Cyclops @@ -631,6 +627,7 @@ Simic Sky Swallower Skeletal Vampire Skinrender Skullcage +Skullclamp Sky Ruin Drake Skyknight Legionnaire Skyshroud Falcon @@ -826,4 +823,4 @@ Zephyr Sprite Zodiac Monkey Zombie Goliath Zombie Outlander -Zombify +Zombify \ No newline at end of file diff --git a/resources/magic/data/cube.txt b/resources/magic/data/ubeefx_cube.txt similarity index 100% rename from resources/magic/data/cube.txt rename to resources/magic/data/ubeefx_cube.txt diff --git a/src/magic/data/CardEventDefinitions.java b/src/magic/data/CardEventDefinitions.java index 7b4141ad84..cfaadd8e55 100644 --- a/src/magic/data/CardEventDefinitions.java +++ b/src/magic/data/CardEventDefinitions.java @@ -390,28 +390,7 @@ public class CardEventDefinitions { } } }; - - private static final MagicSpellCardEvent DISPERSE=new MagicSpellCardEvent("Disperse") { - - @Override - public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) { - - final MagicPlayer player=cardOnStack.getController(); - return new MagicEvent(cardOnStack.getCard(),player,MagicTargetChoice.NEG_TARGET_NONLAND_PERMANENT,MagicBounceTargetPicker.getInstance(), - new Object[]{cardOnStack},this,"Return target nonland permanent$ to its owner's hand."); - } - - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { - - game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0])); - final MagicPermanent permanent=event.getTarget(game,choiceResults,0); - if (permanent!=null) { - game.doAction(new MagicRemoveFromPlayAction(permanent,MagicLocationType.OwnersHand)); - } - } - }; - + private static final MagicSpellCardEvent DOOM_BLADE=new MagicSpellCardEvent("Doom Blade") { @Override @@ -2952,8 +2931,6 @@ public class CardEventDefinitions { MagicTargetChoice.POS_TARGET_CREATURE,MagicPumpTargetPicker.getInstance()); private static final MagicSpellCardEvent CLINGING_DARKNESS=new MagicPlayAuraEvent("Clinging Darkness", MagicTargetChoice.NEG_TARGET_CREATURE,new MagicWeakenTargetPicker(-4,-1)); - private static final MagicSpellCardEvent CURSE_OF_CHAINS=new MagicPlayAuraEvent("Curse of Chains", - MagicTargetChoice.NEG_TARGET_CREATURE,new MagicNoCombatTargetPicker(true,true,true)); private static final MagicSpellCardEvent DRAKE_UMBRA=new MagicPlayAuraEvent("Drake Umbra", MagicTargetChoice.POS_TARGET_CREATURE,MagicPumpTargetPicker.getInstance()); private static final MagicSpellCardEvent DUST_CORONA=new MagicPlayAuraEvent("Dust Corona", @@ -3019,7 +2996,6 @@ public class CardEventDefinitions { DIMINISH, DISFIGURE, DISMAL_FAILURE, - DISPERSE, DOOM_BLADE, DOUBLE_CLEAVE, DOUSE_IN_GLOOM, @@ -3130,7 +3106,6 @@ public class CardEventDefinitions { ARMADILLO_CLOAK, BOAR_UMBRA, CLINGING_DARKNESS, - CURSE_OF_CHAINS, DRAKE_UMBRA, DUST_CORONA, EEL_UMBRA, diff --git a/src/magic/data/CubeDefinitions.java b/src/magic/data/CubeDefinitions.java index 7bc7914eed..89d5d59217 100644 --- a/src/magic/data/CubeDefinitions.java +++ b/src/magic/data/CubeDefinitions.java @@ -17,13 +17,11 @@ public class CubeDefinitions { private static final CubeDefinitions INSTANCE=new CubeDefinitions(); - public static final String DEFAULT_NAME="default"; - - private static final String DEFAULT_FILENAME="cube.txt"; - private static final String[] INCLUDED_CUBES={"Extended","Legacy","Standard","Vintage"}; - + private static final String[] INCLUDED_CUBES={"ubeefx","singularita"}; private static final String CUBE_FILE_EXTENSION="_cube.txt"; + public static final String DEFAULT_NAME=INCLUDED_CUBES[0]; + private static final FileFilter CUBE_FILE_FILTER=new FileFilter() { @Override @@ -89,12 +87,10 @@ public class CubeDefinitions { public void loadCubeDefinitions() throws IOException { - final InputStream inputStream=this.getClass().getResourceAsStream(DEFAULT_FILENAME); - loadCubeDefinition(DEFAULT_NAME,inputStream); - inputStream.close(); - for (final String s : INCLUDED_CUBES) { - final InputStream cubeInputStream=this.getClass().getResourceAsStream(s+CUBE_FILE_EXTENSION); - loadCubeDefinition(s,cubeInputStream); + for (final String cubeName : INCLUDED_CUBES) { + + final InputStream cubeInputStream=this.getClass().getResourceAsStream(cubeName+CUBE_FILE_EXTENSION); + loadCubeDefinition(cubeName,cubeInputStream); cubeInputStream.close(); } diff --git a/src/magic/data/PermanentActivationDefinitions.java b/src/magic/data/PermanentActivationDefinitions.java index e2b205c6b0..d51a50921a 100644 --- a/src/magic/data/PermanentActivationDefinitions.java +++ b/src/magic/data/PermanentActivationDefinitions.java @@ -2107,57 +2107,6 @@ public class PermanentActivationDefinitions { } }; - private static final MagicLocalVariable GRUUL_WAR_PLOW_VARIABLE=new MagicLocalVariable() { - - @Override - public void getPowerToughness(final MagicGame game,final MagicPermanent permanent,final MagicPowerToughness pt) { - - pt.power=4; - pt.toughness=4; - } - - @Override - public long getAbilityFlags(final MagicGame game,final MagicPermanent permanent,final long flags) { - - return flags; - } - - @Override - public int getSubTypeFlags(final MagicPermanent permanent,final int flags) { - - return 0; - } - - @Override - public int getColorFlags(final MagicPermanent permanent,final int flags) { - - return flags; - } - }; - - private static final MagicPermanentActivation GRUUL_WAR_PLOW=new MagicPermanentActivation("Gruul War Plow", - new MagicCondition[]{MagicManaCost.ONE_RED_GREEN.getCondition()},new MagicActivationHints(MagicTiming.Animate,false,1)) { - - @Override - public MagicEvent[] getCostEvent(final MagicSource source) { - - return new MagicEvent[]{new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.ONE_RED_GREEN)}; - } - - @Override - public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) { - - return new MagicEvent(source,source.getController(),new Object[]{source},this, - "Gruul War Plow becomes a 4/4 Juggernaut artifact creature until end of turn."); - } - - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { - - game.doAction(new MagicBecomesCreatureAction((MagicPermanent)data[0],GRUUL_WAR_PLOW_VARIABLE)); - } - }; - private static final MagicPermanentActivation MIND_STONE=new MagicPermanentActivation("Mind Stone", new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicManaCost.TWO.getCondition()},new MagicActivationHints(MagicTiming.Draw)) { @@ -2586,7 +2535,6 @@ public class PermanentActivationDefinitions { RISE_OF_THE_HOBGOBLINS, SEAL_OF_DOOM, SEAL_OF_FIRE, - GRUUL_WAR_PLOW, BRITTLE_EFFIGY, CHIMERIC_MASS, MIND_STONE, diff --git a/src/magic/data/TriggerDefinitions.java b/src/magic/data/TriggerDefinitions.java index 6bcb5281ad..0075176813 100644 --- a/src/magic/data/TriggerDefinitions.java +++ b/src/magic/data/TriggerDefinitions.java @@ -57,7 +57,6 @@ import magic.model.event.MagicEvent; import magic.model.event.MagicEventAction; import magic.model.event.MagicPlayOgreUnlessEvent; import magic.model.event.MagicSacrificePermanentEvent; -import magic.model.event.MagicTapEvent; import magic.model.stack.MagicCardOnStack; import magic.model.target.MagicBecomeTargetPicker; import magic.model.target.MagicBounceTargetPicker; @@ -3251,25 +3250,7 @@ public class TriggerDefinitions { game.doAction(new MagicChangeLifeAction((MagicPlayer)data[0],(Integer)data[1])); } }; - - private static final MagicTrigger CURSE_OF_CHAINS=new MagicTrigger(MagicTriggerType.AtUpkeep,"Curse of Chains") { - - @Override - public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final Object data) { - - final MagicPermanent enchantedCreature=permanent.getEnchantedCreature(); - if (enchantedCreature!=null&&!enchantedCreature.isTapped()) { - return new MagicTapEvent(enchantedCreature); - } - return null; - } - - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object data[],final Object[] choiceResults) { - - } - }; - + private static final MagicTrigger ELEPHANT_GUIDE=new MagicTrigger(MagicTriggerType.WhenOtherPutIntoGraveyardFromPlay,"Elephant Guide") { @Override @@ -3733,7 +3714,6 @@ public class TriggerDefinitions { SERRATED_ARROWS2, SKULLCAGE, ARMADILLO_CLOAK, - CURSE_OF_CHAINS, ELEPHANT_GUIDE, FISTS_OF_IRONWOOD, FLIGHT_OF_FANCY, diff --git a/src/magic/model/variable/MagicStaticLocalVariable.java b/src/magic/model/variable/MagicStaticLocalVariable.java index f7c33586ff..0c36a6b03f 100644 --- a/src/magic/model/variable/MagicStaticLocalVariable.java +++ b/src/magic/model/variable/MagicStaticLocalVariable.java @@ -33,7 +33,6 @@ public class MagicStaticLocalVariable implements MagicLocalVariable { private static int gloryOfWarfare; private static int goblinChieftain; private static int godheadOfAwe; - private static int gruulWarPlow; private static int kinsbaileCavalier; private static int kulrathKnight; private static int levitation; @@ -153,9 +152,6 @@ public class MagicStaticLocalVariable implements MagicLocalVariable { if (controller.getCount(bloodmarkMentor)>0&&MagicColor.Red.hasColor(permanent.getColorFlags())) { flags|=MagicAbility.FirstStrike.getMask(); } - if (controller.getCount(gruulWarPlow)>0) { - flags|=MagicAbility.Trample.getMask(); - } if (controller.getCount(captainOfTheWatch)>0&&permanent.hasSubType(MagicSubType.Soldier)) { flags|=MagicAbility.Vigilance.getMask(); } @@ -225,7 +221,6 @@ public class MagicStaticLocalVariable implements MagicLocalVariable { gloryOfWarfare=definitions.getCard("Glory of Warfare").getIndex(); goblinChieftain=definitions.getCard("Goblin Chieftain").getIndex(); godheadOfAwe=definitions.getCard("Godhead of Awe").getIndex(); - gruulWarPlow=definitions.getCard("Gruul War Plow").getIndex(); kinsbaileCavalier=definitions.getCard("Kinsbaile Cavalier").getIndex(); kulrathKnight=definitions.getCard("Kulrath Knight").getIndex(); levitation=definitions.getCard("Levitation").getIndex(); diff --git a/src/magic/ui/VersionPanel.java b/src/magic/ui/VersionPanel.java index ba9fea9388..eb2ddf67d7 100644 --- a/src/magic/ui/VersionPanel.java +++ b/src/magic/ui/VersionPanel.java @@ -26,7 +26,7 @@ public class VersionPanel extends JPanel { private static final long serialVersionUID = 1L; - private static final String VERSION = "Magarena 1.7"; + private static final String VERSION = "Magarena 1.8"; private static final String AUTHOR = "by ubeefx"; private static final String WEB = "http://magarena.dyndns.org"; private static final String SPACING = " ";