diff --git a/Mage.Sets/src/mage/sets/alarareborn/BantSureblade.java b/Mage.Sets/src/mage/sets/alarareborn/BantSureblade.java index cc37049a504..f8916c14c13 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BantSureblade.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BantSureblade.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -71,11 +71,11 @@ public class BantSureblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Bant Sureblade gets +1/+1 and has first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), "and has first strike")); diff --git a/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java b/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java index 73692f4001a..7275c78f736 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java +++ b/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -71,11 +71,11 @@ public class EsperStormblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Esper Stormblade gets +1/+1 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), "and has flying")); diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java b/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java index 87eeb66e632..dee36f7df46 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java @@ -37,7 +37,7 @@ import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.condition.common.NotMyTurnCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; @@ -54,11 +54,11 @@ public class GloryOfWarfare extends CardImpl { - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield), MyTurnCondition.getInstance(), "As long as it's your turn, creatures you control get +2/+0"))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield), NotMyTurnCondition.getInstance(), "As long as it's not your turn, creatures you control get +0/+2"))); diff --git a/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java b/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java index 56734a063e6..4c72061b3bc 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DeathtouchAbility; @@ -71,11 +71,11 @@ public class GrixisGrimblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Grixis Grimblade gets +1/+1 and has deathtouch. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(DeathtouchAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), "and has deathtouch")); diff --git a/Mage.Sets/src/mage/sets/alarareborn/JundHackblade.java b/Mage.Sets/src/mage/sets/alarareborn/JundHackblade.java index c6f06263f24..ee961225112 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/JundHackblade.java +++ b/Mage.Sets/src/mage/sets/alarareborn/JundHackblade.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; @@ -71,11 +71,11 @@ public class JundHackblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Jund Hackblade gets +1/+1 and has haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(HasteAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), "and has haste")); diff --git a/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java b/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java index 21ef080034f..cce3267605f 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MeddlingMage.java @@ -33,7 +33,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.NameACardEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -79,7 +79,7 @@ public class MeddlingMage extends CardImpl { } } -class MeddlingMageReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class MeddlingMageReplacementEffect extends ContinuousRuleModifyingEffectImpl { public MeddlingMageReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/alarareborn/NayaHushblade.java b/Mage.Sets/src/mage/sets/alarareborn/NayaHushblade.java index b54ebe62eda..674c51e8548 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/NayaHushblade.java +++ b/Mage.Sets/src/mage/sets/alarareborn/NayaHushblade.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.ShroudAbility; @@ -71,11 +71,11 @@ public class NayaHushblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Naya Hushblade gets +1/+1 and has shroud. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, Naya Hushblade gets +1/+1")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(ShroudAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), " and has shroud")); diff --git a/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java b/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java index b55f12fff1e..3642431cf2b 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java +++ b/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java @@ -38,7 +38,7 @@ import mage.abilities.condition.CompoundCondition; import mage.abilities.condition.Condition; import mage.abilities.condition.common.SourceTappedCondition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -74,7 +74,7 @@ public class OldManOfTheSea extends CardImpl { // {tap}: Gain control of target creature with power less than or equal to Old Man of the Sea's power for as long as Old Man of the Sea remains tapped and that creature's power remains less than or equal to Old Man of the Sea's power. FilterCreaturePermanent controllableCreatures = new FilterCreaturePermanent("creature with power less than or equal to Old Man of the Sea's power"); controllableCreatures.add(new PowerLowerEqualSourcePredicate(this.getId())); - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new OldManOfTheSeaGainControlTargetEffect(Duration.Custom, true), new CompoundCondition(SourceTappedCondition.getInstance(), new SourcePowerGreaterEqualTargetCondition()), "Gain control of target creature with power less than or equal to {this}'s power for as long as {this} remains tapped and that creature's power remains less than or equal to {this}'s power"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BladedBracers.java b/Mage.Sets/src/mage/sets/avacynrestored/BladedBracers.java index ff449c29149..c5f1d2f8a50 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BladedBracers.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BladedBracers.java @@ -31,7 +31,7 @@ import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; @@ -57,7 +57,7 @@ public class BladedBracers extends CardImpl { // As long as equipped creature is a Human or an Angel, it has vigilance. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition("Human", "Angel"), ruleText))); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java b/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java index b30f96371ff..5c2702bcd3d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java @@ -37,7 +37,7 @@ import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.abilities.mana.ConditionalAnyColorManaAbility; @@ -229,7 +229,7 @@ class CavernOfSoulsWatcher extends Watcher { } } -class CavernOfSoulsCantCounterEffect extends ContinuousRuleModifiyingEffectImpl { +class CavernOfSoulsCantCounterEffect extends ContinuousRuleModifyingEffectImpl { public CavernOfSoulsCantCounterEffect() { super(Duration.EndOfGame, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java b/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java index 53f8107e749..f0b0ffe44ea 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HomicidalSeclusion.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.OneControlledCreatureCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -58,10 +58,10 @@ public class HomicidalSeclusion extends CardImpl { // As long as you control exactly one creature, that creature gets +3/+1 and has lifelink. ContinuousEffect boostEffect = new BoostControlledEffect(3, 1, Duration.WhileOnBattlefield); - Effect effect = new ConditionalContinousEffect(boostEffect, new OneControlledCreatureCondition(), rule); + Effect effect = new ConditionalContinuousEffect(boostEffect, new OneControlledCreatureCondition(), rule); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); ContinuousEffect lifelinkEffect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield); - effect = new ConditionalContinousEffect(lifelinkEffect, new OneControlledCreatureCondition(), "and has lifelink"); + effect = new ConditionalContinuousEffect(lifelinkEffect, new OneControlledCreatureCondition(), "and has lifelink"); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java b/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java index ba5e538771b..e25abbeb88c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java @@ -31,7 +31,7 @@ import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.OneControlledCreatureCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; @@ -71,7 +71,7 @@ public class PredatorsGambit extends CardImpl { // Enchanted creature has intimidate as long as its controller controls no other creatures. ContinuousEffect effect = new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA); - ConditionalContinousEffect intimidate = new ConditionalContinousEffect(effect, new OneControlledCreatureCondition(), rule); + ConditionalContinuousEffect intimidate = new ConditionalContinuousEffect(effect, new OneControlledCreatureCondition(), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, intimidate)); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/WildwoodGeist.java b/Mage.Sets/src/mage/sets/avacynrestored/WildwoodGeist.java index 04c957ecc59..f506512c68a 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/WildwoodGeist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/WildwoodGeist.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MyTurnCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -55,7 +55,7 @@ public class WildwoodGeist extends CardImpl { this.toughness = new MageInt(3); // Wildwood Geist gets +2/+2 as long as it's your turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), MyTurnCondition.getInstance(), "{this} gets +2/+2 as long as it's your turn"))); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NekoTe.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NekoTe.java index 84392e423bc..e11c07bc384 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NekoTe.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NekoTe.java @@ -34,7 +34,7 @@ import mage.abilities.common.DealsDamageToAPlayerAttachedTriggeredAbility; import mage.abilities.condition.common.SourceOnBattelfieldCondition; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.decorator.ConditionalContinuousRuleModifyingEffect; -import mage.abilities.effects.ContinuousRuleModifiyingEffect; +import mage.abilities.effects.ContinuousRuleModifyingEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.DontUntapInControllersUntapStepTargetEffect; import mage.abilities.effects.common.TapTargetEffect; @@ -57,7 +57,7 @@ public class NekoTe extends CardImpl { this.subtype.add("Equipment"); // Whenever equipped creature deals damage to a creature, tap that creature. That creature doesn't untap during its controller's untap step for as long as Neko-Te remains on the battlefield. - ContinuousRuleModifiyingEffect skipUntapEffect = new DontUntapInControllersUntapStepTargetEffect(Duration.WhileOnBattlefield); + ContinuousRuleModifyingEffect skipUntapEffect = new DontUntapInControllersUntapStepTargetEffect(Duration.WhileOnBattlefield); skipUntapEffect.setText("That creature doesn't untap during its controller's untap step for as long as {this} remains on the battlefield"); ConditionalContinuousRuleModifyingEffect effect = new ConditionalContinuousRuleModifyingEffect(skipUntapEffect, new SourceOnBattelfieldCondition()); Ability ability = new DealsDamageToACreatureAttachedTriggeredAbility(new TapTargetEffect("that creature"), false, "equipped creature", false, true); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EverflameEidolon.java b/Mage.Sets/src/mage/sets/bornofthegods/EverflameEidolon.java index 815c8481fae..be29005389b 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/EverflameEidolon.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/EverflameEidolon.java @@ -33,7 +33,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasSubtypeCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.BestowAbility; @@ -61,7 +61,7 @@ public class EverflameEidolon extends CardImpl { // Bestow {2}{R} this.addAbility(new BestowAbility(this, "{2}{R}")); // {R}: Everflame Eidolon gets +1/+0 until end of turn. If it's an Aura, enchanted creature gets +1/+0 until end of turn instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new BoostSourceEffect(1, 0, Duration.EndOfTurn), new SourceHasSubtypeCondition("Aura"), diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java index 6ef2615db91..3fadf572b58 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -115,7 +115,7 @@ class SpiritOfTheLabyrinthWatcher extends Watcher { } -class SpiritOfTheLabyrinthEffect extends ContinuousRuleModifiyingEffectImpl { +class SpiritOfTheLabyrinthEffect extends ContinuousRuleModifyingEffectImpl { public SpiritOfTheLabyrinthEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment, false, false); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Tromokratis.java b/Mage.Sets/src/mage/sets/bornofthegods/Tromokratis.java index b05f97a2298..a2f9463c1ee 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Tromokratis.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Tromokratis.java @@ -35,7 +35,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.SourceMatchesFilterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -70,7 +70,7 @@ public class Tromokratis extends CardImpl { this.toughness = new MageInt(8); // Tromokratis has hexproof unless it's attacking or blocking. - Effect effect = new ConditionalContinousEffect( + Effect effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield), new InvertCondition(new SourceMatchesFilterCondition(new FilterAttackingOrBlockingCreature())), "{this} has hexproof unless it's attacking or blocking"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java index 0106881bacc..c961344942d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BoseijuWhoSheltersAll.java @@ -37,7 +37,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -123,7 +123,7 @@ class BoseijuWhoSheltersAllWatcher extends Watcher { } } -class BoseijuWhoSheltersAllCantCounterEffect extends ContinuousRuleModifiyingEffectImpl { +class BoseijuWhoSheltersAllCantCounterEffect extends ContinuousRuleModifyingEffectImpl { private static final FilterCard filter = new FilterInstantOrSorceryCard(); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DosanTheFallingLeaf.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DosanTheFallingLeaf.java index a7c72d08b31..59018d04f0a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DosanTheFallingLeaf.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DosanTheFallingLeaf.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -72,7 +72,7 @@ public class DosanTheFallingLeaf extends CardImpl { } } -class DosanTheFallingLeafEffect extends ContinuousRuleModifiyingEffectImpl { +class DosanTheFallingLeafEffect extends ContinuousRuleModifyingEffectImpl { DosanTheFallingLeafEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java index 7f8d0b5d473..d9545e68a0b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasHatamoto.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.BushidoAbility; @@ -72,9 +72,9 @@ public class KondasHatamoto extends CardImpl{ this.addAbility(new BushidoAbility(1)); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java index 9e11fe2d6eb..9250a78ca10 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfCleansingFire.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CastFromHandCondition; import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -77,7 +77,7 @@ public class MyojinOfCleansingFire extends CardImpl { // Myojin of Cleansing Fire enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); // Myojin of Cleansing Fire is indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Cleansing Fire: Destroy all other creatures. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java index 327cf6cad4b..f4f6f167b5d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CastFromHandCondition; import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -73,7 +73,7 @@ public class MyojinOfInfiniteRage extends CardImpl { // Myojin of Infinite Rage enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); // Myojin of Infinite Rage is indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Infinite Rage: Destroy all lands. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java index a0cfcfedf47..8d65fbf1e50 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfLifesWeb.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CastFromHandCondition; import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.PutOntoBattlefieldTargetEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -79,7 +79,7 @@ public class MyojinOfLifesWeb extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); // Myojin of Life's Web is indestructible as long as it has a divinity counter on it. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Life's Web: Put any number of creature cards from your hand onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOntoBattlefieldTargetEffect(false), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java index 2999ed6aa37..c777d7ca103 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfNightsReach.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CastFromHandCondition; import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -71,7 +71,7 @@ public class MyojinOfNightsReach extends CardImpl { // Myojin of Night's Reach enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); // Myojin of Night's Reach is indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Night's Reach: Each opponent discards his or her hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyojinOfNightsReachEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java index 3b03d2555e7..bd4ac22da16 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfSeeingWinds.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CastFromHandCondition; import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -76,7 +76,7 @@ public class MyojinOfSeeingWinds extends CardImpl { // Myojin of Seeing Winds enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), new CastFromHandCondition(), ""), "{this} enters the battlefield with a divinity counter on it if you cast it from your hand")); // Myojin of Seeing Winds is indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter, 1)), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java index f5c0a6a2c46..aa395b860d3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java @@ -39,7 +39,7 @@ import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedMatchesFilterCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; @@ -78,11 +78,11 @@ public class TenzaGodosMaul extends CardImpl { // Equipped creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); // As long as it's legendary, it gets an additional +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEquippedEffect(2, 2), new EquippedMatchesFilterCondition(legendaryFilter), rule1))); // As long as it's red, it has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedMatchesFilterCondition(redFilter), rule2))); // Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) diff --git a/Mage.Sets/src/mage/sets/coldsnap/HaakonStromgaldScourge.java b/Mage.Sets/src/mage/sets/coldsnap/HaakonStromgaldScourge.java index a7104b16dfa..35f9be1beb9 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/HaakonStromgaldScourge.java +++ b/Mage.Sets/src/mage/sets/coldsnap/HaakonStromgaldScourge.java @@ -33,7 +33,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.DiesTriggeredAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.AsThoughEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; @@ -122,7 +122,7 @@ class HaakonStromgaldScourgePlayEffect extends AsThoughEffectImpl { } } -class HaakonStromgaldScourgePlayEffect2 extends ContinuousRuleModifiyingEffectImpl { +class HaakonStromgaldScourgePlayEffect2 extends ContinuousRuleModifyingEffectImpl { public HaakonStromgaldScourgePlayEffect2() { super(Duration.EndOfGame, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java b/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java index c754edb96b1..971b6414f25 100644 --- a/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java +++ b/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.combat.AttacksIfAbleTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.AttacksThisTurnMarkerAbility; @@ -90,7 +90,7 @@ public class BasandraBattleSeraph extends CardImpl { } } -class BasandraBattleSeraphEffect extends ContinuousRuleModifiyingEffectImpl { +class BasandraBattleSeraphEffect extends ContinuousRuleModifyingEffectImpl { public BasandraBattleSeraphEffect() { super(Duration.EndOfTurn, Outcome.Neutral); diff --git a/Mage.Sets/src/mage/sets/commander/ChampionsHelm.java b/Mage.Sets/src/mage/sets/commander/ChampionsHelm.java index 2253d331124..85a27531ca2 100644 --- a/Mage.Sets/src/mage/sets/commander/ChampionsHelm.java +++ b/Mage.Sets/src/mage/sets/commander/ChampionsHelm.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSupertypeCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; @@ -60,7 +60,7 @@ public class ChampionsHelm extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); // As long as equipped creature is legendary, it has hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedHasSupertypeCondition("Legendary"), staticText))); diff --git a/Mage.Sets/src/mage/sets/commander/Stranglehold.java b/Mage.Sets/src/mage/sets/commander/Stranglehold.java index 78a207de723..5745f1d25f0 100644 --- a/Mage.Sets/src/mage/sets/commander/Stranglehold.java +++ b/Mage.Sets/src/mage/sets/commander/Stranglehold.java @@ -30,7 +30,7 @@ package mage.sets.commander; import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; @@ -70,7 +70,7 @@ public class Stranglehold extends CardImpl { } } -class OpponentsCantSearchLibarariesEffect extends ContinuousRuleModifiyingEffectImpl { +class OpponentsCantSearchLibarariesEffect extends ContinuousRuleModifyingEffectImpl { public OpponentsCantSearchLibarariesEffect() { super(Duration.EndOfTurn, Outcome.Benefit, true, false); diff --git a/Mage.Sets/src/mage/sets/commander2013/IllusionistsGambit.java b/Mage.Sets/src/mage/sets/commander2013/IllusionistsGambit.java index fe349328419..51514bdbef5 100644 --- a/Mage.Sets/src/mage/sets/commander2013/IllusionistsGambit.java +++ b/Mage.Sets/src/mage/sets/commander2013/IllusionistsGambit.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.RestrictionEffect; @@ -80,7 +80,7 @@ public class IllusionistsGambit extends CardImpl { } } -class IllusionistsGambitEffect extends ContinuousRuleModifiyingEffectImpl { +class IllusionistsGambitEffect extends ContinuousRuleModifyingEffectImpl { IllusionistsGambitEffect() { super(Duration.EndOfGame, Outcome.Detriment); staticText = "Cast {this} only during the declare blockers step on an opponent's turn"; diff --git a/Mage.Sets/src/mage/sets/commander2013/RubiniaSoulsinger.java b/Mage.Sets/src/mage/sets/commander2013/RubiniaSoulsinger.java index b3461d8388b..30dcc081874 100644 --- a/Mage.Sets/src/mage/sets/commander2013/RubiniaSoulsinger.java +++ b/Mage.Sets/src/mage/sets/commander2013/RubiniaSoulsinger.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SkipUntapOptionalAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -66,7 +66,7 @@ public class RubiniaSoulsinger extends CardImpl { // You may choose not to untap Rubinia Soulsinger during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {tap}: Gain control of target creature for as long as you control Rubinia and Rubinia remains tapped. - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.OneUse), new RubiniaSoulsingerCondition(), "Gain control of target creature for as long as you control Rubinia and Rubinia remains tapped"); diff --git a/Mage.Sets/src/mage/sets/commander2013/SwordOfTheParuns.java b/Mage.Sets/src/mage/sets/commander2013/SwordOfTheParuns.java index 491268ccc64..5af02c7199b 100644 --- a/Mage.Sets/src/mage/sets/commander2013/SwordOfTheParuns.java +++ b/Mage.Sets/src/mage/sets/commander2013/SwordOfTheParuns.java @@ -36,7 +36,7 @@ import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.AttachedToTappedCondition; import mage.abilities.condition.common.EquipmentAttachedCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.EquipAbility; @@ -72,14 +72,14 @@ public class SwordOfTheParuns extends CardImpl { this.subtype.add("Equipment"); // As long as equipped creature is tapped, tapped creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(2,0, Duration.WhileOnBattlefield, filterTapped), new CompoundCondition(EquipmentAttachedCondition.getInstance(), new AttachedToTappedCondition()), "As long as equipped creature is tapped, tapped creatures you control get +2/+0" ))); // As long as equipped creature is untapped, untapped creatures you control get +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(0,2, Duration.WhileOnBattlefield, filterUntapped), new CompoundCondition(EquipmentAttachedCondition.getInstance(), new InvertCondition(new AttachedToTappedCondition())), "As long as equipped creature is untapped, untapped creatures you control get +0/+2" diff --git a/Mage.Sets/src/mage/sets/commander2014/AssaultSuit.java b/Mage.Sets/src/mage/sets/commander2014/AssaultSuit.java index da5999a65a5..78844178e33 100644 --- a/Mage.Sets/src/mage/sets/commander2014/AssaultSuit.java +++ b/Mage.Sets/src/mage/sets/commander2014/AssaultSuit.java @@ -33,7 +33,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.combat.CantAttackControllerAttachedEffect; @@ -97,7 +97,7 @@ public class AssaultSuit extends CardImpl { } } - class AssaultSuitCantBeSacrificed extends ContinuousRuleModifiyingEffectImpl { + class AssaultSuitCantBeSacrificed extends ContinuousRuleModifyingEffectImpl { public AssaultSuitCantBeSacrificed() { super(Duration.WhileOnBattlefield, Outcome.Detriment, true, false); diff --git a/Mage.Sets/src/mage/sets/commander2014/SiegeBehemoth.java b/Mage.Sets/src/mage/sets/commander2014/SiegeBehemoth.java index 7a02f2be160..0209032e397 100644 --- a/Mage.Sets/src/mage/sets/commander2014/SiegeBehemoth.java +++ b/Mage.Sets/src/mage/sets/commander2014/SiegeBehemoth.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.common.DamageAsThoughNotBlockedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceAttackingCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; @@ -62,7 +62,7 @@ public class SiegeBehemoth extends CardImpl { // TODO: DamageAsThoughNotBlockedAbility should be done by rule modifying effect instead of adding ability (if controlled creature looses all abilities it should'nt loose this effect) this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilityControlledEffect(DamageAsThoughNotBlockedAbility.getInstance(), Duration.WhileOnBattlefield), SourceAttackingCondition.getInstance(), "As long as {this} is attacking, for each creature you control, you may have that creature assign its combat damage as though it weren't blocked" diff --git a/Mage.Sets/src/mage/sets/commander2014/WakeTheDead.java b/Mage.Sets/src/mage/sets/commander2014/WakeTheDead.java index 7b427bee99e..46f3a3a6df3 100644 --- a/Mage.Sets/src/mage/sets/commander2014/WakeTheDead.java +++ b/Mage.Sets/src/mage/sets/commander2014/WakeTheDead.java @@ -34,7 +34,7 @@ import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.dynamicvalue.common.GetXValue; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeTargetEffect; @@ -95,7 +95,7 @@ public class WakeTheDead extends CardImpl { } } -class WakeTheDeadEffect extends ContinuousRuleModifiyingEffectImpl { +class WakeTheDeadEffect extends ContinuousRuleModifyingEffectImpl { WakeTheDeadEffect() { super(Duration.EndOfGame, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/conflux/Banefire.java b/Mage.Sets/src/mage/sets/conflux/Banefire.java index 0e1b4fbb026..27885e2dc08 100644 --- a/Mage.Sets/src/mage/sets/conflux/Banefire.java +++ b/Mage.Sets/src/mage/sets/conflux/Banefire.java @@ -32,7 +32,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -132,7 +132,7 @@ class BaneFireEffect extends OneShotEffect { } } -class BanefireCantCounterEffect extends ContinuousRuleModifiyingEffectImpl { +class BanefireCantCounterEffect extends ContinuousRuleModifyingEffectImpl { Condition condition = new testCondition(new ManacostVariableValue(), 5); diff --git a/Mage.Sets/src/mage/sets/conflux/CliffrunnerBehemoth.java b/Mage.Sets/src/mage/sets/conflux/CliffrunnerBehemoth.java index 9065d770e11..713b3a9496d 100644 --- a/Mage.Sets/src/mage/sets/conflux/CliffrunnerBehemoth.java +++ b/Mage.Sets/src/mage/sets/conflux/CliffrunnerBehemoth.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.LifelinkAbility; @@ -72,13 +72,13 @@ public class CliffrunnerBehemoth extends CardImpl { // Cliffrunner Behemoth has haste as long as you control a red permanent. this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(redPermanentFilter), "{this} has haste as long as you control a red permanent"))); // Cliffrunner Behemoth has lifelink as long as you control a white permanent. this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(whitePermanentFilter), "{this} has lifelink as long as you control a white permanent"))); } diff --git a/Mage.Sets/src/mage/sets/conflux/CourtHomunculus.java b/Mage.Sets/src/mage/sets/conflux/CourtHomunculus.java index e0e5453b347..45b77a4d777 100644 --- a/Mage.Sets/src/mage/sets/conflux/CourtHomunculus.java +++ b/Mage.Sets/src/mage/sets/conflux/CourtHomunculus.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.filter.common.FilterArtifactPermanent; @@ -62,7 +62,7 @@ public class CourtHomunculus extends CardImpl { // Court Homunculus gets +1/+1 as long as you control another artifact. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new ControlsAnotherArtifactCondition(), "{this} gets +1/+1 as long as you control another artifact"))); } diff --git a/Mage.Sets/src/mage/sets/conflux/EmberWeaver.java b/Mage.Sets/src/mage/sets/conflux/EmberWeaver.java index 51c87987cbc..0c71ee58dbf 100644 --- a/Mage.Sets/src/mage/sets/conflux/EmberWeaver.java +++ b/Mage.Sets/src/mage/sets/conflux/EmberWeaver.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -69,12 +69,12 @@ public class EmberWeaver extends CardImpl { // As long as you control a red permanent, Ember Weaver gets +1/+0 and has first strike. this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(redPermanentFilter), "{this} gets +1/+0 as long as you control a red permanent"))); this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(redPermanentFilter), "{this} has first strike as long as you control a red permanent"))); diff --git a/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java b/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java index e772cb55d90..9aef936ad27 100644 --- a/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java +++ b/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.DevouredCreaturesCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DevourEffect.DevourFactor; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DevourAbility; @@ -63,11 +63,11 @@ public class HellkiteHatchling extends CardImpl { this.addAbility(new DevourAbility(DevourFactor.Devour1)); // Hellkite Hatchling has flying and trample if it devoured a creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance()), new DevouredCreaturesCondition(Condition.ComparisonType.GreaterThan, 0), "{this} has flying if it devoured a creature"))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance()), new DevouredCreaturesCondition(Condition.ComparisonType.GreaterThan, 0), "{this} has trample if it devoured a creature"))); diff --git a/Mage.Sets/src/mage/sets/conflux/ToxicIguanar.java b/Mage.Sets/src/mage/sets/conflux/ToxicIguanar.java index ae5179728d7..4114eb4cd9f 100644 --- a/Mage.Sets/src/mage/sets/conflux/ToxicIguanar.java +++ b/Mage.Sets/src/mage/sets/conflux/ToxicIguanar.java @@ -36,7 +36,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; @@ -66,7 +66,7 @@ public class ToxicIguanar extends CardImpl { // Toxic Iguanar has deathtouch as long as you control a green permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has deathtouch as long as you control a green permanent"))); } diff --git a/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java b/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java index a8d930def51..052421bda18 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java +++ b/Mage.Sets/src/mage/sets/darkascension/BreakOfDay.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.abilities.condition.common.FatefulHourCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.IndestructibleAbility; @@ -56,7 +56,7 @@ public class BreakOfDay extends CardImpl { // Creatures you control get +1/+1 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); // Fateful hour - If you have 5 or less life, those creatures also are indestructible this turn. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control"), false), new LockedInCondition(FatefulHourCondition.getInstance()), "If you have 5 or less life, those creatures also are indestructible this turn")); diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java index 79a66e3f00e..0c9cbca52cd 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; @@ -77,7 +77,7 @@ public class CurseOfExhaustion extends CardImpl { } } -class CurseOfExhaustionEffect extends ContinuousRuleModifiyingEffectImpl { +class CurseOfExhaustionEffect extends ContinuousRuleModifyingEffectImpl { public CurseOfExhaustionEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java index 573e3043158..730543b46f2 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java +++ b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -95,7 +95,7 @@ public class DungeonGeists extends CardImpl { } } -class DungeonGeistsEffect extends ContinuousRuleModifiyingEffectImpl { +class DungeonGeistsEffect extends ContinuousRuleModifyingEffectImpl { public DungeonGeistsEffect() { super(Duration.Custom, Outcome.Detriment, false, false); diff --git a/Mage.Sets/src/mage/sets/darkascension/GavonyIronwright.java b/Mage.Sets/src/mage/sets/darkascension/GavonyIronwright.java index eba6f4ebff7..6e3c55b2f38 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GavonyIronwright.java +++ b/Mage.Sets/src/mage/sets/darkascension/GavonyIronwright.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FatefulHourCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.constants.Duration; @@ -58,7 +58,7 @@ public class GavonyIronwright extends CardImpl { this.toughness = new MageInt(4); // Fateful hour - As long as you have 5 or less life, other creatures you control get +1/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostControlledEffect(1, 4, Duration.WhileOnBattlefield, false), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostControlledEffect(1, 4, Duration.WhileOnBattlefield, false), FatefulHourCondition.getInstance(), "As long as you have 5 or less life, other creatures you control get +1/+4"))); } diff --git a/Mage.Sets/src/mage/sets/darkascension/GrafdiggersCage.java b/Mage.Sets/src/mage/sets/darkascension/GrafdiggersCage.java index 28dbb0a656b..bb19f19a1dc 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GrafdiggersCage.java +++ b/Mage.Sets/src/mage/sets/darkascension/GrafdiggersCage.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; @@ -71,7 +71,7 @@ public class GrafdiggersCage extends CardImpl { } } -class GrafdiggersCageEffect extends ContinuousRuleModifiyingEffectImpl { +class GrafdiggersCageEffect extends ContinuousRuleModifyingEffectImpl { public GrafdiggersCageEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); @@ -108,7 +108,7 @@ class GrafdiggersCageEffect extends ContinuousRuleModifiyingEffectImpl { } -class GrafdiggersCageEffect2 extends ContinuousRuleModifiyingEffectImpl { +class GrafdiggersCageEffect2 extends ContinuousRuleModifyingEffectImpl { public GrafdiggersCageEffect2() { super(Duration.WhileOnBattlefield, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/darkascension/HeavyMattock.java b/Mage.Sets/src/mage/sets/darkascension/HeavyMattock.java index 9a22c8544dc..23d36982399 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HeavyMattock.java +++ b/Mage.Sets/src/mage/sets/darkascension/HeavyMattock.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class HeavyMattock extends CardImpl { // Equipped creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); // As long as equipped creature is a Human, it gets an additional +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/sets/darkascension/ThrabenDoomsayer.java b/Mage.Sets/src/mage/sets/darkascension/ThrabenDoomsayer.java index adc235a820c..c81e8ec3cb9 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ThrabenDoomsayer.java +++ b/Mage.Sets/src/mage/sets/darkascension/ThrabenDoomsayer.java @@ -36,7 +36,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; @@ -62,7 +62,7 @@ public class ThrabenDoomsayer extends CardImpl { // {tap}: Put a 1/1 white Human creature token onto the battlefield. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanToken()), new TapSourceCost())); // Fateful hour - As long as you have 5 or less life, other creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, false), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, false), FatefulHourCondition.getInstance(), "As long as you have 5 or less life, other creatures you control get +2/+2"))); } diff --git a/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java b/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java index 358fed7f2a1..5de312f16ff 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java +++ b/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.abilities.condition.common.MorbidCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; @@ -52,7 +52,7 @@ public class TragicSlip extends CardImpl { // Target creature gets -1/-1 until end of turn. // Morbid - That creature gets -13/-13 until end of turn instead if a creature died this turn. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new BoostTargetEffect(-13, -13, Duration.EndOfTurn), new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new LockedInCondition(MorbidCondition.getInstance()), diff --git a/Mage.Sets/src/mage/sets/darkascension/VillageSurvivors.java b/Mage.Sets/src/mage/sets/darkascension/VillageSurvivors.java index f794379d8e8..bb30447c347 100644 --- a/Mage.Sets/src/mage/sets/darkascension/VillageSurvivors.java +++ b/Mage.Sets/src/mage/sets/darkascension/VillageSurvivors.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.condition.common.MorbidCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; @@ -60,7 +60,7 @@ public class VillageSurvivors extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Fateful hour - As long as you have 5 or less life, other creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true), FatefulHourCondition.getInstance(), "Fateful hour - As long as you have 5 or less life, other creatures you control have vigilance"))); diff --git a/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java b/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java index f3f1f418101..a93cf763274 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java +++ b/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.NotMyTurnCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.ColorlessManaAbility; @@ -61,7 +61,7 @@ public class WardenOfTheWall extends CardImpl { this.addAbility(new ColorlessManaAbility()); // As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BecomesCreatureSourceEffect(new GargoyleToken(), "", Duration.WhileOnBattlefield), NotMyTurnCondition.getInstance(), "As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BecomesCreatureSourceEffect(new GargoyleToken(), "", Duration.WhileOnBattlefield), NotMyTurnCondition.getInstance(), "As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying"))); } public WardenOfTheWall(final WardenOfTheWall card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java b/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java index b160d305fe6..7990186a525 100644 --- a/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java +++ b/Mage.Sets/src/mage/sets/darksteel/AuriokGlaivemaster.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -60,9 +60,9 @@ public class AuriokGlaivemaster extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), EquippedCondition.getInstance(), rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), EquippedCondition.getInstance(), rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/darksteel/Flamebreak.java b/Mage.Sets/src/mage/sets/darksteel/Flamebreak.java index 5d61f0e9768..492edca4609 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Flamebreak.java +++ b/Mage.Sets/src/mage/sets/darksteel/Flamebreak.java @@ -30,7 +30,7 @@ package mage.sets.darksteel; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.StaticValue; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -80,7 +80,7 @@ public class Flamebreak extends CardImpl { } } -class FlamebreakCantRegenerateEffect extends ContinuousRuleModifiyingEffectImpl { +class FlamebreakCantRegenerateEffect extends ContinuousRuleModifyingEffectImpl { public FlamebreakCantRegenerateEffect() { super(Duration.EndOfTurn, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/darksteel/PristineAngel.java b/Mage.Sets/src/mage/sets/darksteel/PristineAngel.java index 3798c5974c0..fa131cc90a1 100644 --- a/Mage.Sets/src/mage/sets/darksteel/PristineAngel.java +++ b/Mage.Sets/src/mage/sets/darksteel/PristineAngel.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.SourceTappedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -81,7 +81,7 @@ public class PristineAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // As long as Pristine Angel is untapped, it has protection from artifacts and from all colors. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilitySourceEffect(new ProtectionAbility(filter), Duration.WhileOnBattlefield), new InvertCondition(new SourceTappedCondition()), "As long as {this} is untapped, it has protection from artifacts and from all colors"))); diff --git a/Mage.Sets/src/mage/sets/darksteel/SavageBeating.java b/Mage.Sets/src/mage/sets/darksteel/SavageBeating.java index bccb67dbb89..d8ed9ba3fec 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SavageBeating.java +++ b/Mage.Sets/src/mage/sets/darksteel/SavageBeating.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -90,7 +90,7 @@ public class SavageBeating extends CardImpl { } } -class SavageBeatingTimingEffect extends ContinuousRuleModifiyingEffectImpl { +class SavageBeatingTimingEffect extends ContinuousRuleModifyingEffectImpl { SavageBeatingTimingEffect() { super(Duration.EndOfGame, Outcome.Detriment); staticText = "Cast {this} only during your turn and only during combat"; diff --git a/Mage.Sets/src/mage/sets/dissension/DemonsJester.java b/Mage.Sets/src/mage/sets/dissension/DemonsJester.java index 557b4cb08a3..a9862579d95 100644 --- a/Mage.Sets/src/mage/sets/dissension/DemonsJester.java +++ b/Mage.Sets/src/mage/sets/dissension/DemonsJester.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HellbentCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class DemonsJester extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Hellbent - Demon's Jester gets +2/+1 as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2,1,Duration.WhileOnBattlefield), HellbentCondition.getInstance(), "Hellbent - {this} gets +2/+1 as long as you have no cards in hand"))); } diff --git a/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java b/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java index b558bc3d93e..02bc3913601 100644 --- a/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java +++ b/Mage.Sets/src/mage/sets/dissension/FlaringFlameKin.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.EnchantedCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; @@ -69,11 +69,11 @@ public class FlaringFlameKin extends CardImpl { new ManaCostsImpl("{R}")); Condition enchanted = new EnchantedCondition(); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), enchanted, rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), enchanted, rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), enchanted, rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), enchanted, rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); - ConditionalContinousEffect effect3 = new ConditionalContinousEffect(new GainAbilitySourceEffect(grantedAbility), enchanted, rule3); + ConditionalContinuousEffect effect3 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(grantedAbility), enchanted, rule3); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect3)); } diff --git a/Mage.Sets/src/mage/sets/dissension/FreewindEquenaut.java b/Mage.Sets/src/mage/sets/dissension/FreewindEquenaut.java index 1a94971460b..438607fcb36 100644 --- a/Mage.Sets/src/mage/sets/dissension/FreewindEquenaut.java +++ b/Mage.Sets/src/mage/sets/dissension/FreewindEquenaut.java @@ -37,7 +37,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCondition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -67,7 +67,7 @@ public class FreewindEquenaut extends CardImpl { new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilitySourceEffect(ability, Duration.WhileOnBattlefield), new EnchantedCondition(), "As long as {this} is enchanted, it has \"{T}: {this} deals 2 damage to target attacking or blocking creature\""))); diff --git a/Mage.Sets/src/mage/sets/dissension/GobhobblerRats.java b/Mage.Sets/src/mage/sets/dissension/GobhobblerRats.java index 13669b34785..76e3dd9c7c3 100644 --- a/Mage.Sets/src/mage/sets/dissension/GobhobblerRats.java +++ b/Mage.Sets/src/mage/sets/dissension/GobhobblerRats.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HellbentCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -61,10 +61,10 @@ public class GobhobblerRats extends CardImpl { this.toughness = new MageInt(2); // Hellbent - As long as you have no cards in hand, Gobhobbler Rats gets +1/+0 and has "{B}: Regenerate Gobhobbler Rats." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1,0, Duration.WhileOnBattlefield), HellbentCondition.getInstance(), "Hellbent - As long as you have no cards in hand, {this} gets +1/+0")); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield), HellbentCondition.getInstance(), "and has \"{B}: Regenerate {this}.\"")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java b/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java index a8da6833d08..d49cda917c2 100644 --- a/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java +++ b/Mage.Sets/src/mage/sets/dissension/RakdosPitDragon.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HellbentCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; @@ -67,7 +67,7 @@ public class RakdosPitDragon extends CardImpl { new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); // Hellbent — Rakdos Pit Dragon has double strike as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield), HellbentCondition.getInstance(), "Hellbent - Rakdos Pit Dragon has double strike as long as you have no cards in hand"))); diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/FaithsFetters.java b/Mage.Sets/src/mage/sets/divinevsdemonic/FaithsFetters.java index 376129f955e..74e6f039d11 100644 --- a/Mage.Sets/src/mage/sets/divinevsdemonic/FaithsFetters.java +++ b/Mage.Sets/src/mage/sets/divinevsdemonic/FaithsFetters.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -89,7 +89,7 @@ public class FaithsFetters extends CardImpl { } } -class FaithsFettersEffect extends ContinuousRuleModifiyingEffectImpl { +class FaithsFettersEffect extends ContinuousRuleModifyingEffectImpl { public FaithsFettersEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/divinevsdemonic/SerrasBoon.java b/Mage.Sets/src/mage/sets/divinevsdemonic/SerrasBoon.java index d2103ee88ab..ab23734e23b 100644 --- a/Mage.Sets/src/mage/sets/divinevsdemonic/SerrasBoon.java +++ b/Mage.Sets/src/mage/sets/divinevsdemonic/SerrasBoon.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedMatchesFilterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; @@ -72,7 +72,7 @@ public class SerrasBoon extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+2 as long as it's white. Otherwise, it gets -2/-1. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield), new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield), new EquippedMatchesFilterCondition(filter), diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java b/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java index 861293bbeeb..bd694552eaf 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/CouncilOfTheAbsolute.java @@ -35,7 +35,7 @@ import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.NameACardEffect; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.FlashbackAbility; @@ -90,7 +90,7 @@ public class CouncilOfTheAbsolute extends CardImpl { } -class CouncilOfTheAbsoluteReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class CouncilOfTheAbsoluteReplacementEffect extends ContinuousRuleModifyingEffectImpl { public CouncilOfTheAbsoluteReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java b/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java index 74a0bacd07a..bd66e5c1694 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RenderSilent.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -116,7 +116,7 @@ class RenderSilentCounterEffect extends OneShotEffect { } -class RenderSilentEffect extends ContinuousRuleModifiyingEffectImpl { +class RenderSilentEffect extends ContinuousRuleModifyingEffectImpl { public RenderSilentEffect() { super(Duration.EndOfTurn, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/BlindingBeam.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/BlindingBeam.java index 5d68bbbe44b..0d12e44badf 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/BlindingBeam.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/BlindingBeam.java @@ -30,7 +30,7 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.EntwineAbility; @@ -116,7 +116,7 @@ class BlindingBeamEffect extends OneShotEffect { } -class BlindingBeamEffect2 extends ContinuousRuleModifiyingEffectImpl { +class BlindingBeamEffect2 extends ContinuousRuleModifyingEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java b/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java index a1b5f7cf81c..f63cb1393b3 100644 --- a/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java +++ b/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java @@ -30,7 +30,7 @@ package mage.sets.eventide; import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.ManaWasSpentCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -56,11 +56,11 @@ public class CankerousThirst extends CardImpl { this.color.setBlack(true); // If {B} was spent to cast Cankerous Thirst, you may have target creature get -3/-3 until end of turn. If {G} was spent to cast Cankerous Thirst, you may have target creature get +3/+3 until end of turn. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new LockedInCondition(new ManaWasSpentCondition(ColoredManaSymbol.B)), "If {B} was spent to cast {this}, you may have target creature get -3/-3 until end of turn")); - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new BoostTargetEffect(3, 3, Duration.EndOfTurn), new LockedInCondition(new ManaWasSpentCondition(ColoredManaSymbol.G)), "If {G} was spent to cast {this}, you may have target creature get +3/+3 until end of turn")); diff --git a/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java b/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java index ab337e27fe6..c43483d9f1e 100644 --- a/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java +++ b/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -70,12 +70,12 @@ public class CloutOfTheDominus extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is blue, it gets +1/+1 and has shroud. - SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is black, it gets +1/+1")); - blueAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has deathtouch")); + SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is black, it gets +1/+1")); + blueAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has deathtouch")); this.addAbility(blueAbility); // As long as enchanted creature is red, it gets +1/+1 and has haste. - SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); - redAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has haste")); + SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); + redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has haste")); this.addAbility(redAbility); } diff --git a/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java index 5299afb3476..b072571f793 100644 --- a/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java +++ b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; @@ -63,7 +63,7 @@ public class DivinityOfPride extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(LifelinkAbility.getInstance()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), new DivinityOfPrideCondition(), "Divinity of Pride gets +4/+4 as long as you have 25 or more life"))); } diff --git a/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java b/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java index f76c1fe55d1..1dfa2a1c2ef 100644 --- a/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java +++ b/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -68,10 +68,10 @@ public class EdgeOfTheDivinity extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is white, it gets +1/+2. - SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 2), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+2")); + SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 2), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+2")); this.addAbility(whiteAbility); // As long as enchanted creature is black, it gets +2/+1. - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(2, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +2/+1")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +2/+1")); this.addAbility(blackAbility); } diff --git a/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java b/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java index 5b5b82fd39a..d96522ea27b 100644 --- a/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java +++ b/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -70,12 +70,12 @@ public class FavorOfTheOverbeing extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is green, it gets +1/+1 and has vigilance. - SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); - greenAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and has vigilance")); + SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); + greenAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and has vigilance")); this.addAbility(greenAbility); // As long as enchanted creature is blue, it gets +1/+1 and has flying. - SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); - blueAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has flying")); + SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); + blueAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has flying")); this.addAbility(blueAbility); } diff --git a/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java b/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java index 2dc5f48ae3d..8e2c0003915 100644 --- a/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java +++ b/Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java @@ -33,7 +33,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.SourceMatchesFilterCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; @@ -77,7 +77,7 @@ public class FigureOfDestiny extends CardImpl { // {RW}{RW}{RW}: If Figure of Destiny is a Spirit, it becomes a Kithkin Spirit Warrior with base power and toughness 4/4. this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new FigureOfDestiny.FigureOfDestinyToken2(), "", Duration.Custom), new LockedInCondition(new SourceMatchesFilterCondition(filter2)), "If {this} is a Spirit, it becomes a Kithkin Spirit Warrior with base power and toughness 4/4"), @@ -86,7 +86,7 @@ public class FigureOfDestiny extends CardImpl { // {RW}{RW}{RW}{RW}{RW}{RW}: If Figure of Destiny is a Warrior, it becomes a Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike. this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new FigureOfDestiny.FigureOfDestinyToken3(), "", Duration.Custom), new LockedInCondition(new SourceMatchesFilterCondition(filter3)), "If {this} is a Warrior, it becomes a Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike"), diff --git a/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java b/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java index c71c863ef12..b412c62408c 100644 --- a/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java +++ b/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalRequirementEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; @@ -71,12 +71,12 @@ public class GiftOfTheDeity extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is black, it gets +1/+1 and has deathtouch. - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); - blackAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has deathtouch")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); + blackAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has deathtouch")); this.addAbility(blackAbility); // As long as enchanted creature is green, it gets +1/+1 and all creatures able to block it do so. SimpleStaticAbility greenAbility; - greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), + greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); Effect effect = new ConditionalRequirementEffect(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN)); effect.setText("and all creatures able to block it do so"); diff --git a/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java b/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java index dbabfe62974..20c23c87160 100644 --- a/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java +++ b/Mage.Sets/src/mage/sets/eventide/InvertTheSkies.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.ManaWasSpentCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; @@ -64,11 +64,11 @@ public class InvertTheSkies extends CardImpl { this.color.setGreen(true); // Creatures your opponents control lose flying until end of turn if {G} was spent to cast Invert the Skies, and creatures you control gain flying until end of turn if {U} was spent to cast it. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new InvertTheSkiesEffect(), new LockedInCondition(new ManaWasSpentCondition(ColoredManaSymbol.G)), "Creatures your opponents control lose flying until end of turn if {G} was spent to cast {this},")); - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new LockedInCondition(new ManaWasSpentCondition(ColoredManaSymbol.U)), "and creatures you control gain flying until end of turn if {U} was spent to cast it")); diff --git a/Mage.Sets/src/mage/sets/eventide/Moonhold.java b/Mage.Sets/src/mage/sets/eventide/Moonhold.java index 1f5294f3c83..b0ff6baac49 100644 --- a/Mage.Sets/src/mage/sets/eventide/Moonhold.java +++ b/Mage.Sets/src/mage/sets/eventide/Moonhold.java @@ -33,8 +33,8 @@ import mage.abilities.Ability; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.decorator.ConditionalContinuousRuleModifyingEffect; -import mage.abilities.effects.ContinuousRuleModifiyingEffect; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffect; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.constants.CardType; @@ -61,8 +61,8 @@ public class Moonhold extends CardImpl { this.color.setWhite(true); // Target player can't play land cards this turn if {R} was spent to cast Moonhold and can't play creature cards this turn if {W} was spent to cast it. - ContinuousRuleModifiyingEffect effect = new MoonholdEffect(); - ContinuousRuleModifiyingEffect effect2 = new MoonholdEffect2(); + ContinuousRuleModifyingEffect effect = new MoonholdEffect(); + ContinuousRuleModifyingEffect effect2 = new MoonholdEffect2(); effect.setText("Target player can't play land cards this turn if {R} was spent to cast {this} "); effect2.setText("and can't play creature cards this turn if {W} was spent to cast it."); this.getSpellAbility().addEffect(new ConditionalContinuousRuleModifyingEffect( @@ -86,7 +86,7 @@ public class Moonhold extends CardImpl { } } -class MoonholdEffect extends ContinuousRuleModifiyingEffectImpl { +class MoonholdEffect extends ContinuousRuleModifyingEffectImpl { public MoonholdEffect() { super(Duration.EndOfTurn, Outcome.Detriment); @@ -129,7 +129,7 @@ class MoonholdEffect extends ContinuousRuleModifiyingEffectImpl { } } -class MoonholdEffect2 extends ContinuousRuleModifiyingEffectImpl { +class MoonholdEffect2 extends ContinuousRuleModifyingEffectImpl { public MoonholdEffect2() { super(Duration.EndOfTurn, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java b/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java index e662b37ba95..564e4b2290a 100644 --- a/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java +++ b/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -72,12 +72,12 @@ public class ScourgeOfTheNobilis extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is red, it gets +1/+1 and has "{RW}: This creature gets +1/+0 until end of turn." - SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); - redAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R/W}")), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has \"{R/W}: This creature gets +1/+0 until end of turn.\"")); + SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); + redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R/W}")), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has \"{R/W}: This creature gets +1/+0 until end of turn.\"")); this.addAbility(redAbility); // As long as enchanted creature is white, it gets +1/+1 and has lifelink. - SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); - whiteAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "and has lifelink")); + SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); + whiteAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "and has lifelink")); this.addAbility(whiteAbility); } diff --git a/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java b/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java index 70c382e1075..e07b762826b 100644 --- a/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java +++ b/Mage.Sets/src/mage/sets/eventide/TalarasBattalion.java @@ -33,7 +33,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -85,7 +85,7 @@ public class TalarasBattalion extends CardImpl { } } -class TalarasBattalionEffect extends ContinuousRuleModifiyingEffectImpl { +class TalarasBattalionEffect extends ContinuousRuleModifyingEffectImpl { TalarasBattalionEffect() { super(Duration.EndOfGame, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/eventide/Thunderblust.java b/Mage.Sets/src/mage/sets/eventide/Thunderblust.java index 0f9bb053d09..972c834df56 100644 --- a/Mage.Sets/src/mage/sets/eventide/Thunderblust.java +++ b/Mage.Sets/src/mage/sets/eventide/Thunderblust.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasCounterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; @@ -64,7 +64,7 @@ public class Thunderblust extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Thunderblust has trample as long as it has a -1/-1 counter on it. - Effect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.M1M1), rule); + Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.M1M1), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // Persist diff --git a/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java b/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java index 58be459e6ed..d7d7dea31d7 100644 --- a/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java +++ b/Mage.Sets/src/mage/sets/eventide/UnnervingAssault.java @@ -29,7 +29,7 @@ package mage.sets.eventide; import java.util.UUID; import mage.abilities.condition.common.ManaWasSpentCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -65,10 +65,10 @@ public class UnnervingAssault extends CardImpl { this.color.setBlue(true); // Creatures your opponents control get -1/-0 until end of turn if {U} was spent to cast Unnerving Assault, and creatures you control get +1/+0 until end of turn if {R} was spent to cast it. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new BoostAllEffect(-1, 0, Duration.EndOfTurn, filter, false), new ManaWasSpentCondition(ColoredManaSymbol.U), "Creatures your opponents control get -1/0 until end of turn if {U} was spent to cast {this},")); - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new BoostAllEffect(1, 0, Duration.EndOfTurn, filter2, false), new ManaWasSpentCondition(ColoredManaSymbol.R), " and creatures you control get +1/0 until end of turn if {R} was spent to cast it")); this.addInfo("Info1", "(Do both if {U}{R} was spent.)"); diff --git a/Mage.Sets/src/mage/sets/eventide/WardOfBones.java b/Mage.Sets/src/mage/sets/eventide/WardOfBones.java index 8ec71a56eb9..7315222ae28 100644 --- a/Mage.Sets/src/mage/sets/eventide/WardOfBones.java +++ b/Mage.Sets/src/mage/sets/eventide/WardOfBones.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.constants.CardType; @@ -73,7 +73,7 @@ public class WardOfBones extends CardImpl { } } -class WardOfBonesEffect extends ContinuousRuleModifiyingEffectImpl { +class WardOfBonesEffect extends ContinuousRuleModifyingEffectImpl { public WardOfBonesEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java index 6acb54c9f17..11e8d1a2085 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java +++ b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java @@ -38,7 +38,7 @@ import mage.abilities.common.SkipUntapOptionalAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.common.SourceTappedCondition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; @@ -87,7 +87,7 @@ public class Seasinger extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {tap}: Gain control of target creature whose controller controls an Island for as long as you control Seasinger and Seasinger remains tapped. - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom), new PermanentsOnTheBattlefieldCondition(seasinger, PermanentsOnTheBattlefieldCondition.CountType.EQUAL_TO, 1, SourceTappedCondition.getInstance()), rule); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/fatereforged/AbzanKinGuard.java b/Mage.Sets/src/mage/sets/fatereforged/AbzanKinGuard.java index b0569646ae3..a3dd2b32fc3 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/AbzanKinGuard.java +++ b/Mage.Sets/src/mage/sets/fatereforged/AbzanKinGuard.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; @@ -66,7 +66,7 @@ public class AbzanKinGuard extends CardImpl { // Abzan Kin-Guard has lifelink as long as you control a white or black permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has lifelink as long as you control a white or black permanent"))); } diff --git a/Mage.Sets/src/mage/sets/fatereforged/AbzanRunemark.java b/Mage.Sets/src/mage/sets/fatereforged/AbzanRunemark.java index 32b82b71e9b..b9c3418c051 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/AbzanRunemark.java +++ b/Mage.Sets/src/mage/sets/fatereforged/AbzanRunemark.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -78,7 +78,7 @@ public class AbzanRunemark extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has vigilance as long as you control a black or green permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), + new ConditionalContinuousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "{this} has vigilance as long as you control a black or green permanent"))); } diff --git a/Mage.Sets/src/mage/sets/fatereforged/BattleBrawler.java b/Mage.Sets/src/mage/sets/fatereforged/BattleBrawler.java index 2558800dcdd..2867a722a5e 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/BattleBrawler.java +++ b/Mage.Sets/src/mage/sets/fatereforged/BattleBrawler.java @@ -33,7 +33,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -69,9 +69,9 @@ public class BattleBrawler extends CardImpl { // As long as you control a red or white permanent, Battle Brawler gets +1/+0 and has first strike. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1,0, Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new BoostSourceEffect(1,0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a red or white permanent, {this} gets +1/+0")); - ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), + ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "and has first strike")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fatereforged/BloodfireEnforcers.java b/Mage.Sets/src/mage/sets/fatereforged/BloodfireEnforcers.java index eb3f1e749a5..c293036852b 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/BloodfireEnforcers.java +++ b/Mage.Sets/src/mage/sets/fatereforged/BloodfireEnforcers.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.TrampleAbility; @@ -62,9 +62,9 @@ public class BloodfireEnforcers extends CardImpl { // Bloodfire Enforcers has first strike and trample as long as an instant card and a sorcery card are in your graveyard. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), new BloodfireEnforcersCondition(), "{this} has first strike")); - ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), + ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), new BloodfireEnforcersCondition(), "and trample as long as an instant card and a sorcery card are in your graveyard")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/fatereforged/HewedStoneRetainers.java b/Mage.Sets/src/mage/sets/fatereforged/HewedStoneRetainers.java index e93d63247ad..4a9df6b2789 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/HewedStoneRetainers.java +++ b/Mage.Sets/src/mage/sets/fatereforged/HewedStoneRetainers.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -69,7 +69,7 @@ public class HewedStoneRetainers extends CardImpl { } } -class HewedStoneRetainersEffect extends ContinuousRuleModifiyingEffectImpl { +class HewedStoneRetainersEffect extends ContinuousRuleModifyingEffectImpl { HewedStoneRetainersEffect() { super(Duration.EndOfGame, Outcome.Detriment); staticText = "Cast {this} only if you've cast another spell this turn"; diff --git a/Mage.Sets/src/mage/sets/fatereforged/JeskaiRunemark.java b/Mage.Sets/src/mage/sets/fatereforged/JeskaiRunemark.java index aef18b0c0b4..56899c347d3 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/JeskaiRunemark.java +++ b/Mage.Sets/src/mage/sets/fatereforged/JeskaiRunemark.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -78,7 +78,7 @@ public class JeskaiRunemark extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has flying as long as you control a red or white permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), + new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "{this} has flying as long as you control a red or white permanent"))); } diff --git a/Mage.Sets/src/mage/sets/fatereforged/MarduRunemark.java b/Mage.Sets/src/mage/sets/fatereforged/MarduRunemark.java index 2d3a0736a97..1342b65ca41 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/MarduRunemark.java +++ b/Mage.Sets/src/mage/sets/fatereforged/MarduRunemark.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -78,7 +78,7 @@ public class MarduRunemark extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has first strike as long as you control a white or black permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), + new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "{this} has first strike as long as you control a white or black permanent"))); } diff --git a/Mage.Sets/src/mage/sets/fatereforged/SultaiRunemark.java b/Mage.Sets/src/mage/sets/fatereforged/SultaiRunemark.java index bde7898076d..312254c9c46 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/SultaiRunemark.java +++ b/Mage.Sets/src/mage/sets/fatereforged/SultaiRunemark.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -78,7 +78,7 @@ public class SultaiRunemark extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has deathtouch as long as you control a green or blue permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA), + new ConditionalContinuousEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "{this} has deathtouch as long as you control a green or blue permanent"))); } diff --git a/Mage.Sets/src/mage/sets/fatereforged/TemurBattleRage.java b/Mage.Sets/src/mage/sets/fatereforged/TemurBattleRage.java index 74a55b27411..5ee1d199f2c 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/TemurBattleRage.java +++ b/Mage.Sets/src/mage/sets/fatereforged/TemurBattleRage.java @@ -30,7 +30,7 @@ package mage.sets.fatereforged; import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.FerociousCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.TrampleAbility; @@ -57,7 +57,7 @@ public class TemurBattleRage extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Ferocious That creature also gains trample until end of turn if you control a creature with power 4 or greater. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new LockedInCondition(FerociousCondition.getInstance()), rule)); diff --git a/Mage.Sets/src/mage/sets/fatereforged/TemurRunemark.java b/Mage.Sets/src/mage/sets/fatereforged/TemurRunemark.java index 66626084ac7..d45619ffc28 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/TemurRunemark.java +++ b/Mage.Sets/src/mage/sets/fatereforged/TemurRunemark.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -78,7 +78,7 @@ public class TemurRunemark extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has trample as long as you control a blue or red permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA), + new ConditionalContinuousEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "{this} has trample as long as you control a blue or red permanent"))); } diff --git a/Mage.Sets/src/mage/sets/fatereforged/WardenOfTheFirstTree.java b/Mage.Sets/src/mage/sets/fatereforged/WardenOfTheFirstTree.java index b7f8b0e247e..44ab9bd18da 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/WardenOfTheFirstTree.java +++ b/Mage.Sets/src/mage/sets/fatereforged/WardenOfTheFirstTree.java @@ -33,7 +33,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.SourceMatchesFilterCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -79,7 +79,7 @@ public class WardenOfTheFirstTree extends CardImpl { // {2}{W/B}{W/B}: If Warden of the First Tree is a Warrior, it becomes a Human Spirit Warrior with trample and lifelink. this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new WardenOfTheFirstTree2(), "", Duration.Custom), new LockedInCondition(new SourceMatchesFilterCondition(filter)), "If {this} is a Warrior, it becomes a Human Spirit Warrior with trample and lifelink"), diff --git a/Mage.Sets/src/mage/sets/fatereforged/WardscaleDragon.java b/Mage.Sets/src/mage/sets/fatereforged/WardscaleDragon.java index 2ef467bd773..fadb7c5a883 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/WardscaleDragon.java +++ b/Mage.Sets/src/mage/sets/fatereforged/WardscaleDragon.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -75,7 +75,7 @@ public class WardscaleDragon extends CardImpl { } } -class WardscaleDragonRuleEffect extends ContinuousRuleModifiyingEffectImpl { +class WardscaleDragonRuleEffect extends ContinuousRuleModifyingEffectImpl { public WardscaleDragonRuleEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit, true, false); diff --git a/Mage.Sets/src/mage/sets/fatereforged/WildSlash.java b/Mage.Sets/src/mage/sets/fatereforged/WildSlash.java index 9eff5707dc7..95fd687238e 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/WildSlash.java +++ b/Mage.Sets/src/mage/sets/fatereforged/WildSlash.java @@ -33,8 +33,8 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.decorator.ConditionalContinuousRuleModifyingEffect; -import mage.abilities.effects.ContinuousRuleModifiyingEffect; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffect; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -57,7 +57,7 @@ public class WildSlash extends CardImpl { this.expansionSetCode = "FRF"; // Ferocious If you control a creature with power 4 or greater, damage can't be prevented this turn. - ContinuousRuleModifiyingEffect effect = new DamageCantBePreventedEffect(); + ContinuousRuleModifyingEffect effect = new DamageCantBePreventedEffect(); effect.setText("Ferocious — If you control a creature with power 4 or greater, damage can't be prevented this turn.
"); this.getSpellAbility().addEffect(new ConditionalContinuousRuleModifyingEffect(effect, new LockedInCondition(FerociousCondition.getInstance()))); @@ -78,7 +78,7 @@ public class WildSlash extends CardImpl { } } -class DamageCantBePreventedEffect extends ContinuousRuleModifiyingEffectImpl { +class DamageCantBePreventedEffect extends ContinuousRuleModifyingEffectImpl { public DamageCantBePreventedEffect() { super(Duration.EndOfTurn, Outcome.Benefit, false, false); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java b/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java index 18bf50f6626..6b8ca7b4957 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EonHub.java @@ -13,7 +13,7 @@ import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.players.Player; /** @@ -41,7 +41,7 @@ public class EonHub extends CardImpl { } -class SkipUpkeepStepEffect extends ContinuousRuleModifiyingEffectImpl { +class SkipUpkeepStepEffect extends ContinuousRuleModifyingEffectImpl { public SkipUpkeepStepEffect() { super(Duration.WhileOnBattlefield, Outcome.Neutral, false, false); diff --git a/Mage.Sets/src/mage/sets/fifthedition/Stasis.java b/Mage.Sets/src/mage/sets/fifthedition/Stasis.java index 60ba48c5e51..5fca955aac2 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Stasis.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Stasis.java @@ -34,7 +34,7 @@ import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.cards.CardImpl; import mage.game.Game; @@ -71,7 +71,7 @@ public class Stasis extends CardImpl { } } -class SkipUntapStepEffect extends ContinuousRuleModifiyingEffectImpl { +class SkipUntapStepEffect extends ContinuousRuleModifyingEffectImpl { public SkipUntapStepEffect() { super(Duration.WhileOnBattlefield, Outcome.Neutral, false, false); diff --git a/Mage.Sets/src/mage/sets/fourthedition/GiantTortoise.java b/Mage.Sets/src/mage/sets/fourthedition/GiantTortoise.java index f52caceb5f6..0951d7ee3c6 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/GiantTortoise.java +++ b/Mage.Sets/src/mage/sets/fourthedition/GiantTortoise.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.SourceTappedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -56,7 +56,7 @@ public class GiantTortoise extends CardImpl { this.toughness = new MageInt(1); // Giant Tortoise gets +0/+3 as long as it's untapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(0,3, Duration.WhileOnBattlefield), new InvertCondition(new SourceTappedCondition()), "{this} gets +0/+3 as long as it's untapped"))); diff --git a/Mage.Sets/src/mage/sets/fourthedition/SirensCall.java b/Mage.Sets/src/mage/sets/fourthedition/SirensCall.java index 8ce7034cc59..2c3825ff87e 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/SirensCall.java +++ b/Mage.Sets/src/mage/sets/fourthedition/SirensCall.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; @@ -82,7 +82,7 @@ public class SirensCall extends CardImpl { } } -class SirensCallTimingEffect extends ContinuousRuleModifiyingEffectImpl { +class SirensCallTimingEffect extends ContinuousRuleModifyingEffectImpl { SirensCallTimingEffect() { super(Duration.EndOfGame, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/futuresight/GathanRaiders.java b/Mage.Sets/src/mage/sets/futuresight/GathanRaiders.java index 58c554c1368..7128f14b1f6 100644 --- a/Mage.Sets/src/mage/sets/futuresight/GathanRaiders.java +++ b/Mage.Sets/src/mage/sets/futuresight/GathanRaiders.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HellbentCondition; import mage.abilities.costs.common.DiscardCardCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; @@ -58,7 +58,7 @@ public class GathanRaiders extends CardImpl { this.toughness = new MageInt(3); // Hellbent - Gathan Raiders gets +2/+2 as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2,2,Duration.WhileOnBattlefield), HellbentCondition.getInstance(), "Hellbent - {this} gets +2/+2 as long as you have no cards in hand"))); // Morph-Discard a card. diff --git a/Mage.Sets/src/mage/sets/futuresight/GibberingDescent.java b/Mage.Sets/src/mage/sets/futuresight/GibberingDescent.java index 9e34f10d13a..6e860dd4b43 100644 --- a/Mage.Sets/src/mage/sets/futuresight/GibberingDescent.java +++ b/Mage.Sets/src/mage/sets/futuresight/GibberingDescent.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.HellbentCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousRuleModifyingEffect; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -90,7 +90,7 @@ public class GibberingDescent extends CardImpl { } } -class GibberingDescentSkipUpkeepEffect extends ContinuousRuleModifiyingEffectImpl { +class GibberingDescentSkipUpkeepEffect extends ContinuousRuleModifyingEffectImpl { GibberingDescentSkipUpkeepEffect() { super(Duration.WhileOnBattlefield, Outcome.Neutral); diff --git a/Mage.Sets/src/mage/sets/futuresight/OrissSamiteGuardian.java b/Mage.Sets/src/mage/sets/futuresight/OrissSamiteGuardian.java index 9398853f824..55f7eb83046 100644 --- a/Mage.Sets/src/mage/sets/futuresight/OrissSamiteGuardian.java +++ b/Mage.Sets/src/mage/sets/futuresight/OrissSamiteGuardian.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.abilityword.GrandeurAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -87,7 +87,7 @@ public class OrissSamiteGuardian extends CardImpl { } } -class OrissSamiteGuardianCantCastEffect extends ContinuousRuleModifiyingEffectImpl { +class OrissSamiteGuardianCantCastEffect extends ContinuousRuleModifyingEffectImpl { OrissSamiteGuardianCantCastEffect() { super(Duration.EndOfTurn, Outcome.Detriment); @@ -120,7 +120,7 @@ class OrissSamiteGuardianCantCastEffect extends ContinuousRuleModifiyingEffectIm } } -class OrissSamiteGuardianCantAttackEffect extends ContinuousRuleModifiyingEffectImpl { +class OrissSamiteGuardianCantAttackEffect extends ContinuousRuleModifyingEffectImpl { OrissSamiteGuardianCantAttackEffect() { super(Duration.EndOfTurn, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/futuresight/VeilstoneAmulet.java b/Mage.Sets/src/mage/sets/futuresight/VeilstoneAmulet.java index 7bc9af1ca51..95280cf3fcd 100644 --- a/Mage.Sets/src/mage/sets/futuresight/VeilstoneAmulet.java +++ b/Mage.Sets/src/mage/sets/futuresight/VeilstoneAmulet.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.constants.CardType; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.filter.FilterSpell; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.game.Game; @@ -68,7 +68,7 @@ public class VeilstoneAmulet extends CardImpl { // Veilstone Amulet's effect is strange. It effects all creatures you control, // even if they entered the battlefield after the ability resolved. It modifies // the rules of the game until end of turn. -class VeilstoneAmuletEffect extends ContinuousRuleModifiyingEffectImpl { +class VeilstoneAmuletEffect extends ContinuousRuleModifyingEffectImpl { public VeilstoneAmuletEffect() { super(Duration.EndOfTurn, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java index 994edc96f19..563f826fb9c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java @@ -55,7 +55,7 @@ import mage.watchers.Watcher; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; /** * GATECRASH FAQ 11.01.2013 @@ -148,7 +148,7 @@ class AureliasFuryEffect extends OneShotEffect { } } -class AureliasFuryCantCastEffect extends ContinuousRuleModifiyingEffectImpl { +class AureliasFuryCantCastEffect extends ContinuousRuleModifyingEffectImpl { public AureliasFuryCantCastEffect() { super(Duration.EndOfTurn, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/guildpact/LeylineOfLifeforce.java b/Mage.Sets/src/mage/sets/guildpact/LeylineOfLifeforce.java index aeb6a2cabcf..083ae5a33f7 100644 --- a/Mage.Sets/src/mage/sets/guildpact/LeylineOfLifeforce.java +++ b/Mage.Sets/src/mage/sets/guildpact/LeylineOfLifeforce.java @@ -30,7 +30,7 @@ package mage.sets.guildpact; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.LeylineAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -72,7 +72,7 @@ public class LeylineOfLifeforce extends CardImpl { } } -class LeylineOfLifeforceEffect extends ContinuousRuleModifiyingEffectImpl { +class LeylineOfLifeforceEffect extends ContinuousRuleModifyingEffectImpl { LeylineOfLifeforceEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java b/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java index 07a143608a7..69133607354 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkyriderTrainee.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class SkyriderTrainee extends CardImpl { this.toughness = new MageInt(3); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new EnchantedCondition(), "{this} has flying as long as it's enchanted"))); diff --git a/Mage.Sets/src/mage/sets/innistrad/AngelicOverseer.java b/Mage.Sets/src/mage/sets/innistrad/AngelicOverseer.java index b7d907a2c0b..1626460e45c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AngelicOverseer.java +++ b/Mage.Sets/src/mage/sets/innistrad/AngelicOverseer.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.*; import mage.cards.CardImpl; @@ -69,9 +69,9 @@ public class AngelicOverseer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // As long as you control a Human, Angelic Overseer has hexproof and is indestructible. - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new GainAbilitySourceEffect(HexproofAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(HexproofAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule1); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); ability.addEffect(effect2); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java b/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java index cc2c4af1a68..3b3c5236f73 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java +++ b/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java @@ -32,7 +32,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.EquippedHasSubtypeCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; @@ -70,7 +70,7 @@ public class BondsOfFaith extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 as long as it's a Human. Otherwise, it can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(2, 2), new EquippedHasSubtypeCondition("Human"), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEquippedEffect(2, 2), new EquippedHasSubtypeCondition("Human"), rule))); Effect effect = new ConditionalRestrictionEffect(new CantAttackBlockAttachedEffect(AttachmentType.AURA), new InvertCondition(new EquippedHasSubtypeCondition("Human"))); effect.setText("Otherwise, it can't attack or block"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/sets/innistrad/ButchersCleaver.java b/Mage.Sets/src/mage/sets/innistrad/ButchersCleaver.java index b077ba718da..6d862760868 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ButchersCleaver.java +++ b/Mage.Sets/src/mage/sets/innistrad/ButchersCleaver.java @@ -33,7 +33,7 @@ import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; @@ -57,7 +57,7 @@ public class ButchersCleaver extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); // As long as equipped creature is a Human, it has lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition("Human"), staticText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition("Human"), staticText))); // Equip {3} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); diff --git a/Mage.Sets/src/mage/sets/innistrad/HowlpackAlpha.java b/Mage.Sets/src/mage/sets/innistrad/HowlpackAlpha.java index e244dc1f42b..8f5a0b1a0df 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HowlpackAlpha.java +++ b/Mage.Sets/src/mage/sets/innistrad/HowlpackAlpha.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.WolfToken; import java.util.UUID; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; /** @@ -78,7 +78,7 @@ public class HowlpackAlpha extends CardImpl { this.toughness = new MageInt(3); // Other Werewolf and Wolf creatures you control get +1/+1. - Effect effect = new ConditionalContinousEffect(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new TransformedCondition(), null); + Effect effect = new ConditionalContinuousEffect(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new TransformedCondition(), null); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // At the beginning of your end step, put a 2/2 green Wolf creature token onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java b/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java index b380e57151d..3c83e8d3da5 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java +++ b/Mage.Sets/src/mage/sets/innistrad/InstigatorGang.java @@ -42,7 +42,7 @@ import mage.filter.common.FilterAttackingCreature; import java.util.UUID; import mage.abilities.condition.common.TransformedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; /** * @author nantuko @@ -64,7 +64,7 @@ public class InstigatorGang extends CardImpl { // Attacking creatures you control get +1/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, new FilterAttackingCreature()), + new ConditionalContinuousEffect(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, new FilterAttackingCreature()), new TransformedCondition(true), "Attacking creatures you control get +1/+0"))); diff --git a/Mage.Sets/src/mage/sets/innistrad/ManorGargoyle.java b/Mage.Sets/src/mage/sets/innistrad/ManorGargoyle.java index 24136136f8c..309a7bf9095 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ManorGargoyle.java +++ b/Mage.Sets/src/mage/sets/innistrad/ManorGargoyle.java @@ -43,7 +43,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DefenderAbility; @@ -71,7 +71,7 @@ public class ManorGargoyle extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Manor Gargoyle is indestructible as long as it has defender. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance()), HasDefenderCondition.getInstance(), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance()), HasDefenderCondition.getInstance(), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {1}: Until end of turn, Manor Gargoyle loses defender and gains flying. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GargoyleSentinelEffect(), new ManaCostsImpl("{1}"))); diff --git a/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java b/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java index 13518ef144b..b03f9112757 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java +++ b/Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java @@ -33,7 +33,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.NoSpellsWereCastLastTurnCondition; import mage.abilities.condition.common.TransformedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.TransformSourceEffect; @@ -76,7 +76,7 @@ public class MayorOfAvabruck extends CardImpl { this.toughness = new MageInt(1); // Other Human creatures you control get +1/+1. - Effect effect = new ConditionalContinousEffect(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new InvertCondition(new TransformedCondition()), ruleText); + Effect effect = new ConditionalContinuousEffect(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new InvertCondition(new TransformedCondition()), ruleText); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // At the beginning of each upkeep, if no spells were cast last turn, transform Mayor of Avabruck. diff --git a/Mage.Sets/src/mage/sets/innistrad/Nevermore.java b/Mage.Sets/src/mage/sets/innistrad/Nevermore.java index c33012044fb..f8138cf1442 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Nevermore.java +++ b/Mage.Sets/src/mage/sets/innistrad/Nevermore.java @@ -32,7 +32,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.repository.CardRepository; @@ -120,7 +120,7 @@ class NevermoreEffect1 extends OneShotEffect { } -class NevermoreEffect2 extends ContinuousRuleModifiyingEffectImpl { +class NevermoreEffect2 extends ContinuousRuleModifyingEffectImpl { public NevermoreEffect2() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/innistrad/NightRevelers.java b/Mage.Sets/src/mage/sets/innistrad/NightRevelers.java index b6f6266f9bc..62aa1887457 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NightRevelers.java +++ b/Mage.Sets/src/mage/sets/innistrad/NightRevelers.java @@ -33,7 +33,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; @@ -63,7 +63,7 @@ public class NightRevelers extends CardImpl { this.toughness = new MageInt(4); // Night Revelers has haste as long as an opponent controls a Human. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance()), new NightRevelersCondition(), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance()), new NightRevelersCondition(), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java index 8ff2e42af62..a6b1fde594d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java @@ -35,7 +35,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.AddCardSubTypeTargetEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; @@ -92,7 +92,7 @@ public class OliviaVoldaren extends CardImpl { this.addAbility(ability); // {3}{B}{B}: Gain control of target Vampire for as long as you control Olivia Voldaren. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.Custom), new PermanentsOnTheBattlefieldCondition(filter2), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), new PermanentsOnTheBattlefieldCondition(filter2), rule); Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{B}{B}")); ability2.addTarget(new TargetCreaturePermanent(vampireFilter)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java b/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java index a99c00cdb29..9f5743b3bda 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java +++ b/Mage.Sets/src/mage/sets/innistrad/SharpenedPitchfork.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; @@ -64,7 +64,7 @@ public class SharpenedPitchfork extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // As long as equipped creature is a Human, it gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEquippedEffect(1, 1), new EquippedHasSubtypeCondition("Human"), staticText))); } public SharpenedPitchfork(final SharpenedPitchfork card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/SilverInlaidDagger.java b/Mage.Sets/src/mage/sets/innistrad/SilverInlaidDagger.java index d4184fa5f5d..97736d7bd72 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SilverInlaidDagger.java +++ b/Mage.Sets/src/mage/sets/innistrad/SilverInlaidDagger.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedHasSubtypeCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; @@ -60,7 +60,7 @@ public class SilverInlaidDagger extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); // As long as equipped creature is a Human, it gets an additional +1/+0 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEquippedEffect(1, 0), new EquippedHasSubtypeCondition("Human"), staticText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEquippedEffect(1, 0), new EquippedHasSubtypeCondition("Human"), staticText))); } public SilverInlaidDagger(final SilverInlaidDagger card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java b/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java index bf2d8db057f..a00e6e4fe2d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java +++ b/Mage.Sets/src/mage/sets/innistrad/TerrorOfKruinPass.java @@ -34,7 +34,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.TransformedCondition; import mage.abilities.condition.common.TwoOrMoreSpellsWereCastLastTurnCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.TransformSourceEffect; @@ -78,7 +78,7 @@ public class TerrorOfKruinPass extends CardImpl { this.addAbility(DoubleStrikeAbility.getInstance()); // Each Werewolf you control can't be blocked except by two or more creatures. - Effect effect = new ConditionalContinousEffect(new CantBeBlockedByOneAllEffect(2, filter), new TransformedCondition(), ruleText); + Effect effect = new ConditionalContinuousEffect(new CantBeBlockedByOneAllEffect(2, filter), new TransformedCondition(), ruleText); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Terror of Kruin Pass. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); diff --git a/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java index b4236389eec..666508a757b 100644 --- a/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java +++ b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java @@ -32,7 +32,7 @@ import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.UntapTargetEffect; @@ -97,7 +97,7 @@ public class SpinalEmbrace extends CardImpl { } } -class SpinalEmbraceEffect extends ContinuousRuleModifiyingEffectImpl { +class SpinalEmbraceEffect extends ContinuousRuleModifyingEffectImpl { SpinalEmbraceEffect() { super(Duration.EndOfGame, Outcome.Detriment); staticText = "Cast {this} only during combat"; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java b/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java index 0fc72424513..c11e3c6cfe6 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java @@ -33,7 +33,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.EquippedMatchesFilterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalReplacementEffect; import mage.abilities.effects.ReplacementEffect; import mage.abilities.effects.common.AttachEffect; @@ -80,7 +80,7 @@ public class ArmamentOfNyx extends CardImpl { this.addAbility(ability); Condition condition = new EquippedMatchesFilterCondition(filter); // Enchanted creature has double strike as long as it's an enchantment. Otherwise, prevent all damage that would be dealt by enchanted creature - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield), condition, "Enchanted creature has double strike as long as it's an enchantment")); ReplacementEffect effect = new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java index 76cd5d28fb9..e895f247258 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java @@ -37,7 +37,7 @@ import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; @@ -199,7 +199,7 @@ class GodsendExileEffect extends OneShotEffect { } } -class GodsendRuleModifyingEffect extends ContinuousRuleModifiyingEffectImpl { +class GodsendRuleModifyingEffect extends ContinuousRuleModifyingEffectImpl { public GodsendRuleModifyingEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java b/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java index 2198519fc84..620ddd5d9fc 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedMatchesFilterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; @@ -75,7 +75,7 @@ public class NyxInfusion extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 as long as it's an enchantment. Otherwise, it gets -2/-2. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield), new BoostEnchantedEffect(-2,-2,Duration.WhileOnBattlefield), new EquippedMatchesFilterCondition(filter), diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java b/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java index 39e75889ee1..9d176adb922 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MonstrousCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.MonstrosityAbility; @@ -71,7 +71,7 @@ public class SwarmbornGiant extends CardImpl { // As long as Swarmborn Giant is monstrous, it has reach. Ability ability = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.getInstance(), "As long as {this} is monstrous, it has reach")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/judgment/Anger.java b/Mage.Sets/src/mage/sets/judgment/Anger.java index a8a7e405bd4..95ef0b14964 100644 --- a/Mage.Sets/src/mage/sets/judgment/Anger.java +++ b/Mage.Sets/src/mage/sets/judgment/Anger.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; @@ -75,7 +75,7 @@ public class Anger extends CardImpl { // As long as Anger is in your graveyard and you control a Mountain, creatures you control have haste ContinuousEffect effect = new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()); - ConditionalContinousEffect angerEffect = new ConditionalContinousEffect(effect, + ConditionalContinuousEffect angerEffect = new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), ruleText); this.addAbility(new SimpleStaticAbility(Zone.GRAVEYARD, angerEffect)); } diff --git a/Mage.Sets/src/mage/sets/judgment/Brawn.java b/Mage.Sets/src/mage/sets/judgment/Brawn.java index ebe502d7803..4ddf55283b3 100644 --- a/Mage.Sets/src/mage/sets/judgment/Brawn.java +++ b/Mage.Sets/src/mage/sets/judgment/Brawn.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; @@ -75,7 +75,7 @@ public class Brawn extends CardImpl { // As long as Brawn is in your graveyard and you control a Forest, creatures you control have trample ContinuousEffect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()); - ConditionalContinousEffect brawnEffect = new ConditionalContinousEffect(effect, + ConditionalContinuousEffect brawnEffect = new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), ruleText); this.addAbility(new SimpleStaticAbility(Zone.GRAVEYARD, brawnEffect)); } diff --git a/Mage.Sets/src/mage/sets/judgment/Filth.java b/Mage.Sets/src/mage/sets/judgment/Filth.java index f2c31db8828..8ddf79501e3 100644 --- a/Mage.Sets/src/mage/sets/judgment/Filth.java +++ b/Mage.Sets/src/mage/sets/judgment/Filth.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.SwampwalkAbility; @@ -75,7 +75,7 @@ public class Filth extends CardImpl { // As long as Filth is in your graveyard and you control a Swamp, creatures you control have swampwalk. ContinuousEffect effect = new GainAbilityControlledEffect(new SwampwalkAbility(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()); - ConditionalContinousEffect filthEffect = new ConditionalContinousEffect(effect, + ConditionalContinuousEffect filthEffect = new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), ruleText); this.addAbility(new SimpleStaticAbility(Zone.GRAVEYARD, filthEffect)); } diff --git a/Mage.Sets/src/mage/sets/judgment/FlaringPain.java b/Mage.Sets/src/mage/sets/judgment/FlaringPain.java index fa7b227b4a2..656a1c26f60 100644 --- a/Mage.Sets/src/mage/sets/judgment/FlaringPain.java +++ b/Mage.Sets/src/mage/sets/judgment/FlaringPain.java @@ -30,7 +30,7 @@ package mage.sets.judgment; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -69,7 +69,7 @@ public class FlaringPain extends CardImpl { } } -class DamageCantBePreventedEffect extends ContinuousRuleModifiyingEffectImpl { +class DamageCantBePreventedEffect extends ContinuousRuleModifyingEffectImpl { public DamageCantBePreventedEffect() { super(Duration.EndOfTurn, Outcome.Benefit, false, false); diff --git a/Mage.Sets/src/mage/sets/judgment/Valor.java b/Mage.Sets/src/mage/sets/judgment/Valor.java index 2251dbe3e47..0f8b9e189f6 100644 --- a/Mage.Sets/src/mage/sets/judgment/Valor.java +++ b/Mage.Sets/src/mage/sets/judgment/Valor.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -75,7 +75,7 @@ public class Valor extends CardImpl { // As long as Valor is in your graveyard and you control a Plains, creatures you control have first strike ContinuousEffect effect = new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()); - ConditionalContinousEffect valorEffect = new ConditionalContinousEffect(effect, + ConditionalContinuousEffect valorEffect = new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), ruleText); this.addAbility(new SimpleStaticAbility(Zone.GRAVEYARD, valorEffect)); } diff --git a/Mage.Sets/src/mage/sets/judgment/Wonder.java b/Mage.Sets/src/mage/sets/judgment/Wonder.java index ad75160fc96..291d7745c81 100644 --- a/Mage.Sets/src/mage/sets/judgment/Wonder.java +++ b/Mage.Sets/src/mage/sets/judgment/Wonder.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; @@ -76,7 +76,7 @@ public class Wonder extends CardImpl { // As long as Wonder is in your graveyard and you control an Island, creatures you control have flying. ContinuousEffect effect = new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()); - ConditionalContinousEffect wonderEffect = new ConditionalContinousEffect(effect, + ConditionalContinuousEffect wonderEffect = new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), ruleText); this.addAbility(new SimpleStaticAbility(Zone.GRAVEYARD, wonderEffect)); } diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/RoarOfChallenge.java b/Mage.Sets/src/mage/sets/khansoftarkir/RoarOfChallenge.java index 5771fc0c7ff..0079ac213f0 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/RoarOfChallenge.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/RoarOfChallenge.java @@ -30,7 +30,7 @@ package mage.sets.khansoftarkir; import java.util.UUID; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.FerociousCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.combat.MustBeBlockedByAllTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.IndestructibleAbility; @@ -56,7 +56,7 @@ public class RoarOfChallenge extends CardImpl { // All creatures able to block target creature this turn do so. this.getSpellAbility().addEffect(new MustBeBlockedByAllTargetEffect(Duration.EndOfTurn)); // Ferocious - That creature gains indestructible until end of turn if you control a creature with power 4 or greater. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new LockedInCondition(FerociousCondition.getInstance()), "
Ferocious — That creature gains indestructible until end of turn if you control a creature with power 4 or greater.")); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/SavagePunch.java b/Mage.Sets/src/mage/sets/khansoftarkir/SavagePunch.java index 649205654c7..429fd4f85f9 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/SavagePunch.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/SavagePunch.java @@ -37,7 +37,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.FightTargetsEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -64,7 +64,7 @@ public class SavagePunch extends CardImpl { this.expansionSetCode = "KTK"; // Ferocious - The creature you control gets +2/+2 until end of turn before it fights if you control a creature with power 4 or greater. - Effect effect = new ConditionalContinousEffect( + Effect effect = new ConditionalContinuousEffect( new BoostTargetEffect(2,2,Duration.EndOfTurn), new LockedInCondition(FerociousCondition.getInstance()), "Ferocious — The creature you control gets +2/+2 until end of turn before it fights if you control a creature with power 4 or greater"); diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ZurgoHelmsmasher.java b/Mage.Sets/src/mage/sets/khansoftarkir/ZurgoHelmsmasher.java index 6c3ce0f91ad..52ebd8a8c8f 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/ZurgoHelmsmasher.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/ZurgoHelmsmasher.java @@ -33,7 +33,7 @@ import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MyTurnCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.HasteAbility; @@ -70,7 +70,7 @@ public class ZurgoHelmsmasher extends CardImpl { this.addAbility(new AttacksEachTurnStaticAbility()); // Zurgo Helmsmasher has indestructible as long as it's your turn. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), MyTurnCondition.getInstance(), "{this} has indestructible as long as it's your turn"))); diff --git a/Mage.Sets/src/mage/sets/legends/BartelRuneaxe.java b/Mage.Sets/src/mage/sets/legends/BartelRuneaxe.java index ca69d084127..d94a7bb264c 100644 --- a/Mage.Sets/src/mage/sets/legends/BartelRuneaxe.java +++ b/Mage.Sets/src/mage/sets/legends/BartelRuneaxe.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.VigilanceAbility; import mage.cards.Card; import mage.cards.CardImpl; @@ -76,7 +76,7 @@ public class BartelRuneaxe extends CardImpl { } } -class BartelRuneaxeEffect extends ContinuousRuleModifiyingEffectImpl { +class BartelRuneaxeEffect extends ContinuousRuleModifyingEffectImpl { public BartelRuneaxeEffect() { super(Duration.WhileOnBattlefield, Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/sets/legends/Reset.java b/Mage.Sets/src/mage/sets/legends/Reset.java index 8dec5a8949a..0332cb4e686 100644 --- a/Mage.Sets/src/mage/sets/legends/Reset.java +++ b/Mage.Sets/src/mage/sets/legends/Reset.java @@ -30,7 +30,7 @@ package mage.sets.legends; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.UntapAllLandsControllerEffect; import mage.cards.CardImpl; @@ -73,7 +73,7 @@ public class Reset extends CardImpl { } } -class ResetReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class ResetReplacementEffect extends ContinuousRuleModifyingEffectImpl { ResetReplacementEffect() { super(Duration.EndOfGame, Outcome.Detriment); staticText = "Cast {this} only during an opponent's turn after his or her upkeep step"; diff --git a/Mage.Sets/src/mage/sets/legends/TetsuoUmezawa.java b/Mage.Sets/src/mage/sets/legends/TetsuoUmezawa.java index 6062ceca390..57c66cdfa22 100644 --- a/Mage.Sets/src/mage/sets/legends/TetsuoUmezawa.java +++ b/Mage.Sets/src/mage/sets/legends/TetsuoUmezawa.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -97,7 +97,7 @@ public class TetsuoUmezawa extends CardImpl { } } -class TetsuoUmezawaEffect extends ContinuousRuleModifiyingEffectImpl { +class TetsuoUmezawaEffect extends ContinuousRuleModifyingEffectImpl { public TetsuoUmezawaEffect() { super(Duration.WhileOnBattlefield, Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/sets/legends/WillowSatyr.java b/Mage.Sets/src/mage/sets/legends/WillowSatyr.java index 85af2c82235..b3ec1717779 100644 --- a/Mage.Sets/src/mage/sets/legends/WillowSatyr.java +++ b/Mage.Sets/src/mage/sets/legends/WillowSatyr.java @@ -36,7 +36,7 @@ import mage.abilities.condition.CompoundCondition; import mage.abilities.condition.common.SourceOnBattlefieldControlUnchangedCondition; import mage.abilities.condition.common.SourceTappedCondition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -69,7 +69,7 @@ public class WillowSatyr extends CardImpl { // You may choose not to untap Willow Satyr during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {tap}: Gain control of target legendary creature for as long as you control Willow Satyr and Willow Satyr remains tapped. - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom), new CompoundCondition(SourceTappedCondition.getInstance(), new SourceOnBattlefieldControlUnchangedCondition()), "Gain control of target legendary creature for as long as you control {this} and {this} remains tapped"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java b/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java index 351cb36b8f6..14606f15d4c 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Berserk.java @@ -33,7 +33,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.dynamicvalue.common.TargetPermanentPowerCount; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -94,7 +94,7 @@ public class Berserk extends CardImpl { } } -class BerserkReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class BerserkReplacementEffect extends ContinuousRuleModifyingEffectImpl { BerserkReplacementEffect() { super(Duration.EndOfGame, Outcome.Detriment); staticText = "Cast {this} only before the combat damage step"; diff --git a/Mage.Sets/src/mage/sets/lorwyn/DauntlessDourbark.java b/Mage.Sets/src/mage/sets/lorwyn/DauntlessDourbark.java index de5c53c5399..0ec8a43ca70 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/DauntlessDourbark.java +++ b/Mage.Sets/src/mage/sets/lorwyn/DauntlessDourbark.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -81,7 +81,7 @@ public class DauntlessDourbark extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(amount, Duration.EndOfGame))); // Dauntless Dourbark has trample as long as you control another Treefolk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter2), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter2), rule))); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java b/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java index 48c08eb09f9..10f685c3ede 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GaddockTeeg.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.constants.CardType; @@ -76,7 +76,7 @@ public class GaddockTeeg extends CardImpl { } } -class GaddockTeegReplacementEffect4 extends ContinuousRuleModifiyingEffectImpl { +class GaddockTeegReplacementEffect4 extends ContinuousRuleModifyingEffectImpl { public GaddockTeegReplacementEffect4() { super(Duration.WhileOnBattlefield, Outcome.Detriment); @@ -110,7 +110,7 @@ class GaddockTeegReplacementEffect4 extends ContinuousRuleModifiyingEffectImpl { } -class GaddockTeegReplacementEffectX extends ContinuousRuleModifiyingEffectImpl { +class GaddockTeegReplacementEffectX extends ContinuousRuleModifyingEffectImpl { public GaddockTeegReplacementEffectX() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java b/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java index bbc7ced03b2..ae244127086 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.SourceOnBattelfieldCondition; import mage.abilities.condition.common.SourceOnBattlefieldControlUnchangedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.FlyingAbility; @@ -65,7 +65,7 @@ public class SowerOfTemptation extends CardImpl { // When Sower of Temptation enters the battlefield, gain control of target creature for as long as Sower of Temptation remains on the battlefield. // 10/1/2007: You retain control of the targeted creature as long as Sower of Temptation // remains on the battlefield, even if a different player gains control of Sower of Temptation itself. - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom, true), new SourceOnBattelfieldCondition(), "gain control of target creature for as long as {this} remains on the battlefield"); @@ -103,7 +103,7 @@ class SowerOfTemptationGainControlEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom), new SourceOnBattelfieldCondition(), "gain control of target creature for as long as Sower of Temptation remains on the battlefield"); diff --git a/Mage.Sets/src/mage/sets/magic2010/Silence.java b/Mage.Sets/src/mage/sets/magic2010/Silence.java index 2bdd78fbb69..3ca7999e3e2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Silence.java +++ b/Mage.Sets/src/mage/sets/magic2010/Silence.java @@ -31,7 +31,7 @@ package mage.sets.magic2010; import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -64,7 +64,7 @@ public class Silence extends CardImpl { } } -class SilenceEffect extends ContinuousRuleModifiyingEffectImpl { +class SilenceEffect extends ContinuousRuleModifyingEffectImpl { public SilenceEffect() { super(Duration.EndOfTurn, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java b/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java index 80803875309..ca46f9c1b5e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java +++ b/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java @@ -42,7 +42,7 @@ import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; @@ -92,17 +92,15 @@ class VampireNocturnusAbility extends StaticAbility { public VampireNocturnusAbility() { super(Zone.BATTLEFIELD, null); - this.addEffect(new ConditionalContinousEffect( + this.addEffect(new ConditionalContinuousEffect( new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), new VampireNocturnusCondition(), "")); - this.addEffect(new ConditionalContinousEffect( + this.addEffect(new ConditionalContinuousEffect( new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, true), new VampireNocturnusCondition(), "")); - this.addEffect( - new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), + this.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new VampireNocturnusCondition(), "")); - this.addEffect( - new ConditionalContinousEffect(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, true), + this.addEffect(new ConditionalContinuousEffect(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, true), new VampireNocturnusCondition(), "")); } diff --git a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java index 8212488674b..5900b41088b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java +++ b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java @@ -34,7 +34,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.RestrictionEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -160,7 +160,7 @@ class AngelicArbiterCantAttackTargetEffect extends RestrictionEffect { } } -class AngelicArbiterEffect2 extends ContinuousRuleModifiyingEffectImpl { +class AngelicArbiterEffect2 extends ContinuousRuleModifyingEffectImpl { public AngelicArbiterEffect2() { super(Duration.WhileOnBattlefield, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java b/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java index b281553b23f..b39d98a553e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java +++ b/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.SourceOnBattlefieldControlUnchangedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; @@ -71,7 +71,7 @@ public class AegisAngel extends CardImpl { // When Aegis Angel enters the battlefield, another target permanent is indestructible for as long as you control Aegis Angel. - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.Custom), new SourceOnBattlefieldControlUnchangedCondition(), "another target permanent is indestructible for as long as you control Aegis Angel"); diff --git a/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java b/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java index 7d124f80c7b..714eac76eaf 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java +++ b/Mage.Sets/src/mage/sets/magic2012/GrandAbolisher.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -73,7 +73,7 @@ public class GrandAbolisher extends CardImpl { } } -class GrandAbolisherEffect extends ContinuousRuleModifiyingEffectImpl { +class GrandAbolisherEffect extends ContinuousRuleModifyingEffectImpl { public GrandAbolisherEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/magic2012/GriffinRider.java b/Mage.Sets/src/mage/sets/magic2012/GriffinRider.java index 94c8b569dc6..b8dc9d075bc 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GriffinRider.java +++ b/Mage.Sets/src/mage/sets/magic2012/GriffinRider.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -70,9 +70,9 @@ public class GriffinRider extends CardImpl { this.toughness = new MageInt(1); // As long as you control a Griffin creature, Griffin Rider gets +3/+3 and has flying. - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filterGriffinCard), rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filterGriffinCard), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filterGriffinCard), rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filterGriffinCard), rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java index e75cf4dc0b4..2aff9932857 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java +++ b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java @@ -33,7 +33,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.SourceOnBattlefieldControlUnchangedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -63,7 +63,7 @@ public class MasterThief extends CardImpl { this.toughness = new MageInt(2); // When Master Thief enters the battlefield, gain control of target artifact for as long as you control Master Thief. - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom), new SourceOnBattlefieldControlUnchangedCondition(), "gain control of target artifact for as long as you control Master Thief"); diff --git a/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java b/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java index 779c703089a..150a0266558 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java +++ b/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java @@ -36,7 +36,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasCounterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -67,7 +67,7 @@ public class PrimordialHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new PrimordialHydraEntersEffect(), "{this} enters the battlefield with X +1/+1 counters on it")); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PrimordialHydraDoubleEffect(), TargetController.YOU, false)); - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1, 10), staticText); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1, 10), staticText); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ThranGolem.java b/Mage.Sets/src/mage/sets/magic2012/ThranGolem.java index d0d6df7199d..eb4d72649fe 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ThranGolem.java +++ b/Mage.Sets/src/mage/sets/magic2012/ThranGolem.java @@ -36,7 +36,7 @@ import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.EnchantedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -64,13 +64,13 @@ public class ThranGolem extends CardImpl { this.toughness = new MageInt(3); Condition enchanted = new EnchantedCondition(); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), enchanted, rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), enchanted, rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), enchanted, rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), enchanted, rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); - ConditionalContinousEffect effect3 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), enchanted, rule3); + ConditionalContinuousEffect effect3 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), enchanted, rule3); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect3)); - ConditionalContinousEffect effect4 = new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), enchanted, rule4); + ConditionalContinuousEffect effect4 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), enchanted, rule4); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect4)); } diff --git a/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java b/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java index 1baad6b9e82..b1794b6d025 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java +++ b/Mage.Sets/src/mage/sets/magic2013/GroundSeal.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -73,7 +73,7 @@ public class GroundSeal extends CardImpl { } } -class GroundSealEffect extends ContinuousRuleModifiyingEffectImpl { +class GroundSealEffect extends ContinuousRuleModifyingEffectImpl { public GroundSealEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/magic2013/HarborBandit.java b/Mage.Sets/src/mage/sets/magic2013/HarborBandit.java index c7fdd9ccd47..cbd3406628e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/HarborBandit.java +++ b/Mage.Sets/src/mage/sets/magic2013/HarborBandit.java @@ -37,7 +37,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.combat.UnblockableSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -68,7 +68,7 @@ public class HarborBandit extends CardImpl { this.toughness = new MageInt(2); // Harbor Bandit gets +1/+1 as long as you control an Island. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {1}{U}: Harbor Bandit is unblockable this turn. diff --git a/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java b/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java index 1478b53ebcc..4c1cdd23783 100644 --- a/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java +++ b/Mage.Sets/src/mage/sets/magic2013/JacesPhantasm.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInOpponentGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -59,7 +59,7 @@ public class JacesPhantasm extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Jace's Phantasm gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), new CardsInOpponentGraveCondition(10), "{this} gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), new CardsInOpponentGraveCondition(10), "{this} gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard"))); } public JacesPhantasm(final JacesPhantasm card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/PrizedElephant.java b/Mage.Sets/src/mage/sets/magic2013/PrizedElephant.java index 4826ac274e3..ba03ad19509 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PrizedElephant.java +++ b/Mage.Sets/src/mage/sets/magic2013/PrizedElephant.java @@ -37,7 +37,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; @@ -71,7 +71,7 @@ public class PrizedElephant extends CardImpl { // Prized Elephant gets +1/+1 as long as you control a Forest. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); // {G}: Prized Elephant gains trample until end of turn. diff --git a/Mage.Sets/src/mage/sets/magic2014/FesteringNewt.java b/Mage.Sets/src/mage/sets/magic2014/FesteringNewt.java index 859ee4d6d40..deae0381d0a 100644 --- a/Mage.Sets/src/mage/sets/magic2014/FesteringNewt.java +++ b/Mage.Sets/src/mage/sets/magic2014/FesteringNewt.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; @@ -68,7 +68,7 @@ public class FesteringNewt extends CardImpl { this.toughness = new MageInt(1); // When Festering Newt dies, target creature an opponent controls gets -1/-1 until end of turn. That creature gets -4/-4 instead if you control a creature named Bogbrew Witch. - Effect effect = new ConditionalContinousEffect( + Effect effect = new ConditionalContinuousEffect( new BoostTargetEffect(-4,-4, Duration.EndOfTurn), new BoostTargetEffect(-1,-1, Duration.EndOfTurn), new LockedInCondition(new PermanentsOnTheBattlefieldCondition(filterBogbrewWitch)), diff --git a/Mage.Sets/src/mage/sets/magic2014/FiendslayerPaladin.java b/Mage.Sets/src/mage/sets/magic2014/FiendslayerPaladin.java index 18e0dd32a6d..37f8166f327 100644 --- a/Mage.Sets/src/mage/sets/magic2014/FiendslayerPaladin.java +++ b/Mage.Sets/src/mage/sets/magic2014/FiendslayerPaladin.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.Card; @@ -84,7 +84,7 @@ public class FiendslayerPaladin extends CardImpl { } } -class FiendslayerPaladinEffect extends ContinuousRuleModifiyingEffectImpl { +class FiendslayerPaladinEffect extends ContinuousRuleModifyingEffectImpl { public FiendslayerPaladinEffect() { super(Duration.WhileOnBattlefield, Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java b/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java index 0efce974891..fb60a8a748d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java +++ b/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java @@ -32,7 +32,7 @@ import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; @@ -68,7 +68,7 @@ public class PathOfBravery extends CardImpl { this.color.setWhite(true); // As long as your life total is greater than or equal to your starting life total, creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new LifeCondition(), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new LifeCondition(), rule))); // Whenever one or more creatures you control attack, you gain life equal to the number of attacking creatures. this.addAbility(new PathOfBraveryTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java b/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java index b6f26783e9e..c9fdc41e892 100644 --- a/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java +++ b/Mage.Sets/src/mage/sets/magic2014/SavageSummoning.java @@ -37,7 +37,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.CantBeCounteredAbility; import mage.abilities.effects.AsThoughEffectImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; @@ -221,7 +221,7 @@ class SavageSummoningWatcher extends Watcher { } -class SavageSummoningCantCounterEffect extends ContinuousRuleModifiyingEffectImpl { +class SavageSummoningCantCounterEffect extends ContinuousRuleModifyingEffectImpl { private SavageSummoningWatcher watcher; private int zoneChangeCounter; diff --git a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java index 608a2d225c8..607cccf7d4b 100644 --- a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java +++ b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -97,7 +97,7 @@ public class TidebinderMage extends CardImpl { } } -class TidebinderMageEffect extends ContinuousRuleModifiyingEffectImpl { +class TidebinderMageEffect extends ContinuousRuleModifyingEffectImpl { public TidebinderMageEffect() { super(Duration.OneUse, Outcome.Detriment, false, false); diff --git a/Mage.Sets/src/mage/sets/magic2014/WoodbornBehemoth.java b/Mage.Sets/src/mage/sets/magic2014/WoodbornBehemoth.java index e6eb8b7d821..9fb6ff8f3ce 100644 --- a/Mage.Sets/src/mage/sets/magic2014/WoodbornBehemoth.java +++ b/Mage.Sets/src/mage/sets/magic2014/WoodbornBehemoth.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; @@ -60,10 +60,10 @@ public class WoodbornBehemoth extends CardImpl { // As long as you control eight or more lands, Woodborn Behemoth gets +4/+4 and has trample. PermanentsOnTheBattlefieldCondition eightOrMoreLandCondition = new PermanentsOnTheBattlefieldCondition(new FilterLandPermanent(), PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN,7); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect( + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect( new BoostSourceEffect(4,4, Duration.WhileOnBattlefield), eightOrMoreLandCondition, "As long as you control eight or more lands, {this} gets +4/+4"); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect( + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), eightOrMoreLandCondition, " and has trample"); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); diff --git a/Mage.Sets/src/mage/sets/magic2015/AeronautTinkerer.java b/Mage.Sets/src/mage/sets/magic2015/AeronautTinkerer.java index d4bc75b1bc2..7b2feea9fb3 100644 --- a/Mage.Sets/src/mage/sets/magic2015/AeronautTinkerer.java +++ b/Mage.Sets/src/mage/sets/magic2015/AeronautTinkerer.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -60,7 +60,7 @@ public class AeronautTinkerer extends CardImpl { this.toughness = new MageInt(3); // Aeronaut Tinkerer has flying as long as you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent()), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent()), rule))); } diff --git a/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java b/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java index 71c982f9c21..03f0ca72d5f 100644 --- a/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java +++ b/Mage.Sets/src/mage/sets/magic2015/AggressiveMining.java @@ -33,7 +33,7 @@ import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -76,7 +76,7 @@ public class AggressiveMining extends CardImpl { } } -class AggressiveMiningEffect extends ContinuousRuleModifiyingEffectImpl { +class AggressiveMiningEffect extends ContinuousRuleModifyingEffectImpl { public AggressiveMiningEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java b/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java index d369e393d88..4d4a3bb4755 100644 --- a/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java +++ b/Mage.Sets/src/mage/sets/magic2015/HushwingGryff.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -79,7 +79,7 @@ public class HushwingGryff extends CardImpl { } } -class HushwingGryffEffect extends ContinuousRuleModifiyingEffectImpl { +class HushwingGryffEffect extends ContinuousRuleModifyingEffectImpl { HushwingGryffEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment, false, true); diff --git a/Mage.Sets/src/mage/sets/magic2015/JorubaiMurkLurker.java b/Mage.Sets/src/mage/sets/magic2015/JorubaiMurkLurker.java index 44e7032b950..ee980d2787d 100644 --- a/Mage.Sets/src/mage/sets/magic2015/JorubaiMurkLurker.java +++ b/Mage.Sets/src/mage/sets/magic2015/JorubaiMurkLurker.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.LifelinkAbility; @@ -71,7 +71,7 @@ public class JorubaiMurkLurker extends CardImpl { // Jorubai Murk Lurker gets +1/+1 as long as you control a Swamp. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); // {1}{B}: Target creature gains lifelink until end of turn. diff --git a/Mage.Sets/src/mage/sets/magic2015/KirdChieftain.java b/Mage.Sets/src/mage/sets/magic2015/KirdChieftain.java index cc706a605e5..49e6748bc56 100644 --- a/Mage.Sets/src/mage/sets/magic2015/KirdChieftain.java +++ b/Mage.Sets/src/mage/sets/magic2015/KirdChieftain.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -73,7 +73,7 @@ public class KirdChieftain extends CardImpl { // Kird Chieftain gets +1/+1 as long as you control a Forest. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); // {4}{G}: Target creature gets +2/+2 and gains trample until end of turn. diff --git a/Mage.Sets/src/mage/sets/magic2015/ScrapyardMongrel.java b/Mage.Sets/src/mage/sets/magic2015/ScrapyardMongrel.java index 37711ed6da6..b09c671834c 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ScrapyardMongrel.java +++ b/Mage.Sets/src/mage/sets/magic2015/ScrapyardMongrel.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -65,11 +65,11 @@ public class ScrapyardMongrel extends CardImpl { this.toughness = new MageInt(3); // As long as you control an artifact, Scrapyard Mongrel gets +2/+0 and has trample. - Effect boostEffect = new ConditionalContinousEffect( + Effect boostEffect = new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control an artifact, {this} gets +2/+0"); - Effect gainAbilityEffect = new ConditionalContinousEffect( + Effect gainAbilityEffect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "and has trample"); diff --git a/Mage.Sets/src/mage/sets/magic2015/WardenOfTheBeyond.java b/Mage.Sets/src/mage/sets/magic2015/WardenOfTheBeyond.java index b2907ac1ec2..283bcb6586f 100644 --- a/Mage.Sets/src/mage/sets/magic2015/WardenOfTheBeyond.java +++ b/Mage.Sets/src/mage/sets/magic2015/WardenOfTheBeyond.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.Card; @@ -64,7 +64,7 @@ public class WardenOfTheBeyond extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Warden of the Beyond gets +2/+2 as long as an opponent owns a card in exile. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(2,2,Duration.WhileOnBattlefield), OpponentOwnsCardInExileCondition.getInstance(), + new ConditionalContinuousEffect(new BoostSourceEffect(2,2,Duration.WhileOnBattlefield), OpponentOwnsCardInExileCondition.getInstance(), "{this} gets +2/+2 as long as an opponent owns a card in exile"))); } diff --git a/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java b/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java index 8526ac43eab..c9d1806d1f9 100644 --- a/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java +++ b/Mage.Sets/src/mage/sets/mirage/SpiritOfTheNight.java @@ -33,7 +33,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceMatchesFilterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.*; import mage.cards.CardImpl; @@ -82,7 +82,7 @@ public class SpiritOfTheNight extends CardImpl { this.addAbility(new ProtectionAbility(filter)); // Spirit of the Night has first strike as long as it's attacking. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new SourceMatchesFilterCondition(new FilterAttackingCreature()), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new SourceMatchesFilterCondition(new FilterAttackingCreature()), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java index 6200b4cdbd8..e49cf3faa03 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; @@ -62,9 +62,9 @@ public class LeoninDenGuard extends CardImpl { this.toughness = new MageInt(3); // As long as Leonin Den-Guard is equipped, it gets +1/+1 and has vigilance. - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), EquippedCondition.getInstance(), rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), EquippedCondition.getInstance(), rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java index fccfdf7b559..169076b5c7d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ArdentRecruit.java @@ -38,7 +38,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -58,7 +58,7 @@ public class ArdentRecruit extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); - ConditionalContinousEffect effect = new ConditionalContinousEffect(boostSource, MetalcraftCondition.getInstance(), "Ardent Recruit gets +2/+2 as long as you control three or more artifacts"); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.getInstance(), "Ardent Recruit gets +2/+2 as long as you control three or more artifacts"); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); ability.setAbilityWord(AbilityWord.METALCRAFT); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java index c833a181c0d..c88e46e115a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; @@ -54,7 +54,7 @@ public class MirranMettle extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new ConditionalContinousEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn), + this.getSpellAbility().addEffect(new ConditionalContinuousEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new LockedInCondition(MetalcraftCondition.getInstance()), effectText)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRevoker.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRevoker.java index d42f1c5f7fa..b8938d1849d 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRevoker.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PhyrexianRevoker.java @@ -39,7 +39,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.repository.CardRepository; @@ -123,7 +123,7 @@ class PhyrexianRevokerEffect1 extends OneShotEffect { } -class PhyrexianRevokerEffect2 extends ContinuousRuleModifiyingEffectImpl { +class PhyrexianRevokerEffect2 extends ContinuousRuleModifyingEffectImpl { public PhyrexianRevokerEffect2() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RazorfieldRhino.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RazorfieldRhino.java index 3b97532ce9c..d1f311626bb 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RazorfieldRhino.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RazorfieldRhino.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -55,7 +55,7 @@ public class RazorfieldRhino extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); ContinuousEffect effect1 = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect1, MetalcraftCondition.getInstance(), "Metalcraft - Razorfield Rhino gets +2/+2 as long as you control three or more artifacts"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect1, MetalcraftCondition.getInstance(), "Metalcraft - Razorfield Rhino gets +2/+2 as long as you control three or more artifacts"))); } public RazorfieldRhino (final RazorfieldRhino card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java index cfa1663c8f6..15aa8d8f897 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpiralingDuelist.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; @@ -59,7 +59,7 @@ public class SpiralingDuelist extends CardImpl { this.toughness = new MageInt(1); ContinuousEffect effect = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, MetalcraftCondition.getInstance(), effectText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, MetalcraftCondition.getInstance(), effectText))); } public SpiralingDuelist(final SpiralingDuelist card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpireSerpent.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpireSerpent.java index 60fc66e695c..7e1b27204b0 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpireSerpent.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpireSerpent.java @@ -38,7 +38,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.decorator.ConditionalAsThoughEffect; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.combat.CanAttackAsThoughtItDidntHaveDefenderEffect; @@ -62,7 +62,7 @@ public class SpireSerpent extends CardImpl { this.toughness = new MageInt(5); this.addAbility(DefenderAbility.getInstance()); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), MetalcraftCondition.getInstance(), abilityText1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), MetalcraftCondition.getInstance(), abilityText1); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); Effect effect = new ConditionalAsThoughEffect(new CanAttackAsThoughtItDidntHaveDefenderEffect(Duration.WhileOnBattlefield), MetalcraftCondition.getInstance()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/KithkinGreatheart.java b/Mage.Sets/src/mage/sets/modernmasters/KithkinGreatheart.java index 2b027f6bc42..beaeef5fd5f 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/KithkinGreatheart.java +++ b/Mage.Sets/src/mage/sets/modernmasters/KithkinGreatheart.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -70,12 +70,12 @@ public class KithkinGreatheart extends CardImpl { this.toughness = new MageInt(1); // As long as you control a Giant, Kithkin Greatheart gets +1/+1 and has first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a Giant, Kithkin Greatheart gets +1/+1")); this.addAbility(ability); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect( + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); diff --git a/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java b/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java index b7361bf9a90..99fd63946d0 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java +++ b/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.KickerAbility; @@ -82,7 +82,7 @@ public class MoltenDisaster extends CardImpl { } } -class MoltenDisasterSplitSecondEffect extends ContinuousRuleModifiyingEffectImpl { +class MoltenDisasterSplitSecondEffect extends ContinuousRuleModifyingEffectImpl { MoltenDisasterSplitSecondEffect() { super(Duration.WhileOnStack, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/modernmasters/VedalkenShackles.java b/Mage.Sets/src/mage/sets/modernmasters/VedalkenShackles.java index 3c87b830c00..d33c7e8b826 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/VedalkenShackles.java +++ b/Mage.Sets/src/mage/sets/modernmasters/VedalkenShackles.java @@ -34,7 +34,7 @@ import mage.abilities.common.SkipUntapOptionalAbility; import mage.abilities.condition.common.SourceTappedCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -70,7 +70,7 @@ public class VedalkenShackles extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}: Gain control of target creature with power less than or equal to the number of Islands you control for as long as Vedalken Shackles remains tapped. - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom), SourceTappedCondition.getInstance(), "Gain control of target creature with power less than or equal to the number of Islands you control for as long as {this} remains tapped"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/sets/morningtide/MaralenOfTheMornsong.java b/Mage.Sets/src/mage/sets/morningtide/MaralenOfTheMornsong.java index 7a738627fa3..a27ea51b97c 100644 --- a/Mage.Sets/src/mage/sets/morningtide/MaralenOfTheMornsong.java +++ b/Mage.Sets/src/mage/sets/morningtide/MaralenOfTheMornsong.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -80,7 +80,7 @@ public class MaralenOfTheMornsong extends CardImpl { } } -class MaralenOfTheMornsongEffect extends ContinuousRuleModifiyingEffectImpl { +class MaralenOfTheMornsongEffect extends ContinuousRuleModifyingEffectImpl { public MaralenOfTheMornsongEffect() { super(Duration.WhileOnBattlefield, Outcome.Neutral, false, false); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java index eb2dd899ac1..13e7d3e523a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java @@ -33,7 +33,7 @@ import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -108,7 +108,7 @@ class ExclusionRitualImprintEffect extends OneShotEffect { } } -class ExclusionRitualReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class ExclusionRitualReplacementEffect extends ContinuousRuleModifyingEffectImpl { ExclusionRitualReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Players can't cast spells with the same name as the exiled card"; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java b/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java index 666c59fc185..9ecc8fb18ba 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/JorKadeenThePrevailer.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; @@ -65,7 +65,7 @@ public class JorKadeenThePrevailer extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Metalcraft - Creatures you control get +3/+0 as long as you control three or more artifacts. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new BoostControlledEffect(3, 0, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false), + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostControlledEffect(3, 0, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false), MetalcraftCondition.getInstance(), effectText); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/OmenMachine.java b/Mage.Sets/src/mage/sets/newphyrexia/OmenMachine.java index e01002695df..ee03ddf6d0a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/OmenMachine.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/OmenMachine.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -73,7 +73,7 @@ public class OmenMachine extends CardImpl { } } -class OmenMachineEffect extends ContinuousRuleModifiyingEffectImpl { +class OmenMachineEffect extends ContinuousRuleModifyingEffectImpl { public OmenMachineEffect() { super(Duration.WhileOnBattlefield, Outcome.Neutral, false, false); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java b/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java index 5f3acc4bfab..413c7307014 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java @@ -39,7 +39,7 @@ import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.EquipAbility; @@ -70,7 +70,7 @@ public class PuresteelPaladin extends CardImpl { // Whenever an Equipment enters the battlefield under your control, you may draw a card. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), filter, true)); // Metalcraft - Equipment you control have equip {0} as long as you control three or more artifacts - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityControlledEffect(new EquipAbility(Outcome.AddAbility, new GenericManaCost(0)), Duration.WhileOnBattlefield, filter), MetalcraftCondition.getInstance(), "Metalcraft - Equipment you control have equip {0} as long as you control three or more artifacts"))); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java b/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java index e77da7c55ee..7d4f0717aad 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.AbilityType; import mage.constants.CardType; @@ -67,7 +67,7 @@ public class TorporOrb extends CardImpl { } } -class TorporOrbEffect extends ContinuousRuleModifiyingEffectImpl { +class TorporOrbEffect extends ContinuousRuleModifyingEffectImpl { TorporOrbEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment, false, false); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ViridianBetrayers.java b/Mage.Sets/src/mage/sets/newphyrexia/ViridianBetrayers.java index aa135f94eb0..b11ed873a17 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ViridianBetrayers.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ViridianBetrayers.java @@ -36,7 +36,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; @@ -64,7 +64,7 @@ public class ViridianBetrayers extends CardImpl { this.toughness = new MageInt(1); // Viridian Betrayers has infect as long as an opponent is poisoned. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(InfectAbility.getInstance()), PoisonedCondition.getInstance(), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(InfectAbility.getInstance()), PoisonedCondition.getInstance(), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/KirdApe.java b/Mage.Sets/src/mage/sets/ninthedition/KirdApe.java index 23203c7dc1f..550e203cbc6 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/KirdApe.java +++ b/Mage.Sets/src/mage/sets/ninthedition/KirdApe.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.Duration; @@ -66,7 +66,7 @@ public class KirdApe extends CardImpl { // Kird Ape gets +1/+2 as long as you control a Forest. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java b/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java index 87ba01d1393..cb5165270dd 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java +++ b/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; @@ -69,7 +69,7 @@ public class AboshansDesire extends CardImpl { // Enchanted creature has flying. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); // Threshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. - ability.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield), + ability.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - Enchanted creature gets shroud as long as seven or more cards are in your graveyard")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/odyssey/Bloodcurdler.java b/Mage.Sets/src/mage/sets/odyssey/Bloodcurdler.java index af01f809976..2aeb9805224 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Bloodcurdler.java +++ b/Mage.Sets/src/mage/sets/odyssey/Bloodcurdler.java @@ -35,7 +35,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.ExileCardFromOwnGraveyardControllerEffect; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; @@ -73,10 +73,10 @@ public class Bloodcurdler extends CardImpl { Condition thresholdCondition = new CardsInControllerGraveCondition(7); // Threshold - As long as seven or more cards are in your graveyard, Bloodcurdler gets +1/+1 and has "At the beginning of your end step, exile two cards from your graveyard." Ability thresholdAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), thresholdCondition, + new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), thresholdCondition, "Threshold - If seven or more cards are in your graveyard, {this} gets +1/+1")); ContinuousEffect effect = new GainAbilitySourceEffect(new BeginningOfEndStepTriggeredAbility(new ExileCardFromOwnGraveyardControllerEffect(2), TargetController.YOU, false)); - thresholdAbility.addEffect(new ConditionalContinousEffect(effect, thresholdCondition, + thresholdAbility.addEffect(new ConditionalContinuousEffect(effect, thresholdCondition, "and has \"At the beginning of your end step, exile two cards from your graveyard.\"")); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java index 544ef24b031..b06db7653d6 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java +++ b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java @@ -30,7 +30,7 @@ package mage.sets.odyssey; import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -75,7 +75,7 @@ public class CeaseFire extends CardImpl { } } -class CeaseFireEffect extends ContinuousRuleModifiyingEffectImpl { +class CeaseFireEffect extends ContinuousRuleModifyingEffectImpl { private static final FilterSpell filter = new FilterSpell(); static { diff --git a/Mage.Sets/src/mage/sets/odyssey/ChildhoodHorror.java b/Mage.Sets/src/mage/sets/odyssey/ChildhoodHorror.java index a1f81f402d1..f3c553a312d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ChildhoodHorror.java +++ b/Mage.Sets/src/mage/sets/odyssey/ChildhoodHorror.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.CantBlockSourceEffect; @@ -64,7 +64,7 @@ public class ChildhoodHorror extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Childhood Horror gets +2/+2 and can't block. Ability thresholdAbility = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - If seven or more cards are in your graveyard, Childhood Horror gets +2/+2" diff --git a/Mage.Sets/src/mage/sets/odyssey/CrashingCentaur.java b/Mage.Sets/src/mage/sets/odyssey/CrashingCentaur.java index bee37cd728d..9f4f811b6bb 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CrashingCentaur.java +++ b/Mage.Sets/src/mage/sets/odyssey/CrashingCentaur.java @@ -35,7 +35,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -70,11 +70,11 @@ public class CrashingCentaur extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Crashing Centaur gets +2/+2 and has shroud. Ability thresholdAbility = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - If seven or more cards are in your graveyard, {this} gets +2/+2")); - Effect effect = new ConditionalContinousEffect( + Effect effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(ShroudAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has shroud"); thresholdAbility.addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java b/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java index b451d8f5162..7d2d80d10e0 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java +++ b/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java @@ -35,7 +35,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; @@ -85,7 +85,7 @@ public class DecayingSoil extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Decaying Soil has "Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {1}. If you do, return that card to your hand." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(new DecayingSoilTriggeredAbility(new DecayingSoilEffect(), filter)), + new ConditionalContinuousEffect(new GainAbilitySourceEffect(new DecayingSoilTriggeredAbility(new DecayingSoilEffect(), filter)), new CardsInControllerGraveCondition(7), "Threshold - As long as seven or more cards are in your graveyard, {this} has \"Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {1}. If you do, return that card to your hand"))); } diff --git a/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java b/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java index 35e9d99b769..842ffcf8261 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java +++ b/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java @@ -35,7 +35,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RegenerateSourceEffect; @@ -69,7 +69,7 @@ public class DirtyWererat extends CardImpl { ability.addCost(new DiscardCardCost()); // Threshold - As long as seven or more cards are in your graveyard, Dirty Wererat gets +2/+2 and can't block. Ability thresholdAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - If seven or more cards are in your graveyard, Dirty Wererat gets +2/+2 and can't block" diff --git a/Mage.Sets/src/mage/sets/odyssey/Frightcrawler.java b/Mage.Sets/src/mage/sets/odyssey/Frightcrawler.java index a11b96c60fe..9bbc8b80406 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Frightcrawler.java +++ b/Mage.Sets/src/mage/sets/odyssey/Frightcrawler.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.combat.CantBlockSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FearAbility; @@ -62,13 +62,12 @@ public class Frightcrawler extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Frightcrawler gets +2/+2 and can't block. Ability thresholdAbility = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - If seven or more cards are in your graveyard, {this} gets +2/+2 " )); - thresholdAbility.addEffect( - new ConditionalContinousEffect( + thresholdAbility.addEffect(new ConditionalContinuousEffect( new CantBlockSourceEffect(Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "and can't block.")); diff --git a/Mage.Sets/src/mage/sets/odyssey/GorillaTitan.java b/Mage.Sets/src/mage/sets/odyssey/GorillaTitan.java index 54008f965f5..37cad4ac465 100644 --- a/Mage.Sets/src/mage/sets/odyssey/GorillaTitan.java +++ b/Mage.Sets/src/mage/sets/odyssey/GorillaTitan.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -62,7 +62,7 @@ public class GorillaTitan extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Gorilla Titan gets +4/+4 as long as there are no cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(4,4, Duration.WhileInGraveyard), new GorillaTitanCondition(), "{this} gets +4/+4 as long as there are no cards in your graveyard" diff --git a/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java b/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java index 907e8804b65..0574f5ec3d2 100644 --- a/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java +++ b/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -70,7 +70,7 @@ public class KamahlsDesire extends CardImpl { // Enchanted creature has first strike. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); // Threshold - Enchanted creature gets +3/+0 as long as seven or more cards are in your graveyard. - ability.addEffect(new ConditionalContinousEffect(new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield), + ability.addEffect(new ConditionalContinuousEffect(new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - Enchanted creature gets +3/+0 as long as seven or more cards are in your graveyard")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/odyssey/KrosanBeast.java b/Mage.Sets/src/mage/sets/odyssey/KrosanBeast.java index 2cefaa65959..3dceddcf884 100644 --- a/Mage.Sets/src/mage/sets/odyssey/KrosanBeast.java +++ b/Mage.Sets/src/mage/sets/odyssey/KrosanBeast.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -59,7 +59,7 @@ public class KrosanBeast extends CardImpl { // Threshold - Krosan Beast gets +7/+7 as long as seven or more cards are in your graveyard. Ability thresholdAbility = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(7, 7, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - {this} gets +7/+7 as long as seven or more cards are in your graveyard" diff --git a/Mage.Sets/src/mage/sets/odyssey/MetamorphicWurm.java b/Mage.Sets/src/mage/sets/odyssey/MetamorphicWurm.java index c979c6ab397..614e7fff4a1 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MetamorphicWurm.java +++ b/Mage.Sets/src/mage/sets/odyssey/MetamorphicWurm.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -59,7 +59,7 @@ public class MetamorphicWurm extends CardImpl { // Threshold - Metamorphic Wurm gets +4/+4 as long as seven or more cards are in your graveyard. Ability thresholdAbility = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - {this} gets +4/+4 as long as seven or more cards are in your graveyard" diff --git a/Mage.Sets/src/mage/sets/odyssey/MysticCrusader.java b/Mage.Sets/src/mage/sets/odyssey/MysticCrusader.java index 3e5e2c27381..edf27eecf4f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MysticCrusader.java +++ b/Mage.Sets/src/mage/sets/odyssey/MysticCrusader.java @@ -33,7 +33,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -73,9 +73,9 @@ public class MysticCrusader extends CardImpl { // Protection from black and from red this.addAbility(new ProtectionAbility(filter)); // Threshold - As long as seven or more cards are in your graveyard, Mystic Crusader gets +1/+1 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - As long as seven or more cards are in your graveyard, {this} gets +1/+1")); - ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has flying")); + ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has flying")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/MysticPenitent.java b/Mage.Sets/src/mage/sets/odyssey/MysticPenitent.java index cacdb3c027a..03c6e8c2bff 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MysticPenitent.java +++ b/Mage.Sets/src/mage/sets/odyssey/MysticPenitent.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -63,9 +63,9 @@ public class MysticPenitent extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Mystic Penitent gets +1/+1 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - As long as seven or more cards are in your graveyard, {this} gets +1/+1")); - ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has flying")); + ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has flying")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/MysticVisionary.java b/Mage.Sets/src/mage/sets/odyssey/MysticVisionary.java index 7cae2ab5958..c343148db79 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MysticVisionary.java +++ b/Mage.Sets/src/mage/sets/odyssey/MysticVisionary.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -58,7 +58,7 @@ public class MysticVisionary extends CardImpl { this.toughness = new MageInt(1); // Threshold - Mystic Visionary has flying as long as seven or more cards are in your graveyard. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "Threshold - {this} has flying as long as seven or more cards are in your graveyard.")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/MysticZealot.java b/Mage.Sets/src/mage/sets/odyssey/MysticZealot.java index eb1a9cb6c88..0df084d6225 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MysticZealot.java +++ b/Mage.Sets/src/mage/sets/odyssey/MysticZealot.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -60,9 +60,9 @@ public class MysticZealot extends CardImpl { this.toughness = new MageInt(4); // Threshold - As long as seven or more cards are in your graveyard, Mystic Zealot gets +1/+1 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - As long as seven or more cards are in your graveyard, {this} gets +1/+1")); - ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has flying")); + ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has flying")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java b/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java index 69eb3e5c381..79f3716f46d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java +++ b/Mage.Sets/src/mage/sets/odyssey/NimbleMongoose.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; @@ -59,7 +59,7 @@ public class NimbleMongoose extends CardImpl { // Shroud this.addAbility(ShroudAbility.getInstance()); // Threshold - Nimble Mongoose gets +2/+2 as long as seven or more cards are in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), " Threshold - {this} gets +2/+2 as long as seven or more cards are in your graveyard"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), " Threshold - {this} gets +2/+2 as long as seven or more cards are in your graveyard"))); } public NimbleMongoose(final NimbleMongoose card) { diff --git a/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java b/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java index 0c3269b7b63..b561e0fbcd5 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java +++ b/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java @@ -35,7 +35,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.cards.CardImpl; @@ -70,7 +70,7 @@ public class NomadDecoy extends CardImpl { Ability thresholdAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}{W}")); thresholdAbility.addTarget(new TargetCreaturePermanent(2)); thresholdAbility.addCost(new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(thresholdAbility), + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(thresholdAbility), new CardsInControllerGraveCondition(7), "Threshold - {W}{W}, {tap}: Tap two target creatures. Activate this ability only if seven or more cards are in your graveyard."))); } diff --git a/Mage.Sets/src/mage/sets/odyssey/NutCollector.java b/Mage.Sets/src/mage/sets/odyssey/NutCollector.java index 2148328dc41..50e4056b53b 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NutCollector.java +++ b/Mage.Sets/src/mage/sets/odyssey/NutCollector.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; @@ -71,7 +71,7 @@ public class NutCollector extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SquirrelToken()), TargetController.YOU, true)); // Threshold - Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false), + new ConditionalContinuousEffect(new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false), new CardsInControllerGraveCondition(7), "Threshold - Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard"))); } diff --git a/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java b/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java index 9727a1670ad..225c5f9a560 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java +++ b/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java @@ -33,7 +33,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -75,7 +75,7 @@ public class PardicMiner extends CardImpl { } } -class PardicMinerEffect extends ContinuousRuleModifiyingEffectImpl { +class PardicMinerEffect extends ContinuousRuleModifyingEffectImpl { public PardicMinerEffect() { super(Duration.EndOfTurn, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java b/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java index ba8d4c23198..add259b7193 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java +++ b/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java @@ -30,7 +30,7 @@ package mage.sets.odyssey; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; @@ -66,7 +66,7 @@ public class PatriarchsDesire extends CardImpl { ability.addEffect(new BoostEnchantedEffect(2, -2, Duration.WhileOnBattlefield)); // Threshold - Enchanted creature gets an additional +2/-2 as long as seven or more cards are in your graveyard. - ability.addEffect(new ConditionalContinousEffect(new BoostEnchantedEffect(2, -2, + ability.addEffect(new ConditionalContinuousEffect(new BoostEnchantedEffect(2, -2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "

Threshold - Enchanted creature gets an additional +2/-2 as long as seven or more cards are in your graveyard." )); diff --git a/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java b/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java index a727b131b77..74c87a1a4b8 100644 --- a/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java +++ b/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java @@ -36,7 +36,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.continuous.SetCardColorSourceEffect; @@ -77,13 +77,13 @@ public class RepentantVampire extends CardImpl { // Whenever a creature dealt damage by Repentant Vampire this turn dies, put a +1/+1 counter on Repentant Vampire. this.addAbility(new DiesAndDealtDamageThisTurnTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // Threshold - As long as seven or more cards are in your graveyard, Repentant Vampire is white and has "{tap}: Destroy target black creature." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new SetCardColorSourceEffect(ObjectColor.WHITE, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - As long as seven or more cards are in your graveyard, {this} is white")); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "and has \"{t}: Destroy target black creature.\"")); diff --git a/Mage.Sets/src/mage/sets/odyssey/SpringingTiger.java b/Mage.Sets/src/mage/sets/odyssey/SpringingTiger.java index 69aef36853b..db45695f529 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SpringingTiger.java +++ b/Mage.Sets/src/mage/sets/odyssey/SpringingTiger.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -58,7 +58,7 @@ public class SpringingTiger extends CardImpl { // Threshold - Springing Tiger gets +2/+2 as long as seven or more cards are in your graveyard. Ability thresholdAbility = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - {this} gets +2/+2 as long as seven or more cards are in your graveyard" diff --git a/Mage.Sets/src/mage/sets/odyssey/WaywardAngel.java b/Mage.Sets/src/mage/sets/odyssey/WaywardAngel.java index 6fea34e9eda..c4b3c380f66 100644 --- a/Mage.Sets/src/mage/sets/odyssey/WaywardAngel.java +++ b/Mage.Sets/src/mage/sets/odyssey/WaywardAngel.java @@ -34,7 +34,7 @@ import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.SacrificeControllerEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -71,22 +71,22 @@ public class WaywardAngel extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Wayward Angel gets +3/+3, is black, has trample, and has "At the beginning of your upkeep, sacrifice a creature." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - As long as seven or more cards are in your graveyard, {this} gets +3/+3,")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new SetCardColorSourceEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), " is black,")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance()), new CardsInControllerGraveCondition(7), " has trample,")); Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(new FilterControlledCreaturePermanent(), 1, ""), TargetController.YOU, false); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(gainedAbility), new CardsInControllerGraveCondition(7), " and has \"At the beginning of your upkeep, sacrifice a creature.\" ")); diff --git a/Mage.Sets/src/mage/sets/odyssey/Werebear.java b/Mage.Sets/src/mage/sets/odyssey/Werebear.java index b46940fa532..eeffdfc969d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Werebear.java +++ b/Mage.Sets/src/mage/sets/odyssey/Werebear.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; @@ -63,7 +63,7 @@ public class Werebear extends CardImpl { // Threshold - Werebear gets +3/+3 as long as seven or more cards are in your graveyard. Ability thresholdAbility = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - {this} gets +3/+3 as long as seven or more cards are in your graveyard" diff --git a/Mage.Sets/src/mage/sets/planarchaos/VoidstoneGargoyle.java b/Mage.Sets/src/mage/sets/planarchaos/VoidstoneGargoyle.java index 0c33f9610a7..a954dadde11 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/VoidstoneGargoyle.java +++ b/Mage.Sets/src/mage/sets/planarchaos/VoidstoneGargoyle.java @@ -35,7 +35,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -124,7 +124,7 @@ class VoidstoneGargoyleChooseCardEffect extends OneShotEffect { } -class VoidstoneGargoyleReplacementEffect1 extends ContinuousRuleModifiyingEffectImpl { +class VoidstoneGargoyleReplacementEffect1 extends ContinuousRuleModifyingEffectImpl { public VoidstoneGargoyleReplacementEffect1() { super(Duration.WhileOnBattlefield, Outcome.Detriment); @@ -167,7 +167,7 @@ class VoidstoneGargoyleReplacementEffect1 extends ContinuousRuleModifiyingEffect } -class VoidstoneGargoyleRuleModifyingEffect2 extends ContinuousRuleModifiyingEffectImpl { +class VoidstoneGargoyleRuleModifyingEffect2 extends ContinuousRuleModifyingEffectImpl { public VoidstoneGargoyleRuleModifyingEffect2() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/planechase2012/IllusoryAngel.java b/Mage.Sets/src/mage/sets/planechase2012/IllusoryAngel.java index 558c12a2d4b..615701536e4 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/IllusoryAngel.java +++ b/Mage.Sets/src/mage/sets/planechase2012/IllusoryAngel.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -77,7 +77,7 @@ public class IllusoryAngel extends CardImpl { } } -class IllusoryAngelEffect extends ContinuousRuleModifiyingEffectImpl { +class IllusoryAngelEffect extends ContinuousRuleModifyingEffectImpl { IllusoryAngelEffect() { super(Duration.EndOfGame, Outcome.Detriment); staticText = "Cast {this} only if you've cast another spell this turn"; diff --git a/Mage.Sets/src/mage/sets/planeshift/MagnigothTreefolk.java b/Mage.Sets/src/mage/sets/planeshift/MagnigothTreefolk.java index 293f5fb6de2..5df909d875a 100644 --- a/Mage.Sets/src/mage/sets/planeshift/MagnigothTreefolk.java +++ b/Mage.Sets/src/mage/sets/planeshift/MagnigothTreefolk.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition.CountType; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.ForestwalkAbility; import mage.abilities.keyword.IslandwalkAbility; @@ -68,23 +68,23 @@ public class MagnigothTreefolk extends CardImpl { // Domain - For each basic land type among lands you control, Magnigoth Treefolk has landwalk of that type. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilitySourceEffect(new PlainswalkAbility()), new PermanentsOnTheBattlefieldCondition(filterPlains, CountType.MORE_THAN, 0, true), "Domain — For each basic land type among lands you control, {this} has landwalk of that type.")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new IslandwalkAbility(), Duration.WhileOnBattlefield, false, true), new PermanentsOnTheBattlefieldCondition(filterIsland, CountType.MORE_THAN, 0, true), "")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new SwampwalkAbility(), Duration.WhileOnBattlefield, false, true), new PermanentsOnTheBattlefieldCondition(filterSwamp, CountType.MORE_THAN, 0, true), "")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new MountainwalkAbility(), Duration.WhileOnBattlefield, false, true), new PermanentsOnTheBattlefieldCondition(filterMountain, CountType.MORE_THAN, 0, true), "")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, false, true), new PermanentsOnTheBattlefieldCondition(filterForest, CountType.MORE_THAN, 0, true), "")); diff --git a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java index a3fda60f7e8..119f0194e1e 100644 --- a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java +++ b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java @@ -31,7 +31,7 @@ package mage.sets.planeshift; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.combat.CantAttackAllAnyPlayerEffect; import mage.abilities.keyword.KickerAbility; @@ -105,7 +105,7 @@ class OrimsChantEffect extends OneShotEffect { } } -class OrimsChantCantCastEffect extends ContinuousRuleModifiyingEffectImpl { +class OrimsChantCantCastEffect extends ContinuousRuleModifyingEffectImpl { public OrimsChantCantCastEffect() { super(Duration.EndOfTurn, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/ravnica/CrownOfConvergence.java b/Mage.Sets/src/mage/sets/ravnica/CrownOfConvergence.java index fe7dcf25b8f..d65d95c083c 100644 --- a/Mage.Sets/src/mage/sets/ravnica/CrownOfConvergence.java +++ b/Mage.Sets/src/mage/sets/ravnica/CrownOfConvergence.java @@ -32,7 +32,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.TopLibraryCardTypeCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.effects.common.continuous.PlayWithTheTopCardRevealedEffect; @@ -65,7 +65,7 @@ public class CrownOfConvergence extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); // As long as the top card of your library is a creature card, creatures you control that share a color with that card get +1/+1. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new CrownOfConvergenceColorBoostEffect(), new TopLibraryCardTypeCondition(CREATURE), rule1); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new CrownOfConvergenceColorBoostEffect(), new TopLibraryCardTypeCondition(CREATURE), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // {G}{W}: Put the top card of your library on the bottom of your library. diff --git a/Mage.Sets/src/mage/sets/ravnica/GateHound.java b/Mage.Sets/src/mage/sets/ravnica/GateHound.java index 6ac8c0a7283..e41fcd273e9 100644 --- a/Mage.Sets/src/mage/sets/ravnica/GateHound.java +++ b/Mage.Sets/src/mage/sets/ravnica/GateHound.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class GateHound extends CardImpl { this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()), new EnchantedCondition(), "Creatures you control have vigilance as long as {this} is enchanted"))); diff --git a/Mage.Sets/src/mage/sets/ravnica/RollingSpoil.java b/Mage.Sets/src/mage/sets/ravnica/RollingSpoil.java index 88588273f0e..7bcb07ba37c 100644 --- a/Mage.Sets/src/mage/sets/ravnica/RollingSpoil.java +++ b/Mage.Sets/src/mage/sets/ravnica/RollingSpoil.java @@ -29,7 +29,7 @@ package mage.sets.ravnica; import java.util.UUID; import mage.abilities.condition.common.ManaWasSpentCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; @@ -56,7 +56,7 @@ public class RollingSpoil extends CardImpl { this.getSpellAbility().addTarget(new TargetLandPermanent()); // If {B} was spent to cast Rolling Spoil, all creatures get -1/-1 until end of turn. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new BoostAllEffect(-1, -1, Duration.EndOfTurn), new ManaWasSpentCondition(ColoredManaSymbol.B), "If {B} was spent to cast {this}, all creatures get -1/-1 until end of turn")); } diff --git a/Mage.Sets/src/mage/sets/ravnica/ShadowOfDoubt.java b/Mage.Sets/src/mage/sets/ravnica/ShadowOfDoubt.java index b4b7104c5d5..234448bbf56 100644 --- a/Mage.Sets/src/mage/sets/ravnica/ShadowOfDoubt.java +++ b/Mage.Sets/src/mage/sets/ravnica/ShadowOfDoubt.java @@ -33,7 +33,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Rarity; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -70,7 +70,7 @@ public class ShadowOfDoubt extends CardImpl { } } -class LibrariesCantBeSearchedEffect extends ContinuousRuleModifiyingEffectImpl { +class LibrariesCantBeSearchedEffect extends ContinuousRuleModifyingEffectImpl { public LibrariesCantBeSearchedEffect() { super(Duration.EndOfTurn, Outcome.Benefit, true, false); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java b/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java index c4fcbdb6625..4a7b1cf4f16 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ArmoryGuard.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; @@ -67,7 +67,7 @@ public class ArmoryGuard extends CardImpl { this.toughness = new MageInt(5); // Armory Guard has vigilance as long as you control a Gate. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChaosImps.java b/Mage.Sets/src/mage/sets/returntoravnica/ChaosImps.java index 484860f8e43..6bbae1f41e7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChaosImps.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChaosImps.java @@ -34,7 +34,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasCounterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; @@ -65,7 +65,7 @@ public class ChaosImps extends CardImpl { // Chaos Imps has trample as long as it has a +1/+1 counter on it. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), + new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1),"Chaos Imps has trample as long as it has a +1/+1 counter on it"))); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java b/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java index 93dd557e033..03263dccadd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/OakStreetInnkeeper.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.NotMyTurnCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; @@ -65,7 +65,7 @@ public class OakStreetInnkeeper extends CardImpl { this.toughness = new MageInt(2); // As long as it's not your turn, tapped creatures you control have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter), NotMyTurnCondition.getInstance(), "As long as it's not your turn, tapped creatures you control have hexproof"))); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java index 0f2a7bb655d..f96e18249ce 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosLordOfRiots.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.OpponentsLostLifeCount; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.FlashbackAbility; import mage.abilities.keyword.FlyingAbility; @@ -89,7 +89,7 @@ public class RakdosLordOfRiots extends CardImpl { } } -class RakdosLordOfRiotsCantCastEffect extends ContinuousRuleModifiyingEffectImpl { +class RakdosLordOfRiotsCantCastEffect extends ContinuousRuleModifyingEffectImpl { public RakdosLordOfRiotsCantCastEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java index e88e5059e45..2eddaa8e909 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.abilities.effects.common.continuous.BoostSourceEffect; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.common.SimpleStaticAbility; import mage.constants.Zone; @@ -64,7 +64,7 @@ public class ChampionsDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Champion's Drake gets +3/+3 as long as you control a creature with three or more level counters on it. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new PermanentHasCounterCondition(CounterType.LEVEL, 2, new FilterCreaturePermanent(), PermanentHasCounterCondition.CountType.MORE_THAN), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new PermanentHasCounterCondition(CounterType.LEVEL, 2, new FilterCreaturePermanent(), PermanentHasCounterCondition.CountType.MORE_THAN), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java index 11f6785c6d5..266e91e5ac2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java @@ -38,7 +38,7 @@ import mage.abilities.condition.Condition; import mage.abilities.condition.common.TopLibraryCardTypeCondition; import mage.abilities.costs.Cost; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.effects.common.ManaEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -73,12 +73,12 @@ public class MulDayaChannelers extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); // As long as the top card of your library is a creature card, Mul Daya Channelers gets +3/+3. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(TopLibraryCardTypeCondition.CheckType.CREATURE), rule1); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(TopLibraryCardTypeCondition.CheckType.CREATURE), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // As long as the top card of your library is a land card, Mul Daya Channelers has "T: Add two mana of any one color to your mana pool." SimpleManaAbility manaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); - effect = new ConditionalContinousEffect(new GainAbilitySourceEffect(manaAbility, Duration.WhileOnBattlefield), + effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(manaAbility, Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(TopLibraryCardTypeCondition.CheckType.LAND), "As long as the top card of your library is a land card, Mul Daya Channelers has \"{T}: Add two mana of any one color to your mana pool.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiUnderling.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiUnderling.java index 0d98597bfbc..d99af0f9344 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiUnderling.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiUnderling.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.CardsInHandCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -61,9 +61,9 @@ public class AkkiUnderling extends CardImpl { // As long as you have seven or more cards in hand, Akki Underling gets +2/+1 and has first strike. Condition condition = new CardsInHandCondition(CardsInHandCondition.CountType.MORE_THAN,6); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2,1, Duration.WhileOnBattlefield), condition, "As long as you have seven or more cards in hand, {this} gets +2/+1")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), condition, "and has first strike")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CurtainOfLight.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CurtainOfLight.java index 5e33e0904d3..b8ef9015f74 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CurtainOfLight.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CurtainOfLight.java @@ -30,7 +30,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -92,7 +92,7 @@ public class CurtainOfLight extends CardImpl { } } -class CurtainOfLightRuleModifyingEffect extends ContinuousRuleModifiyingEffectImpl { +class CurtainOfLightRuleModifyingEffect extends ContinuousRuleModifyingEffectImpl { CurtainOfLightRuleModifyingEffect() { super(Duration.EndOfGame, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathmaskNezumi.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathmaskNezumi.java index 9ae60c9ef80..f40c558899a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathmaskNezumi.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DeathmaskNezumi.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.CardsInHandCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FearAbility; @@ -61,9 +61,9 @@ public class DeathmaskNezumi extends CardImpl { // As long as you have seven or more cards in hand, Deathmask Nezumi gets +2/+1 and has fear. Condition condition = new CardsInHandCondition(CardsInHandCondition.CountType.MORE_THAN,6); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2,1, Duration.WhileOnBattlefield), condition, "As long as you have seven or more cards in hand, {this} gets +2/+1")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield), condition, "and has fear")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfKiyomaro.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfKiyomaro.java index 27dda75e574..baf667585f8 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfKiyomaro.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/DescendantOfKiyomaro.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -59,11 +59,11 @@ public class DescendantOfKiyomaro extends CardImpl { this.toughness = new MageInt(3); // As long as you have more cards in hand than each opponent, Descendant of Kiyomaro gets +1/+2 and has "Whenever this creature deals combat damage, you gain 3 life." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1,2, Duration.WhileOnBattlefield), new MoreCardsInHandThanOpponentsCondition(), "As long as you have more cards in hand than each opponent, {this} gets +1/+2")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new DealsCombatDamageTriggeredAbility(new GainLifeEffect(3), false)), new MoreCardsInHandThanOpponentsCondition(), "and has \"Whenever this creature deals combat damage, you gain 3 life.\"")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiyomaroFirstToStand.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiyomaroFirstToStand.java index c824b2bc156..fc8d11bbb3a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiyomaroFirstToStand.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiyomaroFirstToStand.java @@ -34,7 +34,7 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.CardsInHandCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; @@ -71,7 +71,7 @@ public class KiyomaroFirstToStand extends CardImpl { // As long as you have four or more cards in hand, Kiyomaro has vigilance. Condition condition = new CardsInHandCondition(CardsInHandCondition.CountType.MORE_THAN,3); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield), condition, "As long as you have four or more cards in hand, {this} has vigilance")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OkinaNightwatch.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OkinaNightwatch.java index 8c592446801..a0b8051f243 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OkinaNightwatch.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OkinaNightwatch.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -56,7 +56,7 @@ public class OkinaNightwatch extends CardImpl { this.toughness = new MageInt(3); // As long as you have more cards in hand than each opponent, Okina Nightwatch gets +3/+3. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(3,3, Duration.WhileOnBattlefield), new MoreCardsInHandThanOpponentsCondition(), "As long as you have more cards in hand than each opponent, Okina Nightwatch gets +3/+3")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PithingNeedle.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PithingNeedle.java index baa121d0828..8edb0491e20 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PithingNeedle.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PithingNeedle.java @@ -32,7 +32,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.NameACardEffect; import mage.cards.CardImpl; import mage.constants.AbilityType; @@ -71,7 +71,7 @@ public class PithingNeedle extends CardImpl { } } -class PithingNeedleEffect extends ContinuousRuleModifiyingEffectImpl { +class PithingNeedleEffect extends ContinuousRuleModifyingEffectImpl { public PithingNeedleEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Secretkeeper.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Secretkeeper.java index 85e5fc576b8..7512f0dc61e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Secretkeeper.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Secretkeeper.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -57,11 +57,11 @@ public class Secretkeeper extends CardImpl { this.toughness = new MageInt(2); // As long as you have more cards in hand than each opponent, Secretkeeper gets +2/+2 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2,2, Duration.WhileOnBattlefield), new MoreCardsInHandThanOpponentsCondition(), "As long as you have more cards in hand than each opponent, Secretkeeper gets +2/+2")); - ability.addEffect(new ConditionalContinousEffect( + ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new MoreCardsInHandThanOpponentsCondition(), "and has flying")); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java index 28a36b6c64c..d2f241e1215 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; @@ -60,7 +60,7 @@ public class AuriokEdgewright extends CardImpl { this.toughness = new MageInt(2); ContinuousEffect effect = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, MetalcraftCondition.getInstance(), effectText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, MetalcraftCondition.getInstance(), effectText))); } public AuriokEdgewright(final AuriokEdgewright card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java index 8c456811f06..ebc6a8a6f3f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -62,9 +62,9 @@ public class AuriokSunchaser extends CardImpl { this.toughness = new MageInt(1); ContinuousEffect effect1 = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect1, MetalcraftCondition.getInstance(), effect1Text))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect1, MetalcraftCondition.getInstance(), effect1Text))); ContinuousEffect effect2 = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect2, MetalcraftCondition.getInstance(), effect2Text))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, MetalcraftCondition.getInstance(), effect2Text))); } public AuriokSunchaser(final AuriokSunchaser card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java index f4c98caaf66..c3d1f665e94 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class CarapaceForger extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); - ConditionalContinousEffect effect = new ConditionalContinousEffect(boostSource, MetalcraftCondition.getInstance(), text); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.getInstance(), text); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java index f3c55da9b22..3c0939cf421 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -55,7 +55,7 @@ public class ChromeSteed extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); - ConditionalContinousEffect effect = new ConditionalContinousEffect(boostSource, MetalcraftCondition.getInstance(), text); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.getInstance(), text); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EtchedChampion.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EtchedChampion.java index 3471ab9b339..c35b35a0e49 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EtchedChampion.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EtchedChampion.java @@ -36,7 +36,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.ProtectionAbility; @@ -72,7 +72,7 @@ public class EtchedChampion extends CardImpl { this.toughness = new MageInt(2); ContinuousEffect effect = new GainAbilitySourceEffect(new ProtectionAbility(filter), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, MetalcraftCondition.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, MetalcraftCondition.getInstance(), ruleText))); } public EtchedChampion(final EtchedChampion card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java index b7f6f70bc4b..3f5a992fda4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -60,9 +60,9 @@ public class EzurisBrigade extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); ContinuousEffect boostSource = new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield); - ConditionalContinousEffect effect = new ConditionalContinousEffect(boostSource, MetalcraftCondition.getInstance(), text); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.getInstance(), text); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); - ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MetalcraftCondition.getInstance(), "")); + ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MetalcraftCondition.getInstance(), "")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java index ef8f0b834a1..21605c80875 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -58,7 +58,7 @@ public class GhalmasWarden extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); - ConditionalContinousEffect effect = new ConditionalContinousEffect(boostSource, MetalcraftCondition.getInstance(), text); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.getInstance(), text); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java index 0882c8a02dd..50d8ffe6830 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java @@ -37,7 +37,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; @@ -68,7 +68,7 @@ public class IndomitableArchangel extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); ContinuousEffect gainAbilityEffect = new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter); - ConditionalContinousEffect effect = new ConditionalContinousEffect(gainAbilityEffect, MetalcraftCondition.getInstance(), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(gainAbilityEffect, MetalcraftCondition.getInstance(), rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java index 4d57695e39a..d242374ecc6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LeoninArbiter.java @@ -37,7 +37,7 @@ import mage.abilities.Ability; import mage.abilities.SpecialAction; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -146,7 +146,7 @@ class LeoninArbiterIgnoreEffect extends OneShotEffect { } } -class LeoninArbiterCantSearchEffect extends ContinuousRuleModifiyingEffectImpl { +class LeoninArbiterCantSearchEffect extends ContinuousRuleModifyingEffectImpl { private final String keyString; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java index 29734539725..e6642c03feb 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java @@ -37,7 +37,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; import mage.cards.CardImpl; import mage.game.permanent.token.Token; @@ -51,9 +51,8 @@ public class RustedRelic extends CardImpl { public RustedRelic (UUID ownerId) { super(ownerId, 199, "Rusted Relic", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "SOM"; - this.addAbility( - new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new RustedRelicToken(), "artifact", Duration.WhileOnBattlefield), MetalcraftCondition.getInstance(), "Metalcraft - Rusted Relic is a 5/5 Golem artifact creature as long as you control three or more artifacts"))); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java index 1ab6f41c297..06184603460 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -58,7 +58,7 @@ public class SnapsailGlider extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); ContinuousEffect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, MetalcraftCondition.getInstance(), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, MetalcraftCondition.getInstance(), rule))); } public SnapsailGlider (final SnapsailGlider card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java index 107f7582742..b3f37610ae9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.LifelinkAbility; @@ -60,9 +60,9 @@ public class SunspearShikari extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), EquippedCondition.getInstance(), rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), EquippedCondition.getInstance(), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance()), EquippedCondition.getInstance(), rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance()), EquippedCondition.getInstance(), rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java b/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java index 2939a3cc57e..1f37db32d6c 100644 --- a/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java +++ b/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -108,7 +108,7 @@ class XantidSwarmTriggeredAbility extends TriggeredAbilityImpl { } } -class XantidSwarmReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class XantidSwarmReplacementEffect extends ContinuousRuleModifyingEffectImpl { public XantidSwarmReplacementEffect() { super(Duration.EndOfTurn, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorCohort.java b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorCohort.java index b1ca032a946..8a91be0bad9 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorCohort.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AshenmoorCohort.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition.CountType; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -72,7 +72,7 @@ public class AshenmoorCohort extends CardImpl { // Ashenmoor Cohort gets +1/+1 as long as you control another black creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0); - ConditionalContinousEffect effect = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BallynockCohort.java b/Mage.Sets/src/mage/sets/shadowmoor/BallynockCohort.java index 9158b415ca1..a77aa15a498 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BallynockCohort.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BallynockCohort.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition.CountType; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -77,7 +77,7 @@ public class BallynockCohort extends CardImpl { // Ballynock Cohort gets +1/+1 as long as you control another white creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0); - Effect effect = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); + Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BlazethornScarecrow.java b/Mage.Sets/src/mage/sets/shadowmoor/BlazethornScarecrow.java index e879911cf83..5830b2296af 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BlazethornScarecrow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BlazethornScarecrow.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; @@ -70,11 +70,11 @@ public class BlazethornScarecrow extends CardImpl { // Blazethorn Scarecrow has haste as long as you control a red creature. ContinuousEffect effect = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Blazethorn Scarecrow has wither as long as you control a green creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(WitherAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BriarberryCohort.java b/Mage.Sets/src/mage/sets/shadowmoor/BriarberryCohort.java index dfbaf41ddb9..8a38aaf7a43 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BriarberryCohort.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BriarberryCohort.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition.CountType; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -77,7 +77,7 @@ public class BriarberryCohort extends CardImpl { // Briarberry Cohort gets +1/+1 as long as you control another blue creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0); - Effect effect = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); + Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CrabappleCohort.java b/Mage.Sets/src/mage/sets/shadowmoor/CrabappleCohort.java index 0161061b1c6..5b023172423 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CrabappleCohort.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CrabappleCohort.java @@ -33,7 +33,7 @@ import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -72,7 +72,7 @@ public class CrabappleCohort extends CardImpl { // Crabapple Cohort gets +1/+1 as long as you control another green creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0); - Effect effect = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); + Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/EverlastingTorment.java b/Mage.Sets/src/mage/sets/shadowmoor/EverlastingTorment.java index 3d5815d5c4d..c7a16ac6d8d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/EverlastingTorment.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/EverlastingTorment.java @@ -30,7 +30,7 @@ package mage.sets.shadowmoor; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.continuous.CantGainLifeAllEffect; import mage.cards.CardImpl; @@ -77,7 +77,7 @@ public class EverlastingTorment extends CardImpl { } } -class DamageCantBePreventedEffect extends ContinuousRuleModifiyingEffectImpl { +class DamageCantBePreventedEffect extends ContinuousRuleModifyingEffectImpl { public DamageCantBePreventedEffect(Duration duration) { super(duration, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java b/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java index 91646087769..856ba829b42 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -69,12 +69,12 @@ public class FistsOfTheDemigod extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is black, it gets +1/+1 and has wither. - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); - blackAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(WitherAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has wither")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); + blackAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(WitherAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has wither")); this.addAbility(blackAbility); // As long as enchanted creature is red, it gets +1/+1 and has first strike. - SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); - redAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has first strike")); + SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); + redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has first strike")); this.addAbility(redAbility); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java b/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java index 4ab1cd93ed4..1c8d9490c46 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -70,12 +70,12 @@ public class HelmOfTheGhastlord extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is blue, it gets +1/+1 and has "Whenever this creature deals damage to an opponent, draw a card." - SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); - blueAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(new DealsDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1),false), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has \"Whenever this creature deals damage to an opponent, draw a card.\"")); + SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); + blueAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(new DealsDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1),false), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has \"Whenever this creature deals damage to an opponent, draw a card.\"")); this.addAbility(blueAbility); // As long as enchanted creature is black, it gets +1/+1 and has "Whenever this creature deals damage to an opponent, that player discards a card." - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); - blackAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(new DealsDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has \"Whenever this creature deals damage to an opponent, that player discards a card.\"")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); + blackAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(new DealsDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has \"Whenever this creature deals damage to an opponent, that player discards a card.\"")); this.addAbility(blackAbility); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/IslebackSpawn.java b/Mage.Sets/src/mage/sets/shadowmoor/IslebackSpawn.java index 326f5d5a7aa..33beb4e627b 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/IslebackSpawn.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/IslebackSpawn.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.CardsInAnyLibraryCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; @@ -59,7 +59,7 @@ public class IslebackSpawn extends CardImpl { // Shroud this.addAbility(ShroudAbility.getInstance()); // Isleback Spawn gets +4/+8 as long as a library has twenty or fewer cards in it. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.ALL, new ConditionalContinuousEffect( new BoostSourceEffect(4,8, Duration.EndOfGame), new CardsInAnyLibraryCondition(Condition.ComparisonType.LessThan, 21), "{this} gets +4/+8 as long as a library has twenty or fewer cards in it"))); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MudbrawlerCohort.java b/Mage.Sets/src/mage/sets/shadowmoor/MudbrawlerCohort.java index 9f8d837e0dc..aedd1baa221 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MudbrawlerCohort.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MudbrawlerCohort.java @@ -33,7 +33,7 @@ import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.HasteAbility; @@ -75,7 +75,7 @@ public class MudbrawlerCohort extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Mudbrawler Cohort gets +1/+1 as long as you control another red creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0); - Effect effect = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); + Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RattleblazeScarecrow.java b/Mage.Sets/src/mage/sets/shadowmoor/RattleblazeScarecrow.java index 25e06e0e093..41bcbcbe978 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RattleblazeScarecrow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RattleblazeScarecrow.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; @@ -70,11 +70,11 @@ public class RattleblazeScarecrow extends CardImpl { // Rattleblaze Scarecrow has persist as long as you control a black creature. ContinuousEffect effect = new GainAbilitySourceEffect(new PersistAbility(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Rattleblaze Scarecrow has haste as long as you control a red creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter), rule2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter), rule2))); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java b/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java index 17473cd7681..d268311acda 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -69,12 +69,12 @@ public class RunesOfTheDeus extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is red, it gets +1/+1 and has double strike. - SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); - redAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has double strike")); + SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); + redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has double strike")); this.addAbility(redAbility); // As long as enchanted creature is green, it gets +1/+1 and has trample. - SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); - greenAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and has trample")); + SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); + greenAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and has trample")); this.addAbility(greenAbility); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java b/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java index d57c078459e..eea6ff8d2b8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -69,12 +69,12 @@ public class ShieldOfTheOversoul extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is green, it gets +1/+1 and is indestructible. - SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); - greenAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(IndestructibleAbility.getInstance() ,AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and is indestructible")); + SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); + greenAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(IndestructibleAbility.getInstance() ,AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and is indestructible")); this.addAbility(greenAbility); // As long as enchanted creature is white, it gets +1/+1 and has flying. - SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); - whiteAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "and has flying")); + SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); + whiteAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "and has flying")); this.addAbility(whiteAbility); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java b/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java index 0d37155acae..248e3a6e328 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; @@ -72,11 +72,11 @@ public class SteelOfTheGodhead extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // As long as enchanted creature is white, it gets +1/+1 and has lifelink. - SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); - whiteAbility.addEffect(new ConditionalContinousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "and has lifelink")); + SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); + whiteAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "and has lifelink")); this.addAbility(whiteAbility); // As long as enchanted creature is blue, it gets +1/+1 and is unblockable. - SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); + SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); Effect effect = new ConditionalRestrictionEffect(new UnblockableAttachedEffect(AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE)); effect.setText("and is unblockable"); blueAbility.addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Tatterkite.java b/Mage.Sets/src/mage/sets/shadowmoor/Tatterkite.java index 93c7688f473..781d2d7608f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Tatterkite.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Tatterkite.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.ruleModifying.CantRegenerateTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -75,7 +75,7 @@ public class Tatterkite extends CardImpl { } } -class CantHaveCountersSourceEffect extends ContinuousRuleModifiyingEffectImpl { +class CantHaveCountersSourceEffect extends ContinuousRuleModifyingEffectImpl { public CantHaveCountersSourceEffect(Duration duration, String objectText) { super(duration, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ThornwatchScarecrow.java b/Mage.Sets/src/mage/sets/shadowmoor/ThornwatchScarecrow.java index 862bbabe90f..3747ebd0d6e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ThornwatchScarecrow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ThornwatchScarecrow.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; @@ -71,11 +71,11 @@ public class ThornwatchScarecrow extends CardImpl { // Thornwatch Scarecrow has wither as long as you control a green creature. ContinuousEffect effect = new GainAbilitySourceEffect(WitherAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Thornwatch Scarecrow has vigilance as long as you control a white creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java b/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java index 604e9dc16ff..92b547813dd 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/VexingShusher.java @@ -34,7 +34,7 @@ import mage.abilities.Ability; import mage.abilities.common.CantBeCounteredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -81,7 +81,7 @@ public class VexingShusher extends CardImpl { } } -class VexingShusherCantCounterTargetEffect extends ContinuousRuleModifiyingEffectImpl { +class VexingShusherCantCounterTargetEffect extends ContinuousRuleModifyingEffectImpl { public VexingShusherCantCounterTargetEffect() { super(Duration.EndOfTurn, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WatchwingScarecrow.java b/Mage.Sets/src/mage/sets/shadowmoor/WatchwingScarecrow.java index 87f86b11010..0f21ae0b56e 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WatchwingScarecrow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WatchwingScarecrow.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -71,11 +71,11 @@ public class WatchwingScarecrow extends CardImpl { // Watchwing Scarecrow has vigilance as long as you control a white creature. ContinuousEffect effect = new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Watchwing Scarecrow has flying as long as you control a blue creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WingrattleScarecrow.java b/Mage.Sets/src/mage/sets/shadowmoor/WingrattleScarecrow.java index 794b963352e..894d2909956 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WingrattleScarecrow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WingrattleScarecrow.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -70,11 +70,11 @@ public class WingrattleScarecrow extends CardImpl { // Wingrattle Scarecrow has flying as long as you control a blue creature. ContinuousEffect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Wingrattle Scarecrow has persist as long as you control a black creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(new PersistAbility(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java index c2276900057..b2f4276e70d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EtherswornCanonist.java @@ -33,7 +33,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.constants.CardType; @@ -122,7 +122,7 @@ class EtherswornCanonistWatcher extends Watcher { } -class EtherswornCanonistReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class EtherswornCanonistReplacementEffect extends ContinuousRuleModifyingEffectImpl { public EtherswornCanonistReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java b/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java index cb9ade33d55..92b722191c1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MindlockOrb.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; @@ -68,7 +68,7 @@ public class MindlockOrb extends CardImpl { } } -class MindlockRuleModifyingEffect extends ContinuousRuleModifiyingEffectImpl { +class MindlockRuleModifyingEffect extends ContinuousRuleModifyingEffectImpl { MindlockRuleModifyingEffect ( ) { super(Duration.WhileOnBattlefield, Outcome.Neutral, true, false); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java b/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java index 331599c2ad3..fe74f0ce972 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WindwrightMage.java @@ -36,7 +36,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; @@ -67,7 +67,7 @@ public class WindwrightMage extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); // Windwright Mage has flying as long as an artifact card is in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), WindwrightMageCondition.getInstance(), "{this} has flying as long as an artifact card is in your graveyard"))); diff --git a/Mage.Sets/src/mage/sets/tempest/HelmOfPossession.java b/Mage.Sets/src/mage/sets/tempest/HelmOfPossession.java index ac9d5ee5d36..7619182d725 100644 --- a/Mage.Sets/src/mage/sets/tempest/HelmOfPossession.java +++ b/Mage.Sets/src/mage/sets/tempest/HelmOfPossession.java @@ -34,7 +34,7 @@ import mage.abilities.common.SkipUntapOptionalAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -60,7 +60,7 @@ public class HelmOfPossession extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}, Sacrifice a creature: Gain control of target creature for as long as you control Helm of Possession and Helm of Possession remains tapped. - ConditionalContinousEffect effect = new ConditionalContinousEffect( + ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom), new HelmOfPossessionCondition(), "Gain control of target creature for as long as you control {this} and {this} remains tapped"); diff --git a/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java b/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java index d273ff0f1ef..27f95aa8b52 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java +++ b/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java @@ -36,7 +36,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.EnchantedTargetCondition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.cards.CardImpl; import mage.constants.Duration; @@ -59,7 +59,7 @@ public class RootwaterMatriarch extends CardImpl { this.toughness = new MageInt(3); // {TAP}: Gain control of target creature for as long as that creature is enchanted - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.OneUse), EnchantedTargetCondition.getInstance(), "Gain control of target creature for as long as that creature is enchanted"); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.OneUse), EnchantedTargetCondition.getInstance(), "Gain control of target creature for as long as that creature is enchanted"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tenth/GaeasHerald.java b/Mage.Sets/src/mage/sets/tenth/GaeasHerald.java index 181220d3805..ba2cf19c677 100644 --- a/Mage.Sets/src/mage/sets/tenth/GaeasHerald.java +++ b/Mage.Sets/src/mage/sets/tenth/GaeasHerald.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -72,7 +72,7 @@ public class GaeasHerald extends CardImpl { } -class CantCounterEffect extends ContinuousRuleModifiyingEffectImpl { +class CantCounterEffect extends ContinuousRuleModifyingEffectImpl { public CantCounterEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/tenth/Incinerate.java b/Mage.Sets/src/mage/sets/tenth/Incinerate.java index 1ac18556be8..9a7ceef7929 100644 --- a/Mage.Sets/src/mage/sets/tenth/Incinerate.java +++ b/Mage.Sets/src/mage/sets/tenth/Incinerate.java @@ -29,7 +29,7 @@ package mage.sets.tenth; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -70,7 +70,7 @@ public class Incinerate extends CardImpl { } } -class IncinerateEffect extends ContinuousRuleModifiyingEffectImpl { +class IncinerateEffect extends ContinuousRuleModifyingEffectImpl { public IncinerateEffect() { super(Duration.EndOfTurn, Outcome.Detriment, true, false); diff --git a/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java b/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java index 4802714da75..e5677c1b81f 100644 --- a/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java +++ b/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java @@ -37,7 +37,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -71,7 +71,7 @@ public class PlatinumAngel extends CardImpl { return new PlatinumAngel(this); } - class PlatinumAngelEffect extends ContinuousRuleModifiyingEffectImpl { + class PlatinumAngelEffect extends ContinuousRuleModifyingEffectImpl { public PlatinumAngelEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit, false, false); diff --git a/Mage.Sets/src/mage/sets/tenth/SteelGolem.java b/Mage.Sets/src/mage/sets/tenth/SteelGolem.java index 127e3d05a6f..e164636a0f6 100644 --- a/Mage.Sets/src/mage/sets/tenth/SteelGolem.java +++ b/Mage.Sets/src/mage/sets/tenth/SteelGolem.java @@ -34,7 +34,7 @@ import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; @@ -67,7 +67,7 @@ public class SteelGolem extends CardImpl { } } -class SteelGolemEffect extends ContinuousRuleModifiyingEffectImpl { +class SteelGolemEffect extends ContinuousRuleModifyingEffectImpl { public SteelGolemEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/theros/ColossusOfAkros.java b/Mage.Sets/src/mage/sets/theros/ColossusOfAkros.java index a350be01a9c..f52116132a2 100644 --- a/Mage.Sets/src/mage/sets/theros/ColossusOfAkros.java +++ b/Mage.Sets/src/mage/sets/theros/ColossusOfAkros.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MonstrousCondition; import mage.abilities.decorator.ConditionalAsThoughEffect; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.CanAttackAsThoughtItDidntHaveDefenderEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -70,7 +70,7 @@ public class ColossusOfAkros extends CardImpl { // As long as Colossus of Akros is monstrous, it has trample and can attack as though it didn't have defender. Ability ability = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.getInstance(), "As long as {this} is monstrous, it has trample")); Effect effect = new ConditionalAsThoughEffect(new CanAttackAsThoughtItDidntHaveDefenderEffect(Duration.WhileOnBattlefield), diff --git a/Mage.Sets/src/mage/sets/theros/ErebossEmissary.java b/Mage.Sets/src/mage/sets/theros/ErebossEmissary.java index 555e7dd4c82..9b6a9a7b185 100644 --- a/Mage.Sets/src/mage/sets/theros/ErebossEmissary.java +++ b/Mage.Sets/src/mage/sets/theros/ErebossEmissary.java @@ -33,7 +33,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasSubtypeCondition; import mage.abilities.costs.common.DiscardTargetCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.BestowAbility; @@ -63,7 +63,7 @@ public class ErebossEmissary extends CardImpl { // Bestow {5}{B} this.addAbility(new BestowAbility(this, "{5}{B}")); // Discard a creature card: Erebos's Emissary gets +2/+2 until end of turn. If Erebos's Emissary is an Aura, enchanted creature gets +2/+2 until end of turn instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEnchantedEffect(2,2, Duration.EndOfTurn), new BoostSourceEffect(2,2, Duration.EndOfTurn), new SourceHasSubtypeCondition("Aura"), diff --git a/Mage.Sets/src/mage/sets/theros/FleecemaneLion.java b/Mage.Sets/src/mage/sets/theros/FleecemaneLion.java index 7cc70678caf..d486e342626 100644 --- a/Mage.Sets/src/mage/sets/theros/FleecemaneLion.java +++ b/Mage.Sets/src/mage/sets/theros/FleecemaneLion.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MonstrousCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.HexproofAbility; @@ -63,12 +63,12 @@ public class FleecemaneLion extends CardImpl { // {3}{G}{W}: Monstrosity 1. this.addAbility(new MonstrosityAbility("{3}{G}{W}", 1)); // As long as Fleecemane Lion is monstrous, it has hexproof and indestructible. - Effect effect = new ConditionalContinousEffect( + Effect effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.getInstance(), "As long as {this} is monstrous, it has hexproof"); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); - effect = new ConditionalContinousEffect( + effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.getInstance(), "and indestructible"); diff --git a/Mage.Sets/src/mage/sets/theros/HundredHandedOne.java b/Mage.Sets/src/mage/sets/theros/HundredHandedOne.java index 162825307dc..2d266f54ca5 100644 --- a/Mage.Sets/src/mage/sets/theros/HundredHandedOne.java +++ b/Mage.Sets/src/mage/sets/theros/HundredHandedOne.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MonstrousCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.MonstrosityAbility; @@ -66,11 +66,11 @@ public class HundredHandedOne extends CardImpl { this.addAbility(new MonstrosityAbility("{3}{W}{W}{W}", 3)); // As long as Hundred-Handed One is monstrous, it has reach and can block an additional ninety-nine creatures each combat. - ConditionalContinousEffect effect1 = new ConditionalContinousEffect( + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.getInstance(), "As long as Hundred-Handed One is monstrous, it has reach"); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect( + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect( new CanBlockAdditionalCreatureEffect(99), MonstrousCondition.getInstance(), "and can block an additional ninety-nine creatures each combat"); diff --git a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java index 2d64b00c329..3dda91ed1bc 100644 --- a/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java +++ b/Mage.Sets/src/mage/sets/theros/ShipbreakerKraken.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.MonstrosityAbility; import mage.cards.CardImpl; @@ -83,7 +83,7 @@ public class ShipbreakerKraken extends CardImpl { } } -class ShipbreakerKrakenReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class ShipbreakerKrakenReplacementEffect extends ContinuousRuleModifyingEffectImpl { public ShipbreakerKrakenReplacementEffect() { super(Duration.Custom, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/theros/UnderworldCerberus.java b/Mage.Sets/src/mage/sets/theros/UnderworldCerberus.java index bc4955e92b3..9e50047530d 100644 --- a/Mage.Sets/src/mage/sets/theros/UnderworldCerberus.java +++ b/Mage.Sets/src/mage/sets/theros/UnderworldCerberus.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.ExileSourceEffect; import mage.abilities.effects.common.ReturnToHandFromGraveyardAllEffect; import mage.abilities.effects.common.combat.CantBeBlockedByOneEffect; @@ -84,7 +84,7 @@ public class UnderworldCerberus extends CardImpl { } } -class UnderworldCerberusEffect extends ContinuousRuleModifiyingEffectImpl { +class UnderworldCerberusEffect extends ContinuousRuleModifyingEffectImpl { public UnderworldCerberusEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/timeshifted/MysticEnforcer.java b/Mage.Sets/src/mage/sets/timeshifted/MysticEnforcer.java index 4f567907e50..ad4c3f70a4e 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/MysticEnforcer.java +++ b/Mage.Sets/src/mage/sets/timeshifted/MysticEnforcer.java @@ -33,7 +33,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; @@ -73,7 +73,7 @@ public class MysticEnforcer extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Mystic Enforcer gets +3/+3 and has flying. Ability thresholdAbility = new SimpleStaticAbility( Zone.BATTLEFIELD, - new ConditionalContinousEffect( + new ConditionalContinuousEffect( new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - {this} gets +3/+3 as long as seven or more cards are in your graveyard" diff --git a/Mage.Sets/src/mage/sets/timespiral/AngelsGrace.java b/Mage.Sets/src/mage/sets/timespiral/AngelsGrace.java index cff3e098615..93ef30220de 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AngelsGrace.java +++ b/Mage.Sets/src/mage/sets/timespiral/AngelsGrace.java @@ -29,7 +29,7 @@ package mage.sets.timespiral; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.SplitSecondAbility; import mage.cards.CardImpl; @@ -72,7 +72,7 @@ public class AngelsGrace extends CardImpl { } } -class AngelsGraceEffect extends ContinuousRuleModifiyingEffectImpl { +class AngelsGraceEffect extends ContinuousRuleModifyingEffectImpl { public AngelsGraceEffect() { super(Duration.EndOfTurn, Outcome.Benefit, false, false); diff --git a/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java b/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java index e63d811fbca..27c415c55b3 100644 --- a/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java +++ b/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java @@ -35,7 +35,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -110,7 +110,7 @@ public class JayaBallardTaskMage extends CardImpl { } } -class CantRegenerateEffect extends ContinuousRuleModifiyingEffectImpl { +class CantRegenerateEffect extends ContinuousRuleModifyingEffectImpl { public CantRegenerateEffect() { super(Duration.EndOfTurn, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java b/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java index dff6d0dfd2e..a848379c069 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java +++ b/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.abilities.condition.common.MyMainPhaseCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; @@ -51,7 +51,7 @@ public class MightOfOldKrosa extends CardImpl { this.color.setGreen(true); // Target creature gets +2/+2 until end of turn. If you cast this spell during your main phase, that creature gets +4/+4 until end of turn instead. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new BoostTargetEffect(4,4, Duration.EndOfTurn), new BoostTargetEffect(2, 2, Duration.EndOfTurn), new LockedInCondition(MyMainPhaseCondition.getInstance()), diff --git a/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java b/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java index b092ace1259..acfbf0f6d3d 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java +++ b/Mage.Sets/src/mage/sets/timespiral/SerraAvenger.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; @@ -81,7 +81,7 @@ public class SerraAvenger extends CardImpl { } } -class CantCastSerraAvengerEffect extends ContinuousRuleModifiyingEffectImpl { +class CantCastSerraAvengerEffect extends ContinuousRuleModifyingEffectImpl { public CantCastSerraAvengerEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/timespiral/TeferiMageOfZhalfir.java b/Mage.Sets/src/mage/sets/timespiral/TeferiMageOfZhalfir.java index d5925dbc269..a44e5640893 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TeferiMageOfZhalfir.java +++ b/Mage.Sets/src/mage/sets/timespiral/TeferiMageOfZhalfir.java @@ -33,7 +33,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FlashAbility; import mage.cards.Card; import mage.cards.CardImpl; @@ -133,7 +133,7 @@ class TeferiMageOfZhalfirAddFlashEffect extends ContinuousEffectImpl { } } -class TeferiMageOfZhalfirReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class TeferiMageOfZhalfirReplacementEffect extends ContinuousRuleModifyingEffectImpl { TeferiMageOfZhalfirReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/torment/LlawanCephalidEmpress.java b/Mage.Sets/src/mage/sets/torment/LlawanCephalidEmpress.java index a853b9914d2..9bc424d3ac6 100644 --- a/Mage.Sets/src/mage/sets/torment/LlawanCephalidEmpress.java +++ b/Mage.Sets/src/mage/sets/torment/LlawanCephalidEmpress.java @@ -34,7 +34,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -95,7 +95,7 @@ public class LlawanCephalidEmpress extends CardImpl { } -class LlawanCephalidRuleModifyingEffect extends ContinuousRuleModifiyingEffectImpl { +class LlawanCephalidRuleModifyingEffect extends ContinuousRuleModifyingEffectImpl { private static final FilterCard filter = new FilterCard("blue creature spells"); diff --git a/Mage.Sets/src/mage/sets/torment/Overmaster.java b/Mage.Sets/src/mage/sets/torment/Overmaster.java index 46a3a2a61ce..e0ec810d218 100644 --- a/Mage.Sets/src/mage/sets/torment/Overmaster.java +++ b/Mage.Sets/src/mage/sets/torment/Overmaster.java @@ -30,7 +30,7 @@ package mage.sets.torment; import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -76,7 +76,7 @@ public class Overmaster extends CardImpl { } } -class OvermasterEffect extends ContinuousRuleModifiyingEffectImpl { +class OvermasterEffect extends ContinuousRuleModifyingEffectImpl { OvermasterEffect() { super(Duration.EndOfTurn, Outcome.Benefit); diff --git a/Mage.Sets/src/mage/sets/torment/PutridImp.java b/Mage.Sets/src/mage/sets/torment/PutridImp.java index 7740dc7da3a..4ccbaa526a7 100644 --- a/Mage.Sets/src/mage/sets/torment/PutridImp.java +++ b/Mage.Sets/src/mage/sets/torment/PutridImp.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.DiscardCardCost; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.combat.CantBlockSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -64,11 +64,11 @@ public class PutridImp extends CardImpl { // Discard a card: Putrid Imp gains flying until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); // Threshold - As long as seven or more cards are in your graveyard, Putrid Imp gets +1/+1 and can't block. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "Threshold - As long as seven or more cards are in your graveyard, {this} gets +1/+1")); - ability.addEffect(new ConditionalContinousEffect(new CantBlockSourceEffect(Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + ability.addEffect(new ConditionalContinuousEffect(new CantBlockSourceEffect(Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "and can't block")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/vintagemasters/CityInABottle.java b/Mage.Sets/src/mage/sets/vintagemasters/CityInABottle.java index 2b875778a26..09d6c92a3a6 100644 --- a/Mage.Sets/src/mage/sets/vintagemasters/CityInABottle.java +++ b/Mage.Sets/src/mage/sets/vintagemasters/CityInABottle.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -294,7 +294,7 @@ class CityInABottleSacrificeEffect extends OneShotEffect { } } -class CityInABottleCantPlayEffect extends ContinuousRuleModifiyingEffectImpl { +class CityInABottleCantPlayEffect extends ContinuousRuleModifyingEffectImpl { private static final FilterCard filter = new FilterCard("cards originally printed in the Arabian Nights expansion"); static { diff --git a/Mage.Sets/src/mage/sets/visions/CityOfSolitude.java b/Mage.Sets/src/mage/sets/visions/CityOfSolitude.java index a55a106a386..b2783ca49dd 100644 --- a/Mage.Sets/src/mage/sets/visions/CityOfSolitude.java +++ b/Mage.Sets/src/mage/sets/visions/CityOfSolitude.java @@ -30,7 +30,7 @@ package mage.sets.visions; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -67,7 +67,7 @@ public class CityOfSolitude extends CardImpl { } } -class CityOfSolitudeEffect extends ContinuousRuleModifiyingEffectImpl { +class CityOfSolitudeEffect extends ContinuousRuleModifyingEffectImpl { CityOfSolitudeEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java index b7716fb5110..febd0e1377a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java +++ b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -76,7 +76,7 @@ public class AbyssalPersecutor extends CardImpl { } } -class AbyssalPersecutorCannotWinEffect extends ContinuousRuleModifiyingEffectImpl { +class AbyssalPersecutorCannotWinEffect extends ContinuousRuleModifyingEffectImpl { AbyssalPersecutorCannotWinEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment, false, false); diff --git a/Mage.Sets/src/mage/sets/worldwake/KitesailApprentice.java b/Mage.Sets/src/mage/sets/worldwake/KitesailApprentice.java index 338d89cecc3..a81ad0a4a19 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KitesailApprentice.java +++ b/Mage.Sets/src/mage/sets/worldwake/KitesailApprentice.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EquippedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -61,9 +61,9 @@ public class KitesailApprentice extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), EquippedCondition.getInstance(), rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), EquippedCondition.getInstance(), rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/worldwake/LoamLion.java b/Mage.Sets/src/mage/sets/worldwake/LoamLion.java index 2a533c5bc13..84ce57accb8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LoamLion.java +++ b/Mage.Sets/src/mage/sets/worldwake/LoamLion.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.filter.common.FilterLandPermanent; @@ -65,7 +65,7 @@ public class LoamLion extends CardImpl { // Loam Lion gets +1/+2 as long as you control a Forest. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java b/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java index f231219bc9f..e207de80c83 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuestForRenewal.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.common.BecomesTappedCreatureControlledTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasCounterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.UntapAllDuringEachOtherPlayersUntapStepEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; @@ -59,7 +59,7 @@ public class QuestForRenewal extends CardImpl { this.addAbility(new BecomesTappedCreatureControlledTriggeredAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); // As long as there are four or more quest counters on Quest for Renewal, untap all creatures you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new UntapAllDuringEachOtherPlayersUntapStepEffect(filter), new SourceHasCounterCondition(CounterType.QUEST, 4), "As long as there are four or more quest counters on {this}, untap all creatures you control during each other player's untap step."))); diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java b/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java index 206e94a00b0..8c0046c8f05 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java @@ -37,7 +37,7 @@ import mage.constants.Zone; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceHasCounterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; @@ -73,7 +73,7 @@ public class QuestForTheGoblinLord extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), goblinFilter, true)); // As long as Quest for the Goblin Lord has five or more quest counters on it, creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, filter, false), new SourceHasCounterCondition(CounterType.QUEST, 5, Integer.MAX_VALUE), rule))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, filter, false), new SourceHasCounterCondition(CounterType.QUEST, 5, Integer.MAX_VALUE), rule))); } public QuestForTheGoblinLord(final QuestForTheGoblinLord card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java b/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java index fe840b5af07..e32fbb7f6b1 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java +++ b/Mage.Sets/src/mage/sets/worldwake/RuthlessCullblade.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.TenOrLessLifeCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class RuthlessCullblade extends CardImpl { // Ruthless Cullblade gets +2/+1 as long as an opponent has 10 or less life. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), + new ConditionalContinuousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), new TenOrLessLifeCondition(TenOrLessLifeCondition.CheckType.AN_OPPONENT), "{this} gets +2/+1 as long as an opponent has 10 or less life."))); } diff --git a/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java b/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java index c25a903988d..942f8bfbd2a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java +++ b/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java @@ -33,7 +33,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.LifelinkAbility; @@ -67,9 +67,9 @@ public class SejiriMerfolk extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/worldwake/SummitApes.java b/Mage.Sets/src/mage/sets/worldwake/SummitApes.java index 546108fb96f..b56f311374d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SummitApes.java +++ b/Mage.Sets/src/mage/sets/worldwake/SummitApes.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.combat.CantBeBlockedByOneEffect; import mage.cards.CardImpl; import mage.constants.Zone; @@ -65,7 +65,7 @@ public class SummitApes extends CardImpl { // As long as you control a Mountain, Summit Apes can't be blocked except by two or more creatures. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new ConditionalContinousEffect(new CantBeBlockedByOneEffect(2), new PermanentsOnTheBattlefieldCondition(filter), rule))); + new ConditionalContinuousEffect(new CantBeBlockedByOneEffect(2), new PermanentsOnTheBattlefieldCondition(filter), rule))); } public SummitApes(final SummitApes card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/TombHex.java b/Mage.Sets/src/mage/sets/worldwake/TombHex.java index be471f2fb79..b500f8db022 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TombHex.java +++ b/Mage.Sets/src/mage/sets/worldwake/TombHex.java @@ -33,7 +33,7 @@ import mage.abilities.condition.LockedInCondition; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.condition.common.LandfallCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.Duration; @@ -55,7 +55,7 @@ public class TombHex extends CardImpl { // Target creature gets -2/-2 until end of turn. // Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead. this.getSpellAbility().addWatcher(new LandfallWatcher()); - this.getSpellAbility().addEffect(new ConditionalContinousEffect(new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new BoostTargetEffect(-2, -2, Duration.EndOfTurn), + this.getSpellAbility().addEffect(new ConditionalContinuousEffect(new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new LockedInCondition(LandfallCondition.getInstance()), "Target creature gets -2/-2 until end of turn. Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java b/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java index 134e4e445ca..ffeef11609a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java +++ b/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java @@ -37,7 +37,7 @@ import mage.abilities.common.CantBlockAbility; import mage.abilities.common.LandfallAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.TenOrLessLifeCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -64,7 +64,7 @@ public class Bloodghast extends CardImpl { this.addAbility(new CantBlockAbility()); // Bloodghast has haste as long as an opponent has 10 or less life. ContinuousEffect effect = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new TenOrLessLifeCondition(TenOrLessLifeCondition.CheckType.AN_OPPONENT), "Bloodghast has haste as long as an opponent has 10 or less life"))); // Landfall — Whenever a land enters the battlefield under your control, you may return Bloodghast from your graveyard to the battlefield. diff --git a/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java b/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java index c507350c24d..e907ebb2bae 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java +++ b/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java @@ -37,7 +37,7 @@ import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -64,7 +64,7 @@ public class ElementalAppeal extends CardImpl { // Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step. this.getSpellAbility().addEffect(new ElementalAppealEffect()); // If Elemental Appeal was kicked, that creature gets +7/+0 until end of turn. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new BoostTargetEffect(7, 0, Duration.EndOfTurn), new LockedInCondition(KickedCondition.getInstance()), "If {this} was kicked, that creature gets +7/+0 until end of turn")); diff --git a/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java b/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java index 840a107c496..717237306f4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java +++ b/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java @@ -38,7 +38,7 @@ import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -64,7 +64,7 @@ public class GuulDrazSpecter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Guul Draz Specter gets +3/+3 as long as an opponent has no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new GuulDrazSpecterCondition(), ruleText))); diff --git a/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java b/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java index 3117d6266d1..1ba0cf97ec5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java +++ b/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.TenOrLessLifeCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.IntimidateAbility; @@ -63,9 +63,9 @@ public class GuulDrazVampire extends CardImpl { // As long as an opponent has 10 or less life, Guul Draz Vampire gets +2/+1 and has intimidate. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.) Condition condition = new TenOrLessLifeCondition(TenOrLessLifeCondition.CheckType.AN_OPPONENT); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), condition, rule1); + ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), condition, rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(IntimidateAbility.getInstance()), condition, rule2); + ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(IntimidateAbility.getInstance()), condition, rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java b/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java index 032a7f6d73f..da3319687eb 100644 --- a/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java +++ b/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java @@ -34,7 +34,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; @@ -120,7 +120,7 @@ class IonaShieldOfEmeriaChooseColorEffect extends OneShotEffect { } } -class IonaShieldOfEmeriaReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class IonaShieldOfEmeriaReplacementEffect extends ContinuousRuleModifyingEffectImpl { IonaShieldOfEmeriaReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java b/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java index 19bc3aec2e7..3e3530079e7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorDuelist.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; @@ -62,7 +62,7 @@ public class KorDuelist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); GainAbilitySourceEffect effect = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect, new SourceIsEquiped(), ruleText))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new SourceIsEquiped(), ruleText))); } public KorDuelist(final KorDuelist card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java b/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java index 5cb5eb1bf39..2496e604121 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java @@ -30,7 +30,7 @@ package mage.sets.zendikar; import java.util.Iterator; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.constants.*; @@ -62,7 +62,7 @@ public class MarshCasualties extends CardImpl { this.addAbility(new KickerAbility("{3}")); // Creatures target player controls get -1/-1 until end of turn. If Marsh Casualties was kicked, those creatures get -2/-2 until end of turn instead. - this.getSpellAbility().addEffect(new ConditionalContinousEffect( + this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new MarshCasualtiesEffect(-2, -2), new MarshCasualtiesEffect(-1, -1), KickedCondition.getInstance(), diff --git a/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java index 2bd229c2fd0..5c7debf3278 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java +++ b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java @@ -34,7 +34,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -68,7 +68,7 @@ public class RoilElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Landfall - Whenever a land enters the battlefield under your control, you may gain control of target creature for as long as you control Roil Elemental. - ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.Custom), new PermanentsOnTheBattlefieldCondition(filter), rule); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), new PermanentsOnTheBattlefieldCondition(filter), rule); Ability ability = new LandfallAbility(Zone.BATTLEFIELD, effect, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java index c92c1f98cd0..1f80f91b0dd 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -61,7 +61,7 @@ public class VampiresBite extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn)); ContinuousEffect effect = new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn); - this.getSpellAbility().addEffect(new ConditionalContinousEffect(effect, new LockedInCondition(KickedCondition.getInstance()), "If {this} was kicked, that creature gains lifelink until end of turn")); + this.getSpellAbility().addEffect(new ConditionalContinuousEffect(effect, new LockedInCondition(KickedCondition.getInstance()), "If {this} was kicked, that creature gains lifelink until end of turn")); } public VampiresBite(final VampiresBite card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java b/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java index aafec011549..0dee86bb13d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java +++ b/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.CantBeTargetedTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.KickerAbility; @@ -70,7 +70,7 @@ public class VinesOfVastwood extends CardImpl { this.getSpellAbility().addEffect(new CantBeTargetedTargetEffect(filter, Duration.EndOfTurn)); // If Vines of Vastwood was kicked, that creature gets +4/+4 until end of turn. - this.getSpellAbility().addEffect(new ConditionalContinousEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn), + this.getSpellAbility().addEffect(new ConditionalContinuousEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn), new LockedInCondition(KickedCondition.getInstance()), staticText)); } diff --git a/Mage/src/mage/abilities/abilityword/LieutenantAbility.java b/Mage/src/mage/abilities/abilityword/LieutenantAbility.java index 58903fe8609..c68af23d2ea 100644 --- a/Mage/src/mage/abilities/abilityword/LieutenantAbility.java +++ b/Mage/src/mage/abilities/abilityword/LieutenantAbility.java @@ -30,7 +30,7 @@ package mage.abilities.abilityword; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CommanderInPlayCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; @@ -46,14 +46,14 @@ import mage.constants.Zone; public class LieutenantAbility extends SimpleStaticAbility { public LieutenantAbility(ContinuousEffect effect) { - super(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), CommanderInPlayCondition.getInstance(), "Lieutenant - As long as you control your commander, {this} gets +2/+2")); - this.addEffect(new ConditionalContinousEffect(effect, CommanderInPlayCondition.getInstance(), effect.getText(null))); + super(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), CommanderInPlayCondition.getInstance(), "Lieutenant - As long as you control your commander, {this} gets +2/+2")); + this.addEffect(new ConditionalContinuousEffect(effect, CommanderInPlayCondition.getInstance(), effect.getText(null))); } public LieutenantAbility(Effects effects) { - super(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), CommanderInPlayCondition.getInstance(), "Lieutenant - As long as you control your commander, {this} gets +2/+2")); + super(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), CommanderInPlayCondition.getInstance(), "Lieutenant - As long as you control your commander, {this} gets +2/+2")); for (Effect effect : effects) { - this.addEffect(new ConditionalContinousEffect((ContinuousEffect) effect, CommanderInPlayCondition.getInstance(), effect.getText(null))); + this.addEffect(new ConditionalContinuousEffect((ContinuousEffect) effect, CommanderInPlayCondition.getInstance(), effect.getText(null))); } } diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java b/Mage/src/mage/abilities/decorator/ConditionalContinuousEffect.java similarity index 86% rename from Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java rename to Mage/src/mage/abilities/decorator/ConditionalContinuousEffect.java index 892bb56d651..7ea23fd4443 100644 --- a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java +++ b/Mage/src/mage/abilities/decorator/ConditionalContinuousEffect.java @@ -17,7 +17,7 @@ import mage.game.Game; * * @author nantuko */ -public class ConditionalContinousEffect extends ContinuousEffectImpl { +public class ConditionalContinuousEffect extends ContinuousEffectImpl { protected ContinuousEffect effect; protected ContinuousEffect otherwiseEffect; @@ -26,7 +26,7 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl { protected boolean initDone = false; - public ConditionalContinousEffect(ContinuousEffect effect, Condition condition, String text) { + public ConditionalContinuousEffect(ContinuousEffect effect, Condition condition, String text) { this(effect, null, condition, text); } @@ -38,7 +38,7 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl { * @param condition * @param text */ - public ConditionalContinousEffect(ContinuousEffect effect, ContinuousEffect otherwiseEffect, Condition condition, String text) { + public ConditionalContinuousEffect(ContinuousEffect effect, ContinuousEffect otherwiseEffect, Condition condition, String text) { super(effect.getDuration(), effect.getLayer(), effect.getSublayer(), effect.getOutcome()); this.effect = effect; this.otherwiseEffect = otherwiseEffect; @@ -46,7 +46,7 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl { this.staticText = text; } - public ConditionalContinousEffect(final ConditionalContinousEffect effect) { + public ConditionalContinuousEffect(final ConditionalContinuousEffect effect) { super(effect); this.effect = effect.effect.copy(); if (effect.otherwiseEffect != null) { @@ -131,7 +131,7 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl { } @Override - public ConditionalContinousEffect copy() { - return new ConditionalContinousEffect(this); + public ConditionalContinuousEffect copy() { + return new ConditionalContinuousEffect(this); } } diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java b/Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java index 51e1a1ec804..8028e727066 100644 --- a/Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java +++ b/Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java @@ -32,8 +32,8 @@ import mage.abilities.Mode; import mage.abilities.condition.Condition; import mage.abilities.condition.FixedCondition; import mage.abilities.condition.LockedInCondition; -import mage.abilities.effects.ContinuousRuleModifiyingEffect; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffect; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.game.Game; import mage.game.events.GameEvent; @@ -41,19 +41,19 @@ import mage.game.events.GameEvent; * * @author LevelX2 */ -public class ConditionalContinuousRuleModifyingEffect extends ContinuousRuleModifiyingEffectImpl { +public class ConditionalContinuousRuleModifyingEffect extends ContinuousRuleModifyingEffectImpl { - protected ContinuousRuleModifiyingEffect effect; - protected ContinuousRuleModifiyingEffect otherwiseEffect; + protected ContinuousRuleModifyingEffect effect; + protected ContinuousRuleModifyingEffect otherwiseEffect; protected Condition condition; protected Condition baseCondition; protected boolean initDone = false; - public ConditionalContinuousRuleModifyingEffect(ContinuousRuleModifiyingEffect effect, Condition condition) { + public ConditionalContinuousRuleModifyingEffect(ContinuousRuleModifyingEffect effect, Condition condition) { this(effect, condition, null); } - public ConditionalContinuousRuleModifyingEffect(ContinuousRuleModifiyingEffect effect, Condition condition, ContinuousRuleModifiyingEffect otherwiseEffect) { + public ConditionalContinuousRuleModifyingEffect(ContinuousRuleModifyingEffect effect, Condition condition, ContinuousRuleModifyingEffect otherwiseEffect) { super(effect.getDuration(), effect.getOutcome()); this.effect = effect; this.baseCondition = condition; @@ -62,9 +62,9 @@ public class ConditionalContinuousRuleModifyingEffect extends ContinuousRuleModi public ConditionalContinuousRuleModifyingEffect(final ConditionalContinuousRuleModifyingEffect effect) { super(effect); - this.effect = (ContinuousRuleModifiyingEffect) effect.effect.copy(); + this.effect = (ContinuousRuleModifyingEffect) effect.effect.copy(); if (effect.otherwiseEffect != null) { - this.otherwiseEffect = (ContinuousRuleModifiyingEffect) effect.otherwiseEffect.copy(); + this.otherwiseEffect = (ContinuousRuleModifyingEffect) effect.otherwiseEffect.copy(); } this.condition = effect.condition; this.baseCondition = effect.baseCondition; diff --git a/Mage/src/mage/abilities/effects/ContinuousEffects.java b/Mage/src/mage/abilities/effects/ContinuousEffects.java index 2f0de6e876f..298aa83ee50 100644 --- a/Mage/src/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/mage/abilities/effects/ContinuousEffects.java @@ -84,7 +84,7 @@ public class ContinuousEffects implements Serializable { //transient Continuous effects private ContinuousEffectsList layeredEffects = new ContinuousEffectsList<>(); - private ContinuousEffectsList continuousRuleModifyingEffects = new ContinuousEffectsList<>(); + private ContinuousEffectsList continuousRuleModifyingEffects = new ContinuousEffectsList<>(); private ContinuousEffectsList replacementEffects = new ContinuousEffectsList<>(); private ContinuousEffectsList preventionEffects = new ContinuousEffectsList<>(); private ContinuousEffectsList requirementEffects = new ContinuousEffectsList<>(); @@ -652,7 +652,7 @@ public class ContinuousEffects implements Serializable { * @return */ public boolean preventedByRuleModification(GameEvent event, Ability targetAbility, Game game, boolean checkPlayableMode) { - for (ContinuousRuleModifiyingEffect effect: continuousRuleModifyingEffects) { + for (ContinuousRuleModifyingEffect effect: continuousRuleModifyingEffects) { if (!effect.checksEventType(event, game)) { continue; } @@ -987,7 +987,7 @@ public class ContinuousEffects implements Serializable { spliceCardEffects.addEffect(newSpliceCardEffect, source); break; case CONTINUOUS_RULE_MODIFICATION: - ContinuousRuleModifiyingEffect newContinuousRuleModifiyingEffect = (ContinuousRuleModifiyingEffect)effect; + ContinuousRuleModifyingEffect newContinuousRuleModifiyingEffect = (ContinuousRuleModifyingEffect)effect; continuousRuleModifyingEffects.addEffect(newContinuousRuleModifiyingEffect, source); break; default: diff --git a/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffectImpl.java b/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffectImpl.java deleted file mode 100644 index 39769df3677..00000000000 --- a/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffectImpl.java +++ /dev/null @@ -1,136 +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.effects; - -import mage.MageObject; -import mage.abilities.Ability; -import mage.constants.Duration; -import mage.constants.EffectType; -import mage.constants.Outcome; -import mage.game.Game; -import mage.game.events.GameEvent; - -/** - * - * @author LevelX2 - */ -public abstract class ContinuousRuleModifiyingEffectImpl extends ContinuousEffectImpl implements ContinuousRuleModifiyingEffect { - - protected final boolean messageToUser; - protected final boolean messageToGameLog; - protected final String infoMessage; - - // 613.10 - // Some continuous effects affect game rules rather than objects. For example, effects may modify - // a player’s maximum hand size, or say that a creature must attack this turn if able. These effects - // are applied after all other continuous effects have been applied. Continuous effects that affect - // the costs of spells or abilities are applied according to the order specified in rule 601.2e. - // All other such effects are applied in timestamp order. See also the rules for timestamp order - // and dependency (rules 613.6 and 613.7). - - // Some of this rule modifying effects are implemented as normal CONTINUOUS effects using the Layer.RulesEffects. - // But if the rule change can be implemented simply by preventing an event from happening, CONTINUOUS_RULE_MODIFICATION effects can be used. - // They work technical like a replacement effect that replaces the event completely. - // But player isn't asked to choose order of effects if multiple are applied to the same event. - - public ContinuousRuleModifiyingEffectImpl(Duration duration, Outcome outcome) { - this(duration, outcome, true, false); - } - - /** - * - * @param duration - * @param outcome - * @param messageToUser - Every time the effect replaces an event, the user gets a message in a dialog window. - * Don't set it to true if the event heppens regularly or very often. The message can be - * changed by overriding the getInfoMessage method. - * @param messageToLog - Every time the effect replaces an event, a message is posted to the game log. The message - * can be changed by overriding the getInfoMessage method. - */ - public ContinuousRuleModifiyingEffectImpl(Duration duration, Outcome outcome, boolean messageToUser, boolean messageToLog) { - super(duration, outcome); - this.effectType = EffectType.CONTINUOUS_RULE_MODIFICATION; - this.infoMessage = null; - this.messageToUser = messageToUser; - this.messageToGameLog = messageToLog; - } - - public ContinuousRuleModifiyingEffectImpl(final ContinuousRuleModifiyingEffectImpl effect) { - super(effect); - this.infoMessage = effect.infoMessage; - this.messageToUser = effect.messageToUser; - this.messageToGameLog = effect.messageToGameLog; - } - - /** - * An early check for the event types this effect applies to. This check was added - * to speed up event handling. Once all existing ContinuousRuleModifiyingEffects have - * implemented this method, the method should be changed to abstract here or removed. - * @param event - * @param game - * @return - */ - @Override - public boolean checksEventType(GameEvent event, Game game) { - return true; - } - - @Override - public boolean apply(Game game, Ability source) { - return true; - } - - @Override - public String getInfoMessage(Ability source, GameEvent event, Game game) { - if (infoMessage == null) { - String message; - MageObject object = game.getObject(source.getSourceId()); - if (object != null) { - message = source.getRule(object.getLogName()); - } else { - message = source.getRule(); - } - return message; - } else { - return infoMessage; - } - } - - @Override - public boolean sendMessageToUser() { - return messageToUser; - } - - @Override - public boolean sendMessageToGameLog() { - return messageToGameLog; - } - - -} diff --git a/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffect.java b/Mage/src/mage/abilities/effects/ContinuousRuleModifyingEffect.java similarity index 95% rename from Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffect.java rename to Mage/src/mage/abilities/effects/ContinuousRuleModifyingEffect.java index d985ef1c7e9..40f57a836f5 100644 --- a/Mage/src/mage/abilities/effects/ContinuousRuleModifiyingEffect.java +++ b/Mage/src/mage/abilities/effects/ContinuousRuleModifyingEffect.java @@ -36,7 +36,7 @@ import mage.game.events.GameEvent; * * @author LevelX2 */ -public interface ContinuousRuleModifiyingEffect extends ContinuousEffect { +public interface ContinuousRuleModifyingEffect extends ContinuousEffect { /** * This check for the relevant events is called at first to prevent further actions if diff --git a/Mage/src/mage/abilities/effects/WhileConditionContiniousEffect.java b/Mage/src/mage/abilities/effects/WhileConditionContinuousEffect.java similarity index 77% rename from Mage/src/mage/abilities/effects/WhileConditionContiniousEffect.java rename to Mage/src/mage/abilities/effects/WhileConditionContinuousEffect.java index e2f1fc37307..a2d4efb8581 100644 --- a/Mage/src/mage/abilities/effects/WhileConditionContiniousEffect.java +++ b/Mage/src/mage/abilities/effects/WhileConditionContinuousEffect.java @@ -8,17 +8,17 @@ import mage.constants.Outcome; import mage.constants.SubLayer; import mage.game.Game; -public abstract class WhileConditionContiniousEffect extends ContinuousEffectImpl { +public abstract class WhileConditionContinuousEffect extends ContinuousEffectImpl { protected Condition condition; - public WhileConditionContiniousEffect(Duration duration, Layer layer, SubLayer sublayer, Condition condition, Outcome outcome) { + public WhileConditionContinuousEffect(Duration duration, Layer layer, SubLayer sublayer, Condition condition, Outcome outcome) { super(duration, outcome); this.condition = condition; this.layer = layer; this.sublayer = sublayer; } - public WhileConditionContiniousEffect(final WhileConditionContiniousEffect effect) { + public WhileConditionContinuousEffect(final WhileConditionContinuousEffect effect) { super(effect); this.condition = effect.condition; } diff --git a/Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java b/Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java index 6870b413cf9..3236efa0ec6 100644 --- a/Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java @@ -28,7 +28,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.game.Game; @@ -40,7 +40,7 @@ import mage.game.permanent.Permanent; * @author LevelX2 */ -public class CantActivateAbilitiesAttachedEffect extends ContinuousRuleModifiyingEffectImpl { +public class CantActivateAbilitiesAttachedEffect extends ContinuousRuleModifyingEffectImpl { public CantActivateAbilitiesAttachedEffect() { super(Duration.WhileOnBattlefield, Outcome.UnboostCreature); diff --git a/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java b/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java index 45a6ea29b26..2126de5fcc8 100644 --- a/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java @@ -30,7 +30,7 @@ package mage.abilities.effects.common; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.FilterObject; @@ -44,7 +44,7 @@ import mage.game.stack.Spell; * * @author BetaSteward_at_googlemail.com */ -public class CantBeCounteredControlledEffect extends ContinuousRuleModifiyingEffectImpl { +public class CantBeCounteredControlledEffect extends ContinuousRuleModifyingEffectImpl { private FilterSpell filterTarget; private FilterObject filterSource; diff --git a/Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java index 56e13eb14ab..097424d434c 100644 --- a/Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java @@ -30,7 +30,7 @@ package mage.abilities.effects.common; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.game.Game; @@ -43,7 +43,7 @@ import mage.game.stack.StackObject; * * @author BetaSteward_at_googlemail.com */ -public class CantBeCounteredSourceEffect extends ContinuousRuleModifiyingEffectImpl { +public class CantBeCounteredSourceEffect extends ContinuousRuleModifyingEffectImpl { public CantBeCounteredSourceEffect() { super(Duration.WhileOnStack, Outcome.Benefit, false, true); diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java b/Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java index 8c8f68724e1..8fd76143d28 100644 --- a/Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.FilterPermanent; @@ -44,7 +44,7 @@ import mage.game.stack.StackObject; * * @author BetaSteward_at_googlemail.com */ -public class CantBeTargetedAllEffect extends ContinuousRuleModifiyingEffectImpl { +public class CantBeTargetedAllEffect extends ContinuousRuleModifyingEffectImpl { private FilterPermanent filterTarget; private FilterStackObject filterSource; diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java b/Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java index 5971c1ac3de..bf055b18060 100644 --- a/Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.AttachmentType; import mage.constants.Duration; import mage.constants.Outcome; @@ -45,7 +45,7 @@ import mage.game.stack.StackObject; * @author LevelX2 */ -public class CantBeTargetedAttachedEffect extends ContinuousRuleModifiyingEffectImpl { +public class CantBeTargetedAttachedEffect extends ContinuousRuleModifyingEffectImpl { private final FilterStackObject filterSource; private final AttachmentType attachmentType; diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java index f8165a0f4bc..d49b331c814 100644 --- a/Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.FilterStackObject; @@ -42,7 +42,7 @@ import mage.game.stack.StackObject; * * @author BetaSteward_at_googlemail.com */ -public class CantBeTargetedSourceEffect extends ContinuousRuleModifiyingEffectImpl { +public class CantBeTargetedSourceEffect extends ContinuousRuleModifyingEffectImpl { private final FilterStackObject filterSource; diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java b/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java index f79af2655e7..644b78b6459 100644 --- a/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java @@ -29,7 +29,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.filter.FilterStackObject; @@ -43,7 +43,7 @@ import mage.game.stack.StackObject; * @author LevelX2 */ -public class CantBeTargetedTargetEffect extends ContinuousRuleModifiyingEffectImpl { +public class CantBeTargetedTargetEffect extends ContinuousRuleModifyingEffectImpl { private final FilterStackObject filterSource; diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java index ebca00685af..b83c0d843a3 100644 --- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java @@ -2,14 +2,14 @@ package mage.abilities.effects.common; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.PhaseStep; import mage.game.Game; import mage.game.events.GameEvent; -public class DontUntapInControllersNextUntapStepSourceEffect extends ContinuousRuleModifiyingEffectImpl { +public class DontUntapInControllersNextUntapStepSourceEffect extends ContinuousRuleModifyingEffectImpl { private int validForTurnNum; diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java index 356838b0a51..2b7a3097cc3 100644 --- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.PhaseStep; @@ -44,7 +44,7 @@ import mage.game.permanent.Permanent; /** * @author BetaSteward_at_googlemail.com */ -public class DontUntapInControllersNextUntapStepTargetEffect extends ContinuousRuleModifiyingEffectImpl { +public class DontUntapInControllersNextUntapStepTargetEffect extends ContinuousRuleModifyingEffectImpl { private int validForTurnNum; diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java index 2b203c2222b..66ba2700bbe 100644 --- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java @@ -30,7 +30,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.PhaseStep; @@ -51,7 +51,7 @@ import mage.players.Player; * @author LevelX2 */ -public class DontUntapInControllersUntapStepAllEffect extends ContinuousRuleModifiyingEffectImpl { +public class DontUntapInControllersUntapStepAllEffect extends ContinuousRuleModifyingEffectImpl { TargetController targetController; FilterPermanent filter; diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java index 164ec3bced4..7818cc0d242 100644 --- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java +++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java @@ -1,7 +1,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.PhaseStep; @@ -12,7 +12,7 @@ import mage.game.permanent.Permanent; /** * @author nantuko */ -public class DontUntapInControllersUntapStepEnchantedEffect extends ContinuousRuleModifiyingEffectImpl { +public class DontUntapInControllersUntapStepEnchantedEffect extends ContinuousRuleModifyingEffectImpl { public DontUntapInControllersUntapStepEnchantedEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment, false, true); diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java index 694098bf192..576628205dc 100644 --- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java @@ -31,7 +31,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.PhaseStep; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -41,7 +41,7 @@ import mage.game.permanent.Permanent; * * @author North */ -public class DontUntapInControllersUntapStepSourceEffect extends ContinuousRuleModifiyingEffectImpl { +public class DontUntapInControllersUntapStepSourceEffect extends ContinuousRuleModifyingEffectImpl { public DontUntapInControllersUntapStepSourceEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment, false, true); diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java index 327a85d02b1..ba9999bb968 100644 --- a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.PhaseStep; @@ -44,7 +44,7 @@ import mage.game.permanent.Permanent; * * @author BetaSteward_at_googlemail.com */ -public class DontUntapInControllersUntapStepTargetEffect extends ContinuousRuleModifiyingEffectImpl { +public class DontUntapInControllersUntapStepTargetEffect extends ContinuousRuleModifyingEffectImpl { public DontUntapInControllersUntapStepTargetEffect(Duration duration) { super(duration, Outcome.Detriment); diff --git a/Mage/src/mage/abilities/effects/common/EpicEffect.java b/Mage/src/mage/abilities/effects/common/EpicEffect.java index 325f3d3dedf..144fc253889 100644 --- a/Mage/src/mage/abilities/effects/common/EpicEffect.java +++ b/Mage/src/mage/abilities/effects/common/EpicEffect.java @@ -8,7 +8,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.constants.Duration; @@ -79,7 +79,7 @@ public class EpicEffect extends OneShotEffect { } } -class EpicReplacementEffect extends ContinuousRuleModifiyingEffectImpl { +class EpicReplacementEffect extends ContinuousRuleModifyingEffectImpl { public EpicReplacementEffect() { super(Duration.EndOfGame, Outcome.Neutral); diff --git a/Mage/src/mage/abilities/effects/common/FlipSourceEffect.java b/Mage/src/mage/abilities/effects/common/FlipSourceEffect.java index f57d41c17f8..9b001216cf4 100644 --- a/Mage/src/mage/abilities/effects/common/FlipSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/FlipSourceEffect.java @@ -2,7 +2,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; import mage.abilities.condition.common.FlippedCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; @@ -36,7 +36,7 @@ public class FlipSourceEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (permanent != null && controller != null) { if (permanent.flip(game)) { - ContinuousEffect effect = new ConditionalContinousEffect(new CopyTokenEffect(flipToken), FlippedCondition.getInstance(), ""); + ContinuousEffect effect = new ConditionalContinuousEffect(new CopyTokenEffect(flipToken), FlippedCondition.getInstance(), ""); game.addEffect(effect, source); game.informPlayers(new StringBuilder(controller.getName()).append(" flips ").append(permanent.getName()).toString()); return true; diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java b/Mage/src/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java index 019c0a0d3d0..c87926e12a2 100644 --- a/Mage/src/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java +++ b/Mage/src/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java @@ -34,7 +34,7 @@ import mage.constants.Outcome; import mage.constants.SubLayer; import mage.abilities.Ability; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; -import mage.abilities.effects.WhileConditionContiniousEffect; +import mage.abilities.effects.WhileConditionContinuousEffect; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -43,7 +43,7 @@ import mage.game.permanent.Permanent; * * @author BetaSteward_at_googlemail.com */ -public class BoostSourceWhileControlsEffect extends WhileConditionContiniousEffect { +public class BoostSourceWhileControlsEffect extends WhileConditionContinuousEffect { private final int power; private final int toughness; diff --git a/Mage/src/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java b/Mage/src/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java index a7884e2359a..6f13383f28f 100644 --- a/Mage/src/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java +++ b/Mage/src/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java @@ -30,7 +30,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.TargetController; @@ -44,7 +44,7 @@ import mage.watchers.common.CastSpellLastTurnWatcher; * @author LevelX2 */ -public class CantCastMoreThanOneSpellEffect extends ContinuousRuleModifiyingEffectImpl { +public class CantCastMoreThanOneSpellEffect extends ContinuousRuleModifyingEffectImpl { private final TargetController targetController; diff --git a/Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java b/Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java index ce6693c4a6c..dfb7f548aff 100644 --- a/Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java @@ -30,7 +30,7 @@ package mage.abilities.effects.common.ruleModifying; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; import mage.game.Game; @@ -42,7 +42,7 @@ import mage.game.events.GameEvent.EventType; * @author LevelX2 */ -public class CantRegenerateTargetEffect extends ContinuousRuleModifiyingEffectImpl { +public class CantRegenerateTargetEffect extends ContinuousRuleModifyingEffectImpl { public CantRegenerateTargetEffect(Duration duration, String objectText) { super(duration, Outcome.Detriment); diff --git a/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java b/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java index a1220a1cf9d..f1747f7ea5c 100644 --- a/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java +++ b/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java @@ -35,7 +35,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.SourceHasCounterCondition; -import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; @@ -76,14 +76,14 @@ public class LevelerCardBuilder { Condition condition = new SourceHasCounterCondition(CounterType.LEVEL, level1, level2); for (Ability ability : abilities) { ContinuousEffect effect = new GainAbilitySourceEffect(ability); - ConditionalContinousEffect abEffect = new ConditionalContinousEffect(effect, condition, ""); + ConditionalContinuousEffect abEffect = new ConditionalContinuousEffect(effect, condition, ""); Ability staticAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, abEffect); staticAbility.setRuleVisible(false); constructed.add(staticAbility); } ContinuousEffect effect = new SetPowerToughnessSourceEffect(power, toughness, Duration.WhileOnBattlefield); - ConditionalContinousEffect ptEffect = new ConditionalContinousEffect(effect, condition, rule); + ConditionalContinuousEffect ptEffect = new ConditionalContinuousEffect(effect, condition, rule); constructed.add(new SimpleStaticAbility(Zone.BATTLEFIELD, ptEffect)); return constructed; diff --git a/Mage/src/mage/abilities/keyword/SplitSecondAbility.java b/Mage/src/mage/abilities/keyword/SplitSecondAbility.java index 72bb0f8ac6e..864e5cb2da5 100644 --- a/Mage/src/mage/abilities/keyword/SplitSecondAbility.java +++ b/Mage/src/mage/abilities/keyword/SplitSecondAbility.java @@ -2,7 +2,7 @@ package mage.abilities.keyword; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; +import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.mana.ManaAbility; import mage.constants.Duration; import mage.constants.Outcome; @@ -40,7 +40,7 @@ public class SplitSecondAbility extends SimpleStaticAbility { // Molten Disaster has a copy of this effect in it's class, so in case this effect has to be changed check also there -class SplitSecondEffect extends ContinuousRuleModifiyingEffectImpl { +class SplitSecondEffect extends ContinuousRuleModifyingEffectImpl { SplitSecondEffect() { super(Duration.WhileOnStack, Outcome.Detriment);