diff --git a/Mage.Sets/src/mage/cards/a/AkoumFirebird.java b/Mage.Sets/src/mage/cards/a/AkoumFirebird.java index c96af6ddb6d..5a2352fa720 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumFirebird.java +++ b/Mage.Sets/src/mage/cards/a/AkoumFirebird.java @@ -30,7 +30,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DoIfCostPaid; @@ -65,7 +65,7 @@ public class AkoumFirebird extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Akoum Firebird attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Landfall-Whenever a land enters the battlefield under your control, you may pay {4}{R}{R}. // If you do, return Akoum Firebird from your graveyard to the battlefield. diff --git a/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java b/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java index f1c27964300..a1ee9629e25 100644 --- a/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java +++ b/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java @@ -29,7 +29,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -50,7 +50,7 @@ public class AshenMonstrosity extends CardImpl { this.toughness = new MageInt(4); this.addAbility(HasteAbility.getInstance()); // Ashen Monstrosity attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public AshenMonstrosity(final AshenMonstrosity card) { diff --git a/Mage.Sets/src/mage/cards/b/BaneOfHanweir.java b/Mage.Sets/src/mage/cards/b/BaneOfHanweir.java index e1680e8d63d..0288234dc83 100644 --- a/Mage.Sets/src/mage/cards/b/BaneOfHanweir.java +++ b/Mage.Sets/src/mage/cards/b/BaneOfHanweir.java @@ -30,7 +30,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.TwoOrMoreSpellsWereCastLastTurnCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; @@ -60,7 +60,7 @@ public class BaneOfHanweir extends CardImpl { this.toughness = new MageInt(5); // Bane of Hanweir attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Bane of Hanweir. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); diff --git a/Mage.Sets/src/mage/cards/b/BattleMadRonin.java b/Mage.Sets/src/mage/cards/b/BattleMadRonin.java index c374ac86df1..1411369017d 100644 --- a/Mage.Sets/src/mage/cards/b/BattleMadRonin.java +++ b/Mage.Sets/src/mage/cards/b/BattleMadRonin.java @@ -28,7 +28,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.BushidoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -54,7 +54,7 @@ public class BattleMadRonin extends CardImpl { this.addAbility(new BushidoAbility(2)); // Battle-Mad Ronin attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public BattleMadRonin(final BattleMadRonin card) { diff --git a/Mage.Sets/src/mage/cards/b/BerserkersOfBloodRidge.java b/Mage.Sets/src/mage/cards/b/BerserkersOfBloodRidge.java index e7c7100c41d..b28d7602959 100644 --- a/Mage.Sets/src/mage/cards/b/BerserkersOfBloodRidge.java +++ b/Mage.Sets/src/mage/cards/b/BerserkersOfBloodRidge.java @@ -30,7 +30,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -48,7 +48,7 @@ public class BerserkersOfBloodRidge extends CardImpl { this.subtype.add(SubType.HUMAN, SubType.BERSERKER); this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public BerserkersOfBloodRidge(final BerserkersOfBloodRidge card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodcrazedNeonate.java b/Mage.Sets/src/mage/cards/b/BloodcrazedNeonate.java index c8733388d7e..667ed6421a6 100644 --- a/Mage.Sets/src/mage/cards/b/BloodcrazedNeonate.java +++ b/Mage.Sets/src/mage/cards/b/BloodcrazedNeonate.java @@ -29,7 +29,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; @@ -52,7 +52,7 @@ public class BloodcrazedNeonate extends CardImpl { this.toughness = new MageInt(1); // Bloodcrazed Neonate attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Whenever Bloodcrazed Neonate deals combat damage to a player, put a +1/+1 counter on it. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); } diff --git a/Mage.Sets/src/mage/cards/b/BloodrockCyclops.java b/Mage.Sets/src/mage/cards/b/BloodrockCyclops.java index f4379bb2ff2..6367ac1bcaf 100644 --- a/Mage.Sets/src/mage/cards/b/BloodrockCyclops.java +++ b/Mage.Sets/src/mage/cards/b/BloodrockCyclops.java @@ -29,7 +29,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -47,7 +47,7 @@ public class BloodrockCyclops extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public BloodrockCyclops(final BloodrockCyclops card) { diff --git a/Mage.Sets/src/mage/cards/c/CrazedGoblin.java b/Mage.Sets/src/mage/cards/c/CrazedGoblin.java index bfd8bae6eba..b077b979a49 100644 --- a/Mage.Sets/src/mage/cards/c/CrazedGoblin.java +++ b/Mage.Sets/src/mage/cards/c/CrazedGoblin.java @@ -30,7 +30,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -48,7 +48,7 @@ public class CrazedGoblin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public CrazedGoblin(final CrazedGoblin card) { diff --git a/Mage.Sets/src/mage/cards/d/DarksteelJuggernaut.java b/Mage.Sets/src/mage/cards/d/DarksteelJuggernaut.java index 2effb3ae30b..e3c3caf48c0 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelJuggernaut.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelJuggernaut.java @@ -29,7 +29,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; @@ -62,7 +62,7 @@ public class DarksteelJuggernaut extends CardImpl { new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledArtifactPermanent("artifacts you control")), Duration.EndOfGame))); // Darksteel Juggernaut attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public DarksteelJuggernaut(final DarksteelJuggernaut card) { diff --git a/Mage.Sets/src/mage/cards/d/DauthiSlayer.java b/Mage.Sets/src/mage/cards/d/DauthiSlayer.java index e689980d390..f3ca71bdf23 100644 --- a/Mage.Sets/src/mage/cards/d/DauthiSlayer.java +++ b/Mage.Sets/src/mage/cards/d/DauthiSlayer.java @@ -29,7 +29,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.ShadowAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -53,7 +53,7 @@ public class DauthiSlayer extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // Dauthi Slayer attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public DauthiSlayer(final DauthiSlayer card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java b/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java index adb239ec472..1d747bb48b1 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java +++ b/Mage.Sets/src/mage/cards/d/DeathbellowRaider.java @@ -29,7 +29,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; @@ -54,7 +54,7 @@ public class DeathbellowRaider extends CardImpl { this.toughness = new MageInt(3); // Deathbellow Raider attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // {2}{B}: Regenerate Deathbellow Raider. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{B}"))); diff --git a/Mage.Sets/src/mage/cards/f/FlamebornHellion.java b/Mage.Sets/src/mage/cards/f/FlamebornHellion.java index bf793a6b1b6..e55fcfbabff 100644 --- a/Mage.Sets/src/mage/cards/f/FlamebornHellion.java +++ b/Mage.Sets/src/mage/cards/f/FlamebornHellion.java @@ -30,7 +30,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -50,7 +50,7 @@ public class FlamebornHellion extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(4); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public FlamebornHellion (final FlamebornHellion card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java b/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java index 1d22e281757..5dd6ddfd0f0 100644 --- a/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java +++ b/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java @@ -29,7 +29,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -62,7 +62,7 @@ public class FlamewakePhoenix extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Flamewake Phoenix attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Ferocious - At the beginning of combat on your turn, if you control a creature with power 4 or greater, you may pay {R}. If you do, return Flamewake Phoenix from your graveyard to the battlefield. this.addAbility(new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java b/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java index 3e9c431fcff..f2a696e81ab 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java @@ -29,7 +29,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect; @@ -54,7 +54,7 @@ public class GalvanicJuggernaut extends CardImpl { this.toughness = new MageInt(5); // Galvanic Juggernaut attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Galvanic Juggernaut doesn't untap during your untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); // Whenever another creature dies, untap Galvanic Juggernaut. diff --git a/Mage.Sets/src/mage/cards/g/GoblinBrigand.java b/Mage.Sets/src/mage/cards/g/GoblinBrigand.java index 1377c79e56c..e93813fd6c7 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBrigand.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBrigand.java @@ -29,7 +29,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -49,7 +49,7 @@ public class GoblinBrigand extends CardImpl { this.toughness = new MageInt(2); // Goblin Brigand attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public GoblinBrigand(final GoblinBrigand card) { diff --git a/Mage.Sets/src/mage/cards/i/ImpetuousSunchaser.java b/Mage.Sets/src/mage/cards/i/ImpetuousSunchaser.java index 76c9aa30f0f..5fbee7c4c0d 100644 --- a/Mage.Sets/src/mage/cards/i/ImpetuousSunchaser.java +++ b/Mage.Sets/src/mage/cards/i/ImpetuousSunchaser.java @@ -29,7 +29,7 @@ package mage.cards.i; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; @@ -56,7 +56,7 @@ public class ImpetuousSunchaser extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Impetuous Sunchaser attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public ImpetuousSunchaser(final ImpetuousSunchaser card) { diff --git a/Mage.Sets/src/mage/cards/j/Juggernaut.java b/Mage.Sets/src/mage/cards/j/Juggernaut.java index 6574cda2c82..de9b2184866 100644 --- a/Mage.Sets/src/mage/cards/j/Juggernaut.java +++ b/Mage.Sets/src/mage/cards/j/Juggernaut.java @@ -30,7 +30,7 @@ package mage.cards.j; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; import mage.cards.CardImpl; @@ -59,7 +59,7 @@ public class Juggernaut extends CardImpl { this.toughness = new MageInt(3); // Juggernaut attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Juggernaut can't be blocked by Walls. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/k/KillSuitCultist.java b/Mage.Sets/src/mage/cards/k/KillSuitCultist.java index 014e802a75f..7a48931c1aa 100644 --- a/Mage.Sets/src/mage/cards/k/KillSuitCultist.java +++ b/Mage.Sets/src/mage/cards/k/KillSuitCultist.java @@ -30,7 +30,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -62,7 +62,7 @@ public class KillSuitCultist extends CardImpl { this.toughness = new MageInt(1); // Kill-Suit Cultist attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // {B}, Sacrifice Kill-Suit Cultist: The next time damage would be dealt to target creature this turn, destroy that creature instead. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KillSuitCultistEffect(), new ManaCostsImpl("{B}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KuldothaRingleader.java b/Mage.Sets/src/mage/cards/k/KuldothaRingleader.java index a3402a1df2a..f73b70b5ad5 100644 --- a/Mage.Sets/src/mage/cards/k/KuldothaRingleader.java +++ b/Mage.Sets/src/mage/cards/k/KuldothaRingleader.java @@ -30,7 +30,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.BattleCryAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -51,7 +51,7 @@ public class KuldothaRingleader extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(new BattleCryAbility()); - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public KuldothaRingleader (final KuldothaRingleader card) { diff --git a/Mage.Sets/src/mage/cards/m/MageRingBully.java b/Mage.Sets/src/mage/cards/m/MageRingBully.java index 4d3d6f34c15..9f919f78693 100644 --- a/Mage.Sets/src/mage/cards/m/MageRingBully.java +++ b/Mage.Sets/src/mage/cards/m/MageRingBully.java @@ -29,7 +29,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.ProwessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -53,7 +53,7 @@ public class MageRingBully extends CardImpl { this.addAbility(new ProwessAbility()); // Mage-Ring Bully attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public MageRingBully(final MageRingBully card) { diff --git a/Mage.Sets/src/mage/cards/m/MogissWarhound.java b/Mage.Sets/src/mage/cards/m/MogissWarhound.java index f24f2236ef4..d4138b8534f 100644 --- a/Mage.Sets/src/mage/cards/m/MogissWarhound.java +++ b/Mage.Sets/src/mage/cards/m/MogissWarhound.java @@ -30,7 +30,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.AttacksIfAbleAttachedEffect; @@ -60,7 +60,7 @@ public class MogissWarhound extends CardImpl { // Bestow 2R (If you cast this card for its bestow cost, it's an Aura spell with enchant creature. It becomes a creature again if it's not attached to a creature.) this.addAbility(new BestowAbility(this, "{2}{R}")); // Mogis's Warhound attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Enchanted creature gets +2/+2 and attacks each turn if able. Effect effect = new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); diff --git a/Mage.Sets/src/mage/cards/m/MonstrousCarabid.java b/Mage.Sets/src/mage/cards/m/MonstrousCarabid.java index 6cefb4378fe..31e48a94d5a 100644 --- a/Mage.Sets/src/mage/cards/m/MonstrousCarabid.java +++ b/Mage.Sets/src/mage/cards/m/MonstrousCarabid.java @@ -29,7 +29,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; @@ -53,7 +53,7 @@ public class MonstrousCarabid extends CardImpl { this.toughness = new MageInt(4); // Monstrous Carabid attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Cycling {BR} this.addAbility(new CyclingAbility(new ManaCostsImpl("{B/R}"))); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianJuggernaut.java b/Mage.Sets/src/mage/cards/p/PhyrexianJuggernaut.java index 9bf7757f3f5..33ca45b666d 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianJuggernaut.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianJuggernaut.java @@ -30,7 +30,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -49,7 +49,7 @@ public class PhyrexianJuggernaut extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public PhyrexianJuggernaut (final PhyrexianJuggernaut card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java b/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java index 658270e0a26..c3d6aaffb22 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java @@ -29,7 +29,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -55,7 +55,7 @@ public class PhyrexianSnowcrusher extends CardImpl { this.toughness = new MageInt(5); // Phyrexian Snowcrusher attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // {1}{S}: Phyrexian Snowcrusher gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{S}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RagingReek.java b/Mage.Sets/src/mage/cards/r/RagingReek.java index d8df1f33f67..d731cbdf656 100644 --- a/Mage.Sets/src/mage/cards/r/RagingReek.java +++ b/Mage.Sets/src/mage/cards/r/RagingReek.java @@ -29,7 +29,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.MonstrosityAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -49,7 +49,7 @@ public class RagingReek extends CardImpl { this.toughness = new MageInt(4); // Raging Reek attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); //{5}{R}: Monstrosity 2 this.addAbility(new MonstrosityAbility("{5}{R}", 2)); diff --git a/Mage.Sets/src/mage/cards/r/Ramroller.java b/Mage.Sets/src/mage/cards/r/Ramroller.java index ff34e6cd917..1b72ec61317 100644 --- a/Mage.Sets/src/mage/cards/r/Ramroller.java +++ b/Mage.Sets/src/mage/cards/r/Ramroller.java @@ -28,7 +28,7 @@ package mage.cards.r; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -63,7 +63,7 @@ public class Ramroller extends CardImpl { this.toughness = new MageInt(3); // Ramroller attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Ramroller gets +2/+0 as long as you control another artifact. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(2, 0, diff --git a/Mage.Sets/src/mage/cards/r/RecklessBrute.java b/Mage.Sets/src/mage/cards/r/RecklessBrute.java index 4917cfee2d3..3a5e3ddbb4d 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessBrute.java +++ b/Mage.Sets/src/mage/cards/r/RecklessBrute.java @@ -29,7 +29,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -53,7 +53,7 @@ public class RecklessBrute extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Reckless Brute attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public RecklessBrute(final RecklessBrute card) { diff --git a/Mage.Sets/src/mage/cards/r/RiotPiker.java b/Mage.Sets/src/mage/cards/r/RiotPiker.java index a772d9cd6d7..62d977cc929 100644 --- a/Mage.Sets/src/mage/cards/r/RiotPiker.java +++ b/Mage.Sets/src/mage/cards/r/RiotPiker.java @@ -30,7 +30,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -57,7 +57,7 @@ public class RiotPiker extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Riot Piker attacks each turn if able - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } diff --git a/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java b/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java index 5378055735d..77cb2985b74 100644 --- a/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java +++ b/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java @@ -30,7 +30,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.ReachAbility; @@ -69,7 +69,7 @@ public class RuricTharTheUnbowed extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Ruric Thar, the Unbowed attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Whenever a player casts a noncreature spell, Ruric Thar deals 6 damage to that player. this.addAbility(new RuricTharTheUnbowedAbility()); diff --git a/Mage.Sets/src/mage/cards/s/SabertoothAlleyCat.java b/Mage.Sets/src/mage/cards/s/SabertoothAlleyCat.java index 3b4e862f38f..612c453c82f 100644 --- a/Mage.Sets/src/mage/cards/s/SabertoothAlleyCat.java +++ b/Mage.Sets/src/mage/cards/s/SabertoothAlleyCat.java @@ -29,7 +29,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -58,7 +58,7 @@ public class SabertoothAlleyCat extends CardImpl { this.toughness = new MageInt(1); // Sabertooth Alley Cat attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // {1}{R}: Creatures without defender can't block Sabertooth Alley Cat this turn. this.addAbility(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/s/SprintingWarbrute.java b/Mage.Sets/src/mage/cards/s/SprintingWarbrute.java index da1e2de6099..cfae2419efc 100644 --- a/Mage.Sets/src/mage/cards/s/SprintingWarbrute.java +++ b/Mage.Sets/src/mage/cards/s/SprintingWarbrute.java @@ -29,7 +29,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.DashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -50,7 +50,7 @@ public class SprintingWarbrute extends CardImpl { this.toughness = new MageInt(4); // Sprinting Warbrute attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Dash {3}{R} this.addAbility(new DashAbility(this, "{3}{R}")); } diff --git a/Mage.Sets/src/mage/cards/t/TattermungeManiac.java b/Mage.Sets/src/mage/cards/t/TattermungeManiac.java index 59f514cd9fc..9ed835551c7 100644 --- a/Mage.Sets/src/mage/cards/t/TattermungeManiac.java +++ b/Mage.Sets/src/mage/cards/t/TattermungeManiac.java @@ -29,7 +29,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -49,7 +49,7 @@ public class TattermungeManiac extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public TattermungeManiac(final TattermungeManiac card) { diff --git a/Mage.Sets/src/mage/cards/t/TectonicFiend.java b/Mage.Sets/src/mage/cards/t/TectonicFiend.java index a016aaca9c2..d4bcc909c40 100644 --- a/Mage.Sets/src/mage/cards/t/TectonicFiend.java +++ b/Mage.Sets/src/mage/cards/t/TectonicFiend.java @@ -29,7 +29,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -51,7 +51,7 @@ public class TectonicFiend extends CardImpl { // Echo {4}{R}{R} this.addAbility(new EchoAbility("{4}{R}{R}")); // Tectonic Fiend attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public TectonicFiend(final TectonicFiend card) { diff --git a/Mage.Sets/src/mage/cards/t/ThranWarMachine.java b/Mage.Sets/src/mage/cards/t/ThranWarMachine.java index fce2deacf72..68019c536de 100644 --- a/Mage.Sets/src/mage/cards/t/ThranWarMachine.java +++ b/Mage.Sets/src/mage/cards/t/ThranWarMachine.java @@ -29,7 +29,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -50,7 +50,7 @@ public class ThranWarMachine extends CardImpl { this.addAbility(new EchoAbility("{4}")); //Thran War Machine attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public ThranWarMachine(final ThranWarMachine card) { diff --git a/Mage.Sets/src/mage/cards/u/UlamogsCrusher.java b/Mage.Sets/src/mage/cards/u/UlamogsCrusher.java index a1f0770bf8a..2630eacf13a 100644 --- a/Mage.Sets/src/mage/cards/u/UlamogsCrusher.java +++ b/Mage.Sets/src/mage/cards/u/UlamogsCrusher.java @@ -30,7 +30,7 @@ package mage.cards.u; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.AnnihilatorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -49,7 +49,7 @@ public class UlamogsCrusher extends CardImpl { this.power = new MageInt(8); this.toughness = new MageInt(8); this.addAbility(new AnnihilatorAbility(2)); - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public UlamogsCrusher (final UlamogsCrusher card) { diff --git a/Mage.Sets/src/mage/cards/u/UrborgDrake.java b/Mage.Sets/src/mage/cards/u/UrborgDrake.java index 5a525d19b63..d2b999eece6 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgDrake.java +++ b/Mage.Sets/src/mage/cards/u/UrborgDrake.java @@ -29,7 +29,7 @@ package mage.cards.u; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -52,7 +52,7 @@ public class UrborgDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Urborg Drake attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public UrborgDrake(final UrborgDrake card) { diff --git a/Mage.Sets/src/mage/cards/u/UtvaraScalper.java b/Mage.Sets/src/mage/cards/u/UtvaraScalper.java index a67db6617c4..428a2dd546f 100644 --- a/Mage.Sets/src/mage/cards/u/UtvaraScalper.java +++ b/Mage.Sets/src/mage/cards/u/UtvaraScalper.java @@ -29,7 +29,7 @@ package mage.cards.u; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -52,7 +52,7 @@ public class UtvaraScalper extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Utvara Scalper attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public UtvaraScalper(final UtvaraScalper card) { diff --git a/Mage.Sets/src/mage/cards/v/ValleyDasher.java b/Mage.Sets/src/mage/cards/v/ValleyDasher.java index 29647250892..fdb35bf12b1 100644 --- a/Mage.Sets/src/mage/cards/v/ValleyDasher.java +++ b/Mage.Sets/src/mage/cards/v/ValleyDasher.java @@ -29,7 +29,7 @@ package mage.cards.v; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -53,7 +53,7 @@ public class ValleyDasher extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Valley Dasher attacks each turn if able - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); } public ValleyDasher(final ValleyDasher card) { diff --git a/Mage.Sets/src/mage/cards/v/VolatileRig.java b/Mage.Sets/src/mage/cards/v/VolatileRig.java index a4a1c9c0fa4..719b7e16ed5 100644 --- a/Mage.Sets/src/mage/cards/v/VolatileRig.java +++ b/Mage.Sets/src/mage/cards/v/VolatileRig.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.AttacksEachTurnStaticAbility; +import mage.abilities.common.AttacksEachCombatStaticAbility; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TrampleAbility; @@ -67,7 +67,7 @@ public class VolatileRig extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Volatile Rig attacks each turn if able. - this.addAbility(new AttacksEachTurnStaticAbility()); + this.addAbility(new AttacksEachCombatStaticAbility()); // Whenever Volatile Rig is dealt damage, flip a coin. If you lose the flip, sacrifice Volatile Rig. this.addAbility(new VolatileRigTriggeredAbility()); diff --git a/Mage/src/main/java/mage/abilities/common/AttacksEachTurnStaticAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksEachTurnStaticAbility.java deleted file mode 100644 index 7e5d27f7cd4..00000000000 --- a/Mage/src/main/java/mage/abilities/common/AttacksEachTurnStaticAbility.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ - -package mage.abilities.common; - -import mage.constants.Duration; -import mage.constants.Zone; -import mage.abilities.StaticAbility; -import mage.abilities.effects.common.combat.AttacksIfAbleSourceEffect; -import mage.watchers.common.AttackedThisTurnWatcher; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public class AttacksEachTurnStaticAbility extends StaticAbility { - - public AttacksEachTurnStaticAbility() { - super(Zone.BATTLEFIELD, new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield)); - addWatcher(new AttackedThisTurnWatcher()); - } - - public AttacksEachTurnStaticAbility(AttacksEachTurnStaticAbility ability) { - super(ability); - } - - @Override - public AttacksEachTurnStaticAbility copy() { - return new AttacksEachTurnStaticAbility(this); - } - -}