diff --git a/Mage.Sets/src/mage/cards/a/AmbushCommander.java b/Mage.Sets/src/mage/cards/a/AmbushCommander.java index 036e316e46f..69d8b124cc3 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushCommander.java +++ b/Mage.Sets/src/mage/cards/a/AmbushCommander.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.game.permanent.token.custom.CreatureToken; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -42,7 +41,11 @@ public final class AmbushCommander extends CardImpl { ContinuousEffect effect = new BecomesCreatureAllEffect( new CreatureToken(1, 1, "1/1 green Elf creatures").withColor("G").withSubType(SubType.ELF), "lands", filter2, Duration.WhileOnBattlefield, true); - effect.getDependencyTypes().add(DependencyType.BecomeForest); + effect.addDependedToType(DependencyType.BecomeForest); + effect.addDependedToType(DependencyType.BecomeIsland); + effect.addDependedToType(DependencyType.BecomeMountain); + effect.addDependedToType(DependencyType.BecomePlains); + effect.addDependedToType(DependencyType.BecomeSwamp); this.addAbility(new SimpleStaticAbility(effect)); // {1}{G}, Sacrifice an Elf: Target creature gets +3/+3 until end of turn. diff --git a/Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java b/Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java index 8f726adaa2a..a0c80d4df31 100644 --- a/Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java +++ b/Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java @@ -64,6 +64,7 @@ class AshayaSoulOfTheWildEffect extends ContinuousEffectImpl { staticText = "Nontoken creatures you control are Forest lands in addition to their other types"; this.dependendToTypes.add(DependencyType.BecomeCreature); this.dependencyTypes.add(DependencyType.BecomeForest); + this.dependencyTypes.add(DependencyType.BecomeNonbasicLand); } private AshayaSoulOfTheWildEffect(final AshayaSoulOfTheWildEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CelestialDawn.java b/Mage.Sets/src/mage/cards/c/CelestialDawn.java index 397cf682d29..123db6fa2e1 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialDawn.java +++ b/Mage.Sets/src/mage/cards/c/CelestialDawn.java @@ -63,6 +63,8 @@ class CelestialDawnToPlainsEffect extends ContinuousEffectImpl { CelestialDawnToPlainsEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); this.staticText = "Lands you control are Plains"; + this.dependendToTypes.add(DependencyType.BecomeNonbasicLand); + this.dependencyTypes.add(DependencyType.BecomePlains); } private CelestialDawnToPlainsEffect(final CelestialDawnToPlainsEffect effect) { @@ -126,7 +128,7 @@ class CelestialDawnToWhiteEffect extends ContinuousEffectImpl { } } // Exile - for (Card card : game.getExile().getAllCards(game)) { + for (Card card : game.getExile().getAllCardsByRange(game, controller.getId())) { if (card.isOwnedBy(controller.getId())) { setColor(card.getColor(game), game); } diff --git a/Mage.Sets/src/mage/cards/c/ChromaticLantern.java b/Mage.Sets/src/mage/cards/c/ChromaticLantern.java index db50ca986ef..1a8a7a561d2 100644 --- a/Mage.Sets/src/mage/cards/c/ChromaticLantern.java +++ b/Mage.Sets/src/mage/cards/c/ChromaticLantern.java @@ -3,13 +3,14 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.DependencyType; import mage.constants.Duration; -import mage.constants.Zone; import mage.filter.StaticFilters; /** @@ -21,7 +22,10 @@ public final class ChromaticLantern extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // Lands you control have "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false))); + ContinuousEffect effect = new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false); + effect.getDependedToTypes().add(DependencyType.BecomeNonbasicLand); + this.addAbility(new SimpleStaticAbility(effect)); + // {T}: Add one mana of any color. this.addAbility(new AnyColorManaAbility()); diff --git a/Mage.Sets/src/mage/cards/c/Conversion.java b/Mage.Sets/src/mage/cards/c/Conversion.java index 73afd85c63a..41cedbc0a28 100644 --- a/Mage.Sets/src/mage/cards/c/Conversion.java +++ b/Mage.Sets/src/mage/cards/c/Conversion.java @@ -54,6 +54,12 @@ public final class Conversion extends CardImpl { ConversionEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); this.staticText = "All Mountains are Plains"; + this.dependendToTypes.add(DependencyType.BecomeForest); + this.dependendToTypes.add(DependencyType.BecomeIsland); + this.dependendToTypes.add(DependencyType.BecomeMountain); + this.dependendToTypes.add(DependencyType.BecomePlains); + this.dependendToTypes.add(DependencyType.BecomeSwamp); + this.dependencyTypes.add(DependencyType.BecomePlains); } private ConversionEffect(final ConversionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DuneChanter.java b/Mage.Sets/src/mage/cards/d/DuneChanter.java index 23a1c23af93..2cd68f54296 100644 --- a/Mage.Sets/src/mage/cards/d/DuneChanter.java +++ b/Mage.Sets/src/mage/cards/d/DuneChanter.java @@ -5,6 +5,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -45,10 +46,12 @@ public final class DuneChanter extends CardImpl { this.addAbility(new SimpleStaticAbility(new DuneChanterContinuousEffect())); // Lands you control have "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( + ContinuousEffect effect = new GainAbilityControlledEffect( new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false - ))); + ); + effect.getDependedToTypes().add(DependencyType.BecomeNonbasicLand); + this.addAbility(new SimpleStaticAbility(effect)); // {T}: Mill two cards. You gain 1 life for each land card milled this way. this.addAbility(new SimpleActivatedAbility(new DuneChanterEffect(), new TapSourceCost())); @@ -76,6 +79,7 @@ class DuneChanterContinuousEffect extends ContinuousEffectImpl { public DuneChanterContinuousEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "Lands you control and land cards you own that aren't on the battlefield are Deserts in addition to their other types"; + dependendToTypes.add(DependencyType.BecomeNonbasicLand); } private DuneChanterContinuousEffect(final DuneChanterContinuousEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/EncroachingMycosynth.java b/Mage.Sets/src/mage/cards/e/EncroachingMycosynth.java index 5270c509724..0e88261963a 100644 --- a/Mage.Sets/src/mage/cards/e/EncroachingMycosynth.java +++ b/Mage.Sets/src/mage/cards/e/EncroachingMycosynth.java @@ -45,6 +45,7 @@ class EncroachingMycosynthEffect extends ContinuousEffectImpl { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "Nonland permanents you control are artifacts in addition to their other types. " + "The same is true for permanent spells you control and nonland permanent cards you own that aren't on the battlefield"; + this.dependendToTypes.add(DependencyType.BecomeNonbasicLand); this.dependencyTypes.add(DependencyType.ArtifactAddingRemoving); // March of the Machines } diff --git a/Mage.Sets/src/mage/cards/g/Glaciers.java b/Mage.Sets/src/mage/cards/g/Glaciers.java index d13f9efb471..71d51987e41 100644 --- a/Mage.Sets/src/mage/cards/g/Glaciers.java +++ b/Mage.Sets/src/mage/cards/g/Glaciers.java @@ -51,6 +51,12 @@ public final class Glaciers extends CardImpl { GlaciersEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); this.staticText = "All Mountains are Plains"; + this.dependendToTypes.add(DependencyType.BecomeForest); + this.dependendToTypes.add(DependencyType.BecomeIsland); + this.dependendToTypes.add(DependencyType.BecomeMountain); + this.dependendToTypes.add(DependencyType.BecomePlains); + this.dependendToTypes.add(DependencyType.BecomeSwamp); + this.dependencyTypes.add(DependencyType.BecomePlains); } private GlaciersEffect(final GlaciersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HarbingerOfTheSeas.java b/Mage.Sets/src/mage/cards/h/HarbingerOfTheSeas.java index f7856b72692..8a7f1d34cc2 100644 --- a/Mage.Sets/src/mage/cards/h/HarbingerOfTheSeas.java +++ b/Mage.Sets/src/mage/cards/h/HarbingerOfTheSeas.java @@ -54,6 +54,7 @@ class HarbingerOfTheSeasEffect extends ContinuousEffectImpl { HarbingerOfTheSeasEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); this.staticText = "Nonbasic lands are Islands"; + dependendToTypes.add(DependencyType.BecomeNonbasicLand); dependencyTypes.add(DependencyType.BecomeIsland); } diff --git a/Mage.Sets/src/mage/cards/k/KormusBell.java b/Mage.Sets/src/mage/cards/k/KormusBell.java index 84bbcf7abdc..d186e67963b 100644 --- a/Mage.Sets/src/mage/cards/k/KormusBell.java +++ b/Mage.Sets/src/mage/cards/k/KormusBell.java @@ -27,11 +27,12 @@ public final class KormusBell extends CardImpl { new CreatureToken(1, 1, "1/1 black creatures").withColor("B"), "lands", filter, Duration.WhileOnBattlefield, true); - effect.addDependedToType(DependencyType.BecomeSwamp); // TODO: are these dependencies correct/complete? - effect.addDependedToType(DependencyType.BecomeIsland); + effect.addDependedToType(DependencyType.BecomeNonbasicLand); effect.addDependedToType(DependencyType.BecomeForest); + effect.addDependedToType(DependencyType.BecomeIsland); effect.addDependedToType(DependencyType.BecomeMountain); effect.addDependedToType(DependencyType.BecomePlains); + effect.addDependedToType(DependencyType.BecomeSwamp); this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java b/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java index e2fd00ab094..c83a5a500e3 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java @@ -3,7 +3,6 @@ package mage.cards.l; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.Mode; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.LeylineAbility; @@ -47,6 +46,7 @@ class SetSupertypeAllEffect extends ContinuousEffectImpl { public SetSupertypeAllEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Detriment); this.staticText = "All nonland permanents are legendary"; + this.dependendToTypes.add(DependencyType.BecomeNonbasicLand); } private SetSupertypeAllEffect(final SetSupertypeAllEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfTheGuildpact.java b/Mage.Sets/src/mage/cards/l/LeylineOfTheGuildpact.java index df4416bb366..a3de4e672b2 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfTheGuildpact.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfTheGuildpact.java @@ -50,6 +50,7 @@ class LeylineOfTheGuildpactEffect extends ContinuousEffectImpl { LeylineOfTheGuildpactEffect() { super(Duration.WhileOnBattlefield, Layer.ColorChangingEffects_5, SubLayer.NA, Outcome.Benefit); staticText = "each nonland permanent you control is all colors"; + dependendToTypes.add(DependencyType.BecomeNonbasicLand); } private LeylineOfTheGuildpactEffect(final LeylineOfTheGuildpactEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java index 28847dcff26..a6f00bb8bd0 100644 --- a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java +++ b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java @@ -50,7 +50,12 @@ class LifeAndLimbEffect extends ContinuousEffectImpl { super(Duration.WhileOnBattlefield, Outcome.Neutral); staticText = "All Forests and all Saprolings are 1/1 green Saproling creatures and Forest lands in addition to their other types"; + this.dependendToTypes.add(DependencyType.BecomeNonbasicLand); this.dependendToTypes.add(DependencyType.BecomeForest); + this.dependendToTypes.add(DependencyType.BecomeIsland); + this.dependendToTypes.add(DependencyType.BecomeMountain); + this.dependendToTypes.add(DependencyType.BecomePlains); + this.dependendToTypes.add(DependencyType.BecomeSwamp); this.dependendToTypes.add(DependencyType.BecomeCreature); } diff --git a/Mage.Sets/src/mage/cards/l/LivingLands.java b/Mage.Sets/src/mage/cards/l/LivingLands.java index fee8a2eadcf..2b371781fd5 100644 --- a/Mage.Sets/src/mage/cards/l/LivingLands.java +++ b/Mage.Sets/src/mage/cards/l/LivingLands.java @@ -26,7 +26,12 @@ public final class LivingLands extends CardImpl { ContinuousEffect effect = new BecomesCreatureAllEffect( new CreatureToken(1, 1, "1/1 creatures"), "lands", filter, Duration.WhileOnBattlefield, false); - effect.getDependencyTypes().add(DependencyType.BecomeForest); // TODO: are these dependencies correct/complete? + effect.getDependedToTypes().add(DependencyType.BecomeNonbasicLand); + effect.addDependedToType(DependencyType.BecomeForest); + effect.addDependedToType(DependencyType.BecomeIsland); + effect.addDependedToType(DependencyType.BecomeMountain); + effect.addDependedToType(DependencyType.BecomePlains); + effect.addDependedToType(DependencyType.BecomeSwamp); this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/l/LivingPlane.java b/Mage.Sets/src/mage/cards/l/LivingPlane.java index 3ad0b887dcd..a9ca5b7904a 100644 --- a/Mage.Sets/src/mage/cards/l/LivingPlane.java +++ b/Mage.Sets/src/mage/cards/l/LivingPlane.java @@ -2,13 +2,11 @@ package mage.cards.l; import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BecomesCreatureAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.game.permanent.token.custom.CreatureToken; @@ -25,9 +23,11 @@ public final class LivingPlane extends CardImpl { this.supertype.add(SuperType.WORLD); // All lands are 1/1 creatures that are still lands. - this.addAbility(new SimpleStaticAbility(new BecomesCreatureAllEffect( + ContinuousEffect effect = new BecomesCreatureAllEffect( new CreatureToken(1, 1, "1/1 creatures"), - "lands", filter, Duration.WhileOnBattlefield, false))); + "lands", filter, Duration.WhileOnBattlefield, false); + effect.getDependedToTypes().add(DependencyType.BecomeNonbasicLand); + this.addAbility(new SimpleStaticAbility(effect)); } private LivingPlane(final LivingPlane card) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java b/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java index 4d1beec9ae5..e07c277a4e8 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java @@ -54,6 +54,7 @@ class MagusOfTheMoonEffect extends ContinuousEffectImpl { MagusOfTheMoonEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); this.staticText = "Nonbasic lands are Mountains"; + dependendToTypes.add(DependencyType.BecomeNonbasicLand); dependencyTypes.add(DependencyType.BecomeMountain); } diff --git a/Mage.Sets/src/mage/cards/m/Melting.java b/Mage.Sets/src/mage/cards/m/Melting.java index d72ded8a51b..81371767199 100644 --- a/Mage.Sets/src/mage/cards/m/Melting.java +++ b/Mage.Sets/src/mage/cards/m/Melting.java @@ -39,6 +39,7 @@ class MeltingEffect extends ContinuousEffectImpl { MeltingEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Detriment); this.staticText = "All lands are no longer snow"; + this.dependendToTypes.add(DependencyType.BecomeNonbasicLand); } private MeltingEffect(final MeltingEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NaturalEmergence.java b/Mage.Sets/src/mage/cards/n/NaturalEmergence.java index c847a1f6252..2b98c547b0c 100644 --- a/Mage.Sets/src/mage/cards/n/NaturalEmergence.java +++ b/Mage.Sets/src/mage/cards/n/NaturalEmergence.java @@ -3,12 +3,14 @@ package mage.cards.n; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect; import mage.abilities.effects.common.continuous.BecomesCreatureAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.DependencyType; import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledEnchantmentPermanent; @@ -37,12 +39,14 @@ public final class NaturalEmergence extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter), false)); // Lands you control are 2/2 creatures with first strike. They're still lands. - this.addAbility(new SimpleStaticAbility(new BecomesCreatureAllEffect( + ContinuousEffect effect = new BecomesCreatureAllEffect( new CreatureToken( 2, 2, "2/2 creatures with first strike" ).withAbility(FirstStrikeAbility.getInstance()), "lands", StaticFilters.FILTER_CONTROLLED_PERMANENT_LANDS, Duration.WhileOnBattlefield, false - ))); + ); + effect.getDependedToTypes().add(DependencyType.BecomeNonbasicLand); + this.addAbility(new SimpleStaticAbility(effect)); } private NaturalEmergence(final NaturalEmergence card) { diff --git a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java index b4f8b3d9df3..ea5ae34c91a 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java +++ b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java @@ -2,12 +2,13 @@ package mage.cards.n; import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BecomesCreatureAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.DependencyType; import mage.constants.Duration; -import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.game.permanent.token.custom.CreatureToken; @@ -24,9 +25,11 @@ public final class NaturesRevolt extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); // All lands are 2/2 creatures that are still lands. - this.addAbility(new SimpleStaticAbility(new BecomesCreatureAllEffect( + ContinuousEffect effect = new BecomesCreatureAllEffect( new CreatureToken(2, 2, "2/2 creatures"), - "lands", filter, Duration.WhileOnBattlefield, false))); + "lands", filter, Duration.WhileOnBattlefield, false); + effect.getDependedToTypes().add(DependencyType.BecomeNonbasicLand); + this.addAbility(new SimpleStaticAbility(effect)); } private NaturesRevolt(final NaturesRevolt card) { diff --git a/Mage.Sets/src/mage/cards/r/Realmwright.java b/Mage.Sets/src/mage/cards/r/Realmwright.java index 41d5a7a9ef0..1b45657dfe8 100644 --- a/Mage.Sets/src/mage/cards/r/Realmwright.java +++ b/Mage.Sets/src/mage/cards/r/Realmwright.java @@ -51,6 +51,7 @@ class RealmwrightEffect extends ContinuousEffectImpl { RealmwrightEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Neutral); staticText = "Lands you control are the chosen type in addition to their other types"; + dependendToTypes.add(DependencyType.BecomeNonbasicLand); } private RealmwrightEffect(final RealmwrightEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RootpathPurifier.java b/Mage.Sets/src/mage/cards/r/RootpathPurifier.java index 29b1953fdf6..056e37f8147 100644 --- a/Mage.Sets/src/mage/cards/r/RootpathPurifier.java +++ b/Mage.Sets/src/mage/cards/r/RootpathPurifier.java @@ -47,6 +47,7 @@ class RootpathPurifierEffect extends ContinuousEffectImpl { RootpathPurifierEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "lands you control and land cards in your library are basic"; + dependendToTypes.add(DependencyType.BecomeNonbasicLand); } private RootpathPurifierEffect(final RootpathPurifierEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java b/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java index d34577f660f..1bca8aa2151 100644 --- a/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java +++ b/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java @@ -50,6 +50,7 @@ class BecomesColorlessForestLandEffect extends ContinuousEffectImpl { BecomesColorlessForestLandEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); this.staticText = "Enchanted permanent is a colorless Forest land"; + dependencyTypes.add(DependencyType.BecomeNonbasicLand); dependencyTypes.add(DependencyType.BecomeForest); } diff --git a/Mage.Sets/src/mage/cards/t/TophTheFirstMetalbender.java b/Mage.Sets/src/mage/cards/t/TophTheFirstMetalbender.java index 480c7237efd..4dc2ef8e110 100644 --- a/Mage.Sets/src/mage/cards/t/TophTheFirstMetalbender.java +++ b/Mage.Sets/src/mage/cards/t/TophTheFirstMetalbender.java @@ -63,6 +63,8 @@ class TophTheFirstMetalbenderEffect extends ContinuousEffectImpl { TophTheFirstMetalbenderEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "nontoken artifacts you control are lands in addition to their other types"; + this.dependendToTypes.add(DependencyType.ArtifactAddingRemoving); + this.dependencyTypes.add(DependencyType.BecomeNonbasicLand); } private TophTheFirstMetalbenderEffect(final TophTheFirstMetalbenderEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddBasicLandTypeAllLandsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddBasicLandTypeAllLandsEffect.java index fb92836067d..c5fdd8277fb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddBasicLandTypeAllLandsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddBasicLandTypeAllLandsEffect.java @@ -20,6 +20,7 @@ public class AddBasicLandTypeAllLandsEffect extends ContinuousEffectImpl { this.subType = subType; this.staticText = "Each land is " + subType.getIndefiniteArticle() + " " + subType.getDescription() + " in addition to its other land types"; + this.dependendToTypes.add(DependencyType.BecomeNonbasicLand); switch (subType) { case PLAINS: this.dependencyTypes.add(DependencyType.BecomePlains); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAllBasicsControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAllBasicsControlledEffect.java index b5991f27b3a..1e96acf7468 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAllBasicsControlledEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAllBasicsControlledEffect.java @@ -8,9 +8,6 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.ArrayList; -import java.util.List; - /** * @author TheElk801 */ @@ -27,6 +24,7 @@ public class BecomesAllBasicsControlledEffect extends ContinuousEffectImpl { public BecomesAllBasicsControlledEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Detriment); this.staticText = "Lands you control are every basic land type in addition to their other types"; + dependendToTypes.add(DependencyType.BecomeNonbasicLand); dependencyTypes.add(DependencyType.BecomeMountain); dependencyTypes.add(DependencyType.BecomeForest); dependencyTypes.add(DependencyType.BecomeSwamp);