Merge pull request #3 from ilcartographer/cardImplementations

Card implementations

Mage.Sets/src/mage/sets/commander/Fertilid.java

@@ -36,12 +36,15 @@ import mage.abilities.costs.common.RemoveCountersSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
+import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.filter.common.FilterBasicLandCard;
+import mage.game.Game;
+import mage.players.Player;
 import mage.target.TargetPlayer;
 import mage.target.common.TargetCardInLibrary;
 
@@ -61,7 +64,7 @@ public class Fertilid extends CardImpl {
         // Fertilid enters the battlefield with two +1/+1 counters on it.
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it"));
         // {1}{G}, Remove a +1/+1 counter from Fertilid: Target player searches his or her library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles his or her library.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), true, true), new ManaCostsImpl("{1}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FertilidEffect(new TargetCardInLibrary(new FilterBasicLandCard()), true, true), new ManaCostsImpl("{1}{G}"));
         ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -76,3 +79,47 @@ public class Fertilid extends CardImpl {
         return new Fertilid(this);
     }
 }
+
+class FertilidEffect extends SearchLibraryPutInPlayEffect {
+    
+    public FertilidEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle) {
+        super(target, tapped, forceShuffle);
+        
+        this.staticText = "Target player searches his or her library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles his or her library.";
+    }
+    
+    public FertilidEffect(final FertilidEffect effect) {
+        super(effect);
+    }
+    
+    @Override
+    public FertilidEffect copy() {
+        return new FertilidEffect(this);
+    }
+    
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(targetPointer.getFirst(game, source));
+        
+        if (player != null) {
+            if (player.searchLibrary(target, game)) {
+                if (target.getTargets().size() > 0) {
+                    for (UUID cardId: target.getTargets()) {
+                        Card card = player.getLibrary().getCard(cardId, game);
+                        if (card != null) {
+                            player.putOntoBattlefieldWithInfo(card, game, Zone.LIBRARY, source.getSourceId(), tapped);
+                        }
+                    }
+                }
+                player.shuffleLibrary(game);
+                return true;
+            }
+            
+            if (forceShuffle) {
+                player.shuffleLibrary(game);
+            }
+        }
+        
+        return false;
+    }
+}

Mage.Sets/src/mage/sets/lorwyn/AquitectsWill.java

@@ -0,0 +1,109 @@
+/*
+ *  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.sets.lorwyn;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
+import mage.abilities.decorator.ConditionalOneShotEffect;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.continuous.BecomesBasicLandTargetEffect;
+import mage.abilities.effects.common.counter.AddCountersTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.counters.CounterType;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetLandPermanent;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AquitectsWill extends CardImpl {
+    private static final String rule = "land is an Island in addition to its other types for as long as it has a flood counter on it.";
+
+    public AquitectsWill(UUID ownerId) {
+        super(ownerId, 52, "Aquitect's Will", Rarity.COMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{U}");
+        this.expansionSetCode = "LRW";
+        this.subtype.add("Merfolk");
+
+        // Put a flood counter on target land. That land is an Island in addition to its other types for as long as it has a flood counter on it. If you control a Merfolk, draw a card.
+        // Add the flood counter to target land
+        this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.FLOOD.createInstance()));
+        this.getSpellAbility().addTarget(new TargetLandPermanent());
+        
+        // Add the Flood counter effect
+        this.getSpellAbility().addEffect(new AquitectsWillEffect(Duration.Custom, false, false, "Island"));
+        
+        // Draw if you control a Merfolk
+        this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
+                new DrawCardSourceControllerEffect(1), 
+                new PermanentsOnTheBattlefieldCondition(new FilterControlledCreaturePermanent("Merfolk", "Merfolk")),
+                "If you control a Merfolk, draw a card"));
+    }
+
+    public AquitectsWill(final AquitectsWill card) {
+        super(card);
+    }
+
+    @Override
+    public AquitectsWill copy() {
+        return new AquitectsWill(this);
+    }
+}
+
+class AquitectsWillEffect extends BecomesBasicLandTargetEffect {
+
+    public AquitectsWillEffect(Duration duration, boolean chooseLandType, boolean loseType, String... landNames) {
+        super(duration, chooseLandType, loseType, landNames);
+    }
+
+    public AquitectsWillEffect(final AquitectsWillEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean isInactive(Ability source, Game game) {
+        Permanent land = game.getPermanent(this.targetPointer.getFirst(game, source));
+        if (land != null && land.getCounters().getCount(CounterType.FLOOD) < 1) {
+            this.discard();
+            return true;
+        }
+        
+        return false;
+    }
+
+    @Override
+    public AquitectsWillEffect copy() {
+        return new AquitectsWillEffect(this);
+    }
+}

Mage/src/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java

@@ -59,6 +59,7 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
 
     protected boolean chooseLandType;
     protected ArrayList<String> landTypes = new ArrayList();
+    protected boolean loseOther;  // loses all other abilities, card types, and creature types
 
     public BecomesBasicLandTargetEffect(Duration duration) {
         this(duration, true, new String[0]);
@@ -69,10 +70,15 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
     }
 
     public BecomesBasicLandTargetEffect(Duration duration, boolean chooseLandType, String... landNames) {
+        this(duration, chooseLandType, true, landNames);
+    }
+    
+    public BecomesBasicLandTargetEffect(Duration duration, boolean chooseLandType, boolean loseOther, String... landNames) {
         super(duration, Outcome.Detriment);
         this.landTypes.addAll(Arrays.asList(landNames));
         this.chooseLandType = chooseLandType;
         this.staticText = setText();
+        this.loseOther = loseOther;
 
     }
 
@@ -105,6 +111,19 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
                 this.discard();
             }
         }
+        
+        if(!loseOther) {
+            for (UUID targetPermanent : targetPointer.getTargets(game, source)) {
+                Permanent land = game.getPermanent(targetPermanent);
+                if (land != null) {
+                    for(String type : land.getSubtype()) {
+                        if(!landTypes.contains(type)) {
+                            landTypes.add(type);
+                        }
+                    }
+                }
+            }
+        }
     }
 
     @Override

Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java

@@ -45,8 +45,8 @@ import mage.target.common.TargetCardInLibrary;
  */
 public class SearchLibraryPutInPlayEffect extends SearchEffect {
 
-    private boolean tapped;
-    private boolean forceShuffle;
+    protected boolean tapped;
+    protected boolean forceShuffle;
 
     public SearchLibraryPutInPlayEffect(TargetCardInLibrary target) {
         this(target, false, true, Outcome.PutCardInPlay);

Mage/src/mage/counters/CounterType.java

@@ -53,6 +53,7 @@ public enum CounterType {
     FADE("fade"),
     FATE("fate"),
     FEATHER("feather"),
+    FLOOD("flood"),
     FUSE("fuse"),
     HATCHLING("hatchling"),
     HOOFPRINT("hoofprint"),