diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/JoragaAuxiliary.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/JoragaAuxiliary.java index 33a466c758..8a124d1f93 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/JoragaAuxiliary.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/JoragaAuxiliary.java @@ -56,7 +56,7 @@ public class JoragaAuxiliary extends CardImpl { this.toughness = new MageInt(3); // {4}{G}{W}: Support 2. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SupportEffect(this, 2), new ManaCostsImpl("{4}{G}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SupportEffect(this, 2, true), new ManaCostsImpl("{4}{G}{W}")); ability.addTarget(new TargetCreaturePermanent(0, 2, new FilterCreaturePermanent("target creatures"), false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/LeadByExample.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/LeadByExample.java index 0d2db32e0d..fd73131561 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/LeadByExample.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/LeadByExample.java @@ -44,7 +44,7 @@ public class LeadByExample extends CardImpl { this.expansionSetCode = "OGW"; // Support 2. - getSpellAbility().addEffect(new SupportEffect(this, 2)); + getSpellAbility().addEffect(new SupportEffect(this, 2, false)); } public LeadByExample(final LeadByExample card) { diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/NissasJudgment.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/NissasJudgment.java index 3bedda7ad7..3d9b527d34 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/NissasJudgment.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/NissasJudgment.java @@ -59,7 +59,7 @@ public class NissasJudgment extends CardImpl { this.expansionSetCode = "OGW"; // Support 2. - getSpellAbility().addEffect(new SupportEffect(this, 2)); + getSpellAbility().addEffect(new SupportEffect(this, 2, false)); // Choose up to one target creature an opponent controls. Each creature you control with a +1/+1 counter on it deals damage equal to its power to that creature. Effect effect = new NissasJudgmentEffect(); diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/PressIntoService.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/PressIntoService.java index 52cc076c27..e5cd73c197 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/PressIntoService.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/PressIntoService.java @@ -52,7 +52,7 @@ public class PressIntoService extends CardImpl { this.expansionSetCode = "OGW"; // Support 2. - getSpellAbility().addEffect(new SupportEffect(this, 2)); + getSpellAbility().addEffect(new SupportEffect(this, 2, false)); // Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/SaddlebackLagac.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/SaddlebackLagac.java index b3af1eb25a..cabad3e5b5 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/SaddlebackLagac.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/SaddlebackLagac.java @@ -52,7 +52,7 @@ public class SaddlebackLagac extends CardImpl { this.toughness = new MageInt(1); // When Saddleback Lagac enters the battlefield, support 2. - Ability ability = new EntersBattlefieldTriggeredAbility(new SupportEffect(this, 2), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new SupportEffect(this, 2, true), false); ability.addTarget(new TargetCreaturePermanent(0, 2, new FilterCreaturePermanent("target creatures"), false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/ShoulderToShoulder.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/ShoulderToShoulder.java index ceda4b5720..c8c2701cda 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/ShoulderToShoulder.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/ShoulderToShoulder.java @@ -45,7 +45,7 @@ public class ShoulderToShoulder extends CardImpl { this.expansionSetCode = "OGW"; // Support 2. - getSpellAbility().addEffect(new SupportEffect(this, 2)); + getSpellAbility().addEffect(new SupportEffect(this, 2, false)); // Draw a card. getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/UnityOfPurpose.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/UnityOfPurpose.java index 3671b3779b..0b3b74d935 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/UnityOfPurpose.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/UnityOfPurpose.java @@ -54,7 +54,7 @@ public class UnityOfPurpose extends CardImpl { this.expansionSetCode = "OGW"; // Support 2. - getSpellAbility().addEffect(new SupportEffect(this, 2)); + getSpellAbility().addEffect(new SupportEffect(this, 2, false)); // Untap each creature you control with a +1/+1 counter on it. this.getSpellAbility().addEffect(new UntapAllControllerEffect(filter, "Untap each creature you control with a +1/+1 counter on it")); diff --git a/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java b/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java index 26b0f2830e..25f6969fac 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/SeaGateLoremaster.java @@ -28,15 +28,15 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,6 +62,7 @@ public class SeaGateLoremaster extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); + // {T}: Draw a card for each Ally you control. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost())); diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java index cdb4ec74a0..2f97f77f28 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java @@ -44,22 +44,16 @@ import mage.util.CardUtil; public class SupportEffect extends AddCountersTargetEffect { private final DynamicValue amountSupportTargets; - private boolean otherPermanent; + private final boolean otherPermanent; - public SupportEffect(Card card, int amount) { - this(new StaticValue(amount)); - if (card.getCardType().contains(CardType.INSTANT) || card.getCardType().contains(CardType.SORCERY)) { - otherPermanent = false; - card.getSpellAbility().addTarget(new TargetCreaturePermanent(0, amount, new FilterCreaturePermanent("target creatures"), false)); - } else { - otherPermanent = true; - } - } - - public SupportEffect(DynamicValue amount) { + public SupportEffect(Card card, int amount, boolean otherPermanent) { super(CounterType.P1P1.createInstance(0), new StaticValue(1)); - this.amountSupportTargets = amount; - this.staticText = setText(); + this.amountSupportTargets = new StaticValue(amount); + this.otherPermanent = otherPermanent; + if (card.getCardType().contains(CardType.INSTANT) || card.getCardType().contains(CardType.SORCERY)) { + card.getSpellAbility().addTarget(new TargetCreaturePermanent(0, amount, new FilterCreaturePermanent("target creatures"), false)); + } + staticText = setText(); } public SupportEffect(final SupportEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java b/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java index 6f7b9fdff6..248df3d584 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreaturePermanent; public class SupportAbility extends EntersBattlefieldTriggeredAbility { public SupportAbility(Card card, int amount) { - super(new SupportEffect(card, amount), false); + super(new SupportEffect(card, amount, true)); if (!card.getCardType().contains(CardType.INSTANT) && !card.getCardType().contains(CardType.SORCERY)) { FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures"); if (card.getCardType().contains(CardType.CREATURE)) {