mirror of
https://github.com/magefree/mage.git
synced 2025-12-21 02:52:02 -08:00
refactor: Remove no-argument Squad constructor (#12038)
This commit is contained in:
parent
168ec1abc6
commit
fd83fbb600
10 changed files with 17 additions and 13 deletions
|
|
@ -4,6 +4,7 @@ import mage.MageInt;
|
||||||
import mage.abilities.common.CantBlockAbility;
|
import mage.abilities.common.CantBlockAbility;
|
||||||
import mage.abilities.common.SimpleActivatedAbility;
|
import mage.abilities.common.SimpleActivatedAbility;
|
||||||
import mage.abilities.costs.common.PayLifeCost;
|
import mage.abilities.costs.common.PayLifeCost;
|
||||||
|
import mage.abilities.costs.mana.GenericManaCost;
|
||||||
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
|
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
|
||||||
import mage.abilities.keyword.IndestructibleAbility;
|
import mage.abilities.keyword.IndestructibleAbility;
|
||||||
import mage.abilities.keyword.SquadAbility;
|
import mage.abilities.keyword.SquadAbility;
|
||||||
|
|
@ -28,7 +29,7 @@ public final class ArcoFlagellant extends CardImpl {
|
||||||
this.toughness = new MageInt(1);
|
this.toughness = new MageInt(1);
|
||||||
|
|
||||||
// Squad {2}
|
// Squad {2}
|
||||||
this.addAbility(new SquadAbility());
|
this.addAbility(new SquadAbility(new GenericManaCost(2)));
|
||||||
|
|
||||||
// Arco-Flagellant can't block.
|
// Arco-Flagellant can't block.
|
||||||
this.addAbility(new CantBlockAbility());
|
this.addAbility(new CantBlockAbility());
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package mage.cards.g;
|
||||||
|
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
import mage.abilities.common.AttacksTriggeredAbility;
|
import mage.abilities.common.AttacksTriggeredAbility;
|
||||||
|
import mage.abilities.costs.mana.GenericManaCost;
|
||||||
import mage.abilities.effects.common.continuous.BoostAllEffect;
|
import mage.abilities.effects.common.continuous.BoostAllEffect;
|
||||||
import mage.abilities.keyword.SquadAbility;
|
import mage.abilities.keyword.SquadAbility;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
|
|
@ -37,7 +38,7 @@ public final class GaryClone extends CardImpl {
|
||||||
this.toughness = new MageInt(3);
|
this.toughness = new MageInt(3);
|
||||||
|
|
||||||
// Squad {2}
|
// Squad {2}
|
||||||
this.addAbility(new SquadAbility());
|
this.addAbility(new SquadAbility(new GenericManaCost(2)));
|
||||||
|
|
||||||
// Whenever Gary Clone attacks, each creature you control named Gary Clone gets +1/+0 until end of turn.
|
// Whenever Gary Clone attacks, each creature you control named Gary Clone gets +1/+0 until end of turn.
|
||||||
this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(
|
this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package mage.cards.p;
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
||||||
|
import mage.abilities.costs.mana.GenericManaCost;
|
||||||
import mage.abilities.effects.common.DestroyTargetEffect;
|
import mage.abilities.effects.common.DestroyTargetEffect;
|
||||||
import mage.abilities.keyword.SquadAbility;
|
import mage.abilities.keyword.SquadAbility;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
|
|
@ -27,7 +28,7 @@ public final class PowderGanger extends CardImpl {
|
||||||
this.toughness = new MageInt(2);
|
this.toughness = new MageInt(2);
|
||||||
|
|
||||||
// Squad {2}
|
// Squad {2}
|
||||||
this.addAbility(new SquadAbility());
|
this.addAbility(new SquadAbility(new GenericManaCost(2)));
|
||||||
|
|
||||||
// When Powder Ganger enters the battlefield, destroy up to one target artifact.
|
// When Powder Ganger enters the battlefield, destroy up to one target artifact.
|
||||||
Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
|
Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package mage.cards.s;
|
||||||
|
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
||||||
|
import mage.abilities.costs.mana.GenericManaCost;
|
||||||
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
|
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
|
||||||
import mage.abilities.keyword.FlashAbility;
|
import mage.abilities.keyword.FlashAbility;
|
||||||
import mage.abilities.keyword.SquadAbility;
|
import mage.abilities.keyword.SquadAbility;
|
||||||
|
|
@ -29,7 +30,7 @@ public final class SicarianInfiltrator extends CardImpl {
|
||||||
this.addAbility(FlashAbility.getInstance());
|
this.addAbility(FlashAbility.getInstance());
|
||||||
|
|
||||||
// Squad {2}
|
// Squad {2}
|
||||||
this.addAbility(new SquadAbility());
|
this.addAbility(new SquadAbility(new GenericManaCost(2)));
|
||||||
|
|
||||||
// Benediction of Omnissiah -- When Sicarian Infiltrator enters the battlefield, draw a card.
|
// Benediction of Omnissiah -- When Sicarian Infiltrator enters the battlefield, draw a card.
|
||||||
this.addAbility(new EntersBattlefieldTriggeredAbility(
|
this.addAbility(new EntersBattlefieldTriggeredAbility(
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package mage.cards.s;
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
||||||
|
import mage.abilities.costs.mana.GenericManaCost;
|
||||||
import mage.abilities.effects.common.DestroyTargetEffect;
|
import mage.abilities.effects.common.DestroyTargetEffect;
|
||||||
import mage.abilities.keyword.SquadAbility;
|
import mage.abilities.keyword.SquadAbility;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
|
|
@ -28,7 +29,7 @@ public final class SpaceMarineDevastator extends CardImpl {
|
||||||
this.toughness = new MageInt(3);
|
this.toughness = new MageInt(3);
|
||||||
|
|
||||||
// Squad {2}
|
// Squad {2}
|
||||||
this.addAbility(new SquadAbility());
|
this.addAbility(new SquadAbility(new GenericManaCost(2)));
|
||||||
|
|
||||||
// Grav-cannon -- When Space Marine Devastator enters the battlefield, destroy up to one target artifact or enchantment.
|
// Grav-cannon -- When Space Marine Devastator enters the battlefield, destroy up to one target artifact or enchantment.
|
||||||
Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
|
Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package mage.cards.u;
|
||||||
|
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
import mage.abilities.common.SimpleStaticAbility;
|
import mage.abilities.common.SimpleStaticAbility;
|
||||||
|
import mage.abilities.costs.mana.GenericManaCost;
|
||||||
import mage.abilities.effects.common.continuous.BoostControlledEffect;
|
import mage.abilities.effects.common.continuous.BoostControlledEffect;
|
||||||
import mage.abilities.keyword.SquadAbility;
|
import mage.abilities.keyword.SquadAbility;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
|
|
@ -26,7 +27,7 @@ public final class UltramarinesHonourGuard extends CardImpl {
|
||||||
this.toughness = new MageInt(2);
|
this.toughness = new MageInt(2);
|
||||||
|
|
||||||
// Squad {2}
|
// Squad {2}
|
||||||
this.addAbility(new SquadAbility());
|
this.addAbility(new SquadAbility(new GenericManaCost(2)));
|
||||||
|
|
||||||
// Other creatures you control get +1/+1.
|
// Other creatures you control get +1/+1.
|
||||||
this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(
|
this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package mage.cards.v;
|
||||||
|
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
|
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
|
||||||
|
import mage.abilities.costs.mana.GenericManaCost;
|
||||||
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
|
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
|
||||||
import mage.abilities.keyword.FlyingAbility;
|
import mage.abilities.keyword.FlyingAbility;
|
||||||
import mage.abilities.keyword.SquadAbility;
|
import mage.abilities.keyword.SquadAbility;
|
||||||
|
|
@ -26,7 +27,7 @@ public final class VanguardSuppressor extends CardImpl {
|
||||||
this.toughness = new MageInt(2);
|
this.toughness = new MageInt(2);
|
||||||
|
|
||||||
// Squad {2}
|
// Squad {2}
|
||||||
this.addAbility(new SquadAbility());
|
this.addAbility(new SquadAbility(new GenericManaCost(2)));
|
||||||
|
|
||||||
// Flying
|
// Flying
|
||||||
this.addAbility(FlyingAbility.getInstance());
|
this.addAbility(FlyingAbility.getInstance());
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package mage.cards.z;
|
package mage.cards.z;
|
||||||
|
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
|
import mage.abilities.costs.mana.GenericManaCost;
|
||||||
import mage.abilities.keyword.FlyingAbility;
|
import mage.abilities.keyword.FlyingAbility;
|
||||||
import mage.abilities.keyword.MiracleAbility;
|
import mage.abilities.keyword.MiracleAbility;
|
||||||
import mage.abilities.keyword.SquadAbility;
|
import mage.abilities.keyword.SquadAbility;
|
||||||
|
|
@ -26,7 +27,7 @@ public final class Zephyrim extends CardImpl {
|
||||||
this.toughness = new MageInt(3);
|
this.toughness = new MageInt(3);
|
||||||
|
|
||||||
// Squad {2}
|
// Squad {2}
|
||||||
this.addAbility(new SquadAbility());
|
this.addAbility(new SquadAbility(new GenericManaCost(2)));
|
||||||
|
|
||||||
// Flying
|
// Flying
|
||||||
this.addAbility(FlyingAbility.getInstance());
|
this.addAbility(FlyingAbility.getInstance());
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import mage.abilities.SpellAbility;
|
||||||
import mage.abilities.StaticAbility;
|
import mage.abilities.StaticAbility;
|
||||||
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
||||||
import mage.abilities.costs.*;
|
import mage.abilities.costs.*;
|
||||||
import mage.abilities.costs.mana.GenericManaCost;
|
|
||||||
import mage.abilities.costs.mana.ManaCostsImpl;
|
import mage.abilities.costs.mana.ManaCostsImpl;
|
||||||
import mage.abilities.effects.CreateTokenCopySourceEffect;
|
import mage.abilities.effects.CreateTokenCopySourceEffect;
|
||||||
import mage.abilities.effects.OneShotEffect;
|
import mage.abilities.effects.OneShotEffect;
|
||||||
|
|
@ -25,9 +24,6 @@ public class SquadAbility extends StaticAbility implements OptionalAdditionalSou
|
||||||
protected static final String SQUAD_ACTIVATION_VALUE_KEY = "squadActivationCount";
|
protected static final String SQUAD_ACTIVATION_VALUE_KEY = "squadActivationCount";
|
||||||
protected static final String SQUAD_REMINDER = "You may pay an additional "
|
protected static final String SQUAD_REMINDER = "You may pay an additional "
|
||||||
+ "{cost} any number of times as you cast this spell.";
|
+ "{cost} any number of times as you cast this spell.";
|
||||||
public SquadAbility() {
|
|
||||||
this(new GenericManaCost(2));
|
|
||||||
}
|
|
||||||
|
|
||||||
public SquadAbility(Cost cost) {
|
public SquadAbility(Cost cost) {
|
||||||
super(Zone.STACK, null);
|
super(Zone.STACK, null);
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ Soulshift|number|
|
||||||
Skulk|new|
|
Skulk|new|
|
||||||
Spectacle|card, cost|
|
Spectacle|card, cost|
|
||||||
Spree|card|
|
Spree|card|
|
||||||
Squad|new|
|
Squad|cost|
|
||||||
Storm|new|
|
Storm|new|
|
||||||
Sunburst|new|
|
Sunburst|new|
|
||||||
Suspend|number, cost, card|
|
Suspend|number, cost, card|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue