Merge branch 'master' into master

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/MTGO1v1Commander.java

@@ -36,17 +36,20 @@ public class MTGO1v1Commander extends Commander {
     public MTGO1v1Commander() {
         super("MTGO 1v1 Commander");
         banned.add("Ancestral Recall");
-        banned.add("Arcum Dagsson");
         banned.add("Back to Basics");
         banned.add("Balance");
+        banned.add("Baral, Chief of Compliance");
         banned.add("Bazaar of Baghdad");
         banned.add("Black Lotus");
         banned.add("Braids, Cabal Minion");
         banned.add("Brainstorm");
         banned.add("Channel");
         banned.add("Derevi, Empyrial Tactician");
+        banned.add("Demonic Tutor");
         banned.add("Dig Through Time");
         banned.add("Edric, Spymaster of Trest");
+        banned.add("Emrakul, the Aeons Torn");
+        banned.add("Enlightened Tutor");
         banned.add("Entomb");
         banned.add("Fastbond");
         banned.add("Food Chain");
@@ -55,6 +58,7 @@ public class MTGO1v1Commander extends Commander {
         banned.add("Griselbrand");
         banned.add("Hermit Druid");
         banned.add("Humility");
+        banned.add("Imperial Seal");
         banned.add("Karakas");
         banned.add("Library of Alexandria");
         banned.add("Mana Crypt");
@@ -68,6 +72,7 @@ public class MTGO1v1Commander extends Commander {
         banned.add("Mox Pearl");
         banned.add("Mox Ruby");
         banned.add("Mox Sapphire");
+        banned.add("Mystical Tutor");
         banned.add("Natural Order");
         banned.add("Necropotence");
         banned.add("Oath of Druids");
@@ -88,8 +93,8 @@ public class MTGO1v1Commander extends Commander {
         banned.add("Treachery");
         banned.add("Treasure Cruise");
         banned.add("Vial Smasher the Fierce");
+        banned.add("Vampiric Tutor");
         banned.add("Yamgmoth's Bargain");
-        banned.add("Yisan, the Wanderer Bard");
         banned.add("Zur the Enchanter");
     }
-}
+}

Mage.Server.Plugins/Mage.Game.MomirGame/pom.xml

@@ -0,0 +1,55 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4.0.0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.mage</groupId>
+        <artifactId>mage-server-plugins</artifactId>
+        <version>1.4.26</version>
+    </parent>
+    
+    <artifactId>mage-game-momirfreeforall</artifactId>
+    <packaging>jar</packaging>
+    <name>Mage Game Momir Basic Free for All</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mage</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mage-game-freeforall</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+
+        </plugins>
+
+        <finalName>mage-game-momir</finalName>
+    </build>
+    
+    <properties/>
+    
+</project>

Mage.Server.Plugins/Mage.Game.MomirGame/src/mage/game/MomirFreeForAllMatch.java

@@ -0,0 +1,55 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.game;
+
+import mage.game.match.MatchImpl;
+import mage.game.match.MatchOptions;
+
+/**
+ *
+ * @author nigelzor
+ */
+public class MomirFreeForAllMatch extends MatchImpl {
+
+    public MomirFreeForAllMatch(MatchOptions options) {
+        super(options);
+    }
+
+    @Override
+    public void startGame() throws GameException {
+        // Momir Vig, Simic Visionary gives +4 starting life
+        int startLife = 24;
+
+        MomirGame game = new MomirGame(options.getAttackOption(), options.getRange(), options.getFreeMulligans(), startLife);
+        game.setStartMessage(this.createGameStartMessage());
+
+        this.initGame(game);
+        games.add(game);
+    }
+
+}

Mage.Server.Plugins/Mage.Game.MomirGame/src/mage/game/MomirFreeForAllType.java

@@ -0,0 +1,57 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.game;
+
+import mage.game.match.MatchType;
+
+/**
+ *
+ * @author nigelzor
+ */
+public class MomirFreeForAllType extends MatchType {
+
+    public MomirFreeForAllType() {
+        this.name = "Momir Basic Free For All";
+        this.maxPlayers = 10;
+        this.minPlayers = 2;
+        this.numTeams = 0;
+        this.useAttackOption = true;
+        this.useRange = true;
+        this.sideboardingAllowed = false;
+    }
+
+    protected MomirFreeForAllType(final MomirFreeForAllType matchType){
+        super(matchType);
+    }
+
+    @Override
+    public MomirFreeForAllType copy() {
+        return new MomirFreeForAllType(this);
+    }
+
+}

Mage.Server.Plugins/Mage.Game.MomirGame/src/mage/game/MomirGame.java

@@ -0,0 +1,105 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.game;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.InfoEffect;
+import mage.cards.repository.CardInfo;
+import mage.cards.repository.CardRepository;
+import mage.constants.MultiplayerAttackOption;
+import mage.constants.PhaseStep;
+import mage.constants.RangeOfInfluence;
+import mage.constants.Zone;
+import mage.game.command.emblems.MomirEmblem;
+import mage.game.match.MatchType;
+import mage.game.turn.TurnMod;
+import mage.players.Player;
+
+
+/**
+ *
+ * @author nigelzor
+ */
+public class MomirGame extends FreeForAll {
+    
+    private int numPlayers;
+
+    public MomirGame(MultiplayerAttackOption attackOption, RangeOfInfluence range, int freeMulligans, int startLife) {
+        super(attackOption, range, freeMulligans, startLife);
+    }
+
+    public MomirGame(final MomirGame game) {
+        super(game);
+    }     
+    
+    @Override
+    public MatchType getGameType() {
+        return new MomirFreeForAllType();
+    }
+
+    @Override
+    public int getNumPlayers() {
+        return numPlayers;
+    }
+
+    @Override
+    protected void init(UUID choosingPlayerId) {
+        Ability ability = new SimpleStaticAbility(Zone.COMMAND, new InfoEffect("Vanguard effects"));
+        for (UUID playerId : state.getPlayerList(startingPlayerId)) {
+            Player player = getPlayer(playerId);
+            if (player != null) {
+                CardInfo cardInfo = CardRepository.instance.findCard("Momir Vig, Simic Visionary");
+                addEmblem(new MomirEmblem(), cardInfo.getCard(), playerId);
+            }
+        }
+        getState().addAbility(ability, null);
+        super.init(choosingPlayerId);
+        state.getTurnMods().add(new TurnMod(startingPlayerId, PhaseStep.DRAW));
+    }
+
+    @Override
+    public Set<UUID> getOpponents(UUID playerId) {
+        Set<UUID> opponents = new HashSet<>();
+        for (UUID opponentId : this.getPlayer(playerId).getInRange()) {
+            if (!opponentId.equals(playerId)) {
+                opponents.add(opponentId);
+            }
+        }
+        return opponents;
+    }
+
+    @Override
+    public MomirGame copy() {
+        return new MomirGame(this);
+    }
+
+}

Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/AdamStyborskisPauperCube.java

@@ -35,9 +35,9 @@ import mage.game.draft.DraftCube;
  */
 public class AdamStyborskisPauperCube extends DraftCube {
 
-public AdamStyborskisPauperCube() {
+    public AdamStyborskisPauperCube() {
         super("Adam Styborkski's Pauper Cube"); // https://docs.google.com/spreadsheets/d/12iQhC4bHqFW7hEWxPBjyC8yBDehFZ0_4DkqzyA8EL3o/edit#gid=0
-        // last updated with Amonkhet 6/12/17
+        // last updated with Hour of Devastation, Iconic Masters and Ixalan 10/18/17
         cubeCards.add(new CardIdentity("Act of Treason", ""));
         cubeCards.add(new CardIdentity("Adventuring Gear", ""));
         cubeCards.add(new CardIdentity("Aerie Ouphes", ""));
@@ -45,6 +45,7 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Aethersnipe", ""));
         cubeCards.add(new CardIdentity("Agony Warp", ""));
         cubeCards.add(new CardIdentity("Aim High", ""));
+        cubeCards.add(new CardIdentity("Ambuscade", ""));
         cubeCards.add(new CardIdentity("Ambush Viper", ""));
         cubeCards.add(new CardIdentity("Angelic Purge", ""));
         cubeCards.add(new CardIdentity("Arachnus Web", ""));
@@ -55,18 +56,18 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Ashes to Ashes", ""));
         cubeCards.add(new CardIdentity("Assault Zeppelid", ""));
         cubeCards.add(new CardIdentity("Attended Knight", ""));
-        cubeCards.add(new CardIdentity("Augur of Bolas", ""));
         cubeCards.add(new CardIdentity("Auger Spree", ""));
+        cubeCards.add(new CardIdentity("Augur of Bolas", ""));
         cubeCards.add(new CardIdentity("Aven Riftwatcher", ""));
         cubeCards.add(new CardIdentity("Aven Surveyor", ""));
         cubeCards.add(new CardIdentity("Azorius Guildgate", ""));
         cubeCards.add(new CardIdentity("Baleful Eidolon", ""));
         cubeCards.add(new CardIdentity("Barbed Lightning", ""));
-        cubeCards.add(new CardIdentity("Barren Moor", ""));
         cubeCards.add(new CardIdentity("Basking Rootwalla", ""));
         cubeCards.add(new CardIdentity("Battle Screech", ""));
         cubeCards.add(new CardIdentity("Beetleback Chief", ""));
         cubeCards.add(new CardIdentity("Beetleform Mage", ""));
+        cubeCards.add(new CardIdentity("Beneath the Sands", ""));
         cubeCards.add(new CardIdentity("Blastoderm", ""));
         cubeCards.add(new CardIdentity("Blazing Torch", ""));
         cubeCards.add(new CardIdentity("Blightning", ""));
@@ -78,8 +79,9 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Bonesplitter", ""));
         cubeCards.add(new CardIdentity("Borderland Marauder", ""));
         cubeCards.add(new CardIdentity("Boros Guildgate", ""));
-        cubeCards.add(new CardIdentity("Borrowed Grave", ""));
+        cubeCards.add(new CardIdentity("Borrowed Grace", ""));
         cubeCards.add(new CardIdentity("Branching Bolt", ""));
+        cubeCards.add(new CardIdentity("Brazen Buccaneers", ""));
         cubeCards.add(new CardIdentity("Brazen Wolves", ""));
         cubeCards.add(new CardIdentity("Burning-Tree Emissary", ""));
         cubeCards.add(new CardIdentity("Burst Lightning", ""));
@@ -97,6 +99,7 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Chain Lightning", ""));
         cubeCards.add(new CardIdentity("Chainer's Edict", ""));
         cubeCards.add(new CardIdentity("Chatter of the Squirrel", ""));
+        cubeCards.add(new CardIdentity("Cinder Barrens", ""));
         cubeCards.add(new CardIdentity("Citanul Woodreaders", ""));
         cubeCards.add(new CardIdentity("Claustrophobia", ""));
         cubeCards.add(new CardIdentity("Clay Statue", ""));
@@ -108,15 +111,12 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Compulsive Research", ""));
         cubeCards.add(new CardIdentity("Compulsory Rest", ""));
         cubeCards.add(new CardIdentity("Consume Strength", ""));
-        cubeCards.add(new CardIdentity("Corpse Churn", ""));
         cubeCards.add(new CardIdentity("Corrupted Zendikon", ""));
         cubeCards.add(new CardIdentity("Counterspell", ""));
         cubeCards.add(new CardIdentity("Crippling Fatigue", ""));
         cubeCards.add(new CardIdentity("Crow of Dark Tidings", ""));
         cubeCards.add(new CardIdentity("Crypt Rats", ""));
         cubeCards.add(new CardIdentity("Crystallization", ""));
-        cubeCards.add(new CardIdentity("Cultist's Staff", ""));
-        cubeCards.add(new CardIdentity("Cultivate", ""));
         cubeCards.add(new CardIdentity("Cunning Strike", ""));
         cubeCards.add(new CardIdentity("Curse of Chains", ""));
         cubeCards.add(new CardIdentity("Custodi Squire", ""));
@@ -124,9 +124,11 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Dauntless Cathar", ""));
         cubeCards.add(new CardIdentity("Dead Reveler", ""));
         cubeCards.add(new CardIdentity("Dead Weight", ""));
+        cubeCards.add(new CardIdentity("Deadeye Tormentor", ""));
         cubeCards.add(new CardIdentity("Death Denied", ""));
         cubeCards.add(new CardIdentity("Deep Analysis", ""));
         cubeCards.add(new CardIdentity("Deprive", ""));
+        cubeCards.add(new CardIdentity("Depths of Desire", ""));
         cubeCards.add(new CardIdentity("Deputy of Acquittals", ""));
         cubeCards.add(new CardIdentity("Desert", ""));
         cubeCards.add(new CardIdentity("Desperate Sentry", ""));
@@ -134,6 +136,7 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Diabolic Edict", ""));
         cubeCards.add(new CardIdentity("Dimir Guildgate", ""));
         cubeCards.add(new CardIdentity("Dinrova Horror", ""));
+        cubeCards.add(new CardIdentity("Dire Fleet Hoarder", ""));
         cubeCards.add(new CardIdentity("Disfigure", ""));
         cubeCards.add(new CardIdentity("Dismal Backwater", ""));
         cubeCards.add(new CardIdentity("Disowned Ancestor", ""));
@@ -152,20 +155,21 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Epic Confrontation", ""));
         cubeCards.add(new CardIdentity("Errant Ephemeron", ""));
         cubeCards.add(new CardIdentity("Esper Cormorants", ""));
-        cubeCards.add(new CardIdentity("Essence Scatter", ""));
         cubeCards.add(new CardIdentity("Evincar's Justice", ""));
         cubeCards.add(new CardIdentity("Evolving Wilds", ""));
         cubeCards.add(new CardIdentity("Faceless Butcher", ""));
         cubeCards.add(new CardIdentity("Faith's Fetters", ""));
+        cubeCards.add(new CardIdentity("Falkenrath Noble", ""));
         cubeCards.add(new CardIdentity("Feeling of Dread", ""));
-        cubeCards.add(new CardIdentity("Fertile Thicket", ""));
         cubeCards.add(new CardIdentity("Fervent Cathar", ""));
         cubeCards.add(new CardIdentity("Firebolt", ""));
         cubeCards.add(new CardIdentity("Fireslinger", ""));
         cubeCards.add(new CardIdentity("Flayer Husk", ""));
         cubeCards.add(new CardIdentity("Flurry of Horns", ""));
         cubeCards.add(new CardIdentity("Forked Bolt", ""));
+        cubeCards.add(new CardIdentity("Forsaken Sanctuary", ""));
         cubeCards.add(new CardIdentity("Fortify", ""));
+        cubeCards.add(new CardIdentity("Foul Orchard", ""));
         cubeCards.add(new CardIdentity("Frilled Oculus", ""));
         cubeCards.add(new CardIdentity("Frostburn Weird", ""));
         cubeCards.add(new CardIdentity("Gathan Raiders", ""));
@@ -182,21 +186,22 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Gods Willing", ""));
         cubeCards.add(new CardIdentity("Goldmeadow Harrier", ""));
         cubeCards.add(new CardIdentity("Golgari Guildgate", ""));
-        cubeCards.add(new CardIdentity("Grapple with the Past", ""));
         cubeCards.add(new CardIdentity("Gravedigger", ""));
         cubeCards.add(new CardIdentity("Gray Merchant of Asphodel", ""));
+        cubeCards.add(new CardIdentity("Grazing Whiptail", ""));
         cubeCards.add(new CardIdentity("Grim Contest", ""));
         cubeCards.add(new CardIdentity("Grisly Salvage", ""));
         cubeCards.add(new CardIdentity("Grixis Slavedriver", ""));
         cubeCards.add(new CardIdentity("Gruul Guildgate", ""));
         cubeCards.add(new CardIdentity("Gryff Vanguard", ""));
         cubeCards.add(new CardIdentity("Guardian Automaton", ""));
+        cubeCards.add(new CardIdentity("Guardian Idol", ""));
         cubeCards.add(new CardIdentity("Guardian of the Guildpact", ""));
         cubeCards.add(new CardIdentity("Gurmag Angler", ""));
-        cubeCards.add(new CardIdentity("Halimar Depths", ""));
         cubeCards.add(new CardIdentity("Halimar Wavewatch", ""));
         cubeCards.add(new CardIdentity("Harrow", ""));
         cubeCards.add(new CardIdentity("Harsh Sustenance", ""));
+        cubeCards.add(new CardIdentity("Highland Lake", ""));
         cubeCards.add(new CardIdentity("Hissing Iguanar", ""));
         cubeCards.add(new CardIdentity("Hooting Mandrills", ""));
         cubeCards.add(new CardIdentity("Humble", ""));
@@ -206,6 +211,7 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Insolent Neonate", ""));
         cubeCards.add(new CardIdentity("Into the Roil", ""));
         cubeCards.add(new CardIdentity("Isolation Zone", ""));
+        cubeCards.add(new CardIdentity("Ivy Elemental", ""));
         cubeCards.add(new CardIdentity("Izzet Chronarch", ""));
         cubeCards.add(new CardIdentity("Izzet Guildgate", ""));
         cubeCards.add(new CardIdentity("Jilt", ""));
@@ -214,7 +220,6 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Kabuto Moth", ""));
         cubeCards.add(new CardIdentity("Keldon Marauders", ""));
         cubeCards.add(new CardIdentity("Kingpin's Pet", ""));
-        cubeCards.add(new CardIdentity("Kodama's Reach", ""));
         cubeCards.add(new CardIdentity("Kor Skyfisher", ""));
         cubeCards.add(new CardIdentity("Kozilek's Channeler", ""));
         cubeCards.add(new CardIdentity("Krenko's Command", ""));
@@ -222,25 +227,24 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Kruin Striker", ""));
         cubeCards.add(new CardIdentity("Lash Out", ""));
         cubeCards.add(new CardIdentity("Last Gasp", ""));
-        cubeCards.add(new CardIdentity("Lawless Broker", ""));
+        cubeCards.add(new CardIdentity("Leave in the Dust", ""));
         cubeCards.add(new CardIdentity("Leonin Bola", ""));
-        cubeCards.add(new CardIdentity("Leonin Scimitar", ""));
+        cubeCards.add(new CardIdentity("Lifecraft Cavalry", ""));
         cubeCards.add(new CardIdentity("Lightning Bolt", ""));
         cubeCards.add(new CardIdentity("Liliana's Specter", ""));
-        cubeCards.add(new CardIdentity("Looming Spires", ""));
         cubeCards.add(new CardIdentity("Lotus Path Djinn", ""));
         cubeCards.add(new CardIdentity("Loyal Pegasus", ""));
         cubeCards.add(new CardIdentity("Lurking Automaton", ""));
         cubeCards.add(new CardIdentity("Magma Jet", ""));
         cubeCards.add(new CardIdentity("Makeshift Mauler", ""));
+        cubeCards.add(new CardIdentity("Man-o'-War", ""));
         cubeCards.add(new CardIdentity("Mana Leak", ""));
         cubeCards.add(new CardIdentity("Manticore of the Gauntlet", ""));
-        cubeCards.add(new CardIdentity("Man-o'-War", ""));
         cubeCards.add(new CardIdentity("Mardu Hordechief", ""));
         cubeCards.add(new CardIdentity("Mardu Skullhunter", ""));
         cubeCards.add(new CardIdentity("Maul Splicer", ""));
-        cubeCards.add(new CardIdentity("Maulfist Squad", ""));
         cubeCards.add(new CardIdentity("Maze of Ith", ""));
+        cubeCards.add(new CardIdentity("Meandering River", ""));
         cubeCards.add(new CardIdentity("Mental Note", ""));
         cubeCards.add(new CardIdentity("Midnight Scavengers", ""));
         cubeCards.add(new CardIdentity("Mind Stone", ""));
@@ -249,6 +253,7 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Mishra's Factory", ""));
         cubeCards.add(new CardIdentity("Mist Raven", ""));
         cubeCards.add(new CardIdentity("Mistral Charger", ""));
+        cubeCards.add(new CardIdentity("Mobile Garrison", ""));
         cubeCards.add(new CardIdentity("Mogg Fanatic", ""));
         cubeCards.add(new CardIdentity("Mogg Flunkies", ""));
         cubeCards.add(new CardIdentity("Mogg War Marshal", ""));
@@ -260,17 +265,17 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Narcolepsy", ""));
         cubeCards.add(new CardIdentity("Necromancer's Assistant", ""));
         cubeCards.add(new CardIdentity("Nessian Asp", ""));
+        cubeCards.add(new CardIdentity("Nest Robber", ""));
         cubeCards.add(new CardIdentity("Nezumi Cutthroat", ""));
         cubeCards.add(new CardIdentity("Night's Whisper", ""));
         cubeCards.add(new CardIdentity("Nightscape Familiar", ""));
         cubeCards.add(new CardIdentity("Ninja of the Deep Hours", ""));
         cubeCards.add(new CardIdentity("Oblivion Ring", ""));
         cubeCards.add(new CardIdentity("Oona's Grace", ""));
-        cubeCards.add(new CardIdentity("Orcish Oriflamme", ""));
         cubeCards.add(new CardIdentity("Orzhov Guildgate", ""));
         cubeCards.add(new CardIdentity("Otherworldly Journey", ""));
         cubeCards.add(new CardIdentity("Pacifism", ""));
-        cubeCards.add(new CardIdentity("Palace Sentinels", ""));
+        cubeCards.add(new CardIdentity("Paladin of the Bloodstained", ""));
         cubeCards.add(new CardIdentity("Peema Outrider", ""));
         cubeCards.add(new CardIdentity("Penumbra Spider", ""));
         cubeCards.add(new CardIdentity("Peregrine Drake", ""));
@@ -287,7 +292,7 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Plated Geopede", ""));
         cubeCards.add(new CardIdentity("Plover Knights", ""));
         cubeCards.add(new CardIdentity("Porcelain Legionnaire", ""));
-        cubeCards.add(new CardIdentity("Pouncing Kavu", ""));
+        cubeCards.add(new CardIdentity("Pounce", ""));
         cubeCards.add(new CardIdentity("Predatory Nightstalker", ""));
         cubeCards.add(new CardIdentity("Preordain", ""));
         cubeCards.add(new CardIdentity("Prey Upon", ""));
@@ -316,27 +321,27 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Renegade Freighter", ""));
         cubeCards.add(new CardIdentity("Rift Bolt", ""));
         cubeCards.add(new CardIdentity("Rishadan Airship", ""));
-        cubeCards.add(new CardIdentity("River Serpent", ""));
         cubeCards.add(new CardIdentity("Ronin Houndmaster", ""));
         cubeCards.add(new CardIdentity("Rugged Highlands", ""));
         cubeCards.add(new CardIdentity("Runed Servitor", ""));
         cubeCards.add(new CardIdentity("Rushing River", ""));
+        cubeCards.add(new CardIdentity("Sailor of Means", ""));
         cubeCards.add(new CardIdentity("Sakura-Tribe Elder", ""));
         cubeCards.add(new CardIdentity("Sandsteppe Outcast", ""));
         cubeCards.add(new CardIdentity("Sangrite Backlash", ""));
         cubeCards.add(new CardIdentity("Sarkhan's Rage", ""));
         cubeCards.add(new CardIdentity("Savage Punch", ""));
-        cubeCards.add(new CardIdentity("Savage Surge", ""));
         cubeCards.add(new CardIdentity("Scatter the Seeds", ""));
-        cubeCards.add(new CardIdentity("Scion of the Wild", ""));
         cubeCards.add(new CardIdentity("Scion Summoner", ""));
+        cubeCards.add(new CardIdentity("Scion of the Wild", ""));
         cubeCards.add(new CardIdentity("Scoured Barrens", ""));
         cubeCards.add(new CardIdentity("Scourge Devil", ""));
         cubeCards.add(new CardIdentity("Screeching Skaab", ""));
         cubeCards.add(new CardIdentity("Scuzzback Marauders", ""));
+        cubeCards.add(new CardIdentity("Search for Tomorrow", ""));
         cubeCards.add(new CardIdentity("Searing Blaze", ""));
         cubeCards.add(new CardIdentity("Seeker of Insight", ""));
-        cubeCards.add(new CardIdentity("Sejiri Steppe", ""));
+        cubeCards.add(new CardIdentity("Seeker of the Way", ""));
         cubeCards.add(new CardIdentity("Selesnya Guildgate", ""));
         cubeCards.add(new CardIdentity("Sentinel Spider", ""));
         cubeCards.add(new CardIdentity("Separatist Voidmage", ""));
@@ -349,7 +354,6 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Sigil Blessing", ""));
         cubeCards.add(new CardIdentity("Silent Departure", ""));
         cubeCards.add(new CardIdentity("Simic Guildgate", ""));
-        cubeCards.add(new CardIdentity("Skinthinner", ""));
         cubeCards.add(new CardIdentity("Skirk Marauder", ""));
         cubeCards.add(new CardIdentity("Skyknight Legionnaire", ""));
         cubeCards.add(new CardIdentity("Slash Panther", ""));
@@ -362,21 +366,21 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Spined Thopter", ""));
         cubeCards.add(new CardIdentity("Splatter Thug", ""));
         cubeCards.add(new CardIdentity("Staggershock", ""));
-        cubeCards.add(new CardIdentity("Stave Off", ""));
+        cubeCards.add(new CardIdentity("Star Compass", ""));
         cubeCards.add(new CardIdentity("Stitched Drake", ""));
+        cubeCards.add(new CardIdentity("Stone Quarry", ""));
+        cubeCards.add(new CardIdentity("Storm Fleet Pyromancer", ""));
         cubeCards.add(new CardIdentity("Stormfront Pegasus", ""));
         cubeCards.add(new CardIdentity("Stormscape Apprentice", ""));
         cubeCards.add(new CardIdentity("Strip Mine", ""));
+        cubeCards.add(new CardIdentity("Striped Riverwinder", ""));
+        cubeCards.add(new CardIdentity("Submerged Boneyard", ""));
         cubeCards.add(new CardIdentity("Sultai Scavenger", ""));
         cubeCards.add(new CardIdentity("Suppression Bonds", ""));
-        cubeCards.add(new CardIdentity("Swift Spinner", ""));
         cubeCards.add(new CardIdentity("Swiftwater Cliffs", ""));
         cubeCards.add(new CardIdentity("Sylvan Might", ""));
         cubeCards.add(new CardIdentity("Sylvok Lifestaff", ""));
         cubeCards.add(new CardIdentity("Tah-Crop Elite", ""));
-        cubeCards.add(new CardIdentity("Tajuru Pathwarden", ""));
-        cubeCards.add(new CardIdentity("Talruum Minotaur", ""));
-        cubeCards.add(new CardIdentity("Tandem Lookout", ""));
         cubeCards.add(new CardIdentity("Temporal Isolation", ""));
         cubeCards.add(new CardIdentity("Tenement Crasher", ""));
         cubeCards.add(new CardIdentity("Terminate", ""));
@@ -387,25 +391,26 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Thornwood Falls", ""));
         cubeCards.add(new CardIdentity("Thought Scour", ""));
         cubeCards.add(new CardIdentity("Thraben Inspector", ""));
+        cubeCards.add(new CardIdentity("Thrill-Kill Assassin", ""));
         cubeCards.add(new CardIdentity("Thundering Giant", ""));
         cubeCards.add(new CardIdentity("Thundering Tanadon", ""));
         cubeCards.add(new CardIdentity("Thunderous Wrath", ""));
+        cubeCards.add(new CardIdentity("Timber Gorge", ""));
         cubeCards.add(new CardIdentity("Time to Feed", ""));
         cubeCards.add(new CardIdentity("Tithe Drinker", ""));
         cubeCards.add(new CardIdentity("Totem-Guide Hartebeest", ""));
         cubeCards.add(new CardIdentity("Tragic Slip", ""));
         cubeCards.add(new CardIdentity("Tranquil Cove", ""));
+        cubeCards.add(new CardIdentity("Tranquil Expanse", ""));
         cubeCards.add(new CardIdentity("Travel Preparations", ""));
         cubeCards.add(new CardIdentity("Treasure Cruise", ""));
         cubeCards.add(new CardIdentity("Triplicate Spirits", ""));
-        cubeCards.add(new CardIdentity("Tumble Magnet", ""));
         cubeCards.add(new CardIdentity("Typhoid Rats", ""));
         cubeCards.add(new CardIdentity("Ulamog's Crusher", ""));
         cubeCards.add(new CardIdentity("Ulvenwald Captive", ""));
         cubeCards.add(new CardIdentity("Undying Rage", ""));
         cubeCards.add(new CardIdentity("Unearth", ""));
         cubeCards.add(new CardIdentity("Unmake", ""));
-        cubeCards.add(new CardIdentity("Unnatural Aggression", ""));
         cubeCards.add(new CardIdentity("Vampire Interloper", ""));
         cubeCards.add(new CardIdentity("Vault Skirge", ""));
         cubeCards.add(new CardIdentity("Viashino Firstblade", ""));
@@ -424,7 +429,6 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Wasteland Scorpion", ""));
         cubeCards.add(new CardIdentity("Wayfarer's Bauble", ""));
         cubeCards.add(new CardIdentity("Werebear", ""));
-        cubeCards.add(new CardIdentity("Whirlpool Whelm", ""));
         cubeCards.add(new CardIdentity("Whitemane Lion", ""));
         cubeCards.add(new CardIdentity("Wild Instincts", ""));
         cubeCards.add(new CardIdentity("Wild Mongrel", ""));
@@ -435,6 +439,7 @@ public AdamStyborskisPauperCube() {
         cubeCards.add(new CardIdentity("Winds of Rebuke", ""));
         cubeCards.add(new CardIdentity("Winged Coatl", ""));
         cubeCards.add(new CardIdentity("Wojek Halberdiers", ""));
+        cubeCards.add(new CardIdentity("Woodland Stream", ""));
         cubeCards.add(new CardIdentity("Wrecking Ball", ""));
         cubeCards.add(new CardIdentity("Wretched Gryff", ""));
         cubeCards.add(new CardIdentity("Yavimaya Elder", ""));

Mage.Server.Plugins/pom.xml

@@ -21,6 +21,7 @@
         <module>Mage.Game.CommanderFreeForAll</module>
         <module>Mage.Game.FreeForAll</module>
         <module>Mage.Game.MomirDuel</module>
+        <module>Mage.Game.MomirGame</module>
         <module>Mage.Game.TinyLeadersDuel</module>
         <module>Mage.Game.CanadianHighlanderDuel</module>
         <module>Mage.Game.PennyDreadfulCommanderFreeForAll</module>

Mage.Server/config/config.xml

@@ -77,6 +77,7 @@
         <gameType name="Canadian Highlander Two Player Duel" jar="mage-game-canadianhighlanderduel.jar" className="mage.game.CanadianHighlanderDuelMatch" typeName="mage.game.CanadianHighlanderDuelType"/>
         <gameType name="Penny Dreadful Commander Free For All" jar="mage-game-pennydreadfulcommanderfreeforall.jar" className="mage.game.PennyDreadfulCommanderFreeForAllMatch" typeName="mage.game.PennyDreadfulCommanderFreeForAllType"/>
         <gameType name="Momir Basic Two Player Duel" jar="mage-game-momirduel.jar" className="mage.game.MomirDuelMatch" typeName="mage.game.MomirDuelType"/>
+		<gameType name="Momir Basic Free For All" jar="mage-game-momir.jar" className="mage.game.MomirFreeForAllMatch" typeName="mage.game.MomirFreeForAllType"/>
     </gameTypes>
     <tournamentTypes>
         <tournamentType name="Constructed Elimination" jar="mage-tournament-constructed.jar" className="mage.tournament.ConstructedEliminationTournament" typeName="mage.tournament.ConstructedEliminationTournamentType"/>

Mage.Server/pom.xml

@@ -160,6 +160,12 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mage-game-momirfreeforall</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>

Mage.Sets/src/mage/cards/a/ActOfAggression.java

@@ -54,12 +54,11 @@ public class ActOfAggression extends CardImpl {
     }
 
     public ActOfAggression(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R/P}{R/P}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R/P}{R/P}");
-
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
     }
 
     public ActOfAggression(final ActOfAggression card) {

Mage.Sets/src/mage/cards/a/ActOfTreason.java

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.a;
 
 import java.util.UUID;
@@ -46,16 +45,14 @@ import mage.target.common.TargetCreaturePermanent;
 public class ActOfTreason extends CardImpl {
 
     public ActOfTreason(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
-
 
         // Gain control of target creature until end of turn. Untap that creature.
         // It gains haste until end of turn. (It can attack and {T} this turn.)
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
-
     }
 
     public ActOfTreason(final ActOfTreason card) {

Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java

@@ -56,7 +56,7 @@ import java.util.*;
  */
 public class AdmiralBeckettBrass extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other Pirates you control");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Pirates you control");
     private static final FilterNonlandPermanent filter2 = new FilterNonlandPermanent("nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn");
 
     static {

Mage.Sets/src/mage/cards/a/AgelessSentinels.java

@@ -87,7 +87,7 @@ public class AgelessSentinels extends CardImpl {
 
         public AgelessSentinelsEffect() {
             super(Duration.WhileOnBattlefield, Outcome.BecomeCreature);
-            staticText = "it becomes a Bird Giant, ";
+            staticText = "it becomes a Bird Giant,";
         }
 
         public AgelessSentinelsEffect(final AgelessSentinelsEffect effect) {

Mage.Sets/src/mage/cards/a/AlliedStrategies.java

@@ -32,6 +32,7 @@ import mage.abilities.dynamicvalue.common.DomainValue;
 import mage.abilities.effects.common.DrawCardTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.target.TargetPlayer;
 
@@ -42,11 +43,13 @@ import mage.target.TargetPlayer;
 public class AlliedStrategies extends CardImpl {
 
     public AlliedStrategies(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{U}");
 
         // Domain - Target player draws a card for each basic land type among lands he or she controls.
         this.getSpellAbility().addEffect(new DrawCardTargetEffect(new DomainValue(true)));
         this.getSpellAbility().addTarget(new TargetPlayer());
+        this.getSpellAbility().setAbilityWord(AbilityWord.DOMAIN);
+
     }
 
     public AlliedStrategies(final AlliedStrategies card) {

Mage.Sets/src/mage/cards/a/AlphaStatus.java

@@ -109,6 +109,6 @@ class AlphaStatusDynamicValue implements DynamicValue {
 
     @Override
     public String getMessage() {
-        return "each other creature on the battlefield that shares a creature type with it";
+        return "other creature on the battlefield that shares a creature type with it";
     }
 }

Mage.Sets/src/mage/cards/a/AltarGolem.java

@@ -53,18 +53,18 @@ import mage.target.common.TargetControlledCreaturePermanent;
 /**
  *
  * @author jeffwadsworth
-
+ *
  */
 public class AltarGolem extends CardImpl {
-    
+
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
-    
+
     static {
         filter.add(Predicates.not(new TappedPredicate()));
     }
 
     public AltarGolem(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{7}");
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}");
         this.subtype.add(SubType.GOLEM);
 
         this.power = new MageInt(0);
@@ -72,17 +72,17 @@ public class AltarGolem extends CardImpl {
 
         // Trample
         this.addAbility(TrampleAbility.getInstance());
-        
+
         // Altar Golem's power and toughness are each equal to the number of creatures on the battlefield.
-        DynamicValue amount = new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creatures in play"));
+        DynamicValue amount = new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("creatures on the battlefield"));
         this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(amount, Duration.EndOfGame)));
-        
+
         // Altar Golem doesn't untap during your untap step.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect()));
-        
+
         // Tap five untapped creatures you control: Untap Altar Golem.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(5, 5, filter, true))));
-        
+
     }
 
     public AltarGolem(final AltarGolem card) {

Mage.Sets/src/mage/cards/a/AncientOoze.java

@@ -52,15 +52,17 @@ import mage.game.permanent.Permanent;
 public class AncientOoze extends CardImpl {
 
     public AncientOoze(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}{G}");
         this.subtype.add(SubType.OOZE);
 
-        this.color.setGreen(true); 
+        this.color.setGreen(true);
         this.power = new MageInt(0);
         this.toughness = new MageInt(0);
 
-		// Ancient Ooze's power and toughness are each equal to the total converted mana cost of other creatures you control.
+        // Ancient Ooze's power and toughness are each equal to the total converted mana cost of other creatures you control.
-        this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new AncientOozePowerToughnessValue(), Duration.EndOfGame)));
+        this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new AncientOozePowerToughnessValue(), Duration.EndOfGame)
+                .setText("{this}'s power and toughness are each equal to the total converted mana cost of other creatures you control.")
+        ));
     }
 
     public AncientOoze(final AncientOoze card) {
@@ -74,12 +76,12 @@ public class AncientOoze extends CardImpl {
 }
 
 class AncientOozePowerToughnessValue implements DynamicValue {
-    
+
     @Override
     public int calculate(Game game, Ability sourceAbility, Effect effect) {
         int value = 0;
-        for(Permanent creature : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), sourceAbility.getControllerId(), game)){
+        for (Permanent creature : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), sourceAbility.getControllerId(), game)) {
-            if(creature != null && !sourceAbility.getSourceId().equals(creature.getId())){
+            if (creature != null && !sourceAbility.getSourceId().equals(creature.getId())) {
                 value += creature.getConvertedManaCost();
             }
         }

Mage.Sets/src/mage/cards/a/AssassinsBlade.java

@@ -0,0 +1,85 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
+import mage.abilities.condition.common.AttackedThisStepCondition;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.PhaseStep;
+import mage.constants.TurnPhase;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.filter.predicate.permanent.AttackingPredicate;
+import mage.target.common.TargetCreaturePermanent;
+import mage.watchers.common.PlayerAttackedStepWatcher;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class AssassinsBlade extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack attacking creature");
+
+    static {
+        filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK)));
+        filter.add(new AttackingPredicate());
+    }
+
+    public AssassinsBlade(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}");
+
+        // Cast Assassin's Blade only during the declare attackers step and only if you've been attacked this step.
+        Ability ability = new CastOnlyDuringPhaseStepSourceAbility(
+                TurnPhase.COMBAT, PhaseStep.DECLARE_ATTACKERS, AttackedThisStepCondition.instance,
+                "Cast {this} only during the declare attackers step and only if you've been attacked this step."
+        );
+        ability.addWatcher(new PlayerAttackedStepWatcher());
+        this.addAbility(ability);
+
+        // Destroy target nonblack attacking creature.
+        this.getSpellAbility().addEffect(new DestroyTargetEffect());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+    }
+
+    public AssassinsBlade(final AssassinsBlade card) {
+        super(card);
+    }
+
+    @Override
+    public AssassinsBlade copy() {
+        return new AssassinsBlade(this);
+    }
+}

Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java

