From 0c4f487db59b666d631d32549954492a969f457e Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 19 Apr 2018 18:36:09 +1000 Subject: [PATCH 1/2] Fix for TrugaJunglePlane (Adding in new condition). --- .../mage/game/command/planes/TrugaJunglePlane.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java b/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java index dde38661955..e1a9b507bd0 100644 --- a/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java @@ -29,11 +29,12 @@ package mage.game.command.planes; import java.util.ArrayList; import java.util.List; -import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.IsStillOnPlaneCondition; import mage.abilities.condition.common.MainPhaseStackEmptyCondition; import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RevealLibraryPutIntoHandEffect; import mage.abilities.effects.common.RollPlanarDieEffect; @@ -54,12 +55,17 @@ import mage.watchers.common.PlanarRollWatcher; */ public class TrugaJunglePlane extends Plane { + private static final String rule = "All lands have '{t}: Add one mana of any color to your mana pool"; + public TrugaJunglePlane() { this.setName("Plane - Truga Jungle"); this.setExpansionSetCodeForImage("PCA"); - // All lands have '{t}: Add one mana of any color to your mana pool" - Ability ability = new SimpleStaticAbility(Zone.COMMAND, new GainAbilityAllEffect(new AnyColorManaAbility(), Duration.Custom, StaticFilters.FILTER_LANDS, false)); + SimpleStaticAbility ability + = new SimpleStaticAbility(Zone.COMMAND, new ConditionalContinuousEffect( + new GainAbilityAllEffect(new AnyColorManaAbility(), Duration.Custom, StaticFilters.FILTER_LANDS), + new IsStillOnPlaneCondition(this.getName()), + rule)); this.getAbilities().add(ability); // Active player can roll the planar die: Whenever you roll {CHAOS}, reveal the top three cards of your libary. Put all land cards revealed this way into your hand the rest on the bottom of your library in any order. From 96472332a4e1b701fe01bd8754bfe31ba29d57df Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 19 Apr 2018 18:57:32 +1000 Subject: [PATCH 2/2] Fix for AkoumPlane (Any player). --- Mage/src/main/java/mage/game/command/planes/AkoumPlane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java b/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java index b748bf7395e..52bbe6c9117 100644 --- a/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java @@ -70,7 +70,7 @@ public class AkoumPlane extends Plane { this.setExpansionSetCodeForImage("PCA"); // Players may cast enchantment spells as if they had flash - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.COMMAND, new CastAsThoughItHadFlashAllEffect(Duration.Custom, filterCard, false)); + SimpleStaticAbility ability = new SimpleStaticAbility(Zone.COMMAND, new CastAsThoughItHadFlashAllEffect(Duration.Custom, filterCard, true)); this.getAbilities().add(ability); // Active player can roll the planar die: Whenever you roll {CHAOS}, destroy target creature that isn't enchanted