fixed issue 19 (again) + added some new sample decks

Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java

@@ -34,16 +34,13 @@ import mage.Constants.Outcome;
 import mage.Constants.Rarity;
 import mage.Constants.Zone;
 import mage.MageInt;
-import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.ZoneChangeTriggeredAbility;
 import mage.abilities.effects.common.SearchLibraryPutInPlayEffect;
 import mage.abilities.keyword.FirstStrikeAbility;
 import mage.cards.CardImpl;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterLandPermanent;
 import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.target.common.TargetCardInLibrary;
 
 /**
@@ -81,13 +78,18 @@ public class KnightOfTheWhiteOrchid extends CardImpl<KnightOfTheWhiteOrchid> {
 
 }
 
-class KnightOfTheWhiteOrchidAbility extends EntersBattlefieldTriggeredAbility<KnightOfTheWhiteOrchidAbility> {
+class KnightOfTheWhiteOrchidAbility extends ZoneChangeTriggeredAbility<KnightOfTheWhiteOrchidAbility> {
+
+	private static FilterCard filter1 = new FilterCard("Plains");
+	private static FilterLandPermanent filter2 = new FilterLandPermanent();
+
+	static {
+		filter1.getName().add("Plains");
+	}
 
 	public KnightOfTheWhiteOrchidAbility() {
-		super(null, true);
+		super(Zone.BATTLEFIELD, null, "When {this} enters the battlefield, if an opponent controls more lands than you, you may ", true);
-		FilterCard filter = new FilterCard("Plains");
+		TargetCardInLibrary target = new TargetCardInLibrary(filter1);
-		filter.getName().add("Plains");
-		TargetCardInLibrary target = new TargetCardInLibrary(filter);
 		addEffect(new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay));
 	}
 
@@ -100,34 +102,15 @@ class KnightOfTheWhiteOrchidAbility extends EntersBattlefieldTriggeredAbility<Kn
 		return new KnightOfTheWhiteOrchidAbility(this);
 	}
 
-	@Override
-	public boolean checkTrigger(GameEvent event, Game game) {
-		if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
-			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-			if (zEvent.getToZone() == Zone.BATTLEFIELD) {
-				trigger(game, this.controllerId);
-				return true;
-			}
-		}
-		return false;
-	}
-
 	@Override
 	public boolean checkInterveningIfClause(Game game) {
-		FilterLandPermanent filter = new FilterLandPermanent();
+		int numLands = game.getBattlefield().countAll(filter2, this.controllerId);
-		int numLands = game.getBattlefield().countAll(filter, this.controllerId);
 		for (UUID opponentId: game.getOpponents(this.controllerId)) {
-			if (numLands < game.getBattlefield().countAll(filter, opponentId)) {
+			if (numLands < game.getBattlefield().countAll(filter2, opponentId)) {
 				return true;
 			}
 		}
 		return false;
 	}
 
-
-	@Override
-	public String getRule() {
-		return "When {this} enters the battlefield, if an opponent controls more lands than you, you may " + super.getRule();
-	}
-
 }

Mage.Sets/src/mage/sets/zendikar/SejiriRefuge.java

@@ -0,0 +1,69 @@
+/*
+ *  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.zendikar;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.abilities.common.EntersBattlefieldTappedAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.mana.BlueManaAbility;
+import mage.abilities.mana.WhiteManaAbility;
+import mage.cards.CardImpl;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class SejiriRefuge extends CardImpl<SejiriRefuge> {
+
+	public SejiriRefuge(UUID ownerId) {
+		super(ownerId, 224, "Sejiri Refuge", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null);
+		this.expansionSetCode = "ZEN";
+		this.addAbility(new EntersBattlefieldTappedAbility());
+		this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(1), false));
+		this.addAbility(new WhiteManaAbility());
+		this.addAbility(new BlueManaAbility());
+	}
+
+	public SejiriRefuge(final SejiriRefuge card) {
+		super(card);
+	}
+
+	@Override
+	public SejiriRefuge copy() {
+		return new SejiriRefuge(this);
+	}
+
+	@Override
+	public String getArt() {
+		return "126610_typ_reg_sty_010.jpg";
+	}
+}

Mage/src/mage/abilities/common/EntersBattlefieldTriggeredAbility.java

@@ -29,51 +29,30 @@
 package mage.abilities.common;
 
 import mage.Constants.Zone;
-import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class EntersBattlefieldTriggeredAbility<T extends EntersBattlefieldTriggeredAbility<T>> extends TriggeredAbilityImpl<T> {
+public class EntersBattlefieldTriggeredAbility extends ZoneChangeTriggeredAbility<EntersBattlefieldTriggeredAbility> {
 
 	public EntersBattlefieldTriggeredAbility(Effect effect) {
 		this(effect, false);
 	}
 
 	public EntersBattlefieldTriggeredAbility(Effect effect, boolean optional) {
-		super(Zone.BATTLEFIELD, effect, optional);
+		super(Zone.BATTLEFIELD, effect, "When {this} enters the battlefield, ", optional);
 	}
 
 	public EntersBattlefieldTriggeredAbility(EntersBattlefieldTriggeredAbility ability) {
 		super(ability);
 	}
 
-	@Override
-	public boolean checkTrigger(GameEvent event, Game game) {
-		if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
-			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-			if (zEvent.getToZone() == Zone.BATTLEFIELD) {
-				trigger(game, this.controllerId);
-				return true;
-			}
-		}
-		return false;
-	}
 
 	@Override
-	public String getRule() {
+	public EntersBattlefieldTriggeredAbility copy() {
-		return "When {this} enters the battlefield, " + super.getRule();
+		return new EntersBattlefieldTriggeredAbility(this);
-	}
-
-	@Override
-	public T copy() {
-		return (T) new EntersBattlefieldTriggeredAbility(this);
 	}
 
 }

Mage/src/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java

@@ -29,44 +29,22 @@
 package mage.abilities.common;
 
 import mage.Constants.Zone;
-import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class LeavesBattlefieldTriggeredAbility extends TriggeredAbilityImpl<LeavesBattlefieldTriggeredAbility> {
+public class LeavesBattlefieldTriggeredAbility extends ZoneChangeTriggeredAbility<LeavesBattlefieldTriggeredAbility> {
 
 	public LeavesBattlefieldTriggeredAbility(Effect effect, boolean optional) {
-		super(Zone.BATTLEFIELD, effect, optional);
+		super(Zone.BATTLEFIELD, null, effect, "When {this} leaves the battlefield, ", optional);
 	}
 
 	public LeavesBattlefieldTriggeredAbility(LeavesBattlefieldTriggeredAbility ability) {
 		super(ability);
 	}
 
-	@Override
-	public boolean checkTrigger(GameEvent event, Game game) {
-		if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
-			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-			if (zEvent.getFromZone() == Zone.BATTLEFIELD) {
-				trigger(game, this.controllerId);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public String getRule() {
-		return "When {this} leaves the battlefield, " + super.getRule();
-	}
-
 	@Override
 	public LeavesBattlefieldTriggeredAbility copy() {
 		return new LeavesBattlefieldTriggeredAbility(this);

Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java

@@ -29,44 +29,22 @@
 package mage.abilities.common;
 
 import mage.Constants.Zone;
-import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PutIntoGraveFromBattlefieldTriggeredAbility extends TriggeredAbilityImpl<PutIntoGraveFromBattlefieldTriggeredAbility> {
+public class PutIntoGraveFromBattlefieldTriggeredAbility extends ZoneChangeTriggeredAbility<PutIntoGraveFromBattlefieldTriggeredAbility> {
 
 	public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect, boolean optional) {
-		super(Zone.GRAVEYARD, effect, optional);
+		super(Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, "When {this} is put into a graveyard from the battlefield, ", optional);
 	}
 
 	public PutIntoGraveFromBattlefieldTriggeredAbility(PutIntoGraveFromBattlefieldTriggeredAbility ability) {
 		super(ability);
 	}
 
-	@Override
-	public boolean checkTrigger(GameEvent event, Game game) {
-		if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
-			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
-			if (zEvent.getFromZone() == Zone.BATTLEFIELD && zEvent.getToZone() == Zone.GRAVEYARD) {
-				trigger(game, this.controllerId);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public String getRule() {
-		return "When {this} is put into a graveyard from the battlefield, " + super.getRule();
-	}
-
 	@Override
 	public PutIntoGraveFromBattlefieldTriggeredAbility copy() {
 		return new PutIntoGraveFromBattlefieldTriggeredAbility(this);

Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java

@@ -0,0 +1,99 @@
+/*
+ *  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.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.ZoneChangeEvent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ZoneChangeTriggeredAbility<T extends ZoneChangeTriggeredAbility<T>> extends TriggeredAbilityImpl<T> {
+
+	protected Zone fromZone;
+	protected Zone toZone;
+	protected String rule;
+
+	public ZoneChangeTriggeredAbility(Zone fromZone, Zone toZone, Effect effect, String rule, boolean optional) {
+		super(fromZone, effect, optional);
+		this.fromZone = fromZone;
+		this.toZone = toZone;
+		this.rule = rule;
+	}
+
+	public ZoneChangeTriggeredAbility(Zone toZone, Effect effect, String rule, boolean optional) {
+		super(toZone, effect, optional);
+		this.fromZone = null;
+		this.toZone = toZone;
+		this.rule = rule;
+	}
+
+	public ZoneChangeTriggeredAbility(ZoneChangeTriggeredAbility ability) {
+		super(ability);
+		this.fromZone = ability.fromZone;
+		this.toZone = ability.toZone;
+		this.rule = ability.rule;
+	}
+
+	@Override
+	public boolean checkTrigger(GameEvent event, Game game) {
+		if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId())) {
+			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
+			if ((fromZone == null || zEvent.getFromZone() == fromZone) && (toZone == null || zEvent.getToZone() == toZone)) {
+				trigger(game, this.controllerId);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public String getRule() {
+		return rule + super.getRule();
+	}
+
+	@Override
+	public T copy() {
+		return (T)new ZoneChangeTriggeredAbility(this);
+	}
+
+	public Zone getFromZone() {
+		return fromZone;
+	}
+
+	public Zone getToZone() {
+		return toZone;
+	}
+}

Mage/src/mage/abilities/effects/ContinuousEffectImpl.java

@@ -118,15 +118,24 @@ public abstract class ContinuousEffectImpl<T extends ContinuousEffectImpl<T>> ex
 	public void init(Ability source, Game game) {
 		//20100716 - 611.2c
 		if (source instanceof ActivatedAbility) {
-			switch (layer) {
+			if (layer != null) {
-				case CopyEffects_1:
+				switch (layer) {
-				case ControlChangingEffects_2:
+					case CopyEffects_1:
-				case TextChangingEffects_3:
+					case ControlChangingEffects_2:
-				case TypeChangingEffects_4:
+					case TextChangingEffects_3:
-				case ColorChangingEffects_5:
+					case TypeChangingEffects_4:
-				case AbilityAddingRemovingEffects_6:
+					case ColorChangingEffects_5:
-				case PTChangingEffects_7:
+					case AbilityAddingRemovingEffects_6:
+					case PTChangingEffects_7:
+						this.affectedObjectsSet = true;
+				}
+			}
+			else {
+				if (hasLayer(Layer.CopyEffects_1) || hasLayer(Layer.ControlChangingEffects_2) || hasLayer(Layer.TextChangingEffects_3) ||
+					hasLayer(Layer.TypeChangingEffects_4) || hasLayer(Layer.ColorChangingEffects_5) || hasLayer(Layer.AbilityAddingRemovingEffects_6) ||
+					hasLayer(Layer.PTChangingEffects_7)) {
 					this.affectedObjectsSet = true;
+				}
 			}
 		}
 	}

Mage/src/mage/game/permanent/PermanentCard.java

@@ -36,6 +36,7 @@ import mage.Constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbility;
+import mage.abilities.common.ZoneChangeTriggeredAbility;
 import mage.abilities.keyword.LevelAbility;
 import mage.cards.Card;
 import mage.cards.LevelerCard;
@@ -116,11 +117,18 @@ public class PermanentCard extends PermanentImpl<PermanentCard> {
 
 	public void checkPermanentOnlyTriggers(ZoneChangeEvent event, Game game) {
 		// we only want to trigger abilities that are not on the underlying card ie. have been added by another effect
+		// or we want to trigger abilities that only trigger on leaving the battlefield
 		// card abilities will get triggered later when the card hits the new zone
 		Card card = game.getCard(objectId).copy();
 		for (TriggeredAbility ability: abilities.getTriggeredAbilities(event.getFromZone())) {
 			if (!card.getAbilities().containsKey(ability.getId()))
 				ability.checkTrigger(event, game);
+			else if (ability instanceof ZoneChangeTriggeredAbility && event.getFromZone() == Zone.BATTLEFIELD) {
+				ZoneChangeTriggeredAbility zcAbility = (ZoneChangeTriggeredAbility)ability;
+				if (zcAbility.getToZone() == null) {
+					ability.checkTrigger(event, game);
+				}
+			}
 		}
 		for (TriggeredAbility ability: abilities.getTriggeredAbilities(event.getToZone())) {
 			if (!card.getAbilities().containsKey(ability.getId()))