@@ -68,7 +68,7 @@ public class AtalyaSamiteMaster extends CardImpl {
 
         // {X}, {tap}: Choose one - Prevent the next X damage that would be dealt to target creature this turn; or you gain X life. Spend only white mana on X. 
         PreventDamageToTargetEffect effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, false, true, new ManacostVariableValue());
-        effect.setText("Prevent the next X damage that would be dealt to target creature this turn");
+        effect.setText("Prevent the next X damage that would be dealt to target creature this turn. Spend only white mana on X.");
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}"));
         ability.addCost(new TapSourceCost());
 
@@ -81,7 +81,7 @@ public class AtalyaSamiteMaster extends CardImpl {
 
         // or you gain X life
         Mode mode = new Mode();
-        mode.getEffects().add(new GainLifeEffect(new ManacostVariableValue()));
+        mode.getEffects().add(new GainLifeEffect(new ManacostVariableValue()).setText("You gain X life. Spend only white mana on X."));
         ability.addMode(mode);
 
         this.addAbility(ability);

Mage.Sets/src/mage/cards/a/AuramancersGuise.java

@@ -70,7 +70,7 @@ public class AuramancersGuise extends CardImpl {
         BoostEnchantedEffect effect = new BoostEnchantedEffect(ptBoost, ptBoost, Duration.WhileOnBattlefield);
         effect.setText("Enchanted creature gets +2/+2 for each Aura attached to it");
         SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
-        ability2.addEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA));
+        ability2.addEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA).setText("and has vigilance"));
         this.addAbility(ability2);
     }
 

Mage.Sets/src/mage/cards/b/BanishingKnack.java

@@ -51,12 +51,14 @@ public class BanishingKnack extends CardImpl {
 
     private static final FilterPermanent filter = new FilterNonlandPermanent();
 
-        public BanishingKnack(UUID ownerId, CardSetInfo setInfo) {
+    public BanishingKnack(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{U}");
 
         Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost());
         gainedAbility.addTarget(new TargetPermanent(filter));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn)
+                .setText("Until end of turn, target creature gains \"{T}: Return target nonland permanent to its owner's hand.\"")
+        );
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 

Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java

@@ -55,7 +55,7 @@ import mage.util.CardUtil;
 public class BattlefieldThaumaturge extends CardImpl {
 
     public BattlefieldThaumaturge(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}");
         this.subtype.add(SubType.HUMAN, SubType.WIZARD);
 
         this.power = new MageInt(2);
@@ -79,10 +79,9 @@ public class BattlefieldThaumaturge extends CardImpl {
 
 class BattlefieldThaumaturgeSpellsCostReductionEffect extends CostModificationEffectImpl {
 
-
     public BattlefieldThaumaturgeSpellsCostReductionEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit, CostModificationType.REDUCE_COST);
-        this.staticText = "Each instant and sorcery spell you cast costs 1 less to cast for each creature it targets";
+        this.staticText = "Each instant and sorcery spell you cast costs {1} less to cast for each creature it targets";
     }
 
     protected BattlefieldThaumaturgeSpellsCostReductionEffect(BattlefieldThaumaturgeSpellsCostReductionEffect effect) {
@@ -92,9 +91,9 @@ class BattlefieldThaumaturgeSpellsCostReductionEffect extends CostModificationEf
     @Override
     public boolean apply(Game game, Ability source, Ability abilityToModify) {
         Set<UUID> creaturesTargeted = new HashSet<>();
-        for (Target target: abilityToModify.getTargets()) {
+        for (Target target : abilityToModify.getTargets()) {
-            for (UUID uuid: target.getTargets()) {
+            for (UUID uuid : target.getTargets()) {
-                Permanent permanent = game.getPermanent(uuid); 
+                Permanent permanent = game.getPermanent(uuid);
                 if (permanent != null && permanent.isCreature()) {
                     creaturesTargeted.add(permanent.getId());
                 }

Mage.Sets/src/mage/cards/b/BellowingAegisaur.java

@@ -49,7 +49,7 @@ import mage.filter.predicate.permanent.ControllerPredicate;
  */
 public class BellowingAegisaur extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature you control");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature you control");
 
     static {
         filter.add(new ControllerPredicate(TargetController.YOU));

Mage.Sets/src/mage/cards/b/BelltollDragon.java

@@ -49,8 +49,8 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  * @author fireshoes
  */
 public class BelltollDragon extends CardImpl {
-    
+
-    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("each other Dragon creature you control");
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Dragon creature you control");
 
     static {
         filter.add(new AnotherPredicate());
@@ -58,7 +58,7 @@ public class BelltollDragon extends CardImpl {
     }
 
     public BelltollDragon(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{U}");
         this.subtype.add(SubType.DRAGON);
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
@@ -69,7 +69,7 @@ public class BelltollDragon extends CardImpl {
         this.addAbility(HexproofAbility.getInstance());
         // Megamorph {5}{U}{U}
         this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{U}{U}"), true));
-        
+
         // When Belltoll Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control.
         this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false));
     }

Mage.Sets/src/mage/cards/b/Bequeathal.java

@@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class Bequeathal extends CardImpl {
 
     public Bequeathal(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}");
         this.subtype.add(SubType.AURA);
 
         // Enchant creature
@@ -59,7 +59,7 @@ public class Bequeathal extends CardImpl {
         this.addAbility(ability);
 
         // When enchanted creature dies, you draw two cards.
-        this.addAbility( new DiesAttachedTriggeredAbility(new DrawCardSourceControllerEffect(2), "enchanted creature"));
+        this.addAbility(new DiesAttachedTriggeredAbility(new DrawCardSourceControllerEffect(2).setText("you draw two cards"), "enchanted creature"));
     }
 
     public Bequeathal(final Bequeathal card) {

Mage.Sets/src/mage/cards/b/BlackCarriage.java

@@ -52,21 +52,21 @@ import mage.target.common.TargetControlledCreaturePermanent;
 public class BlackCarriage extends CardImpl {
 
     public BlackCarriage(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");
         this.subtype.add(SubType.HORSE);
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 
         // Trample
         this.addAbility(TrampleAbility.getInstance());
-        
+
         // Black Carriage doesn't untap during your untap step.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect()));
-        
+
         // Sacrifice a creature: Untap Black Carriage. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, 
+        this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD,
                 new UntapSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(new FilterControlledCreaturePermanent("a creature"))),
-                new IsStepCondition(PhaseStep.UPKEEP), null));
+                new IsStepCondition(PhaseStep.UPKEEP), "Sacrifice a creature: Untap {this}. Activate this ability only during your upkeep."));
     }
 
     public BlackCarriage(final BlackCarriage card) {

Mage.Sets/src/mage/cards/b/BlackManaBattery.java

@@ -53,7 +53,6 @@ public class BlackManaBattery extends CardImpl {
 
     public BlackManaBattery(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
-        
 
         // {2}, {tap}: Put a charge counter on Black Mana Battery.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance(1)), new GenericManaCost(2));
@@ -65,10 +64,10 @@ public class BlackManaBattery extends CardImpl {
                 Mana.BlackMana(1),
                 new IntPlusDynamicValue(1, new RemovedCountersForCostValue()),
                 new TapSourceCost(),
-                "Add {B} to your mana pool, then add {B} to your mana pool for each storage counter removed this way",
+                "Add {B} to your mana pool, then add {B} to your mana pool for each charge counter removed this way",
-                true, new CountersSourceCount(CounterType.STORAGE));
+                true, new CountersSourceCount(CounterType.CHARGE));
-        ability.addCost(new RemoveVariableCountersSourceCost(CounterType.STORAGE.createInstance(),
+        ability.addCost(new RemoveVariableCountersSourceCost(CounterType.CHARGE.createInstance(),
-                "Remove X storage counters from {this}"));
+                "Remove any number of charge counters from {this}"));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/b/BlindWithAnger.java

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.b;
 
 import java.util.UUID;
@@ -42,7 +41,6 @@ import mage.constants.SuperType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.SupertypePredicate;
-import mage.target.Target;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -57,14 +55,13 @@ public class BlindWithAnger extends CardImpl {
     }
 
     public BlindWithAnger(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}");
         this.subtype.add(SubType.ARCANE);
 
-        this.getSpellAbility().addEffect(new UntapTargetEffect());
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap target nonlegendary creature"));
-        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
-        Target target = new TargetCreaturePermanent(filter);
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
-        this.getSpellAbility().addTarget(target);
     }
 
     public BlindWithAnger(final BlindWithAnger card) {

Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java

@@ -61,7 +61,7 @@ public class BloodcrazedHoplite extends CardImpl {
     }
 
     public BloodcrazedHoplite(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}");
         this.subtype.add(SubType.HUMAN, SubType.SOLDIER);
 
         this.power = new MageInt(2);
@@ -88,7 +88,7 @@ public class BloodcrazedHoplite extends CardImpl {
 class BloodcrazedHopliteTriggeredAbility extends TriggeredAbilityImpl {
 
     public BloodcrazedHopliteTriggeredAbility() {
-        super(Zone.ALL, new RemoveCounterTargetEffect(CounterType.P1P1.createInstance()), true);
+        super(Zone.ALL, new RemoveCounterTargetEffect(CounterType.P1P1.createInstance()), false);
     }
 
     public BloodcrazedHopliteTriggeredAbility(BloodcrazedHopliteTriggeredAbility ability) {

Mage.Sets/src/mage/cards/b/BloodfireInfusion.java

@@ -0,0 +1,116 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeAttachedCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.DamageAllEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.target.TargetPermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.target.common.TargetControlledCreaturePermanent;
+
+/**
+ *
+ * @author L_J
+ */
+public class BloodfireInfusion extends CardImpl {
+
+    public BloodfireInfusion(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}");
+        this.subtype.add(SubType.AURA);
+
+        // Enchant creature you control
+        TargetPermanent auraTarget = new TargetControlledCreaturePermanent();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
+        Ability ability = new EnchantAbility(auraTarget.getTargetName());
+        this.addAbility(ability);
+        
+        // {R}, Sacrifice enchanted creature: Bloodfire Infusion deals damage equal to the sacrificed creature's power to each creature.
+        Effect effect = new DamageAllEffect(new AttachedPermanentPowerCount(), new FilterCreaturePermanent());
+        effect.setText("{this} deals damage equal to the sacrificed creature's power to each creature");
+        Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{R}"));
+        ability2.addCost(new SacrificeAttachedCost());
+        this.addAbility(ability2);
+        
+    }
+
+    public BloodfireInfusion(final BloodfireInfusion card) {
+        super(card);
+    }
+
+    @Override
+    public BloodfireInfusion copy() {
+        return new BloodfireInfusion(this);
+    }
+}
+
+class AttachedPermanentPowerCount implements DynamicValue {
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        Permanent attachment = game.getPermanentOrLKIBattlefield(sourceAbility.getSourceId());
+        Permanent permanent = game.getPermanentOrLKIBattlefield(attachment.getAttachedTo());
+        if (attachment != null
+                && permanent != null
+                && (permanent.getPower().getValue() >= 0)) {
+            return permanent.getPower().getValue();
+        }
+        return 0;
+    }
+
+    @Override
+    public AttachedPermanentPowerCount copy() {
+        return new AttachedPermanentPowerCount();
+    }
+
+    @Override
+    public String toString() {
+        return "X";
+    }
+
+    @Override
+    public String getMessage() {
+        return "enchanted creature's power";
+    }
+}

Mage.Sets/src/mage/cards/b/BlueManaBattery.java

@@ -64,10 +64,10 @@ public class BlueManaBattery extends CardImpl {
                 Mana.BlueMana(1),
                 new IntPlusDynamicValue(1, new RemovedCountersForCostValue()),
                 new TapSourceCost(),
-                "Add {U} to your mana pool, then add {U} to your mana pool for each storage counter removed this way",
+                "Add {U} to your mana pool, then add {U} to your mana pool for each charge counter removed this way",
-                true, new CountersSourceCount(CounterType.STORAGE));
+                true, new CountersSourceCount(CounterType.CHARGE));
-        ability.addCost(new RemoveVariableCountersSourceCost(CounterType.STORAGE.createInstance(),
+        ability.addCost(new RemoveVariableCountersSourceCost(CounterType.CHARGE.createInstance(),
-                "Remove X storage counters from {this}"));
+                "Remove any number of charge counters from {this}"));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/b/BonethornValesk.java

@@ -53,7 +53,7 @@ public class BonethornValesk extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Whenever a permanent is turned face up, Bonethorn Valesk deals 1 damage to target creature or player.
-        Ability ability = new TurnedFaceUpAllTriggeredAbility(new DamageTargetEffect(1), new FilterPermanent());
+        Ability ability = new TurnedFaceUpAllTriggeredAbility(new DamageTargetEffect(1), new FilterPermanent("a permanent"));
         ability.addTarget(new TargetCreatureOrPlayer());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java

@@ -47,8 +47,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
  */
 public class BraidsConjurerAdept extends CardImpl {
 
-    private static final FilterCard filter = new FilterCard("artifact, creature, or land card")
+    private static final FilterCard filter = new FilterCard("an artifact, creature, or land card");
-;
+
     static {
         filter.add(Predicates.or(
                 new CardTypePredicate(CardType.ARTIFACT),
@@ -57,7 +57,7 @@ public class BraidsConjurerAdept extends CardImpl {
     }
 
     public BraidsConjurerAdept(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.HUMAN, SubType.WIZARD);
         this.power = new MageInt(2);

Mage.Sets/src/mage/cards/b/BreathOfDreams.java

@@ -0,0 +1,75 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.ObjectColor;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
+import mage.abilities.keyword.CumulativeUpkeepAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.ColorPredicate;
+
+/**
+ *
+ * @author L_J
+ */
+public class BreathOfDreams extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Green creatures");
+
+    static{
+        filter.add(new ColorPredicate(ObjectColor.GREEN));
+    }
+
+    public BreathOfDreams(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}");
+
+        // Cumulative upkeep-Pay {U}.
+        this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{U}")));
+
+        // Green creatures have "Cumulative upkeep {1}."
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}")), Duration.WhileOnBattlefield, filter)));
+    }
+
+    public BreathOfDreams(final BreathOfDreams card) {
+        super(card);
+    }
+
+    @Override
+    public BreathOfDreams copy() {
+        return new BreathOfDreams(this);
+    }
+}

Mage.Sets/src/mage/cards/b/BrownOuphe.java

@@ -53,7 +53,7 @@ import java.util.UUID;
  */
 public class BrownOuphe extends CardImpl {
 
-    private final static FilterStackObject filter = new FilterStackObject("ability from an artifact source");
+    private final static FilterStackObject filter = new FilterStackObject("activated ability from an artifact source");
 
     static {
         filter.add(new ArtifactSourcePredicate());

Mage.Sets/src/mage/cards/b/BrutalHordechief.java

@@ -33,7 +33,7 @@ import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.ReplacementEffectImpl;
+import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.effects.common.LoseLifeTargetEffect;
 import mage.abilities.effects.common.combat.BlocksIfAbleAllEffect;
@@ -71,7 +71,7 @@ public class BrutalHordechief extends CardImpl {
 
         // {3}{R/W}{R/W}: Creatures your opponents control block this turn if able, and you choose how those creatures block.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlocksIfAbleAllEffect(filter, Duration.EndOfTurn), new ManaCostsImpl("{3}{R/W}{R/W}"));
-        ability.addEffect(new BrutalHordechiefReplacementEffect());
+        ability.addEffect(new BrutalHordechiefChooseBlockersEffect());
         this.addAbility(ability);
     }
 
@@ -123,20 +123,20 @@ class BrutalHordechiefTriggeredAbility extends TriggeredAbilityImpl {
     }
 }
 
-class BrutalHordechiefReplacementEffect extends ReplacementEffectImpl {
+class BrutalHordechiefChooseBlockersEffect extends ContinuousRuleModifyingEffectImpl { // TODO: reverse the resolution order in case of effect multiples
 
-    public BrutalHordechiefReplacementEffect() {
+    public BrutalHordechiefChooseBlockersEffect() {
-        super(Duration.EndOfCombat, Outcome.Benefit);
+        super(Duration.EndOfTurn, Outcome.Benefit, false, false);
         staticText = ", and you choose how those creatures block";
     }
 
-    public BrutalHordechiefReplacementEffect(final BrutalHordechiefReplacementEffect effect) {
+    public BrutalHordechiefChooseBlockersEffect(final BrutalHordechiefChooseBlockersEffect effect) {
         super(effect);
     }
 
     @Override
-    public BrutalHordechiefReplacementEffect copy() {
+    public BrutalHordechiefChooseBlockersEffect copy() {
-        return new BrutalHordechiefReplacementEffect(this);
+        return new BrutalHordechiefChooseBlockersEffect(this);
     }
 
     @Override
@@ -151,16 +151,11 @@ class BrutalHordechiefReplacementEffect extends ReplacementEffectImpl {
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        return event.getPlayerId().equals(source.getControllerId());
-    }
-    
-    @Override
-    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         Player blockController = game.getPlayer(source.getControllerId());
         if (blockController != null) {
             game.getCombat().selectBlockers(blockController, game);
             return true;
         }
         return false;
-    }    
+    }
 }

Mage.Sets/src/mage/cards/c/CabalConditioning.java

@@ -42,10 +42,12 @@ import mage.target.TargetPlayer;
 public class CabalConditioning extends CardImpl {
 
     public CabalConditioning(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{6}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{6}{B}");
 
         // Any number of target players each discard a number of cards equal to the highest converted mana cost among permanents you control.
-        this.getSpellAbility().addEffect(new DiscardTargetEffect(new HighestConvertedManaCostValue()));
+        this.getSpellAbility().addEffect(new DiscardTargetEffect(new HighestConvertedManaCostValue())
+                .setText("Any number of target players each discard a number of cards equal to the highest converted mana cost among permanents you control.")
+        );
         this.getSpellAbility().addTarget(new TargetPlayer(0, Integer.MAX_VALUE, false));
     }
 

Mage.Sets/src/mage/cards/c/CaptivatingCrew.java

@@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent;
  */
 public class CaptivatingCrew extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("target creature an opponent controls");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
 
     static {
         filter.add(new ControllerPredicate(TargetController.OPPONENT));

Mage.Sets/src/mage/cards/c/CavalryMaster.java

@@ -46,15 +46,15 @@ import mage.filter.predicate.mageobject.AbilityPredicate;
  * @author Plopman
  */
 public class CavalryMaster extends CardImpl {
-    
+
     static final private FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control with flanking");
-    
+
-    static{
+    static {
         filter.add(new AbilityPredicate(FlankingAbility.class));
     }
-    
+
     public CavalryMaster(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.KNIGHT);
 
@@ -64,7 +64,10 @@ public class CavalryMaster extends CardImpl {
         // Flanking
         this.addAbility(new FlankingAbility());
         // Other creatures you control with flanking have flanking.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, true)));
+        this.addAbility(new SimpleStaticAbility(
+                Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, true)
+                        .setText("Other creatures you control with flanking have flanking.")
+        ));
     }
 
     public CavalryMaster(final CavalryMaster card) {

Mage.Sets/src/mage/cards/c/ChampionsVictory.java

@@ -0,0 +1,73 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.c;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
+import mage.abilities.condition.common.AttackedThisStepCondition;
+import mage.abilities.effects.common.ReturnToHandTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.PhaseStep;
+import mage.constants.TurnPhase;
+import mage.target.common.TargetAttackingCreature;
+import mage.watchers.common.PlayerAttackedStepWatcher;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class ChampionsVictory extends CardImpl {
+
+    public ChampionsVictory(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{U}");
+
+        // Cast Champion's Victory only during the declare attackers step and only if you've been attacked this step.
+        Ability ability = new CastOnlyDuringPhaseStepSourceAbility(
+                TurnPhase.COMBAT, PhaseStep.DECLARE_ATTACKERS, AttackedThisStepCondition.instance,
+                "Cast {this} only during the declare attackers step and only if you've been attacked this step."
+        );
+        ability.addWatcher(new PlayerAttackedStepWatcher());
+        this.addAbility(ability);
+
+        // Return target attacking creature to its owner's hand.
+        this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
+        this.getSpellAbility().addTarget(new TargetAttackingCreature());
+    }
+
+    public ChampionsVictory(final ChampionsVictory card) {
+        super(card);
+    }
+
+    @Override
+    public ChampionsVictory copy() {
+        return new ChampionsVictory(this);
+    }
+}

Mage.Sets/src/mage/cards/c/ChaosHarlequin.java

@@ -0,0 +1,107 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.c;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author L_J
+ */
+public class ChaosHarlequin extends CardImpl {
+
+    public ChaosHarlequin(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}");
+        this.subtype.add(SubType.HUMAN);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(4);
+
+        // {R}: Exile the top card of your library. If that card is a land card, Chaos Harlequin gets -4/-0 until end of turn. Otherwise, Chaos Harlequin gets +2/+0 until end of turn.
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChaosHarlequinEffect(), new ManaCostsImpl("{R}")));
+    }
+
+    public ChaosHarlequin(final ChaosHarlequin card) {
+        super(card);
+    }
+
+    @Override
+    public ChaosHarlequin copy() {
+        return new ChaosHarlequin(this);
+    }
+}
+
+class ChaosHarlequinEffect extends OneShotEffect {
+
+    public ChaosHarlequinEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "Exile the top card of your library. If that card is a land card, {this} gets -4/-0 until end of turn. Otherwise, {this} gets +2/+0 until end of turn";
+    }
+
+    public ChaosHarlequinEffect(final ChaosHarlequinEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ChaosHarlequinEffect copy() {
+        return new ChaosHarlequinEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player != null) {
+            Card card = player.getLibrary().removeFromTop(game);
+            if (card != null) {
+                player.moveCardToExileWithInfo(card, null, "", source.getSourceId(), game, Zone.LIBRARY, true);
+                if (card.isLand()) {
+                    game.addEffect(new BoostSourceEffect(-4, 0, Duration.EndOfTurn), source);
+                } else {
+                    game.addEffect(new BoostSourceEffect(2, 0, Duration.EndOfTurn), source);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/c/ChaosMoon.java

@@ -0,0 +1,224 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.c;
+
+import java.util.UUID;
+import mage.MageObject;
+import mage.Mana;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.common.TapForManaAllTriggeredManaAbility;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.AddManaToManaPoolTargetControllerEffect;
+import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
+import mage.abilities.effects.common.ManaEffect;
+import mage.abilities.effects.common.continuous.BoostAllEffect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.abilities.mana.DelayedTriggeredManaAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.common.FilterLandPermanent;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.ManaEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author L_J
+ */
+public class ChaosMoon extends CardImpl {
+
+    public ChaosMoon(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}");
+
+
+        // At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ChaosMoonEffect(), TargetController.ANY, false));
+    }
+
+    public ChaosMoon(final ChaosMoon card) {
+        super(card);
+    }
+
+    @Override
+    public ChaosMoon copy() {
+        return new ChaosMoon(this);
+    }
+}
+
+class ChaosMoonEffect extends OneShotEffect {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("red creatures");
+
+    static {
+        filter.add(new ColorPredicate(ObjectColor.RED));
+    }
+
+    public ChaosMoonEffect() {
+        super(Outcome.Neutral);
+        this.staticText = "count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type";
+    }
+
+    public ChaosMoonEffect(final ChaosMoonEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ChaosMoonEffect copy() {
+        return new ChaosMoonEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player != null) {
+            int permanentsInPlay = new PermanentsOnBattlefieldCount().calculate(game, source, null);
+            // Odd
+            if (permanentsInPlay % 2 != 0) {
+                game.addEffect(new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), source);
+                new CreateDelayedTriggeredAbilityEffect(new ChaosMoonOddTriggeredAbility()).apply(game, source);
+            }
+            // Even
+            else {
+                game.addEffect(new BoostAllEffect(-1, -1, Duration.EndOfTurn, filter, false), source);
+                game.addEffect(new ChaosMoonEvenReplacementEffect(), source);
+            }
+            return true;
+        }
+        return false;
+    }
+}
+
+class ChaosMoonOddTriggeredAbility extends DelayedTriggeredManaAbility {
+
+    private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain");
+
+    static {
+        filter.add(new SubtypePredicate(SubType.MOUNTAIN));
+    }
+
+    public ChaosMoonOddTriggeredAbility() {
+        super(new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.R), "his or her"), Duration.EndOfTurn, false);
+        this.usesStack = false;
+    }
+
+    public ChaosMoonOddTriggeredAbility(ChaosMoonOddTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.TAPPED_FOR_MANA;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent land = game.getPermanent(event.getTargetId());
+        if (land != null && filter.match(land, game)) {
+            for (Effect effect : this.getEffects()) {
+                effect.setTargetPointer(new FixedTarget(land.getControllerId()));
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public ChaosMoonOddTriggeredAbility copy() {
+        return new ChaosMoonOddTriggeredAbility(this);
+    }
+
+    @Override
+    public String getRule() {
+        return "Until end of turn, whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool";
+    }
+}
+
+class ChaosMoonEvenReplacementEffect extends ReplacementEffectImpl {
+
+    private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain");
+
+    static {
+        filter.add(new SubtypePredicate(SubType.MOUNTAIN));
+    }
+
+    ChaosMoonEvenReplacementEffect() {
+        super(Duration.EndOfTurn, Outcome.Neutral);
+        staticText = "Until end of turn, if a Mountain is tapped for mana, it produces colorless mana instead of any other type.";
+    }
+
+    ChaosMoonEvenReplacementEffect(final ChaosMoonEvenReplacementEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ChaosMoonEvenReplacementEffect copy() {
+        return new ChaosMoonEvenReplacementEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        ManaEvent manaEvent = (ManaEvent) event;
+        Mana mana = manaEvent.getMana();
+        mana.setToMana(Mana.ColorlessMana(mana.count()));
+        return false;
+    }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.TAPPED_FOR_MANA;
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        MageObject mageObject = game.getObject(event.getSourceId());
+        if (mageObject != null && mageObject.isLand()) {
+            Permanent land = game.getPermanent(event.getSourceId());
+            return land != null && filter.match(land, game);
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/c/ChariotOfVictory.java

@@ -52,13 +52,13 @@ import mage.constants.Zone;
 public class ChariotOfVictory extends CardImpl {
 
     public ChariotOfVictory(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
         this.subtype.add(SubType.EQUIPMENT);
 
         // Equipped creature has first strike, trample, and haste.
         Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT));
         Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT);
-        effect.setText(", trample");
+        effect.setText(", trample,");
         ability.addEffect(effect);
         effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT);
         effect.setText("and haste");

Mage.Sets/src/mage/cards/c/ChillHaunting.java

@@ -50,7 +50,7 @@ public class ChillHaunting extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}");
 
         // As an additional cost to cast Chill Haunting, exile X creature cards from your graveyard.
-        this.getSpellAbility().addCost(new ExileXFromYourGraveCost(new FilterCreatureCard("cards from your graveyard")));
+        this.getSpellAbility().addCost(new ExileXFromYourGraveCost(new FilterCreatureCard("creature cards from your graveyard"), true));
 
         // Target creature gets -X/-X until end of turn.
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/c/ClergyOfTheHolyNimbus.java

@@ -53,7 +53,7 @@ import mage.game.permanent.Permanent;
 public class ClergyOfTheHolyNimbus extends CardImpl {
 
     public ClergyOfTheHolyNimbus(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.CLERIC);
         this.power = new MageInt(1);
@@ -61,7 +61,7 @@ public class ClergyOfTheHolyNimbus extends CardImpl {
 
         // If Clergy of the Holy Nimbus would be destroyed, regenerate it.   
         this.addAbility(new SimpleStaticAbility(Zone.ALL, new ClergyOfTheHolyNimbusReplacementEffect()));
-                
+
         // {1}: Clergy of the Holy Nimbus can't be regenerated this turn. Only any opponent may activate this ability.
         this.addAbility(new ActivateOnlyByOpponentActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}")));
     }
@@ -90,7 +90,7 @@ class ClergyOfTheHolyNimbusReplacementEffect extends ReplacementEffectImpl {
     @Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         Permanent ClergyOfTheHolyNimbus = game.getPermanent(event.getTargetId());
-        if (ClergyOfTheHolyNimbus != null 
+        if (ClergyOfTheHolyNimbus != null
                 && event.getAmount() == 0) { // 1=noRegen
             if (ClergyOfTheHolyNimbus.regenerate(source.getSourceId(), game)) {
                 game.informPlayers(source.getSourceObject(game).getName() + " has been regenerated.");
@@ -116,4 +116,4 @@ class ClergyOfTheHolyNimbusReplacementEffect extends ReplacementEffectImpl {
         return new ClergyOfTheHolyNimbusReplacementEffect(this);
     }
 
-}
+}

Mage.Sets/src/mage/cards/c/CloakAndDagger.java

@@ -51,18 +51,19 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
 public class CloakAndDagger extends CardImpl {
 
     private static final FilterPermanent filter = new FilterCreaturePermanent("a Rogue creature");
+
     static {
         filter.add(new SubtypePredicate(SubType.ROGUE));
     }
 
     public CloakAndDagger(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ARTIFACT},"{2}");
+        super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ARTIFACT}, "{2}");
         this.subtype.add(SubType.ROGUE);
         this.subtype.add(SubType.EQUIPMENT);
 
         // Equipped creature gets +2/+0 and has shroud.
         Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0));
-        ability.addEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT));
+        ability.addEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has shroud"));
         this.addAbility(ability);
         // Whenever a Rogue creature enters the battlefield, you may attach Cloak and Dagger to it.
         this.addAbility(new EntersBattlefieldAllTriggeredAbility(

Mage.Sets/src/mage/cards/c/ClockworkAvian.java

@@ -69,19 +69,33 @@ public class ClockworkAvian extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
+
         // Clockwork Avian enters the battlefield with four +1/+0 counters on it.
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P0.createInstance(4)), "{this} enters the battlefield with four +1/+0 counters on it"));
+        this.addAbility(new EntersBattlefieldAbility(
+                new AddCountersSourceEffect(CounterType.P1P0.createInstance(4)),
+                "with four +1/+0 counters on it"
+        ));
 
         // At end of combat, if Clockwork Avian attacked or blocked this combat, remove a +1/+0 counter from it.
         this.addAbility(new ConditionalTriggeredAbility(
                 new EndOfCombatTriggeredAbility(new RemoveCounterSourceEffect(CounterType.P1P0.createInstance()), false),
                 AttackedOrBlockedThisCombatSourceCondition.instance,
                 "At end of combat, if {this} attacked or blocked this combat, remove a +1/+0 counter from it."),
-                new AttackedOrBlockedThisCombatWatcher());
+                new AttackedOrBlockedThisCombatWatcher()
+        );
 
         // {X}, {tap}: Put up to X +1/+0 counters on Clockwork Avian. This ability can't cause the total number of +1/+0 counters on Clockwork Avian to be greater than four. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD,
+        Ability ability = new ConditionalActivatedAbility(
-                new AvianAddCountersSourceEffect(CounterType.P1P0.createInstance(), new ManacostVariableValue(), true, true), new ManaCostsImpl("{X}"), new IsStepCondition(PhaseStep.UPKEEP), null);
+                Zone.BATTLEFIELD,
+                new AvianAddCountersSourceEffect(
+                        CounterType.P1P0.createInstance(),
+                        new ManacostVariableValue(),
+                        true, true
+                ),
+                new ManaCostsImpl("{X}"),
+                new IsStepCondition(PhaseStep.UPKEEP),
+                null
+        );
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }
@@ -100,6 +114,7 @@ class AvianAddCountersSourceEffect extends AddCountersSourceEffect {
 
     public AvianAddCountersSourceEffect(Counter counter, DynamicValue amount, boolean informPlayers, boolean putOnCard) {
         super(counter, amount, informPlayers, putOnCard);
+        staticText = "Put up to X +1/+0 counters on {this}. This ability can't cause the total number of +1/+0 counters on {this} to be greater than four.";
     }
 
     @Override

Mage.Sets/src/mage/cards/c/ClockworkBeast.java

@@ -67,18 +67,31 @@ public class ClockworkBeast extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Clockwork Beast enters the battlefield with seven +1/+0 counters on it.
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P0.createInstance(7)), "{this} enters the battlefield with seven +1/+0 counters on it"));
+        this.addAbility(new EntersBattlefieldAbility(
+                new AddCountersSourceEffect(CounterType.P1P0.createInstance(7)),
+                "with seven +1/+0 counters on it"
+        ));
 
         // At end of combat, if Clockwork Beast attacked or blocked this combat, remove a +1/+0 counter from it.
         this.addAbility(new ConditionalTriggeredAbility(
                 new EndOfCombatTriggeredAbility(new RemoveCounterSourceEffect(CounterType.P1P0.createInstance()), false),
                 AttackedOrBlockedThisCombatSourceCondition.instance,
                 "At end of combat, if {this} attacked or blocked this combat, remove a +1/+0 counter from it."),
-                new AttackedOrBlockedThisCombatWatcher());
+                new AttackedOrBlockedThisCombatWatcher()
+        );
 
         // {X}, {tap}: Put up to X +1/+0 counters on Clockwork Beast. This ability can't cause the total number of +1/+0 counters on Clockwork Beast to be greater than seven. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD,
+        Ability ability = new ConditionalActivatedAbility(
-                new BeastAddCountersSourceEffect(CounterType.P1P0.createInstance(), new ManacostVariableValue(), true, true), new ManaCostsImpl("{X}"), new IsStepCondition(PhaseStep.UPKEEP), null);
+                Zone.BATTLEFIELD,
+                new BeastAddCountersSourceEffect(
+                        CounterType.P1P0.createInstance(),
+                        new ManacostVariableValue(),
+                        true, true
+                ),
+                new ManaCostsImpl("{X}"),
+                new IsStepCondition(PhaseStep.UPKEEP),
+                null
+        );
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }
@@ -97,6 +110,7 @@ class BeastAddCountersSourceEffect extends AddCountersSourceEffect {
 
     public BeastAddCountersSourceEffect(Counter counter, DynamicValue amount, boolean informPlayers, boolean putOnCard) {
         super(counter, amount, informPlayers, putOnCard);
+        staticText = "Put up to X +1/+0 counters on {this}. This ability can't cause the total number of +1/+0 counters on {this} to be greater than seven.";
     }
 
     @Override

Mage.Sets/src/mage/cards/c/ClockworkSwarm.java

@@ -0,0 +1,151 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.c;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EndOfCombatTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.SimpleEvasionAbility;
+import mage.abilities.condition.common.AttackedOrBlockedThisCombatSourceCondition;
+import mage.abilities.condition.common.IsStepCondition;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.ManacostVariableValue;
+import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.effects.common.counter.RemoveCounterSourceEffect;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import mage.counters.Counter;
+import mage.counters.CounterType;
+import mage.counters.Counters;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.watchers.common.AttackedOrBlockedThisCombatWatcher;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class ClockworkSwarm extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Walls");
+
+    static {
+        filter.add(new SubtypePredicate(SubType.WALL));
+    }
+
+    public ClockworkSwarm(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}");
+
+        this.subtype.add(SubType.INSECT);
+        this.power = new MageInt(0);
+        this.toughness = new MageInt(3);
+
+        // Clockwork Swarm enters the battlefield with four +1/+0 counters on it.
+        this.addAbility(new EntersBattlefieldAbility(
+                new AddCountersSourceEffect(CounterType.P1P0.createInstance(4)),
+                "with four +1/+0 counters on it"
+        ));
+
+        // Clockwork Swarm can't be blocked by Walls.
+        this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield)));
+
+        // At end of combat, if Clockwork Swarm attacked or blocked this combat, remove a +1/+0 counter from it.
+        this.addAbility(new ConditionalTriggeredAbility(
+                new EndOfCombatTriggeredAbility(new RemoveCounterSourceEffect(CounterType.P1P0.createInstance()), false),
+                AttackedOrBlockedThisCombatSourceCondition.instance,
+                "At end of combat, if {this} attacked or blocked this combat, remove a +1/+0 counter from it."),
+                new AttackedOrBlockedThisCombatWatcher());
+
+        // {X}, {tap}: Put up to X +1/+0 counters on Clockwork Swarm. This ability can't cause the total number of +1/+0 counters on Clockwork Swarm to be greater than four. Activate this ability only during your upkeep.
+        Ability ability = new ConditionalActivatedAbility(
+                Zone.BATTLEFIELD,
+                new SwarmAddCountersSourceEffect(
+                        CounterType.P1P0.createInstance(),
+                        new ManacostVariableValue(),
+                        true, true
+                ),
+                new ManaCostsImpl("{X}"),
+                new IsStepCondition(PhaseStep.UPKEEP),
+                null
+        );
+        ability.addCost(new TapSourceCost());
+        this.addAbility(ability);
+    }
+
+    public ClockworkSwarm(final ClockworkSwarm card) {
+        super(card);
+    }
+
+    @Override
+    public ClockworkSwarm copy() {
+        return new ClockworkSwarm(this);
+    }
+}
+
+class SwarmAddCountersSourceEffect extends AddCountersSourceEffect {
+
+    public SwarmAddCountersSourceEffect(Counter counter, DynamicValue amount, boolean informPlayers, boolean putOnCard) {
+        super(counter, amount, informPlayers, putOnCard);
+        staticText = "Put up to X +1/+0 counters on {this}. This ability can't cause the total number of +1/+0 counters on {this} to be greater than four.";
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Counters permCounters = game.getPermanent(source.getSourceId()).getCounters(game);
+        int countersWas = permCounters.getCount(CounterType.P1P0);
+        if (countersWas < 4) {
+            super.apply(game, source);
+            if (permCounters.getCount(CounterType.P1P0) > 4) {
+                permCounters.removeCounter(CounterType.P1P0, permCounters.getCount(CounterType.P1P0) - 4);
+            }//if countersWas < 4 then counter is min(current,4); there is no setCounters function though
+        }//else this is a rare case of a Beast getting boosted by outside sources. Which is the sole purpose of this if, for the benefit of this rare but not impossible case
+        return true;
+    }
+
+    public SwarmAddCountersSourceEffect(final SwarmAddCountersSourceEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public SwarmAddCountersSourceEffect copy() {
+        return new SwarmAddCountersSourceEffect(this);
+    }
+}

Mage.Sets/src/mage/cards/c/CoalitionFlag.java

@@ -45,7 +45,7 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.target.TargetPermanent;
-import mage.target.common.TargetCreaturePermanent;
+import mage.target.common.TargetControlledCreaturePermanent;
 
 /**
  *
@@ -59,7 +59,7 @@ public class CoalitionFlag extends CardImpl {
         this.subtype.add(SubType.AURA);
 
         // Enchant creature you control
-        TargetPermanent auraTarget = new TargetCreaturePermanent();
+        TargetPermanent auraTarget = new TargetControlledCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/cards/c/CollapsingBorders.java

@@ -36,6 +36,7 @@ import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.GainLifeTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.constants.TargetController;
 
@@ -47,7 +48,7 @@ import mage.constants.TargetController;
 public class CollapsingBorders extends CardImpl {
 
     public CollapsingBorders(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}");
 
         // Domain - At the beginning of each player's upkeep, that player gains 1 life for each basic land type among lands he or she controls. Then Collapsing Borders deals 3 damage to him or her.
         Effect effect = new GainLifeTargetEffect(new DomainValue(true));
@@ -56,6 +57,7 @@ public class CollapsingBorders extends CardImpl {
         effect = new DamageTargetEffect(3);
         effect.setText("Then {this} deals 3 damage to him or her.");
         ability.addEffect(effect);
+        ability.setAbilityWord(AbilityWord.DOMAIN);
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/c/CollectiveRestraint.java

@@ -36,6 +36,7 @@ import mage.abilities.dynamicvalue.common.DomainValue;
 import mage.abilities.effects.common.combat.CantAttackYouUnlessPayManaAllEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.game.Game;
@@ -51,7 +52,9 @@ public class CollectiveRestraint extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}");
 
         // Domain - Creatures can't attack you unless their controller pays {X} for each creature he or she controls that's attacking you, where X is the number of basic land types you control.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CollectiveRestraintPayManaToAttackAllEffect()));
+        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CollectiveRestraintPayManaToAttackAllEffect());
+        ability.setAbilityWord(AbilityWord.DOMAIN);
+        this.addAbility(ability);
 
     }
 

Mage.Sets/src/mage/cards/c/ColossalHeroics.java

@@ -45,14 +45,13 @@ import mage.target.common.TargetCreaturePermanent;
 public class ColossalHeroics extends CardImpl {
 
     public ColossalHeroics(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{G}");
-
 
         // Strive - Colossal Heroics costs {1}{G} more to cast for each target beyond the first.
         this.addAbility(new StriveAbility("{1}{G}"));
         // Any number of target creatures each get +2/+2 until end of turn. Untap those creatures.
-        Effect effect = new BoostTargetEffect(2,2, Duration.EndOfTurn);
+        Effect effect = new BoostTargetEffect(2, 2, Duration.EndOfTurn);
-        effect.setText("Any number of target creatures each get +2/+2");
+        effect.setText("Any number of target creatures each get +2/+2 until end of turn.");
         this.getSpellAbility().addEffect(effect);
         effect = new UntapTargetEffect();
         effect.setText("Untap those creatures");

Mage.Sets/src/mage/cards/c/CommandOfUnsummoning.java

@@ -0,0 +1,74 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.c;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
+import mage.abilities.condition.common.AttackedThisStepCondition;
+import mage.abilities.effects.common.ReturnToHandTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.PhaseStep;
+import mage.constants.TurnPhase;
+import mage.filter.common.FilterAttackingCreature;
+import mage.target.common.TargetAttackingCreature;
+import mage.watchers.common.PlayerAttackedStepWatcher;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class CommandOfUnsummoning extends CardImpl {
+
+    public CommandOfUnsummoning(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}");
+
+        // Cast Command of Unsummoning only during the declare attackers step and only if you've been attacked this step.
+        Ability ability = new CastOnlyDuringPhaseStepSourceAbility(
+                TurnPhase.COMBAT, PhaseStep.DECLARE_ATTACKERS, AttackedThisStepCondition.instance,
+                "Cast {this} only during the declare attackers step and only if you've been attacked this step."
+        );
+        ability.addWatcher(new PlayerAttackedStepWatcher());
+        this.addAbility(ability);
+
+        // Return one or two target attacking creatures to their owner's hand.
+        this.getSpellAbility().addEffect(new ReturnToHandTargetEffect().setText("Return one or two target attacking creatures to their owner's hand."));
+        this.getSpellAbility().addTarget(new TargetAttackingCreature(1, 2, new FilterAttackingCreature(), false));
+    }
+
+    public CommandOfUnsummoning(final CommandOfUnsummoning card) {
+        super(card);
+    }
+
+    @Override
+    public CommandOfUnsummoning copy() {
+        return new CommandOfUnsummoning(this);
+    }
+}

Mage.Sets/src/mage/cards/c/Confound.java

@@ -44,14 +44,14 @@ import mage.target.TargetSpell;
  */
 public class Confound extends CardImpl {
 
-    private final static FilterSpell filter = new FilterSpell("spell that targets one or more creatures");
+    private final static FilterSpell filter = new FilterSpell("spell that targets a creature");
 
     static {
         filter.add(new TargetsPermanentPredicate(new FilterCreaturePermanent()));
     }
 
     public Confound(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
 
         // Counter target spell that targets one or more creatures.
         this.getSpellAbility().addEffect(new CounterTargetEffect());

Mage.Sets/src/mage/cards/c/ConfusionInTheRanks.java

@@ -60,21 +60,25 @@ public class ConfusionInTheRanks extends CardImpl {
         filter.add(Predicates.or(
                 new CardTypePredicate(CardType.ARTIFACT),
                 new CardTypePredicate(CardType.CREATURE),
-                new CardTypePredicate(CardType.ENCHANTMENT)));
+                new CardTypePredicate(CardType.ENCHANTMENT)
+        ));
     }
     private final UUID originalId;
 
     public ConfusionInTheRanks(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}");
 
         // Whenever an artifact, creature, or enchantment enters the battlefield, its controller chooses target permanent another player controls that shares a card type with it. Exchange control of those permanents.
         Ability ability = new EntersBattlefieldAllTriggeredAbility(
                 Zone.BATTLEFIELD,
-                new ExchangeControlTargetEffect(Duration.EndOfGame, "its controller chooses target permanent another player controls that shares a card type with it. Exchange control of those permanents"),
+                new ExchangeControlTargetEffect(
-                filter,
+                        Duration.EndOfGame,
-                false,
+                        "its controller chooses target permanent "
-                SetTargetPointer.PERMANENT,
+                        + "another player controls that shares a card type with it. "
-                null);
+                        + "Exchange control of those permanents"
+                ),
+                filter, false, SetTargetPointer.PERMANENT, null
+        );
         ability.addTarget(new TargetPermanent());
         originalId = ability.getOriginalId();
         this.addAbility(ability);
