Added Sentinel, Wakestone Gargoyle, Silhana Starfletcher and Orchard Warden.

Mage.Client/serverlist.txt

@@ -1,5 +1,5 @@
 woogerworks   (Version 1.3.0 dev 2014-10-29V2) :xmage.woogerworks.com:17171
-XMage.info 1  (Version 1.3.0 dev 2014-11-29v3) :176.31.186.181:17171
+XMage.info 1  (Version 1.3.0 dev 2014-11-29v4) :176.31.186.181:17171
 XMage.info 2  (Version 1.3.0 dev 2014-11-29V4) :176.31.186.181:17000
 Seedds Server (Version 1.3.0 dev 2014-11-29v2) :115.29.203.80:17171
 localhost -> connect to your local server (must be started):localhost:17171

Mage.Sets/src/mage/sets/apocalypse/Cromat.java

@@ -70,7 +70,7 @@ public class Cromat extends CardImpl {
         this.toughness = new MageInt(5);
 
         // {W}{B}: Destroy target creature blocking or blocked by Cromat.
-        FilterCreaturePermanent filter = new FilterCreaturePermanent("creature blocking or blocked by {this}");
+        FilterCreaturePermanent filter = new FilterCreaturePermanent("creature blocking or blocked by Cromat");
         filter.add(Predicates.or(new BlockedByIdPredicate(this.getId()),
                                  new BlockingAttackerIdPredicate(this.getId())));        
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{W}{B}"));

Mage.Sets/src/mage/sets/coldsnap/MishrasBauble.java

@@ -57,7 +57,7 @@ public class MishrasBauble extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryTopCardTargetPlayerEffect(), new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addEffect(new CreateDelayedTriggeredAbilityEffect(
-                new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1), Duration.OneUse)));
+                new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1), Duration.OneUse), false));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/sets/conspiracy/WakestoneGargoyle.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.sets.conspiracy;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.combat.CanAttackAsThoughtItDidntHaveDefenderAllEffect;
+import mage.abilities.keyword.DefenderAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.mageobject.AbilityPredicate;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class WakestoneGargoyle extends CardImpl {
+
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control with defender");
+    
+    static {
+        filter.add(new AbilityPredicate(DefenderAbility.class));
+    }
+    
+    public WakestoneGargoyle(UUID ownerId) {
+        super(ownerId, 88, "Wakestone Gargoyle", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}");
+        this.expansionSetCode = "CNS";
+        this.subtype.add("Gargoyle");
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(4);
+
+        // Defender
+        this.addAbility(DefenderAbility.getInstance());
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+        // {1}{W}: Creatures you control with defender can attack this turn as though they didn't have defender.
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughtItDidntHaveDefenderAllEffect(Duration.EndOfTurn, filter), new ManaCostsImpl("{1}{W}") ));
+    }
+
+    public WakestoneGargoyle(final WakestoneGargoyle card) {
+        super(card);
+    }
+
+    @Override
+    public WakestoneGargoyle copy() {
+        return new WakestoneGargoyle(this);
+    }
+}

Mage.Sets/src/mage/sets/dissension/WakestoneGargoyle.java

