diff --git a/Mage.Sets/src/mage/cards/a/AbuelosAwakening.java b/Mage.Sets/src/mage/cards/a/AbuelosAwakening.java index 4c35ce005dd..26a5957c02f 100644 --- a/Mage.Sets/src/mage/cards/a/AbuelosAwakening.java +++ b/Mage.Sets/src/mage/cards/a/AbuelosAwakening.java @@ -93,6 +93,7 @@ class AbuelosAwakeningContinuousEffect extends ContinuousEffectImpl { AbuelosAwakeningContinuousEffect() { super(Duration.Custom, Outcome.Neutral); staticText = "It's a 1/1 Spirit creature with flying in addition to its other types"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private AbuelosAwakeningContinuousEffect(final AbuelosAwakeningContinuousEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/ArlinnTheMoonsFury.java b/Mage.Sets/src/mage/cards/a/ArlinnTheMoonsFury.java index 614001b4479..bc906251947 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnTheMoonsFury.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnTheMoonsFury.java @@ -59,6 +59,7 @@ class ArlinnTheMoonsFuryEffect extends ContinuousEffectImpl { ArlinnTheMoonsFuryEffect() { super(Duration.EndOfTurn, Outcome.Benefit); staticText = "until end of turn, {this} becomes a 5/5 Werewolf creature with trample, indestructible, and haste"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private ArlinnTheMoonsFuryEffect(final ArlinnTheMoonsFuryEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/ChimericCoils.java b/Mage.Sets/src/mage/cards/c/ChimericCoils.java index 34efa55d955..764a0b4ac98 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericCoils.java +++ b/Mage.Sets/src/mage/cards/c/ChimericCoils.java @@ -24,7 +24,7 @@ public final class ChimericCoils extends CardImpl { public ChimericCoils(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); - // {X}{1}: Chimeric Coils becomes an X/X Construct artifact creature. Sacrifice it at the beginning of thhe next end step. + // {X}{1}: Chimeric Coils becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(new ChimericCoilsEffect(), new ManaCostsImpl<>("{X}{1}")); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new SacrificeSourceEffect()))); this.addAbility(ability); @@ -45,6 +45,7 @@ class ChimericCoilsEffect extends ContinuousEffectImpl { ChimericCoilsEffect() { super(Duration.Custom, Outcome.BecomeCreature); staticText = "{this} becomes an X/X Construct artifact creature"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private ChimericCoilsEffect(final ChimericCoilsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/ChimericStaff.java b/Mage.Sets/src/mage/cards/c/ChimericStaff.java index 1cc20dc76dc..ac323495b8f 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericStaff.java +++ b/Mage.Sets/src/mage/cards/c/ChimericStaff.java @@ -40,6 +40,7 @@ class ChimericStaffEffect extends ContinuousEffectImpl { ChimericStaffEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "{this} becomes an X/X Construct artifact creature until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private ChimericStaffEffect(final ChimericStaffEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CyberdriveAwakener.java b/Mage.Sets/src/mage/cards/c/CyberdriveAwakener.java index 76632b7468f..469c5c7e081 100644 --- a/Mage.Sets/src/mage/cards/c/CyberdriveAwakener.java +++ b/Mage.Sets/src/mage/cards/c/CyberdriveAwakener.java @@ -70,6 +70,7 @@ class CyberdriveAwakenerEffect extends ContinuousEffectImpl { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "until end of turn, each noncreature artifact you control " + "becomes an artifact creature with base power and toughness 4/4"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private CyberdriveAwakenerEffect(final CyberdriveAwakenerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/EccentricApprentice.java b/Mage.Sets/src/mage/cards/e/EccentricApprentice.java index bafd1e10fd5..ebd24d9c3e4 100644 --- a/Mage.Sets/src/mage/cards/e/EccentricApprentice.java +++ b/Mage.Sets/src/mage/cards/e/EccentricApprentice.java @@ -87,7 +87,7 @@ class EccentricApprenticeEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: permanent.removeAllCreatureTypes(game); - permanent.removeSubType(game, SubType.BIRD); + permanent.addSubType(game, SubType.BIRD); return true; case AbilityAddingRemovingEffects_6: permanent.addAbility(FlyingAbility.getInstance(), source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/e/EverythingamajigC.java b/Mage.Sets/src/mage/cards/e/EverythingamajigC.java index e38c629f950..52e90c7f894 100644 --- a/Mage.Sets/src/mage/cards/e/EverythingamajigC.java +++ b/Mage.Sets/src/mage/cards/e/EverythingamajigC.java @@ -130,6 +130,7 @@ class ChimericStaffEffect extends ContinuousEffectImpl { ChimericStaffEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "{this} becomes an X/X Construct artifact creature until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private ChimericStaffEffect(final ChimericStaffEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GrandMasterOfFlowers.java b/Mage.Sets/src/mage/cards/g/GrandMasterOfFlowers.java index d7cd6b7743a..5cd17023d38 100644 --- a/Mage.Sets/src/mage/cards/g/GrandMasterOfFlowers.java +++ b/Mage.Sets/src/mage/cards/g/GrandMasterOfFlowers.java @@ -81,6 +81,7 @@ class GrandMasterOfFlowersEffect extends ContinuousEffectImpl { super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "as long as {this} has seven or more loyalty counters on him, " + "he's a 7/7 Dragon God creature with flying and indestructible"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private GrandMasterOfFlowersEffect(final GrandMasterOfFlowersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GristTheHungerTide.java b/Mage.Sets/src/mage/cards/g/GristTheHungerTide.java index 2c22115dba2..452bd588ee3 100644 --- a/Mage.Sets/src/mage/cards/g/GristTheHungerTide.java +++ b/Mage.Sets/src/mage/cards/g/GristTheHungerTide.java @@ -91,6 +91,7 @@ class GristTheHungerTideTypeEffect extends ContinuousEffectImpl { super(Duration.Custom, Outcome.Benefit); staticText = "as long as {this} isn't on the battlefield, " + "it's a 1/1 Insect creature in addition to its other types"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private GristTheHungerTideTypeEffect(final GristTheHungerTideTypeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HalsinEmeraldArchdruid.java b/Mage.Sets/src/mage/cards/h/HalsinEmeraldArchdruid.java index 28627014685..612927e11e7 100644 --- a/Mage.Sets/src/mage/cards/h/HalsinEmeraldArchdruid.java +++ b/Mage.Sets/src/mage/cards/h/HalsinEmeraldArchdruid.java @@ -63,6 +63,7 @@ class HalsinEmeraldArchdruidEffect extends ContinuousEffectImpl { super(Duration.EndOfTurn, Outcome.Benefit); staticText = "until end of turn, target token you control becomes a green Bear creature " + "with base power and toughness 4/4 in addition to its other colors and types"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private HalsinEmeraldArchdruidEffect(final HalsinEmeraldArchdruidEffect effect) { diff --git a/Mage.Sets/src/mage/cards/i/IdolOfFalseGods.java b/Mage.Sets/src/mage/cards/i/IdolOfFalseGods.java index f12a8b43132..41b7c396d5c 100644 --- a/Mage.Sets/src/mage/cards/i/IdolOfFalseGods.java +++ b/Mage.Sets/src/mage/cards/i/IdolOfFalseGods.java @@ -72,6 +72,7 @@ class IdolOfFalseGodsEffect extends ContinuousEffectImpl { super(Duration.WhileOnBattlefield, Outcome.Benefit); staticText = "as long as {this} has eight or more +1/+1 counters on it, " + "it's a 0/0 creature in addition to its other types and it has annihilator 2"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private IdolOfFalseGodsEffect(final IdolOfFalseGodsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java index ba29f49f494..40e446df128 100644 --- a/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java +++ b/Mage.Sets/src/mage/cards/k/KarnSilverGolem.java @@ -60,6 +60,7 @@ class KarnSilverGolemEffect extends ContinuousEffectImpl { KarnSilverGolemEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private KarnSilverGolemEffect(final KarnSilverGolemEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KarnTheGreatCreator.java b/Mage.Sets/src/mage/cards/k/KarnTheGreatCreator.java index 596de41eced..52e6b54ffac 100644 --- a/Mage.Sets/src/mage/cards/k/KarnTheGreatCreator.java +++ b/Mage.Sets/src/mage/cards/k/KarnTheGreatCreator.java @@ -96,6 +96,7 @@ class KarnTheGreatCreatorAnimateEffect extends ContinuousEffectImpl { super(Duration.UntilYourNextTurn, Outcome.BecomeCreature); staticText = "Until your next turn, up to one target noncreature artifact becomes " + "an artifact creature with power and toughness each equal to its mana value."; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private KarnTheGreatCreatorAnimateEffect(final KarnTheGreatCreatorAnimateEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KarnsTouch.java b/Mage.Sets/src/mage/cards/k/KarnsTouch.java index 221ca5c1724..ba10ee299a5 100644 --- a/Mage.Sets/src/mage/cards/k/KarnsTouch.java +++ b/Mage.Sets/src/mage/cards/k/KarnsTouch.java @@ -6,11 +6,7 @@ import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; import mage.game.Game; @@ -52,6 +48,7 @@ class KarnsTouchEffect extends ContinuousEffectImpl { KarnsTouchEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private KarnsTouchEffect(final KarnsTouchEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java index 572d395df98..63a7026988e 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java @@ -62,6 +62,7 @@ class LiegeOfTheTangleEffect extends ContinuousEffectImpl { LiegeOfTheTangleEffect() { super(Duration.EndOfGame, Outcome.BecomeCreature); staticText = "each of those lands is an 8/8 green Elemental creature for as long as it has an awakening counter on it. They're still lands"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private LiegeOfTheTangleEffect(final LiegeOfTheTangleEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LuxiorGiadasGift.java b/Mage.Sets/src/mage/cards/l/LuxiorGiadasGift.java index a155d828c3b..b0349bd6470 100644 --- a/Mage.Sets/src/mage/cards/l/LuxiorGiadasGift.java +++ b/Mage.Sets/src/mage/cards/l/LuxiorGiadasGift.java @@ -98,6 +98,7 @@ class LuxiorGiadasGiftEffect extends ContinuousEffectImpl { LuxiorGiadasGiftEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "equipped permanent isn't a planeswalker and is a creature in addition to its other types"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private LuxiorGiadasGiftEffect(final LuxiorGiadasGiftEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MajesticMetamorphosis.java b/Mage.Sets/src/mage/cards/m/MajesticMetamorphosis.java index bc03754a22b..54c21da2d7c 100644 --- a/Mage.Sets/src/mage/cards/m/MajesticMetamorphosis.java +++ b/Mage.Sets/src/mage/cards/m/MajesticMetamorphosis.java @@ -46,6 +46,7 @@ class MajesticMetamorphosisEffect extends ContinuousEffectImpl { super(Duration.EndOfTurn, Outcome.Benefit); staticText = "until end of turn, target artifact or creature becomes " + "a 4/4 Angel artifact creature and gains flying"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private MajesticMetamorphosisEffect(final MajesticMetamorphosisEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java index 6c22ed486b9..117e184df0b 100644 --- a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java +++ b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java @@ -50,6 +50,8 @@ class MarchOfTheMachinesEffect extends ContinuousEffectImpl { super(Duration.WhileOnBattlefield, Outcome.BecomeCreature); staticText = "Each noncreature artifact is an artifact creature with power and toughness each equal to its mana value"; dependendToTypes.add(DependencyType.ArtifactAddingRemoving); + + dependencyTypes.add(DependencyType.BecomeCreature); } private MarchOfTheMachinesEffect(final MarchOfTheMachinesEffect effect) { diff --git a/Mage.Sets/src/mage/cards/o/OkoThiefOfCrowns.java b/Mage.Sets/src/mage/cards/o/OkoThiefOfCrowns.java index 0540947b704..e874e0cf00a 100644 --- a/Mage.Sets/src/mage/cards/o/OkoThiefOfCrowns.java +++ b/Mage.Sets/src/mage/cards/o/OkoThiefOfCrowns.java @@ -72,6 +72,7 @@ class OkoThiefOfCrownsEffect extends ContinuousEffectImpl { super(Duration.Custom, Outcome.Benefit); staticText = "target artifact or creature loses all abilities " + "and becomes a green Elk creature with base power and toughness 3/3"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private OkoThiefOfCrownsEffect(final OkoThiefOfCrownsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RelicsRoar.java b/Mage.Sets/src/mage/cards/r/RelicsRoar.java index d2ab7421a4a..f7533e4076f 100644 --- a/Mage.Sets/src/mage/cards/r/RelicsRoar.java +++ b/Mage.Sets/src/mage/cards/r/RelicsRoar.java @@ -41,6 +41,7 @@ class RelicsRoarEffect extends ContinuousEffectImpl { super(Duration.EndOfTurn, Outcome.Benefit); staticText = "until end of turn, target artifact or creature becomes a Dinosaur artifact creature " + "with base power and toughness 4/3 in addition to its other types"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private RelicsRoarEffect(final RelicsRoarEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java b/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java index 6d0217c0109..dc07a0a5276 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanTheDragonspeaker.java @@ -65,6 +65,7 @@ class SarkhanTheDragonspeakerEffect extends ContinuousEffectImpl { SarkhanTheDragonspeakerEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "Until end of turn, {this} becomes a legendary 4/4 red Dragon creature with flying, indestructible, and haste."; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private SarkhanTheDragonspeakerEffect(final SarkhanTheDragonspeakerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SarkhanTheMasterless.java b/Mage.Sets/src/mage/cards/s/SarkhanTheMasterless.java index 88ba634a00e..d5003fdd51b 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanTheMasterless.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanTheMasterless.java @@ -91,6 +91,7 @@ class SarkhanTheMasterlessBecomeDragonEffect extends ContinuousEffectImpl { SarkhanTheMasterlessBecomeDragonEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "Until end of turn, each planeswalker you control becomes a 4/4 red Dragon creature and gains flying."; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private SarkhanTheMasterlessBecomeDragonEffect(final SarkhanTheMasterlessBecomeDragonEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SlumberingTora.java b/Mage.Sets/src/mage/cards/s/SlumberingTora.java index 42aac02ba0a..adfa6f3e726 100644 --- a/Mage.Sets/src/mage/cards/s/SlumberingTora.java +++ b/Mage.Sets/src/mage/cards/s/SlumberingTora.java @@ -57,6 +57,7 @@ class SlumberingToraEffect extends ContinuousEffectImpl { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "{this} becomes an X/X Cat artifact creature until end of turn, " + "where X is the discarded card's mana value"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private SlumberingToraEffect(final SlumberingToraEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SparkRupture.java b/Mage.Sets/src/mage/cards/s/SparkRupture.java index c98094d5f72..094a29a1275 100644 --- a/Mage.Sets/src/mage/cards/s/SparkRupture.java +++ b/Mage.Sets/src/mage/cards/s/SparkRupture.java @@ -54,6 +54,7 @@ class SparkRuptureEffect extends ContinuousEffectImpl { super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "each planeswalker with one or more loyalty counters on it loses all abilities " + "and is a creature with power and toughness each equal to the number of loyalty counters on it"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private SparkRuptureEffect(final SparkRuptureEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java index 6cba8effd37..a3640fce2bf 100644 --- a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java +++ b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java @@ -73,6 +73,7 @@ class SydriGalvanicGeniusEffect extends ContinuousEffectImpl { SydriGalvanicGeniusEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private SydriGalvanicGeniusEffect(final SydriGalvanicGeniusEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TangletroveKelp.java b/Mage.Sets/src/mage/cards/t/TangletroveKelp.java index 86149e4d04f..bd222c006f0 100644 --- a/Mage.Sets/src/mage/cards/t/TangletroveKelp.java +++ b/Mage.Sets/src/mage/cards/t/TangletroveKelp.java @@ -60,6 +60,7 @@ class TangletroveKelpEffect extends ContinuousEffectImpl { TangletroveKelpEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "other Clues you control become 6/6 Plant creatures in addition to their other types until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private TangletroveKelpEffect(final TangletroveKelpEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java index 524cec21d69..defd76cd1fc 100644 --- a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java +++ b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java @@ -51,6 +51,7 @@ class TestamentOfFaithEffect extends ContinuousEffectImpl { TestamentOfFaithEffect() { super(Duration.EndOfTurn, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.BecomeCreature); staticText = " Wall creature"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private TestamentOfFaithEffect(final TestamentOfFaithEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TezzeretBetrayerOfFlesh.java b/Mage.Sets/src/mage/cards/t/TezzeretBetrayerOfFlesh.java index 5ff979b1150..4f0ad18a8ef 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretBetrayerOfFlesh.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretBetrayerOfFlesh.java @@ -144,6 +144,7 @@ class TezzeretBetrayerOfFleshTypeEffect extends ContinuousEffectImpl { super(Duration.Custom, Outcome.BecomeCreature); staticText = "target artifact becomes an artifact creature. " + "If it isn't a Vehicle, it has base power and toughness 4/4"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private TezzeretBetrayerOfFleshTypeEffect(final TezzeretBetrayerOfFleshTypeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java b/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java index 8ac4fc2e510..8ae9ad4f28e 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretTheSeeker.java @@ -103,6 +103,7 @@ class TezzeretTheSeekerEffect3 extends ContinuousEffectImpl { public TezzeretTheSeekerEffect3() { super(Duration.EndOfTurn, Outcome.BecomeCreature); this.staticText = "Artifacts you control become artifact creatures with base power and toughness 5/5 until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private TezzeretTheSeekerEffect3(final TezzeretTheSeekerEffect3 effect) { diff --git a/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java b/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java index e0aed6c05d3..0a20c783203 100644 --- a/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java +++ b/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java @@ -54,6 +54,7 @@ class TheAntiquitiesWarEffect extends ContinuousEffectImpl { TheAntiquitiesWarEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); this.staticText = "Artifacts you control become artifact creatures with base power and toughness 5/5 until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private TheAntiquitiesWarEffect(final TheAntiquitiesWarEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TheBlackstaffOfWaterdeep.java b/Mage.Sets/src/mage/cards/t/TheBlackstaffOfWaterdeep.java index f5fcee867d4..86e25c0d386 100644 --- a/Mage.Sets/src/mage/cards/t/TheBlackstaffOfWaterdeep.java +++ b/Mage.Sets/src/mage/cards/t/TheBlackstaffOfWaterdeep.java @@ -65,6 +65,7 @@ class TheBlackstaffOfWaterdeepEffect extends ContinuousEffectImpl { super(Duration.Custom, Outcome.Benefit); staticText = "another target nontoken artifact you control becomes " + "a 4/4 artifact creature for as long as {this} remains tapped"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private TheBlackstaffOfWaterdeepEffect(final TheBlackstaffOfWaterdeepEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TitaniasSong.java b/Mage.Sets/src/mage/cards/t/TitaniasSong.java index a9306e863f8..16d174eee52 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniasSong.java +++ b/Mage.Sets/src/mage/cards/t/TitaniasSong.java @@ -10,12 +10,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; import mage.game.Game; @@ -56,6 +51,7 @@ class TitaniasSongEffect extends ContinuousEffectImpl { public TitaniasSongEffect(Duration duration) { super(duration, Outcome.BecomeCreature); staticText = "Each noncreature artifact loses its abilities and is an artifact creature with power and toughness each equal to its mana value"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private TitaniasSongEffect(final TitaniasSongEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/Toymaker.java b/Mage.Sets/src/mage/cards/t/Toymaker.java index 2dd8bd47339..985b8881f19 100644 --- a/Mage.Sets/src/mage/cards/t/Toymaker.java +++ b/Mage.Sets/src/mage/cards/t/Toymaker.java @@ -11,13 +11,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.SubType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; import mage.game.Game; @@ -66,6 +60,7 @@ class ToymakerEffect extends ContinuousEffectImpl { ToymakerEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); staticText = "Target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private ToymakerEffect(final ToymakerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TuneUp.java b/Mage.Sets/src/mage/cards/t/TuneUp.java index eebcef11ae2..c76ba069c0d 100644 --- a/Mage.Sets/src/mage/cards/t/TuneUp.java +++ b/Mage.Sets/src/mage/cards/t/TuneUp.java @@ -3,14 +3,11 @@ package mage.cards.t; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; -import mage.abilities.effects.common.ReturnFromYourGraveyardToBattlefieldAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; +import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; @@ -42,11 +39,12 @@ public final class TuneUp extends CardImpl { } } -class TuneUpEffect extends OneShotEffect { +class TuneUpEffect extends ContinuousEffectImpl { TuneUpEffect() { - super(Outcome.BecomeCreature); + super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.staticText = "If it's a Vehicle, it becomes an artifact creature"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private TuneUpEffect(final TuneUpEffect effect) { diff --git a/Mage.Sets/src/mage/cards/v/VeiledSentry.java b/Mage.Sets/src/mage/cards/v/VeiledSentry.java index b541b5abc15..47e1dafc782 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledSentry.java +++ b/Mage.Sets/src/mage/cards/v/VeiledSentry.java @@ -51,6 +51,7 @@ class VeiledSentryEffect extends ContinuousEffectImpl { public VeiledSentryEffect() { super(Duration.Custom, Outcome.BecomeCreature); staticText = "{this} becomes an Illusion creature with power and toughness equal to that spell's mana value"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private VeiledSentryEffect(final VeiledSentryEffect effect) { diff --git a/Mage.Sets/src/mage/cards/w/WeatherlightCompleated.java b/Mage.Sets/src/mage/cards/w/WeatherlightCompleated.java index 430dd73e943..31381654dd5 100644 --- a/Mage.Sets/src/mage/cards/w/WeatherlightCompleated.java +++ b/Mage.Sets/src/mage/cards/w/WeatherlightCompleated.java @@ -71,6 +71,7 @@ class WeatherlightCompleatedEffect extends ContinuousEffectImpl { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "as long as {this} has four or more phyresis counters on it, " + "it's a Phyrexian creature in addition to its other types"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private WeatherlightCompleatedEffect(final WeatherlightCompleatedEffect effect) { diff --git a/Mage.Sets/src/mage/cards/w/WeepingAngel.java b/Mage.Sets/src/mage/cards/w/WeepingAngel.java index 3aedf42ed7c..45623b0f5ea 100644 --- a/Mage.Sets/src/mage/cards/w/WeepingAngel.java +++ b/Mage.Sets/src/mage/cards/w/WeepingAngel.java @@ -69,6 +69,7 @@ class WeepingAngelMarbleizeEffect extends ContinuousEffectImpl { WeepingAngelMarbleizeEffect() { super(Duration.EndOfTurn, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Detriment); staticText = "{this} isn't a creature until end of turn."; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private WeepingAngelMarbleizeEffect(final WeepingAngelMarbleizeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java index 20e9949ff7c..90e0f410a77 100644 --- a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java +++ b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java @@ -9,14 +9,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.SubLayer; -import mage.constants.SubType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; import mage.game.Game; @@ -69,6 +62,7 @@ class XenicPoltergeistEffect extends ContinuousEffectImpl { public XenicPoltergeistEffect() { super(Duration.Custom, Outcome.BecomeCreature); staticText = "Until your next upkeep, target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private XenicPoltergeistEffect(final XenicPoltergeistEffect effect) { diff --git a/Mage.Sets/src/mage/cards/x/Xenograft.java b/Mage.Sets/src/mage/cards/x/Xenograft.java index 372c4cf5a4a..f8141eedb81 100644 --- a/Mage.Sets/src/mage/cards/x/Xenograft.java +++ b/Mage.Sets/src/mage/cards/x/Xenograft.java @@ -45,6 +45,7 @@ class XenograftAddSubtypeEffect extends ContinuousEffectImpl { XenograftAddSubtypeEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); staticText = "Each creature you control is the chosen type in addition to its other types"; + this.dependendToTypes.add(DependencyType.BecomeCreature); } private XenograftAddSubtypeEffect(final XenograftAddSubtypeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java b/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java index 7840ec91610..c25729cc55a 100644 --- a/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java +++ b/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java @@ -79,6 +79,7 @@ class ZurEternalSchemerEffect extends ContinuousEffectImpl { super(Duration.EndOfGame, Outcome.BecomeCreature); staticText = "Target non-Aura enchantment you control becomes a creature in addition to its other types " + "and has base power and base toughness each equal to its mana value."; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private ZurEternalSchemerEffect(final ZurEternalSchemerEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java index 543245abb19..11844e6c322 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java @@ -36,6 +36,7 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl { this.token = token; this.loseType = loseType; staticText = text; + this.dependencyTypes.add(DependencyType.BecomeCreature); } protected BecomesCreatureAttachedEffect(final BecomesCreatureAttachedEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java index e9e9ee45137..f04894de77c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureIfVehicleEffect.java @@ -16,6 +16,7 @@ public class BecomesCreatureIfVehicleEffect extends ContinuousEffectImpl { public BecomesCreatureIfVehicleEffect() { super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.staticText = "As long as enchanted permanent is a Vehicle, it's a creature in addition to its other types"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } protected BecomesCreatureIfVehicleEffect(final BecomesCreatureIfVehicleEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/VehiclesBecomeArtifactCreatureEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/VehiclesBecomeArtifactCreatureEffect.java index 961adf11310..66f8632b223 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/VehiclesBecomeArtifactCreatureEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/VehiclesBecomeArtifactCreatureEffect.java @@ -11,6 +11,7 @@ public class VehiclesBecomeArtifactCreatureEffect extends ContinuousEffectImpl { public VehiclesBecomeArtifactCreatureEffect(Duration duration) { super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.BecomeCreature); staticText = "Vehicles you control become artifact creatures until end of turn"; + this.dependencyTypes.add(DependencyType.BecomeCreature); } private VehiclesBecomeArtifactCreatureEffect(final VehiclesBecomeArtifactCreatureEffect effect) {