@@ -92,28 +96,31 @@ public class ConfusionInTheRanks extends CardImpl {
             for (Effect effect : ability.getEffects()) {
                 enteringPermanentId = effect.getTargetPointer().getFirst(game, ability);
             }
-            if (enteringPermanentId != null) {
+            if (enteringPermanentId == null) {
-                Permanent enteringPermanent = game.getPermanent(enteringPermanentId);
+                return;
-                if (enteringPermanent != null) {
-                    ability.setControllerId(enteringPermanent.getControllerId());
-                    ability.getTargets().clear();
-                    FilterPermanent filterTarget = new FilterPermanent();
-                    String message = "";
-                    filterTarget.add(Predicates.not(new ControllerIdPredicate(enteringPermanent.getControllerId())));
-                    Set<CardTypePredicate> cardTypesPredicates = new HashSet<>(1);
-                    for (CardType cardTypeEntering : enteringPermanent.getCardType()) {
-                        cardTypesPredicates.add(new CardTypePredicate(cardTypeEntering));
-                        if (!message.isEmpty()) {
-                            message += "or ";
-                        }
-                        message += cardTypeEntering.toString().toLowerCase() + ' ';
-                    }
-                    filterTarget.add(Predicates.or(cardTypesPredicates));
-                    message += "you do not control";
-                    filterTarget.setMessage(message);
-                    ability.getTargets().add(new TargetPermanent(filterTarget));
-                }
             }
+            Permanent enteringPermanent = game.getPermanent(enteringPermanentId);
+            if (enteringPermanent == null) {
+                return;
+            }
+            ability.getTargets().clear();
+            FilterPermanent filterTarget = new FilterPermanent();
+            String message = "";
+            filterTarget.add(Predicates.not(new ControllerIdPredicate(enteringPermanent.getControllerId())));
+            Set<CardTypePredicate> cardTypesPredicates = new HashSet<>(1);
+            for (CardType cardTypeEntering : enteringPermanent.getCardType()) {
+                cardTypesPredicates.add(new CardTypePredicate(cardTypeEntering));
+                if (!message.isEmpty()) {
+                    message += "or ";
+                }
+                message += cardTypeEntering.toString().toLowerCase() + ' ';
+            }
+            filterTarget.add(Predicates.or(cardTypesPredicates));
+            message += "you don't control";
+            filterTarget.setMessage(message);
+            TargetPermanent target = new TargetPermanent(filterTarget);
+            target.setTargetController(enteringPermanent.getControllerId());
+            ability.getTargets().add(target);
         }
     }
 

