diff --git a/Mage.Sets/src/mage/cards/a/AlandraSkyDreamer.java b/Mage.Sets/src/mage/cards/a/AlandraSkyDreamer.java deleted file mode 100644 index c933f6f8df1..00000000000 --- a/Mage.Sets/src/mage/cards/a/AlandraSkyDreamer.java +++ /dev/null @@ -1,91 +0,0 @@ -package mage.cards.a; - -import mage.MageInt; -import mage.abilities.common.DrawCardTriggeredAbility; -import mage.abilities.effects.common.CreateTokenEffect; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.game.permanent.token.DrakeToken; - -import java.util.UUID; -import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; -import mage.abilities.effects.common.continuous.BoostAllOfChosenSubtypeEffect; -import mage.abilities.effects.common.continuous.BoostSourceEffect; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.filter.common.FilterCreaturePermanent; - -/** - * @author amoscatelli - */ -public final class AlandraSkyDreamer extends CardImpl { - - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("drakes you control"); - - static { - filter.add(TargetController.YOU.getControllerPredicate()); - filter.add(SubType.DRAKE.getPredicate()); - } - - public AlandraSkyDreamer(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); - addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.MERFOLK); - this.subtype.add(SubType.WIZARD); - - this.power = new MageInt(2); - this.toughness = new MageInt(4); - - // Whenever you draw your second card earch turn, create a 2/2 blue Drake creature token with flying. - this.addAbility( - new DrawCardTriggeredAbility( - new CreateTokenEffect( - new DrakeToken() - ), - false, - 2 - ) - ); - - // Whenever you draw your fifth card each turn, Drakes you control each get +X/+X until end of turn, where X is the number of cards in your hand. - this.addAbility( - new DrawCardTriggeredAbility( - new BoostAllOfChosenSubtypeEffect( - CardsInControllerHandCount.instance, - CardsInControllerHandCount.instance, - Duration.EndOfTurn, - filter, - true - ), - false, - 5 - ) - ); - - // Whenever you draw your fifth card each turn, Alandra, Sky Dreamer get +X/+X until end of turn, where X is the number of cards in your hand. - this.addAbility( - new DrawCardTriggeredAbility( - new BoostSourceEffect( - CardsInControllerHandCount.instance, - CardsInControllerHandCount.instance, - Duration.EndOfTurn - ), - false, - 5 - ) - ); - - } - - private AlandraSkyDreamer(final AlandraSkyDreamer card) { - super(card); - } - - @Override - public AlandraSkyDreamer copy() { - return new AlandraSkyDreamer(this); - } -} diff --git a/Mage.Sets/src/mage/cards/b/BloodhazeWolverine.java b/Mage.Sets/src/mage/cards/b/BloodhazeWolverine.java index cec956f444f..38b7b6e5131 100644 --- a/Mage.Sets/src/mage/cards/b/BloodhazeWolverine.java +++ b/Mage.Sets/src/mage/cards/b/BloodhazeWolverine.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -27,9 +27,9 @@ public final class BloodhazeWolverine extends CardImpl { this.toughness = new MageInt(1); // Whenever you draw your second card each turn, Bloodhaze Wolverine gets +1/+1 and gains first strike until end of turn. - Ability ability = new DrawCardTriggeredAbility(new BoostSourceEffect( + Ability ability = new DrawSecondCardTriggeredAbility(new BoostSourceEffect( 1, 1, Duration.EndOfTurn - ).setText("{this} gets +1/+1"), false, 2); + ).setText("{this} gets +1/+1"), false); ability.addEffect(new GainAbilitySourceEffect( FirstStrikeAbility.getInstance(), Duration.EndOfTurn ).setText("and gains first strike until end of turn")); diff --git a/Mage.Sets/src/mage/cards/d/DoggedDetective.java b/Mage.Sets/src/mage/cards/d/DoggedDetective.java index 7ff9cb5eb49..fa3e4d50c84 100644 --- a/Mage.Sets/src/mage/cards/d/DoggedDetective.java +++ b/Mage.Sets/src/mage/cards/d/DoggedDetective.java @@ -2,7 +2,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; import mage.abilities.effects.keyword.SurveilEffect; @@ -31,7 +31,7 @@ public final class DoggedDetective extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SurveilEffect(2))); // Whenever an opponent draws their second card each turn, you may return Dogged Detective from your graveyard to your hand. - this.addAbility(new DrawCardTriggeredAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), true, TargetController.OPPONENT, 2)); + this.addAbility(new DrawSecondCardTriggeredAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), true, TargetController.OPPONENT)); } private DoggedDetective(final DoggedDetective card) { diff --git a/Mage.Sets/src/mage/cards/e/EtherealInvestigator.java b/Mage.Sets/src/mage/cards/e/EtherealInvestigator.java index d8437fba9c1..a42ce321bd3 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealInvestigator.java +++ b/Mage.Sets/src/mage/cards/e/EtherealInvestigator.java @@ -1,7 +1,7 @@ package mage.cards.e; import mage.MageInt; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.OpponentsCount; import mage.abilities.effects.common.CreateTokenEffect; @@ -34,8 +34,8 @@ public final class EtherealInvestigator extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new InvestigateEffect(OpponentsCount.instance))); // Whenever you draw your second card each turn, create a 1/1 white Spirit creature token with flying. - this.addAbility(new DrawCardTriggeredAbility( - new CreateTokenEffect(new SpiritWhiteToken()), false, 2 + this.addAbility(new DrawSecondCardTriggeredAbility( + new CreateTokenEffect(new SpiritWhiteToken()), false )); } diff --git a/Mage.Sets/src/mage/cards/f/FaerieVandal.java b/Mage.Sets/src/mage/cards/f/FaerieVandal.java index 3a8ecaf1ac0..dff975f655d 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieVandal.java +++ b/Mage.Sets/src/mage/cards/f/FaerieVandal.java @@ -1,7 +1,7 @@ package mage.cards.f; import mage.MageInt; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; @@ -33,8 +33,8 @@ public final class FaerieVandal extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you draw your second card each turn, put a +1/+1 counter on Faerie Vandal. - this.addAbility(new DrawCardTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, 2 + this.addAbility(new DrawSecondCardTriggeredAbility( + new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false )); } diff --git a/Mage.Sets/src/mage/cards/g/GaviNestWarden.java b/Mage.Sets/src/mage/cards/g/GaviNestWarden.java index 23076f9a03c..fc839dbfcde 100644 --- a/Mage.Sets/src/mage/cards/g/GaviNestWarden.java +++ b/Mage.Sets/src/mage/cards/g/GaviNestWarden.java @@ -2,7 +2,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.CyclingDiscardCost; import mage.abilities.costs.mana.GenericManaCost; @@ -40,7 +40,7 @@ public final class GaviNestWarden extends CardImpl { this.addAbility(new SimpleStaticAbility(new CyclingZeroCostEffect()), new GaviNestWardenWatcher()); // Whenever you draw your second card each turn, create a 2/2 red and white Dinosaur Cat creature token. - this.addAbility(new DrawCardTriggeredAbility(new CreateTokenEffect(new DinosaurCatToken()), false, 2)); + this.addAbility(new DrawSecondCardTriggeredAbility(new CreateTokenEffect(new DinosaurCatToken()), false)); } private GaviNestWarden(final GaviNestWarden card) { diff --git a/Mage.Sets/src/mage/cards/g/GixianPuppeteer.java b/Mage.Sets/src/mage/cards/g/GixianPuppeteer.java index 4c436531d3a..9133871cc9d 100644 --- a/Mage.Sets/src/mage/cards/g/GixianPuppeteer.java +++ b/Mage.Sets/src/mage/cards/g/GixianPuppeteer.java @@ -4,7 +4,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesSourceTriggeredAbility; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; @@ -41,7 +41,7 @@ public final class GixianPuppeteer extends CardImpl { this.toughness = new MageInt(3); // Whenever you draw your second card each turn, each opponent loses 2 life and you gain 2 life. - Ability ability = new DrawCardTriggeredAbility(new LoseLifeOpponentsEffect(2), false, 2); + Ability ability = new DrawSecondCardTriggeredAbility(new LoseLifeOpponentsEffect(2), false); ability.addEffect(new GainLifeEffect(2).concatBy("and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GurglingAnointer.java b/Mage.Sets/src/mage/cards/g/GurglingAnointer.java index c1ce8462d65..03f99beefbb 100644 --- a/Mage.Sets/src/mage/cards/g/GurglingAnointer.java +++ b/Mage.Sets/src/mage/cards/g/GurglingAnointer.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.DiesSourceTriggeredAbility; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -52,7 +52,7 @@ public final class GurglingAnointer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you draw your second card each turn, put a +1/+1 counter on Gurgling Anointer. - this.addAbility(new DrawCardTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, 2)); + this.addAbility(new DrawSecondCardTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // When Gurgling Anointer dies, return another target creature card with mana value less than or equal to Gurgling Anointer's power from your graveyard to the battlefield. Ability ability = new DiesSourceTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/i/ImprobableAlliance.java b/Mage.Sets/src/mage/cards/i/ImprobableAlliance.java index 1ff77bccd40..40c680fb5fc 100644 --- a/Mage.Sets/src/mage/cards/i/ImprobableAlliance.java +++ b/Mage.Sets/src/mage/cards/i/ImprobableAlliance.java @@ -1,6 +1,6 @@ package mage.cards.i; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -21,7 +21,7 @@ public final class ImprobableAlliance extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}{R}"); // Whenever you draw your second card each turn, create a 1/1 blue Faerie creature token with flying. - this.addAbility(new DrawCardTriggeredAbility(new CreateTokenEffect(new FaerieToken()), false, 2)); + this.addAbility(new DrawSecondCardTriggeredAbility(new CreateTokenEffect(new FaerieToken()), false)); // {4}{U}{R}: Draw a card, then discard a card. this.addAbility(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/i/IrencragPyromancer.java b/Mage.Sets/src/mage/cards/i/IrencragPyromancer.java index bbfe345c182..15265ab3170 100644 --- a/Mage.Sets/src/mage/cards/i/IrencragPyromancer.java +++ b/Mage.Sets/src/mage/cards/i/IrencragPyromancer.java @@ -2,7 +2,7 @@ package mage.cards.i; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class IrencragPyromancer extends CardImpl { this.toughness = new MageInt(4); // Whenever you draw your second card each turn, Irencrag Pyromancer deals 3 damage to any target. - Ability ability = new DrawCardTriggeredAbility(new DamageTargetEffect(3), false, 2); + Ability ability = new DrawSecondCardTriggeredAbility(new DamageTargetEffect(3), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JaceArcaneStrategist.java b/Mage.Sets/src/mage/cards/j/JaceArcaneStrategist.java index 2d76b46b9bc..3ed23ece1d1 100644 --- a/Mage.Sets/src/mage/cards/j/JaceArcaneStrategist.java +++ b/Mage.Sets/src/mage/cards/j/JaceArcaneStrategist.java @@ -2,7 +2,7 @@ package mage.cards.j; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.combat.CantBeBlockedAllEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -31,8 +31,8 @@ public final class JaceArcaneStrategist extends CardImpl { this.setStartingLoyalty(4); // Whenever you draw your second card each turn, put a +1/+1 counter on target creature you control. - Ability ability = new DrawCardTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false, 2 + Ability ability = new DrawSecondCardTriggeredAbility( + new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false ); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/Jackhammer.java b/Mage.Sets/src/mage/cards/j/Jackhammer.java index aa123650ef2..db185bac9f7 100644 --- a/Mage.Sets/src/mage/cards/j/Jackhammer.java +++ b/Mage.Sets/src/mage/cards/j/Jackhammer.java @@ -2,7 +2,7 @@ package mage.cards.j; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DrawCardSourceControllerEffect; diff --git a/Mage.Sets/src/mage/cards/j/JolraelMwonvuliRecluse.java b/Mage.Sets/src/mage/cards/j/JolraelMwonvuliRecluse.java index 6fbf95c4d56..f1bf5241920 100644 --- a/Mage.Sets/src/mage/cards/j/JolraelMwonvuliRecluse.java +++ b/Mage.Sets/src/mage/cards/j/JolraelMwonvuliRecluse.java @@ -1,7 +1,7 @@ package mage.cards.j; import mage.MageInt; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; @@ -33,7 +33,7 @@ public final class JolraelMwonvuliRecluse extends CardImpl { this.toughness = new MageInt(2); // Whenever you draw your second card each turn, create a 2/2 green Cat creature token. - this.addAbility(new DrawCardTriggeredAbility(new CreateTokenEffect(new GreenCat2Token()), false, 2)); + this.addAbility(new DrawSecondCardTriggeredAbility(new CreateTokenEffect(new GreenCat2Token()), false)); // {4}{G}{G}: Until end of turn, creatures you control have base power and toughness X/X, where X is the number of cards in your hand. this.addAbility(new SimpleActivatedAbility(new SetBasePowerToughnessAllEffect( diff --git a/Mage.Sets/src/mage/cards/l/LatNamAdept.java b/Mage.Sets/src/mage/cards/l/LatNamAdept.java index 4ab7a876149..fe6c63dbd84 100644 --- a/Mage.Sets/src/mage/cards/l/LatNamAdept.java +++ b/Mage.Sets/src/mage/cards/l/LatNamAdept.java @@ -1,7 +1,7 @@ package mage.cards.l; import mage.MageInt; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,8 +25,8 @@ public final class LatNamAdept extends CardImpl { this.toughness = new MageInt(3); // Whenever you draw your second card each turn, put a +1/+1 counter on Lat-Nam Adept. - this.addAbility(new DrawCardTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, 2 + this.addAbility(new DrawSecondCardTriggeredAbility( + new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false )); } diff --git a/Mage.Sets/src/mage/cards/m/MadRatter.java b/Mage.Sets/src/mage/cards/m/MadRatter.java index 47047f47bbf..aa38a136333 100644 --- a/Mage.Sets/src/mage/cards/m/MadRatter.java +++ b/Mage.Sets/src/mage/cards/m/MadRatter.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.MageInt; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class MadRatter extends CardImpl { this.toughness = new MageInt(2); // Whenever you draw your second card each turn, create two 1/1 black Rat creature tokens. - this.addAbility(new DrawCardTriggeredAbility(new CreateTokenEffect(new RatToken(), 2), false, 2)); + this.addAbility(new DrawSecondCardTriggeredAbility(new CreateTokenEffect(new RatToken(), 2), false)); } private MadRatter(final MadRatter card) { diff --git a/Mage.Sets/src/mage/cards/m/MantleOfTides.java b/Mage.Sets/src/mage/cards/m/MantleOfTides.java index aa61c42d4ec..efde9dae20c 100644 --- a/Mage.Sets/src/mage/cards/m/MantleOfTides.java +++ b/Mage.Sets/src/mage/cards/m/MantleOfTides.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.abilities.Ability; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; @@ -29,9 +29,9 @@ public final class MantleOfTides extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 2))); // Whenever you draw your second card each turn, attach Mantle of Tides to target creature you control. - Ability ability = new DrawCardTriggeredAbility(new AttachEffect( + Ability ability = new DrawSecondCardTriggeredAbility(new AttachEffect( Outcome.Benefit, "attach {this} to target creature you control" - ), false, 2); + ), false); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MinnWilyIllusionist.java b/Mage.Sets/src/mage/cards/m/MinnWilyIllusionist.java index 0d4c748029e..454c45fe487 100644 --- a/Mage.Sets/src/mage/cards/m/MinnWilyIllusionist.java +++ b/Mage.Sets/src/mage/cards/m/MinnWilyIllusionist.java @@ -3,7 +3,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.Card; @@ -41,8 +41,8 @@ public final class MinnWilyIllusionist extends CardImpl { this.toughness = new MageInt(3); // Whenever you draw your second card each turn, create a 1/1 blue Illusion creature token with "This creature gets +1/+0 for each other Illusion you control." - this.addAbility(new DrawCardTriggeredAbility( - new CreateTokenEffect(new MinnWilyIllusionistToken()), false, 2 + this.addAbility(new DrawSecondCardTriggeredAbility( + new CreateTokenEffect(new MinnWilyIllusionistToken()), false )); // Whenever an Illusion you control dies, you may put a permanent card with mana value less than or equal to that creature's power from your hand onto the battlefield. diff --git a/Mage.Sets/src/mage/cards/m/MysticSkyfish.java b/Mage.Sets/src/mage/cards/m/MysticSkyfish.java index a6626145f7d..9c75a23b5c6 100644 --- a/Mage.Sets/src/mage/cards/m/MysticSkyfish.java +++ b/Mage.Sets/src/mage/cards/m/MysticSkyfish.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.MageInt; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -25,8 +25,8 @@ public final class MysticSkyfish extends CardImpl { this.toughness = new MageInt(1); // Whenever you draw your second card each turn, Mystic Skyfish gains flying until end of turn. - this.addAbility(new DrawCardTriggeredAbility( - new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false, 2) + this.addAbility(new DrawSecondCardTriggeredAbility( + new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false) ); } diff --git a/Mage.Sets/src/mage/cards/s/SteelgazeGriffin.java b/Mage.Sets/src/mage/cards/s/SteelgazeGriffin.java index 7acea05e106..303869131ef 100644 --- a/Mage.Sets/src/mage/cards/s/SteelgazeGriffin.java +++ b/Mage.Sets/src/mage/cards/s/SteelgazeGriffin.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class SteelgazeGriffin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When you draw your second card each turn, Steelgaze Griffin gets +2/+0 until end of turn. - this.addAbility(new DrawCardTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false, 2)); + this.addAbility(new DrawSecondCardTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false)); } private SteelgazeGriffin(final SteelgazeGriffin card) { diff --git a/Mage.Sets/src/mage/cards/t/TheCouncilOfFour.java b/Mage.Sets/src/mage/cards/t/TheCouncilOfFour.java index d06dbe25f8f..0564008a997 100644 --- a/Mage.Sets/src/mage/cards/t/TheCouncilOfFour.java +++ b/Mage.Sets/src/mage/cards/t/TheCouncilOfFour.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.common.CastSecondSpellTriggeredAbility; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -30,10 +30,10 @@ public final class TheCouncilOfFour extends CardImpl { this.toughness = new MageInt(8); // Whenever a player draws their second card during their turn, you draw a card. - this.addAbility(new DrawCardTriggeredAbility( + this.addAbility(new DrawSecondCardTriggeredAbility( new DrawCardSourceControllerEffect(1) .setText("you draw a card"), - false, TargetController.ACTIVE, 2 + false, TargetController.ACTIVE )); // Whenever a player casts their second spell during their turn, you create a 2/2 white Knight creature token. diff --git a/Mage.Sets/src/mage/cards/t/ThopterMechanic.java b/Mage.Sets/src/mage/cards/t/ThopterMechanic.java index 461023a26ec..8a4f9142ecd 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterMechanic.java +++ b/Mage.Sets/src/mage/cards/t/ThopterMechanic.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.common.DiesSourceTriggeredAbility; -import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.DrawSecondCardTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; @@ -28,8 +28,8 @@ public final class ThopterMechanic extends CardImpl { this.toughness = new MageInt(1); // Whenever you draw your second card each turn, put a +1/+1 counter on Thopter Mechanic. - this.addAbility(new DrawCardTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, 2 + this.addAbility(new DrawSecondCardTriggeredAbility( + new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false )); // When Thopter Mechanic dies, create a 1/1 colorless Thopter artifact creature token with flying. diff --git a/Mage.Sets/src/mage/sets/Jumpstart2022.java b/Mage.Sets/src/mage/sets/Jumpstart2022.java index ee2b1c39b20..a8232718a24 100644 --- a/Mage.Sets/src/mage/sets/Jumpstart2022.java +++ b/Mage.Sets/src/mage/sets/Jumpstart2022.java @@ -32,7 +32,6 @@ public final class Jumpstart2022 extends ExpansionSet { cards.add(new SetCardInfo("Aftershock", 129, Rarity.COMMON, mage.cards.a.Aftershock.class)); cards.add(new SetCardInfo("Ajani's Pridemate", 142, Rarity.UNCOMMON, mage.cards.a.AjanisPridemate.class)); cards.add(new SetCardInfo("Ajani, Strength of the Pride", 141, Rarity.MYTHIC, mage.cards.a.AjaniStrengthOfThePride.class)); - cards.add(new SetCardInfo("Alandra, Sky Dreamer", 9, Rarity.RARE, mage.cards.a.AlandraSkyDreamer.class)); cards.add(new SetCardInfo("Alchemist's Vial", 753, Rarity.COMMON, mage.cards.a.AlchemistsVial.class)); cards.add(new SetCardInfo("Alley Strangler", 375, Rarity.COMMON, mage.cards.a.AlleyStrangler.class)); cards.add(new SetCardInfo("Alseid of Life's Bounty", 143, Rarity.UNCOMMON, mage.cards.a.AlseidOfLifesBounty.class)); diff --git a/Mage/src/main/java/mage/abilities/common/DrawCardTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DrawSecondCardTriggeredAbility.java similarity index 64% rename from Mage/src/main/java/mage/abilities/common/DrawCardTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DrawSecondCardTriggeredAbility.java index e9e49031b94..c0a38d83893 100644 --- a/Mage/src/main/java/mage/abilities/common/DrawCardTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DrawSecondCardTriggeredAbility.java @@ -18,36 +18,32 @@ import java.util.*; /** * @author TheElk801 */ -public class DrawCardTriggeredAbility extends TriggeredAbilityImpl { +public class DrawSecondCardTriggeredAbility extends TriggeredAbilityImpl { private static final Hint hint = new ValueHint( "Cards drawn this turn", CardsDrawnThisTurnDynamicValue.instance ); private final TargetController targetController; - private final DrawCardWatcher drawCardWatcher = new DrawCardWatcher(); - private final Integer cardNumber; - public DrawCardTriggeredAbility(Effect effect, boolean optional, Integer cardNumber) { - this(effect, optional, TargetController.YOU, cardNumber); + public DrawSecondCardTriggeredAbility(Effect effect, boolean optional) { + this(effect, optional, TargetController.YOU); } - public DrawCardTriggeredAbility(Effect effect, boolean optional, TargetController targetController, Integer cardNumber) { - this(Zone.BATTLEFIELD, effect, optional, targetController, cardNumber); + public DrawSecondCardTriggeredAbility(Effect effect, boolean optional, TargetController targetController) { + this(Zone.BATTLEFIELD, effect, optional, targetController); } - public DrawCardTriggeredAbility(Zone zone, Effect effect, boolean optional, TargetController targetController, Integer cardNumber) { + public DrawSecondCardTriggeredAbility(Zone zone, Effect effect, boolean optional, TargetController targetController) { super(zone, effect, optional); - this.addWatcher(this.drawCardWatcher); + this.addWatcher(new DrawSecondCardWatcher()); this.targetController = targetController; - this.cardNumber = cardNumber; this.addHint(hint); setTriggerPhrase(generateTriggerPhrase()); } - private DrawCardTriggeredAbility(final DrawCardTriggeredAbility ability) { + private DrawSecondCardTriggeredAbility(final DrawSecondCardTriggeredAbility ability) { super(ability); this.targetController = ability.targetController; - this.cardNumber = ability.cardNumber; } @Override @@ -77,7 +73,7 @@ public class DrawCardTriggeredAbility extends TriggeredAbilityImpl { default: throw new IllegalArgumentException("TargetController " + targetController + " not supported"); } - return drawCardWatcher.checkEvent(event.getPlayerId(), event, cardNumber); + return DrawSecondCardWatcher.checkEvent(event.getPlayerId(), event, game); } public String generateTriggerPhrase() { @@ -94,16 +90,17 @@ public class DrawCardTriggeredAbility extends TriggeredAbilityImpl { } @Override - public DrawCardTriggeredAbility copy() { - return new DrawCardTriggeredAbility(this); + public DrawSecondCardTriggeredAbility copy() { + return new DrawSecondCardTriggeredAbility(this); } } -class DrawCardWatcher extends Watcher { +class DrawSecondCardWatcher extends Watcher { - private final Map> drawMap = new HashMap<>(); + private final Set drewOnce = new HashSet<>(); + private final Map secondDrawMap = new HashMap<>(); - DrawCardWatcher() { + DrawSecondCardWatcher() { super(WatcherScope.GAME); } @@ -112,20 +109,21 @@ class DrawCardWatcher extends Watcher { if (event.getType() != GameEvent.EventType.DREW_CARD) { return; } - if (!drawMap.containsKey(event.getPlayerId())) { - drawMap.putIfAbsent(event.getPlayerId(), new TreeSet<>()); + if (drewOnce.contains(event.getPlayerId())) { + secondDrawMap.putIfAbsent(event.getPlayerId(), event.getId()); + } else { + drewOnce.add(event.getPlayerId()); } - drawMap.get(event.getPlayerId()).add(event.getId()); } @Override public void reset() { super.reset(); - drawMap.clear(); + drewOnce.clear(); + secondDrawMap.clear(); } - - public boolean checkEvent(UUID playerId, GameEvent event, Integer cardNumber) { - return this.drawMap.containsKey(playerId) && Objects.equals(this.drawMap.get(playerId).size(), cardNumber) && event.getId().equals(this.drawMap.get(playerId).last()); + + static boolean checkEvent(UUID playerId, GameEvent event, Game game) { + return event.getId().equals(game.getState().getWatcher(DrawSecondCardWatcher.class).secondDrawMap.getOrDefault(playerId, null)); } - } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllOfChosenSubtypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllOfChosenSubtypeEffect.java index 70352fbe94a..6a2c1e466af 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllOfChosenSubtypeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllOfChosenSubtypeEffect.java @@ -1,7 +1,6 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.constants.Duration; import mage.constants.SubType; @@ -24,10 +23,6 @@ public class BoostAllOfChosenSubtypeEffect extends BoostAllEffect { super(power, toughness, duration, filter, excludeSource); } - public BoostAllOfChosenSubtypeEffect(DynamicValue power, DynamicValue toughness, Duration duration, FilterCreaturePermanent filter, boolean excludeSource) { - super(power, toughness, duration, filter, excludeSource); - } - public BoostAllOfChosenSubtypeEffect(final BoostAllOfChosenSubtypeEffect effect) { super(effect); this.subtype = effect.subtype;