@@ -0,0 +1,54 @@
+/*
+ *  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.dissension;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class WakestoneGargoyle extends mage.sets.conspiracy.WakestoneGargoyle {
+
+    public WakestoneGargoyle(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 21;
+        this.expansionSetCode = "DIS";
+        this.rarity = Rarity.RARE;
+    }
+
+    public WakestoneGargoyle(final WakestoneGargoyle card) {
+        super(card);
+    }
+
+    @Override
+    public WakestoneGargoyle copy() {
+        return new WakestoneGargoyle(this);
+    }
+}

Mage.Sets/src/mage/sets/guildpact/SilhanaStarfletcher.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.sets.guildpact;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.Mana;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.common.ChooseColorEffect;
+import mage.abilities.effects.common.ManaEffect;
+import mage.abilities.keyword.ReachAbility;
+import mage.abilities.mana.SimpleManaAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.ColoredManaSymbol;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class SilhanaStarfletcher extends CardImpl {
+
+    public SilhanaStarfletcher(UUID ownerId) {
+        super(ownerId, 95, "Silhana Starfletcher", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}");
+        this.expansionSetCode = "GPT";
+        this.subtype.add("Elf");
+        this.subtype.add("Druid");
+        this.subtype.add("Archer");
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(3);
+
+        // Reach
+        this.addAbility(ReachAbility.getInstance());
+        
+        // As Silhana Starfletcher enters the battlefield, choose a color.        
+        this.addAbility(new EntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral)));
+        
+        // {tap}: Add one mana of the chosen color to your mana pool.
+        this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new SilhanaStarfletcherManaEffect(), new TapSourceCost()));
+        
+    }
+
+    public SilhanaStarfletcher(final SilhanaStarfletcher card) {
+        super(card);
+    }
+
+    @Override
+    public SilhanaStarfletcher copy() {
+        return new SilhanaStarfletcher(this);
+    }
+}
+
+class SilhanaStarfletcherManaEffect extends ManaEffect {
+
+    public SilhanaStarfletcherManaEffect() {
+        super();
+        staticText = "Add one mana of the chosen color to your mana pool";
+    }
+
+    public SilhanaStarfletcherManaEffect(final SilhanaStarfletcherManaEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player != null) {
+                player.getManaPool().addMana(getMana(game, source), game, source);
+        }
+        return true;
+    }
+
+    @Override
+    public Mana getMana(Game game, Ability source) {
+        ObjectColor color = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color");
+        if (color != null) {
+            return new Mana(ColoredManaSymbol.lookup(color.toString().charAt(0)));
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public SilhanaStarfletcherManaEffect copy() {
+        return new SilhanaStarfletcherManaEffect(this);
+    }
+}

Mage.Sets/src/mage/sets/legends/Sentinel.java

@@ -0,0 +1,115 @@
+/*
+ *  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.legends;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.dynamicvalue.common.StaticValue;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continious.SetToughnessSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.permanent.BlockedByIdPredicate;
+import mage.filter.predicate.permanent.BlockingAttackerIdPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class Sentinel extends CardImpl {
+
+    public Sentinel(UUID ownerId) {
+        super(ownerId, 239, "Sentinel", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}");
+        this.expansionSetCode = "LEG";
+        this.subtype.add("Shapeshifter");
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        FilterCreaturePermanent filter = new FilterCreaturePermanent("creature blocking or blocked by Sentinel");
+        filter.add(Predicates.or(new BlockedByIdPredicate(this.getId()),
+                                 new BlockingAttackerIdPredicate(this.getId())));        
+        // 0: Change Sentinel's base toughness to 1 plus the power of target creature blocking or blocked by Sentinel. (This effect lasts indefinitely.)
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SentinelEffect(), new GenericManaCost(0));
+        ability.addTarget(null);
+        ability.addTarget(new TargetCreaturePermanent(filter));        
+        this.addAbility(ability);
+        
+    }
+
+    public Sentinel(final Sentinel card) {
+        super(card);
+    }
+
+    @Override
+    public Sentinel copy() {
+        return new Sentinel(this);
+    }
+}
+
+class SentinelEffect extends OneShotEffect {
+    
+    public SentinelEffect() {
+        super(Outcome.Detriment);
+        this.staticText = "Change {this}'s base toughness to 1 plus the power of target creature blocking or blocked by {this}. <i>(This effect lasts indefinitely.)</i>";
+    }
+    
+    public SentinelEffect(final SentinelEffect effect) {
+        super(effect);
+    }
+    
+    @Override
+    public SentinelEffect copy() {
+        return new SentinelEffect(this);
+    }
+    
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        Permanent targetPermanent = game.getPermanentOrLKIBattlefield(targetPointer.getFirst(game, source));
+        if (controller != null && targetPermanent != null) {
+            int newToughness = targetPermanent.getPower().getValue() + 1;
+            game.addEffect(new SetToughnessSourceEffect(new StaticValue(newToughness), Duration.Custom), source);
+            return true;
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/sets/legions/WardSliver.java

@@ -37,7 +37,6 @@ import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.keyword.ProtectionAbility;
 import mage.cards.CardImpl;
-import mage.choices.Choice;
 import mage.choices.ChoiceColor;
 import mage.constants.CardType;
 import mage.constants.Duration;

Mage.Sets/src/mage/sets/morningtide/OrchardWarden.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.morningtide;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.SetTargetPointer;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class OrchardWarden extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another Treefolk creature");
+    
+    static {
+        filter.add(new SubtypePredicate("Treefolk"));
+        filter.add(new AnotherPredicate());
+    }
+    
+    public OrchardWarden(UUID ownerId) {
+        super(ownerId, 131, "Orchard Warden", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
+        this.expansionSetCode = "MOR";
+        this.subtype.add("Treefolk");
+        this.subtype.add("Shaman");
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(6);
+
+        // Whenever another Treefolk creature enters the battlefield under your control, you may gain life equal to that creature's toughness.
+        this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new OrchardWardenffect(), filter, true, SetTargetPointer.PERMANENT, ""));
+    }
+
+    public OrchardWarden(final OrchardWarden card) {
+        super(card);
+    }
+
+    @Override
+    public OrchardWarden copy() {
+        return new OrchardWarden(this);
+    }
+}
+
+class OrchardWardenffect extends OneShotEffect {
+    
+    public OrchardWardenffect() {
+        super(Outcome.GainLife);
+        this.staticText = "you may gain life equal to that creature's toughness";
+    }
+    
+    public OrchardWardenffect(final OrchardWardenffect effect) {
+        super(effect);
+    }
+    
+    @Override
+    public OrchardWardenffect copy() {
+        return new OrchardWardenffect(this);
+    }
+    
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source));
+        if (controller != null && permanent != null) {
+            controller.gainLife(permanent.getToughness().getValue(), game);
+            return true;
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/sets/stronghold/RollingStones.java

@@ -35,7 +35,7 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
 import mage.constants.Zone;
-import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 
 /**
@@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
  */
 public class RollingStones extends CardImpl {
 
-    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Wall creatures");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall creatures");
     
     static {
         filter.add(new SubtypePredicate("Wall"));

Mage/src/mage/abilities/effects/common/combat/CanAttackAsThoughtItDidntHaveDefenderAllEffect.java

@@ -72,15 +72,23 @@ public class CanAttackAsThoughtItDidntHaveDefenderAllEffect extends AsThoughEffe
     }
 
     @Override
-    public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
-        Permanent permanent = game.getPermanent(sourceId);
-        if (permanent != null && filter.match(permanent, game)) {
-            return true;
-        }
-        return false;
+    public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
+        Permanent permanent = game.getPermanent(objectId);
+        return permanent != null && filter.match(permanent, game);
     }
     
     private String getText() {
-        return filter.getMessage() + " can attack as though they didn't have defender";
+        StringBuilder sb = new StringBuilder(filter.getMessage());
+        sb.append(" can attack ");
+        if (!duration.toString().isEmpty()) {            
+            if(Duration.EndOfTurn.equals(duration)) {
+                sb.append("this turn");
+            } else {
+                sb.append(duration.toString());
+            }
+            sb.append(" ");
+        }
+        sb.append("as though they didn't have defender");
+        return  sb.toString();
     }
 }

Mage/src/mage/abilities/effects/common/continious/SetToughnessSourceEffect.java

@@ -68,6 +68,10 @@ public class SetToughnessSourceEffect extends ContinuousEffectImpl {
             int value = amount.calculate(game, source, this);
             mageObject.getToughness().setValue(value);
             return true;
+        } else {
+            if (Duration.Custom.equals(duration)) {
+                discard();
+            }
         }
         return false;
     }