Mage.Sets/src/mage/cards/c/ConqueringManticore.java

@@ -41,6 +41,9 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Duration;
+import mage.constants.TargetController;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -49,8 +52,14 @@ import mage.target.common.TargetCreaturePermanent;
  */
 public class ConqueringManticore extends CardImpl {
 
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.OPPONENT));
+    }
+
     public ConqueringManticore(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{R}");
         this.subtype.add(SubType.MANTICORE);
 
         this.power = new MageInt(5);
@@ -59,9 +68,9 @@ public class ConqueringManticore extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), false);
-        ability.addEffect(new UntapTargetEffect());
+        ability.addEffect(new UntapTargetEffect().setText("Untap that creature"));
-        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
-        ability.addTarget(new TargetCreaturePermanent());
+        ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/c/ConsumeStrength.java

@@ -29,7 +29,9 @@ package mage.cards.c;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -38,6 +40,7 @@ import mage.filter.predicate.mageobject.AnotherTargetPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
 
 /**
  *
@@ -46,17 +49,16 @@ import mage.target.common.TargetCreaturePermanent;
 public class ConsumeStrength extends CardImpl {
 
     public ConsumeStrength(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{B}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}{G}");
-
 
         // Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn.
         this.getSpellAbility().addEffect(new ConsumeStrengthEffect());
-        
+
         FilterCreaturePermanent filter1 = new FilterCreaturePermanent("creature to get +2/+2");
         TargetCreaturePermanent target1 = new TargetCreaturePermanent(filter1);
         target1.setTargetTag(1);
         this.getSpellAbility().addTarget(target1);
-        
+
         FilterCreaturePermanent filter2 = new FilterCreaturePermanent("another creature to get -2/-2");
         filter2.add(new AnotherTargetPredicate(2));
         TargetCreaturePermanent target2 = new TargetCreaturePermanent(filter2);
@@ -74,10 +76,10 @@ public class ConsumeStrength extends CardImpl {
     }
 }
 
-class ConsumeStrengthEffect extends ContinuousEffectImpl {
+class ConsumeStrengthEffect extends OneShotEffect {
 
     public ConsumeStrengthEffect() {
-        super(Duration.EndOfTurn, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature);
+        super(Outcome.BoostCreature);
         this.staticText = "Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn";
     }
 
@@ -94,14 +96,16 @@ class ConsumeStrengthEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(source.getFirstTarget());
         if (permanent != null) {
-            permanent.addPower(2);
+            ContinuousEffect effect = new BoostTargetEffect(2, 2, Duration.EndOfTurn);
-            permanent.addToughness(2);
+            effect.setTargetPointer(new FixedTarget(permanent, game));
+            game.addEffect(effect, source);
         }
         permanent = game.getPermanent(source.getTargets().get(1).getFirstTarget());
         if (permanent != null) {
-            permanent.addPower(-2);
+            ContinuousEffect effect = new BoostTargetEffect(-2, -2, Duration.EndOfTurn);
-            permanent.addToughness(-2);
+            effect.setTargetPointer(new FixedTarget(permanent, game));
+            game.addEffect(effect, source);
         }
         return true;
     }
-}
+}

Mage.Sets/src/mage/cards/d/DakraMystic.java

@@ -52,7 +52,7 @@ import mage.players.Player;
 public class DakraMystic extends CardImpl {
 
     public DakraMystic(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}");
         this.subtype.add(SubType.MERFOLK);
         this.subtype.add(SubType.WIZARD);
 
@@ -63,8 +63,7 @@ public class DakraMystic extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DakraMysticEffect(), new ManaCostsImpl("{U}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
-        
+
-        
     }
 
     public DakraMystic(final DakraMystic card) {
@@ -78,38 +77,38 @@ public class DakraMystic extends CardImpl {
 }
 
 class DakraMysticEffect extends OneShotEffect {
-    
+
     public DakraMysticEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player reveals the top card of his or her library. You may put the revealed cards into their owners graveyard. If you don't, each player draws a card";
+        this.staticText = "Each player reveals the top card of his or her library. You may put the revealed cards into their owners' graveyard. If you don't, each player draws a card";
     }
-    
+
     public DakraMysticEffect(final DakraMysticEffect effect) {
         super(effect);
     }
-    
+
     @Override
     public DakraMysticEffect copy() {
         return new DakraMysticEffect(this);
     }
-    
+
     @Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            for(UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) {
+            for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
                 Player player = game.getPlayer(playerId);
                 if (player != null && player.getLibrary().hasCards()) {
                     player.revealCards(player.getLogName(), new CardsImpl(player.getLibrary().getFromTop(game)), game);
                 }
             }
             if (controller.chooseUse(outcome, "Put revealed cards into graveyard?", source, game)) {
-                for(UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) {
+                for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
-                    Player player = game.getPlayer(playerId);                    
+                    Player player = game.getPlayer(playerId);
                     if (player != null && player.getLibrary().hasCards()) {
                         player.moveCards(player.getLibrary().getFromTop(game), Zone.GRAVEYARD, source, game);
                     }
-                }                
+                }
             } else {
                 new DrawCardAllEffect(1).apply(game, source);
             }

Mage.Sets/src/mage/cards/d/DarienKingOfKjeldor.java

@@ -53,7 +53,7 @@ import mage.players.Player;
 public class DarienKingOfKjeldor extends CardImpl {
 
     public DarienKingOfKjeldor(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}{W}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.SOLDIER);
@@ -74,6 +74,7 @@ public class DarienKingOfKjeldor extends CardImpl {
         return new DarienKingOfKjeldor(this);
     }
 }
+
 class DarienKingOfKjeldorTriggeredAbility extends TriggeredAbilityImpl {
 
     public DarienKingOfKjeldorTriggeredAbility() {
@@ -105,7 +106,7 @@ class DarienKingOfKjeldorTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever you are dealt damage, you may create that many 1/1 white Soldier creature tokens.";
+        return "Whenever you're dealt damage, you may create that many 1/1 white Soldier creature tokens.";
     }
 }
 
@@ -133,4 +134,4 @@ class DarienKingOfKjeldorEffect extends OneShotEffect {
         }
         return false;
     }
-}
+}

Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java

@@ -71,6 +71,7 @@ public class DaughterOfAutumn extends CardImpl {
         // {W}: The next 1 damage that would be dealt to target white creature this turn is dealt to Daughter of Autumn instead.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DaughterOfAutumnPreventDamageTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{W}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
+        this.addAbility(ability);
     }
 
     public DaughterOfAutumn(final DaughterOfAutumn card) {

Mage.Sets/src/mage/cards/d/DazzlingBeauty.java

@@ -0,0 +1,118 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.d;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
+import mage.abilities.common.delayed.AtTheBeginOfNextUpkeepDelayedTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.PhaseStep;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.permanent.AttackingPredicate;
+import mage.filter.predicate.permanent.BlockedPredicate;
+import mage.game.Game;
+import mage.game.combat.CombatGroup;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2 & L_J
+ */
+public class DazzlingBeauty extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("unblocked attacking creature");
+
+    static {
+        filter.add(new AttackingPredicate());
+        filter.add(Predicates.not(new BlockedPredicate()));
+    }
+
+    public DazzlingBeauty(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{W}");
+
+        // Cast Dazzling Beauty only during the declare blockers step.
+        this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(null, PhaseStep.DECLARE_BLOCKERS, null, "Cast Dazzling Beauty only during the declare blockers step"));
+
+        // Target unblocked attacking creature becomes blocked.
+        this.getSpellAbility().addEffect(new DazzlingBeautyEffect());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+
+        // Draw a card at the beginning of the next turn's upkeep.
+        this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false));
+    }
+
+    public DazzlingBeauty(final DazzlingBeauty card) {
+        super(card);
+    }
+
+    @Override
+    public DazzlingBeauty copy() {
+        return new DazzlingBeauty(this);
+    }
+}
+
+class DazzlingBeautyEffect extends OneShotEffect {
+
+    public DazzlingBeautyEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "Target unblocked attacking creature becomes blocked";
+    }
+
+    public DazzlingBeautyEffect(final DazzlingBeautyEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public DazzlingBeautyEffect copy() {
+        return new DazzlingBeautyEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
+        if (controller != null && permanent != null) {
+            CombatGroup combatGroup = game.getCombat().findGroup(permanent.getId());
+            if (combatGroup != null) {
+                combatGroup.setBlocked(true);
+                return true;
+            }
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/d/DecreeOfSilence.java

@@ -45,7 +45,7 @@ import mage.constants.CardType;
 import mage.constants.SetTargetPointer;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import mage.filter.StaticFilters;
+import mage.filter.FilterSpell;
 import mage.target.TargetSpell;
 
 /**
@@ -55,19 +55,19 @@ import mage.target.TargetSpell;
 public class DecreeOfSilence extends CardImpl {
 
     public DecreeOfSilence(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{6}{U}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{6}{U}{U}");
 
         // Whenever an opponent casts a spell, counter that spell and put a depletion counter on Decree of Silence. If there are three or more depletion counters on Decree of Silence, sacrifice it.
         Effect effect = new CounterTargetEffect();
         effect.setText("counter that spell");
-        Ability ability = new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, effect, StaticFilters.FILTER_SPELL,
+        Ability ability = new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, effect, new FilterSpell("a spell"),
-            false, SetTargetPointer.SPELL);
+                false, SetTargetPointer.SPELL);
         effect = new AddCountersSourceEffect(CounterType.DEPLETION.createInstance());
         effect.setText("and put a depletion counter on {this}.");
         ability.addEffect(effect);
         ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(),
-            new SourceHasCounterCondition(CounterType.DEPLETION, 3, Integer.MAX_VALUE),
+                new SourceHasCounterCondition(CounterType.DEPLETION, 3, Integer.MAX_VALUE),
-            " If there are three or more depletion counters on {this}, sacrifice it"));
+                " If there are three or more depletion counters on {this}, sacrifice it"));
         this.addAbility(ability);
         // Cycling {4}{U}{U}
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{4}{U}{U}")));

Mage.Sets/src/mage/cards/d/DeepWater.java

@@ -0,0 +1,120 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.d;
+
+import java.util.UUID;
+import mage.MageObject;
+import mage.Mana;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledPermanent;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.ManaEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author L_J
+ */
+public class DeepWater extends CardImpl {
+
+    public DeepWater(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}");
+
+        // {U}: Until end of turn, if you tap a land you control for mana, it produces {U} instead of any other type.
+        SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DeepWaterReplacementEffect(), new ManaCostsImpl("{U}"));
+        this.addAbility(ability);
+    }
+
+    public DeepWater(final DeepWater card) {
+        super(card);
+    }
+
+    @Override
+    public DeepWater copy() {
+        return new DeepWater(this);
+    }
+}
+
+class DeepWaterReplacementEffect extends ReplacementEffectImpl {
+
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent();
+
+    DeepWaterReplacementEffect() {
+        super(Duration.EndOfTurn, Outcome.Neutral);
+        staticText = "Until end of turn, if you tap a land you control for mana, it produces {U} instead of any other type";
+    }
+
+    DeepWaterReplacementEffect(final DeepWaterReplacementEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public DeepWaterReplacementEffect copy() {
+        return new DeepWaterReplacementEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        ManaEvent manaEvent = (ManaEvent) event;
+        Mana mana = manaEvent.getMana();
+        mana.setToMana(Mana.BlueMana(mana.count()));
+        return false;
+    }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.TAPPED_FOR_MANA;
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        MageObject mageObject = game.getObject(event.getSourceId());
+        if (mageObject != null && mageObject.isLand()) {
+            Permanent land = game.getPermanent(event.getSourceId());
+            return land != null && filter.match(land, game);
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/d/DefiantStand.java

@@ -0,0 +1,76 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.d;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
+import mage.abilities.condition.common.AttackedThisStepCondition;
+import mage.abilities.effects.common.UntapTargetEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.PhaseStep;
+import mage.constants.TurnPhase;
+import mage.target.common.TargetCreaturePermanent;
+import mage.watchers.common.PlayerAttackedStepWatcher;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class DefiantStand extends CardImpl {
+
+    public DefiantStand(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{W}");
+
+        // Cast Defiant Stand only during the declare attackers step and only if you've been attacked this step.
+        Ability ability = new CastOnlyDuringPhaseStepSourceAbility(
+                TurnPhase.COMBAT, PhaseStep.DECLARE_ATTACKERS, AttackedThisStepCondition.instance,
+                "Cast {this} only during the declare attackers step and only if you've been attacked this step."
+        );
+        ability.addWatcher(new PlayerAttackedStepWatcher());
+        this.addAbility(ability);
+
+        // Target creature gets +1/+3 until end of turn. Untap that creature.
+        this.getSpellAbility().addEffect(new BoostTargetEffect(1, 3, Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap that creature"));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+    }
+
+    public DefiantStand(final DefiantStand card) {
+        super(card);
+    }
+
+    @Override
+    public DefiantStand copy() {
+        return new DefiantStand(this);
+    }
+}

Mage.Sets/src/mage/cards/d/DeityOfScars.java

@@ -50,11 +50,10 @@ import mage.counters.CounterType;
 public class DeityOfScars extends CardImpl {
 
     public DeityOfScars(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B/G}{B/G}{B/G}{B/G}{B/G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B/G}{B/G}{B/G}{B/G}{B/G}");
         this.subtype.add(SubType.SPIRIT);
         this.subtype.add(SubType.AVATAR);
 
-
         this.power = new MageInt(7);
         this.toughness = new MageInt(7);
 
@@ -62,7 +61,7 @@ public class DeityOfScars extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // Deity of Scars enters the battlefield with two -1/-1 counters on it.
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(2))));
+        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(2)), "with two -1/-1 counters on it"));
 
         // {B/G}, Remove a -1/-1 counter from Deity of Scars: Regenerate Deity of Scars.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B/G}"));

Mage.Sets/src/mage/cards/d/DementiaSliver.java

@@ -51,7 +51,7 @@ import mage.target.common.TargetOpponent;
  * @author fireshoes
  */
 public class DementiaSliver extends CardImpl {
-    
+
     private static final FilterPermanent filter = new FilterPermanent("All Slivers");
 
     static {
@@ -59,7 +59,7 @@ public class DementiaSliver extends CardImpl {
     }
 
     public DementiaSliver(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{B}");
         this.subtype.add(SubType.SLIVER);
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
@@ -70,7 +70,12 @@ public class DementiaSliver extends CardImpl {
         gainedAbility.addTarget(new TargetOpponent());
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
                 new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter,
-                        "All Slivers have \"{T}: Name a card. Target opponent reveals a card at random from his or her hand. If it's the named card, that player discards it\"")));
+                        "All Slivers have \"{T}: Choose a card name. "
+                        + "Target opponent reveals a card at random from his or her hand."
+                        + " If that card has the chosen name, that player discards it."
+                        + " Activate this ability only during your turn.\""
+                )
+        ));
     }
 
     public DementiaSliver(final DementiaSliver card) {
@@ -98,7 +103,7 @@ class DementiaSliverEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player opponent = game.getPlayer(targetPointer.getFirst(game, source));
         MageObject sourceObject = game.getObject(source.getSourceId());
-        String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY);        
+        String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY);
         if (opponent != null && sourceObject != null && !cardName.isEmpty()) {
             if (!opponent.getHand().isEmpty()) {
                 Cards revealed = new CardsImpl();
@@ -121,4 +126,4 @@ class DementiaSliverEffect extends OneShotEffect {
         return new DementiaSliverEffect(this);
     }
 
-}
+}

