From 6deeddb59f869f0ee78ba4e481c95be40960c3bb Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 08:08:34 +0000
Subject: [PATCH] Finally removed the remove list. (Replaced by SVar:RemAIDeck)

---
 .../GenerateConstructedMultiColorDeck.java    | 415 +-----------------
 1 file changed, 2 insertions(+), 413 deletions(-)

diff --git a/src/forge/GenerateConstructedMultiColorDeck.java b/src/forge/GenerateConstructedMultiColorDeck.java
index 597d41eccb3..cfd82fd07d5 100644
--- a/src/forge/GenerateConstructedMultiColorDeck.java
+++ b/src/forge/GenerateConstructedMultiColorDeck.java
@@ -343,417 +343,6 @@ public class GenerateConstructedMultiColorDeck
 
   private CardList filterBadCards(CardList list, int colors)
   {
-    /**
-     *  remove "bad" and multi-colored cards
-     */
-    final ArrayList<String> remove = new ArrayList<String>();
-    remove.add("Sarcomite Myr");
-    remove.add("Force of Savagery");
-    remove.add("Darksteel Colossus");
-    remove.add("Jokulhaups");
-    remove.add("Steel Wall");
-    remove.add("Ornithopter");
-    remove.add("Amnesia");
-    remove.add("Battle of Wits");
-    remove.add("Ashes to Ashes");
-    remove.add("Haunted Angel");
-    remove.add("Sky Swallower");
-    remove.add("Magus of the Library");
-    remove.add("The Unspeakable");
-    remove.add("Wall of Kelp");
-
-    remove.add("Incendiary Command");
-    remove.add("Memnarch");
-    remove.add("Plague Wind");
-    // remove.add("Klaas, Elf Friend");
-    remove.add("Delirium Skeins");
-
-    remove.add("Undying Beast");
-    remove.add("Wit's End");
-
-    remove.add("Blinding Light");
-    remove.add("Hymn to Tourach");
-    
-    /**
-     *  cards that slow the computer down:
-     */
-    // remove.add("Anger");
-    // remove.add("Brawn");
-    // remove.add("Valor");
-    // remove.add("Wonder");
-    
-    /**
-     *  cards that have bugs"
-     */
-    remove.add("Admonition Angel");
-    remove.add("AEther Flash");
-    remove.add("Battle Strain");
-    remove.add("Ancestral Vision");
-    
-    /**
-     *  not fully implemented:
-     */
-    remove.add("Arashi, the Sky Asunder");
-    // remove.add("Aether Membrane");
-    // remove.add("Hand of Cruelty");
-    // remove.add("Hand of Honor");
-    
-    /**
-     *  useless, or combo cards:
-     */
-    remove.add("Aluren");
-    remove.add("Conspiracy");
-    remove.add("Crucible of Fire");
-    remove.add("Verduran Enchantress");
-    remove.add("Enchantress's Presence");
-    remove.add("Mesa Enchantress");
-    remove.add("Moat");
-    remove.add("Magus of the Moat");
-    remove.add("Relentless Rats");
-    remove.add("Vedalken Archmage");
-    remove.add("Hatching Plans");
-    remove.add("Sensation Gorger");
-    remove.add("Time Elemental");
-    remove.add("Thran Quarry");
-    remove.add("Glimmervoid");
-    remove.add("Parallel Evolution");
-    remove.add("Soultether Golem");
-    
-    /**
-     *  semi useless:
-     */
-    remove.add("Wren's Run Packmaster");
-    remove.add("Nova Chaser");
-    remove.add("Supreme Exemplar");
-    remove.add("Goblin Ringleader");
-    remove.add("Sylvan Messenger");
-    remove.add("Tromp the Domains");
-    remove.add("Legacy Weapon");
-    
-    /**
-     *  cards the AI cannot play (effectively):
-     */
-    remove.add("Necropotence");
-    remove.add("Yawgmoth's Bargain");
-    remove.add("Sensei's Divining Top");
-    remove.add("Standstill");
-    // remove.add("Counterspell");
-    // remove.add("Exclude");
-    // remove.add("False Summoning");
-    // remove.add("Essence Scatter");
-    // remove.add("Preemptive Strike");
-    // remove.add("Punish Ignorance");
-    // remove.add("Remand");
-    // remove.add("Mystic Snake");
-    // remove.add("Absorb");
-    // remove.add("Undermine");
-    // remove.add("Overwhelming Intellect");
-    remove.add("AEther Vial");
-    remove.add("Covetous Dragon");
-    remove.add("Terramorphic Expanse");
-    remove.add("Earthcraft");
-    remove.add("Burst of Speed");
-    remove.add("Magnify");
-    remove.add("Nature's Cloak");
-    remove.add("Resuscitate");
-    remove.add("Shield Wall");
-    remove.add("Solidarity");
-    remove.add("Steadfastness");
-    remove.add("Tortoise Formation");
-    remove.add("Icy Manipulator");
-    remove.add("Chalice of the Void");
-    remove.add("Political Trickery");
-    remove.add("Vedalken Plotter");
-    remove.add("Ponder");
-    remove.add("Omen");
-    remove.add("Twiddle");
-    remove.add("Index");
-    remove.add("Machinate");
-    remove.add("Energy Tap");
-    remove.add("Recall");
-    remove.add("Demonic Consultation");
-    remove.add("Bridge from Below");
-    remove.add("Peel from Reality");
-    remove.add("Ensnare");
-    remove.add("Scattershot");
-    remove.add("Mind's Desire");
-    remove.add("Doomsday");
-    remove.add("Daze");
-    remove.add("Impulse");
-    remove.add("Necrogenesis");
-    remove.add("Night Soil");
-    remove.add("Commune with Nature");
-    remove.add("Global Ruin");
-    remove.add("Momentous Fall");
-    remove.add("Banishing Knack");
-    remove.add("Counterbalance");
-    remove.add("High Tide");
-    remove.add("Survival of the Fittest");
-    remove.add("Animate Land");
-    remove.add("Mox Diamond");
-    remove.add("Voltaic Key");
-    remove.add("Thwart");
-    remove.add("Force of Will");
-    remove.add("Jandor's Saddlebags");
-    remove.add("Natural Selection");
-    remove.add("Blinkmoth Infusion");
-    remove.add("Eye of Ugin");
-
-
-
-    /**
-     *  Buyback cards:
-     */
-    remove.add("Capsize");
-    remove.add("Whispers of the Muse");
-    remove.add("Elvish Fury");
-    remove.add("Lab Rats");
-    remove.add("Sprout Swarm");
-
-     /**
-     *  Fog cards:
-     */
-    remove.add("Fog");
-    remove.add("Holy Day");
-    remove.add("Respite");
-    remove.add("Moment's Peace");
-    remove.add("Lull");
-    remove.add("Angelsong");
-    remove.add("Darkness");
-    
-    /**
-     *  Win condition cards:
-     */
-    remove.add("Barren Glory");
-    remove.add("Near-Death Experience");
-    remove.add("Epic Struggle");
-    
-    /**
-     *  Symmetrical effects:
-     */
-    remove.add("Terra Eternal");
-    remove.add("Aysen Highway");
-    remove.add("Hidden Path");
-    remove.add("Day of Destiny");
-    remove.add("Hanna's Custody");
-    remove.add("Thorn of Amethyst");
-    remove.add("Squeeze");
-    remove.add("Hum of the Radix");
-    remove.add("Helm of Awakening");
-    remove.add("Feroz's Ban");
-    remove.add("Sphere of Resistance");
-    remove.add("Leyline of Singularity");
-    remove.add("Mirror Gallery");
-    remove.add("Night of Souls' Betrayal");
-    remove.add("Planar Void");
-    remove.add("Fecundity");
-
-
-    /**
-     *  (Color) Hosers:
-     */
-    remove.add("High Seas");
-    remove.add("Gloom");
-    remove.add("Chill");
-    remove.add("Dread of Night");
-    remove.add("Insight");
-    remove.add("Warmth");
-    remove.add("Bereavement");
-    remove.add("Yawgmoth's Edict");
-    remove.add("Havoc");
-    remove.add("Starlight");
-    remove.add("Renewing Dawn");
-    remove.add("Cleanse");
-    remove.add("Virtue's Ruin");
-    remove.add("Perish");
-    remove.add("Nature's Ruin");
-    remove.add("Boiling Seas");
-    remove.add("Boil");
-    remove.add("Flashfires");
-    remove.add("Karma");
-
-    
-    /**
-     *  Harmful effects:
-     */
-    remove.add("Flowstone Surge");
-    remove.add("Urborg Shambler");
-    remove.add("Stronghold Taskmaster");
-    
-    /**
-     *  Fetchlands:
-     */
-    remove.add("Tectonic Edge");
-    remove.add("Wooded Foothills");
-    remove.add("Windswept Heath");
-    remove.add("Polluted Delta");
-    remove.add("Flooded Strand");
-    remove.add("Bloodstained Mire");
-    remove.add("Verdant Catacombs");
-    remove.add("Scalding Tarn");
-    remove.add("Misty Rainforest");
-    remove.add("Marsh Flats");
-    remove.add("Arid Mesa");
-    
-    /**
-     *  Painlands:
-     */
-    remove.add("Adarkar Wastes");
-    remove.add("Brushland");
-    remove.add("Karplusan Forest");
-    remove.add("Sulfurous Springs");
-    remove.add("Underground River");
-    remove.add("Battlefield Forge");
-    remove.add("Caves of Koilos");
-    remove.add("Llanowar Wastes");
-    remove.add("Shivan Reef");
-    remove.add("Yavimaya Coast");
-    remove.add("Salt Flats");
-    remove.add("Pine Barrens");
-    remove.add("Skyshroud Forest");
-    remove.add("Caldera Lake");
-    remove.add("Scabland");
-    
-    /**
-     *  Filter Lands:
-     */
-    remove.add("An-Havva Township");
-    remove.add("Aysen Abbey");
-    remove.add("Cascade Bluffs");
-    remove.add("Castle Sengir");
-    remove.add("Crystal Quarry");
-    remove.add("Darkwater Catacombs");
-    remove.add("Fetid Heath");
-    remove.add("Fire-Lit Thicket");
-    remove.add("Flooded Grove");
-    remove.add("Graven Cairns");
-    remove.add("Henge of Ramos");
-    remove.add("Koskun Keep");
-    remove.add("Mossfire Valley");
-    remove.add("Mystic Gate");
-    remove.add("Rugged Prairie");
-    remove.add("School of the Unseen");
-    remove.add("Shadowblood Ridge");
-    remove.add("Shimmering Grotto");
-    remove.add("Skycloud Expanse");
-    remove.add("Sungrass Prairie");
-    remove.add("Sunken Ruins");
-    remove.add("Twilight Mire");
-    remove.add("Wizards' School");
-    remove.add("Wooded Bastion");
- 
-    /**
-     *  Medallions:
-     */  
-    remove.add("Sapphire Medallion");
-    remove.add("Emerald Medallion");
-    remove.add("Jet Medallion");
-    remove.add("Pearl Medallion");
-    remove.add("Ruby Medallion"); 
-
-    /**
-     *  manapool stuff:
-     */
-    remove.add("Agent of Stromgald");
-    remove.add("Ancient Spring");
-    remove.add("Ancient Tomb");
-    remove.add("Apprentice Wizard");
-    remove.add("Azorius Chancery");
-    remove.add("Azorius Signet");
-    remove.add("Basal Thrull");
-    remove.add("Basalt Monolith");
-    remove.add("Black Lotus");
-    remove.add("Blood Vassal");
-    remove.add("Bog Initiate");
-    remove.add("Boros Garrison");
-    remove.add("Boros Signet");
-    remove.add("Cabal Coffers");
-    remove.add("Celestial Prism");
-    remove.add("Ceta Discple");
-    remove.add("Chromatic Star");
-    remove.add("Coal Golem");
-    remove.add("Composite Golem");
-    remove.add("Crosis's Attendant");
-    remove.add("Crystal Vein");
-    remove.add("Darigaaz's Attendant");
-    remove.add("Dark Ritual");
-    remove.add("Dimir Aqueduct");
-    remove.add("Dimir Signet");
-    remove.add("Dreamstone Hedron");
-    remove.add("Dromar's Attendant");
-    remove.add("Dwarven Ruins");
-    remove.add("Ebon Stronghold");
-    remove.add("Elvish Archdruid");
-    remove.add("Everflowing Chalice");
-    remove.add("Eye of Ramos");
-    remove.add("Fire Sprites");
-    // remove.add("Forbidden Orchard");
-    remove.add("Fyndhorn Elder");
-    remove.add("Gaea's Cradle");
-    remove.add("Geothermal Crevice");
-    remove.add("Gilded Lotus");
-    remove.add("Golgari Rot Farm");
-    remove.add("Golgari Signet");
-    remove.add("Greenweaver Druid");
-    remove.add("Grim Monolith");
-    remove.add("Gruul Signet");
-    remove.add("Gruul Turf");
-    remove.add("Harabaz Druid");
-    remove.add("Havenwood Battleground");
-    remove.add("Heart of Ramos");
-    remove.add("Helionaut");
-    remove.add("Horn of Ramos");
-    remove.add("Implements of Sacrifice");
-    remove.add("Irrigation Ditch");
-    remove.add("Izzet Boilerworks");
-    remove.add("Izzet Signet");
-    remove.add("Kaleidostone");
-    remove.add("Knotvine Mystic");
-    remove.add("Lotus Bloom");
-    remove.add("Lotus Cobra");
-    remove.add("Magus of the Coffers");
-    remove.add("Mana Cylix");
-    remove.add("Mana Prism");
-    remove.add("Mana Vault");
-    remove.add("Morgue Toad");
-    remove.add("Nantuko Elder");
-    remove.add("Nomadic Elf");
-    remove.add("Orochi Leafcaller");
-    remove.add("Orzhov Basilica");
-    remove.add("Orzhov Signet");
-    remove.add("Priest of Titania");
-    remove.add("Prismatic Lens");
-    remove.add("Pyretic Ritual");
-    remove.add("Rakdos Carnarium");
-    remove.add("Rakdos Signet");
-    remove.add("Rith's Attendant");
-    remove.add("Rofellos, Llanowar Emissary");
-    remove.add("Ruins of Trokair");
-    remove.add("Sea Scryer");
-    remove.add("Seething Song");
-    remove.add("Selesnya Sanctuary");
-    remove.add("Selesnya Signet");
-    remove.add("Serra's Sanctum");
-    remove.add("Simic Growth Chamber");
-    remove.add("Simic Signet");
-    remove.add("Sisay's Ring");
-    remove.add("Skull of Ramos");
-    remove.add("Skyshroud Elf");
-    remove.add("Sol Ring");
-    remove.add("Sulfur Vent");
-    remove.add("Sunglasses of Urza");
-    remove.add("Svyelunite Temple");
-    remove.add("Thran Dynamo");
-    remove.add("Tinder Farm");
-    remove.add("Tolarian Academy");
-    remove.add("Tooth of Ramos");
-    remove.add("Treva's Attendant");
-    remove.add("Ur-Golem's Eye");
-    remove.add("Viridian Acolyte");
-    remove.add("Worn Powerstone");
-    remove.add("Channel the Suns");
-   
-    
     final ArrayList<Card> goodLand = new ArrayList<Card>();
     //goodLand.add("Faerie Conclave");
     //goodLand.add("Forbidding Watchtower");
@@ -786,7 +375,7 @@ public class GenerateConstructedMultiColorDeck
 	    	  
 	        return CardUtil.getColors(c).size() <= 3 &&
 	               !c.isLand()                       && //no land
-	               !(remove.contains(c.getName()) || c.getSVar("RemAIDeck").equals("True"))    || //OR very important
+	               c.getSVar("RemAIDeck").equals("True")    || //OR very important
 	               goodLand.contains(c.getName());
 	      }
 	    });
@@ -800,7 +389,7 @@ public class GenerateConstructedMultiColorDeck
 	      {  
 	        return CardUtil.getColors(c).size() >= 2 && //only get multicolored cards
 	               !c.isLand()                       && //no land
-	               !remove.contains(c.getName())     || //OR very important
+	               c.getSVar("RemAIDeck").equals("True")     || //OR very important
 	               goodLand.contains(c.getName());
 	      }
 	    });