Mage.Sets/src/mage/cards/d/DescentOfTheDragons.java

@@ -72,7 +72,7 @@ class DescentOfTheDragonsEffect extends OneShotEffect {
 
     public DescentOfTheDragonsEffect() {
         super(Outcome.Benefit);
-        staticText = "Destroy any number of target creatures.  For each creature destroyed this way, its controller creates a 4/4 red Dragon creature token with flying";
+        staticText = "Destroy any number of target creatures. For each creature destroyed this way, its controller creates a 4/4 red Dragon creature token with flying";
     }
 
     public DescentOfTheDragonsEffect(final DescentOfTheDragonsEffect effect) {

Mage.Sets/src/mage/cards/d/Detritivore.java

@@ -63,7 +63,7 @@ import mage.target.common.TargetNonBasicLandPermanent;
 public class Detritivore extends CardImpl {
 
     public Detritivore(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}");
         this.subtype.add(SubType.LHURGOYF);
 
         this.power = new MageInt(0);
@@ -132,7 +132,6 @@ class NonBasicLandsInOpponentsGraveyards implements DynamicValue {
         filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
     }
 
-
     @Override
     public int calculate(Game game, Ability sourceAbility, Effect effect) {
         int amount = 0;
@@ -162,6 +161,6 @@ class NonBasicLandsInOpponentsGraveyards implements DynamicValue {
 
     @Override
     public String getMessage() {
-        return "the number of nonbasic land cards in your opponents' graveyards";
+        return "nonbasic land cards in your opponents' graveyards";
     }
 }

Mage.Sets/src/mage/cards/d/DictateOfErebos.java

@@ -45,19 +45,19 @@ import mage.filter.predicate.permanent.ControllerPredicate;
  */
 public class DictateOfErebos extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control");
 
     static {
         filter.add(new ControllerPredicate(TargetController.YOU));
     }
 
     public DictateOfErebos(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}");
 
         // Flash
         this.addAbility(FlashAbility.getInstance());
         // Whenever a creature you control dies, each opponent sacrifices a creature.
-        this.addAbility(new DiesCreatureTriggeredAbility(new SacrificeOpponentsEffect(new FilterControlledCreaturePermanent("a creature")), false, filter));
+        this.addAbility(new DiesCreatureTriggeredAbility(new SacrificeOpponentsEffect(new FilterControlledCreaturePermanent("creature")), false, filter));
     }
 
     public DictateOfErebos(final DictateOfErebos card) {

Mage.Sets/src/mage/cards/d/DivineLight.java

@@ -50,10 +50,12 @@ public class DivineLight extends CardImpl {
     }
 
     public DivineLight(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{W}");
 
         // Prevent all damage that would be dealt this turn to creatures you control.
-        this.getSpellAbility().addEffect(new PreventAllDamageToAllEffect(Duration.EndOfTurn, filter));
+        this.getSpellAbility().addEffect(new PreventAllDamageToAllEffect(Duration.EndOfTurn, filter)
+                .setText("Prevent all damage that would be dealt this turn to creatures you control.")
+        );
     }
 
     public DivineLight(final DivineLight card) {

Mage.Sets/src/mage/cards/d/DominusOfFealty.java

@@ -51,17 +51,16 @@ import mage.target.TargetPermanent;
 public class DominusOfFealty extends CardImpl {
 
     public DominusOfFealty(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U/R}{U/R}{U/R}{U/R}{U/R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U/R}{U/R}{U/R}{U/R}{U/R}");
         this.subtype.add(SubType.SPIRIT);
         this.subtype.add(SubType.AVATAR);
 
-
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
         this.addAbility(FlyingAbility.getInstance());
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), TargetController.YOU, true);
-        ability.addEffect(new UntapTargetEffect());
+        ability.addEffect(new UntapTargetEffect().setText("If you do, untap it"));
-        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("and it gains haste until end of turn"));
         ability.addTarget(new TargetPermanent());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/d/DralnusPet.java

@@ -65,7 +65,7 @@ import mage.players.Player;
 public class DralnusPet extends CardImpl {
 
     public DralnusPet(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
         this.subtype.add(SubType.SHAPESHIFTER);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
@@ -77,7 +77,7 @@ public class DralnusPet extends CardImpl {
         this.addAbility(new KickerAbility(kickerCosts));
         // If Dralnu's Pet was kicked, it enters the battlefield with flying and with X +1/+1 counters on it, where X is the discarded card's converted mana cost.
         Ability ability = new EntersBattlefieldAbility(new DralnusPetEffect(), KickedCondition.instance,
-                "If {this} was kicked, it enters the battlefield with flying and with X +1/+1 counters on it, where X is the discarded card's converted mana cost", "");
+                "If {this} was kicked, it enters the battlefield with flying and with X +1/+1 counters on it, where X is the discarded card's converted mana cost.", "");
         ability.addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield));
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/d/DreamcallerSiren.java

@@ -84,7 +84,7 @@ public class DreamcallerSiren extends CardImpl {
         ability.addTarget(new TargetNonlandPermanent(0, 2, false));
         this.addAbility(new ConditionalTriggeredAbility(ability,
                 new PermanentsOnTheBattlefieldCondition(filter),
-                "when {this} enters the battlefield, if you control another Pirate, tap up to two nonland permanents."));
+                "when {this} enters the battlefield, if you control another Pirate, tap up to two target nonland permanents."));
     }
 
     public DreamcallerSiren(final DreamcallerSiren card) {

Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java

@@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
  */
 public class DroverOfTheMighty extends CardImpl {
 
-    private static final FilterPermanent filter = new FilterPermanent("a Dinosaur");
+    private static final FilterPermanent filter = new FilterPermanent("Dinosaur");
 
     static {
         filter.add(new SubtypePredicate(SubType.DINOSAUR));

Mage.Sets/src/mage/cards/d/DuergarMineCaptain.java

@@ -45,12 +45,12 @@ import mage.filter.common.FilterAttackingCreature;
 /**
  *
  * @author jeffwadsworth
-
+ *
  */
 public class DuergarMineCaptain extends CardImpl {
 
     public DuergarMineCaptain(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R/W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R/W}");
         this.subtype.add(SubType.DWARF);
         this.subtype.add(SubType.SOLDIER);
 
@@ -58,10 +58,13 @@ public class DuergarMineCaptain extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {1}{RW}, {untap}: Attacking creatures get +1/+0 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 0, Duration.EndOfTurn, new FilterAttackingCreature(), false), new ManaCostsImpl("{1}{R/W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
+                new BoostAllEffect(1, 0, Duration.EndOfTurn, new FilterAttackingCreature("attacking creatures"), false),
+                new ManaCostsImpl("{1}{R/W}")
+        );
         ability.addCost(new UntapSourceCost());
         this.addAbility(ability);
-        
+
     }
 
     public DuergarMineCaptain(final DuergarMineCaptain card) {

Mage.Sets/src/mage/cards/d/DutifulAttendant.java

@@ -46,14 +46,14 @@ import mage.target.common.TargetCardInYourGraveyard;
  */
 public class DutifulAttendant extends CardImpl {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("another creature card from your graveyard");
+    private static final FilterCreatureCard filter = new FilterCreatureCard("another target creature card from your graveyard");
 
     static {
         filter.add(new AnotherCardPredicate());
     }
 
     public DutifulAttendant(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.WARRIOR);
         this.power = new MageInt(1);

Mage.Sets/src/mage/cards/d/DwarvenPatrol.java

@@ -46,18 +46,18 @@ import mage.filter.predicate.mageobject.ColorPredicate;
 /**
  *
  * @author LoneFox
-
+ *
  */
 public class DwarvenPatrol extends CardImpl {
 
-    private static final FilterSpell filter = new FilterSpell("nonred spell");
+    private static final FilterSpell filter = new FilterSpell("a nonred spell");
 
     static {
         filter.add(Predicates.not(new ColorPredicate(ObjectColor.RED)));
     }
 
     public DwarvenPatrol(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
         this.subtype.add(SubType.DWARF);
         this.power = new MageInt(4);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/e/Earthlore.java

@@ -0,0 +1,104 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.e;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
+import mage.abilities.condition.common.AttachedToMatchesFilterCondition;
+import mage.abilities.condition.common.MyTurnCondition;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.common.TapAttachedCost;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.Outcome;
+import mage.constants.Duration;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterBlockingCreature;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetControlledPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author L_J
+ */
+public class Earthlore extends CardImpl {
+
+    private static final FilterControlledPermanent filterLand = new FilterControlledPermanent("land you control");
+
+    static {
+        filterLand.add(new CardTypePredicate(CardType.LAND));
+    }
+
+    private static final FilterPermanent filterUntapped = new FilterPermanent("enchanted land is untapped");
+    
+    static {
+        filterUntapped.add(Predicates.not(new TappedPredicate()));
+    }
+
+    public Earthlore(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}");
+        this.subtype.add(SubType.AURA);
+
+        // Enchant land you control
+        TargetPermanent auraTarget = new TargetControlledPermanent(filterLand);
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
+        Ability ability = new EnchantAbility(auraTarget.getTargetName());
+        this.addAbility(ability);
+
+        // Tap enchanted land: Target blocking creature gets +1/+2 until end of turn. Activate this ability only if enchanted land is untapped.
+        Cost cost = new TapAttachedCost();
+        cost.setText("Tap enchanted land");
+        Ability ability2 = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD,
+                new BoostTargetEffect(1, 2, Duration.EndOfTurn), cost, new AttachedToMatchesFilterCondition(filterUntapped));
+        ability2.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature("blocking creature")));
+        this.addAbility(ability2);
+
+    }
+
+    public Earthlore(final Earthlore card) {
+        super(card);
+    }
+
+    @Override
+    public Earthlore copy() {
+        return new Earthlore(this);
+    }
+}

Mage.Sets/src/mage/cards/e/EchoChamber.java

@@ -0,0 +1,113 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.e;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.DelayedTriggeredAbility;
+import mage.abilities.common.ActivateAsSorceryActivatedAbility;
+import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.ExileTargetEffect;
+import mage.abilities.effects.common.CreateTokenCopyTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.target.common.TargetOpponentsChoicePermanent;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author L_J
+ */
+public class EchoChamber extends CardImpl {
+
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
+
+    public EchoChamber(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
+
+        // {4}, {tap}: An opponent chooses target creature he or she controls. Create a token that's a copy of that creature. That token gains haste until end of turn. Exile the token at the beginning of the next end step. Activate this ability only any time you could cast a sorcery.
+        Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new EchoChamberCreateTokenEffect(), new GenericManaCost(4));
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetOpponentsChoicePermanent(1, 1, filter, false, true));
+        this.addAbility(ability);
+    }
+
+    public EchoChamber(final EchoChamber card) {
+        super(card);
+    }
+
+    @Override
+    public EchoChamber copy() {
+        return new EchoChamber(this);
+    }
+}
+
+class EchoChamberCreateTokenEffect extends OneShotEffect {
+
+    EchoChamberCreateTokenEffect() {
+        super(Outcome.Copy);
+        this.staticText = "An opponent chooses target creature he or she controls. Create a token that's a copy of that creature. That token gains haste until end of turn. Exile the token at the beginning of the next end step";
+    }
+
+    EchoChamberCreateTokenEffect(final EchoChamberCreateTokenEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public EchoChamberCreateTokenEffect copy() {
+        return new EchoChamberCreateTokenEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent copiedPermanent = game.getPermanent(this.getTargetPointer().getFirst(game, source));
+        if (copiedPermanent != null) {
+            CreateTokenCopyTargetEffect effect = new CreateTokenCopyTargetEffect(null, CardType.CREATURE, true);
+            if (effect.apply(game, source)) {
+                for (Permanent copyPermanent : effect.getAddedPermanent()) {
+                    ExileTargetEffect exileEffect = new ExileTargetEffect();
+                    exileEffect.setTargetPointer(new FixedTarget(copyPermanent, game));
+                    DelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(exileEffect);
+                    game.addDelayedTriggeredAbility(delayedAbility, source);
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/e/EightfoldMaze.java

@@ -0,0 +1,73 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.e;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
+import mage.abilities.condition.common.AttackedThisStepCondition;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.PhaseStep;
+import mage.constants.TurnPhase;
+import mage.target.common.TargetAttackingCreature;
+import mage.watchers.common.PlayerAttackedStepWatcher;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class EightfoldMaze extends CardImpl {
+
+    public EightfoldMaze(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{W}");
+
+        // Cast Eightfold Maze only during the declare attackers step and only if you've been attacked this step.
+        Ability ability = new CastOnlyDuringPhaseStepSourceAbility(
+                TurnPhase.COMBAT, PhaseStep.DECLARE_ATTACKERS, AttackedThisStepCondition.instance,
+                "Cast {this} only during the declare attackers step and only if you've been attacked this step."
+        );
+        ability.addWatcher(new PlayerAttackedStepWatcher());
+        this.addAbility(ability);
+
+        // Destroy target attacking creature.
+        this.getSpellAbility().addEffect(new DestroyTargetEffect());
+        this.getSpellAbility().addTarget(new TargetAttackingCreature());
+    }
+
+    public EightfoldMaze(final EightfoldMaze card) {
+        super(card);
+    }
+
+    @Override
+    public EightfoldMaze copy() {
+        return new EightfoldMaze(this);
+    }
+}

Mage.Sets/src/mage/cards/e/EldraziObligator.java

@@ -55,7 +55,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class EldraziObligator extends CardImpl {
 
     public EldraziObligator(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
         this.subtype.add(SubType.ELDRAZI);
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
@@ -65,15 +65,15 @@ public class EldraziObligator extends CardImpl {
 
         // Haste
         this.addAbility(HasteAbility.getInstance());
-                        
+
         DoIfCostPaid costPaidEffect = new DoIfCostPaid(new GainControlTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{C}"));
         Effect untapEffect = new UntapTargetEffect();
-        untapEffect.setText("Untap that creature");        
+        untapEffect.setText("untap that creature,");
         Effect hasteEffect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn);
-        hasteEffect.setText("It gains haste until end of turn");
+        hasteEffect.setText("and it gains haste until end of turn");
         costPaidEffect.addEffect(untapEffect);
-        costPaidEffect.addEffect(hasteEffect);        
+        costPaidEffect.addEffect(hasteEffect);
-            
+
         // When you cast Eldrazi Obligator, you may pay {1}{C}. If you do, gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
         Ability ability = new CastSourceTriggeredAbility(costPaidEffect);
 

Mage.Sets/src/mage/cards/e/EnergyArc.java

@@ -0,0 +1,67 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.e;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.PreventDamageByTargetEffect;
+import mage.abilities.effects.common.PreventDamageToTargetEffect;
+import mage.abilities.effects.common.UntapTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Zone;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author L_J
+ */
+public class EnergyArc extends CardImpl {
+
+    public EnergyArc(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}{U}");
+
+        // Untap any number of target creatures. Prevent all combat damage that would be dealt to and dealt by those creatures this turn.
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE));
+        this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap any number of target creatures. "));
+        this.getSpellAbility().addEffect(new PreventDamageByTargetEffect(Duration.EndOfTurn, true).setText("Prevent all combat damage that would be dealt to "));
+        this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, true).setText("and dealt by those creatures this turn."));
+    }
+
+    public EnergyArc(final EnergyArc card) {
+        super(card);
+    }
+
+    @Override
+    public EnergyArc copy() {
+        return new EnergyArc(this);
+    }
+}

Mage.Sets/src/mage/cards/e/EnergyTap.java

@@ -56,9 +56,9 @@ public class EnergyTap extends CardImpl {
     }
 
     public EnergyTap(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{U}");
 
-        // Tap target untapped creature you control. If you do, add X mana of {C} to your mana pool, where X is that creature's converted mana cost.
+        // Tap target untapped creature you control. If you do, add an amount of {C} to your mana pool equal to that creature's converted mana cost.
         this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(filter));
         this.getSpellAbility().addEffect(new EnergyTapEffect());
     }
@@ -77,7 +77,7 @@ class EnergyTapEffect extends OneShotEffect {
 
     EnergyTapEffect() {
         super(Outcome.PutManaInPool);
-        this.staticText = "Tap target untapped creature you control. If you do, add X mana of {C} to your mana pool, where X is that creature's converted mana cost";
+        this.staticText = "Tap target untapped creature you control. If you do, add an amount of {C} to your mana pool equal to that creature's converted mana cost";
     }
 
     EnergyTapEffect(final EnergyTapEffect effect) {
@@ -106,4 +106,4 @@ class EnergyTapEffect extends OneShotEffect {
         }
         return applied;
     }
-}
+}

Mage.Sets/src/mage/cards/e/EnsnaringBridge.java

@@ -47,7 +47,7 @@ import mage.players.Player;
 public class EnsnaringBridge extends CardImpl {
 
     public EnsnaringBridge(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
 
         // Creatures with power greater than the number of cards in your hand can't attack.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EnsnaringBridgeRestrictionEffect()));
@@ -63,7 +63,6 @@ public class EnsnaringBridge extends CardImpl {
     }
 }
 
-
 class EnsnaringBridgeRestrictionEffect extends RestrictionEffect {
 
     public EnsnaringBridgeRestrictionEffect() {
@@ -78,10 +77,11 @@ class EnsnaringBridgeRestrictionEffect extends RestrictionEffect {
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
         Player controller = game.getPlayer(source.getControllerId());
-        if (controller != null) {
+        if (controller == null) {
-            return permanent.getPower().getValue() > controller.getHand().size();
+            return false;
         }
-        return false;
+        return controller.getInRange().contains(permanent.getControllerId())
+                && permanent.getPower().getValue() > controller.getHand().size();
     }
 
     @Override

Mage.Sets/src/mage/cards/e/EntropicSpecter.java

@@ -52,7 +52,7 @@ import mage.players.Player;
 public class EntropicSpecter extends CardImpl {
 
     public EntropicSpecter(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");
         this.subtype.add(SubType.SPECTER);
         this.subtype.add(SubType.SPIRIT);
 
@@ -105,7 +105,7 @@ class CardsInTargetPlayerHandCount implements DynamicValue {
 
     @Override
     public String getMessage() {
-        return "cards in chosen opponents hand";
+        return "cards in the chosen player's hand";
     }
 
     @Override

Mage.Sets/src/mage/cards/e/EssenceFilter.java

@@ -0,0 +1,108 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.e;
+
+import java.util.UUID;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.filter.StaticFilters;
+import mage.filter.common.FilterEnchantmentPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author LevelX2 & L_J
+ */
+public class EssenceFilter extends CardImpl {
+
+    public EssenceFilter(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{G}{G}");
+
+        // Destroy all enchantments or all nonwhite enchantments.
+        this.getSpellAbility().addEffect(new EssenceFilterEffect());
+    }
+
+    public EssenceFilter(final EssenceFilter card) {
+        super(card);
+    }
+
+    @Override
+    public EssenceFilter copy() {
+        return new EssenceFilter(this);
+    }
+}
+
+class EssenceFilterEffect extends OneShotEffect {
+
+    private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("nonwhite enchantments");
+
+    static {
+        filter.add(Predicates.not(new ColorPredicate(ObjectColor.WHITE)));
+    }
+
+    public EssenceFilterEffect() {
+        super(Outcome.Detriment);
+        this.staticText = "Destroy all enchantments or all nonwhite enchantments";
+    }
+
+    public EssenceFilterEffect(final EssenceFilterEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public EssenceFilterEffect copy() {
+        return new EssenceFilterEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller != null) {
+            if (controller.chooseUse(outcome, "Destroy all enchantments? (otherwise all nonwhite enchantments are destroyed)", source, game)) {
+                for (Permanent permanent : game.getBattlefield().getActivePermanents(new FilterEnchantmentPermanent(), controller.getId(), source.getSourceId(), game)) {
+                    permanent.destroy(source.getSourceId(), game, false);
+                }
+            } else {
+                for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, controller.getId(), source.getSourceId(), game)) {
+                    permanent.destroy(source.getSourceId(), game, false);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/e/EssenceFlare.java

@@ -0,0 +1,80 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.e;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
+import mage.abilities.effects.common.counter.AddCountersAttachedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.Outcome;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.counters.BoostCounter;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LoneFox & L_J
+ */
+public class EssenceFlare extends CardImpl {
+
+    public EssenceFlare(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}");
+        this.subtype.add(SubType.AURA);
+
+        // Enchant creature
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
+        Ability ability = new EnchantAbility(auraTarget.getTargetName());
+        this.addAbility(ability);
+        // Enchanted creature gets +2/+0.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0)));
+        // At the beginning of the upkeep of enchanted creature's controller, put a -0/-1 counter on that creature.
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAttachedEffect(new BoostCounter(0, -1), "that creature"),
+            TargetController.CONTROLLER_ATTACHED_TO, false));
+    }
+
+    public EssenceFlare(final EssenceFlare card) {
+        super(card);
+    }
+
+    @Override
+    public EssenceFlare copy() {
+        return new EssenceFlare(this);
+    }
+}

Mage.Sets/src/mage/cards/e/Evangelize.java

@@ -53,7 +53,7 @@ public class Evangelize extends CardImpl {
 
         // Gain control of target creature of an opponent's choice that he or she controls.
         GainControlTargetEffect effect = new GainControlTargetEffect(Duration.EndOfGame);
-        effect.setText("Gain control of target creature of an opponent's choice that he or she controls");
+        effect.setText("Gain control of target creature of an opponent's choice he or she controls");
         this.getSpellAbility().addEffect(effect);
         this.getSpellAbility().addTarget(new TargetOpponentsChoicePermanent(1, 1, filter, false, true));
     }

Mage.Sets/src/mage/cards/e/EvasiveAction.java

@@ -32,6 +32,7 @@ import mage.abilities.dynamicvalue.common.DomainValue;
 import mage.abilities.effects.common.CounterUnlessPaysEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.target.TargetSpell;
 
@@ -42,11 +43,12 @@ import mage.target.TargetSpell;
 public class EvasiveAction extends CardImpl {
 
     public EvasiveAction(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
 
         // Domain - Counter target spell unless its controller pays {1} for each basic land type among lands you control.
         this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new DomainValue()));
         this.getSpellAbility().addTarget(new TargetSpell());
+        this.getSpellAbility().setAbilityWord(AbilityWord.DOMAIN);
     }
 
     public EvasiveAction(final EvasiveAction card) {

Mage.Sets/src/mage/cards/e/ExoticCurse.java

@@ -28,6 +28,7 @@
 package mage.cards.e;
 
 import java.util.UUID;
+import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.dynamicvalue.common.DomainValue;
@@ -37,6 +38,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Duration;
@@ -51,7 +53,7 @@ import mage.target.TargetPermanent;
 public class ExoticCurse extends CardImpl {
 
     public ExoticCurse(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}");
         this.subtype.add(SubType.AURA);
 
         // Enchant creature
@@ -62,8 +64,9 @@ public class ExoticCurse extends CardImpl {
 
         // Domain - Enchanted creature gets -1/-1 for each basic land type among lands you control.
         DynamicValue unboost = new SignInversionDynamicValue(new DomainValue());
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
+        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(unboost, unboost, Duration.WhileOnBattlefield));
-                new BoostEnchantedEffect(unboost, unboost, Duration.WhileOnBattlefield)));
+        ability.setAbilityWord(AbilityWord.DOMAIN);
+        this.addAbility(ability);
     }
 
     public ExoticCurse(final ExoticCurse card) {

Mage.Sets/src/mage/cards/f/FatalFrenzy.java

@@ -55,11 +55,15 @@ import mage.target.targetpointer.FixedTarget;
 public class FatalFrenzy extends CardImpl {
 
     public FatalFrenzy(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{R}");
 
         // Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)
-        this.getSpellAbility().addEffect(new BoostTargetEffect(new TargetPermanentPowerCount(), new StaticValue(0), Duration.EndOfTurn, true));
+                .setText("Until end of turn, target creature you control gains trample")
+        );
+        this.getSpellAbility().addEffect(new BoostTargetEffect(new TargetPermanentPowerCount(), new StaticValue(0), Duration.EndOfTurn, true)
+                .setText("and gets +X/+0, where X is its power.")
+        );
         this.getSpellAbility().addEffect(new FatalFrenzyEffect());
         this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
 

Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java

@@ -76,7 +76,7 @@ public class FathomFleetCaptain extends CardImpl {
         this.addAbility(new ConditionalTriggeredAbility(
                 new AttacksTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new PirateToken()), new GenericManaCost(2)), false),
                 new PermanentsOnTheBattlefieldCondition(filter),
-                "Whenever {this} attacks, if you control another nontoken Pirate, you may pay {2}. If you do, creature a 2/2 black Pirate creature token with menace"));
+                "Whenever {this} attacks, if you control another nontoken Pirate, you may pay {2}. If you do, create a 2/2 black Pirate creature token with menace"));
     }
 
     public FathomFleetCaptain(final FathomFleetCaptain card) {

Mage.Sets/src/mage/cards/f/FieryBombardment.java

@@ -37,6 +37,7 @@ import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
@@ -54,15 +55,14 @@ import mage.target.common.TargetCreatureOrPlayer;
 public class FieryBombardment extends CardImpl {
 
     public FieryBombardment(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}");
-
 
         // Chroma - {2}, Sacrifice a creature: Fiery Bombardment deals damage to target creature or player equal to the number of red mana symbols in the sacrificed creature's mana cost.
         Effect effect = new FieryBombardmentEffect();
-        effect.setText("<i>Chroma</i> - Fiery Bombardment deals damage to target creature or player equal to the number of red mana symbols in the sacrificed creature's mana cost.");
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent()));
         ability.addTarget(new TargetCreatureOrPlayer());
+        ability.setAbilityWord(AbilityWord.CHROMA);
         this.addAbility(ability);
 
     }
@@ -81,6 +81,7 @@ class FieryBombardmentEffect extends OneShotEffect {
 
     public FieryBombardmentEffect() {
         super(Outcome.Benefit);
+        staticText = "{this} deals damage to target creature or player equal to the number of red mana symbols in the sacrificed creature's mana cost.";
     }
 
     public FieryBombardmentEffect(final FieryBombardmentEffect effect) {
@@ -117,4 +118,4 @@ class FieryBombardmentEffect extends OneShotEffect {
         }
         return true;
     }
-}
+}

Mage.Sets/src/mage/cards/f/FireAtWill.java

@@ -54,11 +54,10 @@ public class FireAtWill extends CardImpl {
     }
 
     public FireAtWill(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R/W}{R/W}{R/W}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R/W}{R/W}{R/W}");
-
 
         // Fire at Will deals 3 damage divided as you choose among one, two, or three target attacking or blocking creatures.
-        this.getSpellAbility().addEffect(new DamageMultiEffect(3));
+        this.getSpellAbility().addEffect(new DamageMultiEffect(3).setText("{this} deals 3 damage divided as you choose among one, two, or three target attacking or blocking creatures."));
         this.getSpellAbility().addTarget(new TargetCreaturePermanentAmount(3, filter));
 
     }

Mage.Sets/src/mage/cards/f/FirebrandRanger.java

@@ -57,7 +57,7 @@ import mage.target.common.TargetCardInHand;
 public class FirebrandRanger extends CardImpl {
 
     public FirebrandRanger(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.SOLDIER);
         this.power = new MageInt(2);
@@ -80,7 +80,7 @@ public class FirebrandRanger extends CardImpl {
 }
 
 class PutLandOnBattlefieldEffect extends OneShotEffect {
-    
+
     private static final FilterCard filter = new FilterCard("basic land card");
 
     static {
@@ -91,7 +91,7 @@ class PutLandOnBattlefieldEffect extends OneShotEffect {
 
     public PutLandOnBattlefieldEffect() {
         super(Outcome.PutLandInPlay);
-        this.staticText = "put a basic land card from your hand onto the battlefield";
+        this.staticText = "you may put a basic land card from your hand onto the battlefield";
     }
 
     public PutLandOnBattlefieldEffect(final PutLandOnBattlefieldEffect effect) {
@@ -120,4 +120,4 @@ class PutLandOnBattlefieldEffect extends OneShotEffect {
         }
         return false;
     }
-}
+}

Mage.Sets/src/mage/cards/f/FirewakeSliver.java

@@ -53,32 +53,32 @@ import mage.target.common.TargetCreaturePermanent;
  */
 public class FirewakeSliver extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All sliver creatures");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures");
     private static final FilterCreaturePermanent targetSliverFilter = new FilterCreaturePermanent("Sliver");
 
     static {
         filter.add(new SubtypePredicate(SubType.SLIVER));
         targetSliverFilter.add(new SubtypePredicate(SubType.SLIVER));
     }
-    
+
     public FirewakeSliver(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{G}");
         this.subtype.add(SubType.SLIVER);
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
         // All Sliver creatures have haste.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false)));        
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false)));
-        
+
         // All Slivers have "{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn."
-        Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2,2,Duration.EndOfTurn), new GenericManaCost(1));
+        Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(1));
         gainedAbility.addCost(new SacrificeSourceCost());
         gainedAbility.addTarget(new TargetCreaturePermanent(targetSliverFilter));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(
                 gainedAbility, Duration.WhileOnBattlefield,
-                filter, "All Slivers have \"{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn.\"")));                
+                filter, "All Slivers have \"{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn.\"")));
-        
+
     }
 
     public FirewakeSliver(final FirewakeSliver card) {

Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java

@@ -53,14 +53,14 @@ public class FlagstonesOfTrokair extends CardImpl {
     }
 
     public FlagstonesOfTrokair(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
         addSuperType(SuperType.LEGENDARY);
 
         // {tap}: Add {W} to your mana pool.
         this.addAbility(new WhiteManaAbility());
 
         // When Flagstones of Trokair is put into a graveyard from the battlefield, you may search your library for a Plains card and put it onto the battlefield tapped. If you do, shuffle your library.
-        this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(FILTER), true, true), true));
+        this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(FILTER), true, false), true));
     }
 
     public FlagstonesOfTrokair(final FlagstonesOfTrokair card) {

Mage.Sets/src/mage/cards/f/FlashConscription.java

@@ -59,11 +59,14 @@ public class FlashConscription extends CardImpl {
 
         // Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. If {W} was spent to cast Flash Conscription, the creature gains "Whenever this creature deals combat damage, you gain that much life" until end of turn.
         this.getSpellAbility().addEffect(new UntapTargetEffect());
-        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
-        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
+        this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("That creature gains haste until end of turn"));
         this.getSpellAbility().addEffect(new ConditionalContinuousEffect(
                 new GainAbilityTargetEffect(new FlashConscriptionTriggeredAbility(), Duration.EndOfTurn),
-                new ManaWasSpentCondition(ColoredManaSymbol.W), "If {W} was spent to cast {this}, the creature gains \"Whenever this creature deals combat damage, you gain that much life\" until end of turn"));
+                new ManaWasSpentCondition(ColoredManaSymbol.W),
+                "If {W} was spent to cast {this}, the creature gains "
+                + "\"Whenever this creature deals combat damage, you gain that much life\" until end of turn"
+        ));
 
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }

Mage.Sets/src/mage/cards/f/FlowstoneChanneler.java

@@ -31,7 +31,7 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.DiscardTargetCost;
+import mage.abilities.costs.common.DiscardCardCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.Effect;
@@ -43,7 +43,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
-import mage.target.common.TargetCardInHand;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -69,7 +68,7 @@ public class FlowstoneChanneler extends CardImpl {
         ability.addEffect(effect);
         ability.addTarget(new TargetCreaturePermanent());
         ability.addCost(new TapSourceCost());
-        ability.addCost(new DiscardTargetCost(new TargetCardInHand()));
+        ability.addCost(new DiscardCardCost());
         this.addAbility(ability);
     }