diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 0ccd1ba14c..eec2a7224e 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -56,7 +56,7 @@ import mage.abilities.costs.mana.MonoHybridManaCost; import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.effects.Effect; import mage.abilities.effects.ReplacementEffect; -import mage.abilities.effects.common.BecomesCreatureSourceEOTEffect; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.EquipAbility; @@ -72,7 +72,6 @@ import mage.cards.Card; import mage.cards.Cards; import mage.cards.decks.Deck; import mage.choices.Choice; -import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureForCombat; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java b/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java index 13bd320436..925f48b32d 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java @@ -35,8 +35,8 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; -import mage.abilities.effects.common.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java b/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java index f850b78973..dc0b73aecf 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java @@ -32,9 +32,8 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; -import mage.abilities.effects.common.BoostTargetEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java b/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java index ff4e2646e2..8494413658 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java @@ -30,20 +30,16 @@ package mage.sets.alarareborn; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; -import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MyTurn; import mage.abilities.condition.common.NotMyTurn; import mage.abilities.decorator.ConditionalContinousEffect; -import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; -import mage.game.Game; /** * diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java b/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java index 54e1da1847..61378b5594 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java @@ -34,9 +34,8 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; -import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java b/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java index 57437a5864..c527672415 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MadrushCyclops.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.filter.common.FilterControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java b/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java index 89bb6a1efa..5f1dea3bea 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java +++ b/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java index 970e2290bc..b574cadff8 100644 --- a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java +++ b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java index cbea29a076..ab70b24b3b 100644 --- a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java +++ b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; diff --git a/Mage.Sets/src/mage/sets/conflux/BoneSaw.java b/Mage.Sets/src/mage/sets/conflux/BoneSaw.java index 596d561e69..4ed3b4efeb 100644 --- a/Mage.Sets/src/mage/sets/conflux/BoneSaw.java +++ b/Mage.Sets/src/mage/sets/conflux/BoneSaw.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java index e2affe96d5..c4ec0c30f8 100644 --- a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java +++ b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java @@ -33,7 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java index f8275d5b6f..efa55571f8 100644 --- a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java +++ b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java index d485bdbcd0..ef332eb58b 100644 --- a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java +++ b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java @@ -36,8 +36,8 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java index b56e03e3be..51ffb50f45 100644 --- a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java +++ b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java index a4b44264a3..27c759d655 100644 --- a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java +++ b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/Thornling.java b/Mage.Sets/src/mage/sets/conflux/Thornling.java index e16c3f312d..3144d648e3 100644 --- a/Mage.Sets/src/mage/sets/conflux/Thornling.java +++ b/Mage.Sets/src/mage/sets/conflux/Thornling.java @@ -36,8 +36,8 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.TrampleAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java index 4058d0a3ce..ad3c765520 100644 --- a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java +++ b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java @@ -37,8 +37,8 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ContagionClasp.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ContagionClasp.java new file mode 100644 index 0000000000..65949b792e --- /dev/null +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ContagionClasp.java @@ -0,0 +1,54 @@ +/* + * 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.sets.elspethvstezzeret; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class ContagionClasp extends mage.sets.scarsofmirrodin.ContagionClasp { + + public ContagionClasp (UUID ownerId) { + super(ownerId); + this.cardNumber = 63; + this.expansionSetCode = "DDF"; + } + + public ContagionClasp (final ContagionClasp card) { + super(card); + } + + @Override + public ContagionClasp copy() { + return new ContagionClasp(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/GlorySeeker.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/GlorySeeker.java new file mode 100644 index 0000000000..3b1f70c4e0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/GlorySeeker.java @@ -0,0 +1,54 @@ +/* + * 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.sets.elspethvstezzeret; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class GlorySeeker extends mage.sets.riseoftheeldrazi.GlorySeeker { + + public GlorySeeker (UUID ownerId) { + super(ownerId); + this.cardNumber = 7; + this.expansionSetCode = "DDF"; + } + + public GlorySeeker (final GlorySeeker card) { + super(card); + } + + @Override + public GlorySeeker copy() { + return new GlorySeeker(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/InfantryVeteran.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/InfantryVeteran.java new file mode 100644 index 0000000000..2a0a341362 --- /dev/null +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/InfantryVeteran.java @@ -0,0 +1,54 @@ +/* + * 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.sets.elspethvstezzeret; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class InfantryVeteran extends mage.sets.magic2011.InfantryVeteran { + + public InfantryVeteran (UUID ownerId) { + super(ownerId); + this.cardNumber = 4; + this.expansionSetCode = "DDF"; + } + + public InfantryVeteran (final InfantryVeteran card) { + super(card); + } + + @Override + public InfantryVeteran copy() { + return new InfantryVeteran(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/KorSkyfisher.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/KorSkyfisher.java new file mode 100644 index 0000000000..b6239cdcb4 --- /dev/null +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/KorSkyfisher.java @@ -0,0 +1,54 @@ +/* + * 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.sets.elspethvstezzeret; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class KorSkyfisher extends mage.sets.zendikar.KorSkyfisher { + + public KorSkyfisher (UUID ownerId) { + super(ownerId); + this.cardNumber = 8; + this.expansionSetCode = "DDF"; + } + + public KorSkyfisher (final KorSkyfisher card) { + super(card); + } + + @Override + public KorSkyfisher copy() { + return new KorSkyfisher(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SilverMyr.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SilverMyr.java new file mode 100644 index 0000000000..90731a389f --- /dev/null +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SilverMyr.java @@ -0,0 +1,54 @@ +/* + * 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.sets.elspethvstezzeret; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class SilverMyr extends mage.sets.mirrodin.SilverMyr { + + public SilverMyr (UUID ownerId) { + super(ownerId); + this.cardNumber = 43; + this.expansionSetCode = "DDF"; + } + + public SilverMyr (final SilverMyr card) { + super(card); + } + + @Override + public SilverMyr copy() { + return new SilverMyr(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelOverseer.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelOverseer.java new file mode 100644 index 0000000000..0093df3b90 --- /dev/null +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelOverseer.java @@ -0,0 +1,54 @@ +/* + * 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.sets.elspethvstezzeret; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class SteelOverseer extends mage.sets.magic2011.SteelOverseer { + + public SteelOverseer (UUID ownerId) { + super(ownerId); + this.cardNumber = 44; + this.expansionSetCode = "DDF"; + } + + public SteelOverseer (final SteelOverseer card) { + super(card); + } + + @Override + public SteelOverseer copy() { + return new SteelOverseer(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelWall.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelWall.java new file mode 100644 index 0000000000..b541320160 --- /dev/null +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SteelWall.java @@ -0,0 +1,54 @@ +/* + * 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.sets.elspethvstezzeret; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class SteelWall extends mage.sets.mirrodin.SteelWall { + + public SteelWall (UUID ownerId) { + super(ownerId); + this.cardNumber = 41; + this.expansionSetCode = "DDF"; + } + + public SteelWall (final SteelWall card) { + super(card); + } + + @Override + public SteelWall copy() { + return new SteelWall(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java index 4d45a5ef77..78b7e0de2f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java @@ -32,8 +32,8 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.GainAbilityTargetEffect; -import mage.abilities.effects.common.GainControlTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java index 2409a4610e..4528e641f6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java @@ -42,9 +42,9 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.Effects; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.effects.common.counter.AddPlusOneCountersControlledEffect; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/Disorient.java b/Mage.Sets/src/mage/sets/magic2010/Disorient.java index 3c172dbe2c..6be28ffe59 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disorient.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disorient.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java index 086e020ab4..bf13839ff6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java +++ b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java @@ -38,7 +38,7 @@ import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.ManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java index 89a135f74d..ef9e30191d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java +++ b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java index 5502cf14e2..4ef8e72d2c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java +++ b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java @@ -35,9 +35,9 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.Effects; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java index c593f8bcea..a06777a859 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java +++ b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java @@ -35,8 +35,8 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.BoostControlledEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java b/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java index 612578f8d4..5fad8fef2a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java +++ b/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java @@ -34,7 +34,7 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java index 825ae8a713..5a9a9ce3cb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java +++ b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java index dd7f6ff498..cabdc1b6f4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java @@ -38,8 +38,8 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.BoostControlledEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java index a120990eaa..9d939b442b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java +++ b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/MindControl.java b/Mage.Sets/src/mage/sets/magic2010/MindControl.java index dfe11c31a3..d0ad39a67c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindControl.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindControl.java @@ -30,21 +30,15 @@ package mage.sets.magic2010; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Layer; import mage.Constants.Outcome; import mage.Constants.Rarity; -import mage.Constants.SubLayer; import mage.Constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.ControlEnchantedEffect; +import mage.abilities.effects.common.continious.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; -import mage.game.Game; -import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/Overrun.java b/Mage.Sets/src/mage/sets/magic2010/Overrun.java index 8caf54c1dd..eaacce4e72 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Overrun.java +++ b/Mage.Sets/src/mage/sets/magic2010/Overrun.java @@ -32,8 +32,8 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostControlledEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java index 35e87ef949..a852ebb4dc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java +++ b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/Shatter.java b/Mage.Sets/src/mage/sets/magic2010/Shatter.java new file mode 100644 index 0000000000..66b1531e00 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2010/Shatter.java @@ -0,0 +1,54 @@ +/* + * 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.sets.magic2010; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class Shatter extends mage.sets.mirrodin.Shatter { + + public Shatter (UUID ownerId) { + super(ownerId); + this.cardNumber = 155; + this.expansionSetCode = "M10"; + } + + public Shatter (final Shatter card) { + super(card); + } + + @Override + public Shatter copy() { + return new Shatter(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java index 3097eb4177..61942d9fe5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java +++ b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java @@ -38,7 +38,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java index 13c0115a92..a102be3022 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java index fd80427cc1..bf531dc26d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java @@ -42,16 +42,13 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; -import mage.filter.Filter.ComparisonScope; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java index 8e71efd132..bd880ee755 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java @@ -31,19 +31,16 @@ package mage.sets.magic2011; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; -import mage.Constants.PhaseStep; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.Effect; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; /** * diff --git a/Mage.Sets/src/mage/sets/magic2011/Diminish.java b/Mage.Sets/src/mage/sets/magic2011/Diminish.java index 6db434d8d3..e78e2e7614 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Diminish.java +++ b/Mage.Sets/src/mage/sets/magic2011/Diminish.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.SetPowerToughnessTargetEffect; +import mage.abilities.effects.common.continious.SetPowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java index 56a121e9b2..ccc35de5aa 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java index f9a108f5c3..020cd5cea0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetAttackingCreature; diff --git a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java index 5517736bd1..e8e3c875e2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.game.Game; diff --git a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java index 1d441ffb37..6e491b06a8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java +++ b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java index 138723d0a7..57681776a6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java +++ b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java @@ -35,8 +35,8 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.BoostControlledEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java index 711de045c9..6f605038ce 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.LeylineAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java index 3f360ffb33..afc260e939 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java +++ b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java @@ -32,8 +32,8 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostTargetEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java index 53f5aa6336..e04394dd02 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java index 7eba6da5c1..759fc850b9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java b/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java index e574a7ceb2..748408731c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java +++ b/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java @@ -42,7 +42,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.BoostEnchantedEffect; +import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java index f65fd2df98..f1cfc9bfd5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java +++ b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java b/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java index 31c7e43a9f..4b7c67a6f2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java +++ b/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java @@ -35,8 +35,8 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; -import mage.abilities.effects.common.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java index 554eceb107..892c8ab05e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java +++ b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java @@ -32,8 +32,8 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostTargetEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java b/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java index 7290b737ef..94b1e70447 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java +++ b/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java @@ -35,8 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; -import mage.abilities.effects.common.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/WaterServant.java b/Mage.Sets/src/mage/sets/magic2011/WaterServant.java index 3c2415df3f..1352933932 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WaterServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/WaterServant.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java new file mode 100644 index 0000000000..32715e4a63 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java @@ -0,0 +1,71 @@ +/* + * 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.sets.mirrodin; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Duration; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.effects.common.DestroyTargetEffect; +import mage.cards.CardImpl; +import mage.filter.Filter; +import mage.filter.FilterPermanent; +import mage.target.TargetPermanent; + +/** + * + * @author Loki + */ +public class Shatter extends CardImpl { + private static FilterPermanent filter = new FilterPermanent("artifact"); + + static { + filter.getCardType().add(CardType.ARTIFACT); + filter.setScopeCardType(Filter.ComparisonScope.Any); + } + + public Shatter (UUID ownerId) { + super(ownerId, 105, "Shatter", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); + this.expansionSetCode = "MRD"; + this.color.setRed(true); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); + } + + public Shatter (final Shatter card) { + super(card); + } + + @Override + public Shatter copy() { + return new Shatter(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java b/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java new file mode 100644 index 0000000000..8d3646dfa7 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java @@ -0,0 +1,62 @@ +/* + * 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.sets.mirrodin; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.abilities.keyword.DefenderAbility; +import mage.cards.CardImpl; + +/** + * + * @author Loki + */ +public class SteelWall extends CardImpl { + + public SteelWall (UUID ownerId) { + super(ownerId, 248, "Steel Wall", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}"); + this.expansionSetCode = "MRD"; + this.subtype.add("Wall"); + this.power = new MageInt(0); + this.toughness = new MageInt(4); + this.addAbility(DefenderAbility.getInstance()); + } + + public SteelWall (final SteelWall card) { + super(card); + } + + @Override + public SteelWall copy() { + return new SteelWall(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/ravnika/RoofstalkerWight.java b/Mage.Sets/src/mage/sets/ravnika/RoofstalkerWight.java index 8001fde79d..2010c1e0e1 100644 --- a/Mage.Sets/src/mage/sets/ravnika/RoofstalkerWight.java +++ b/Mage.Sets/src/mage/sets/ravnika/RoofstalkerWight.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java index 7e5e1648ca..a601a3806e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java @@ -32,11 +32,10 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java index fdfaa93cfb..94d6fb50d2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java new file mode 100644 index 0000000000..eeed7aade1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java @@ -0,0 +1,73 @@ +/* + * 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.sets.riseoftheeldrazi; + +import java.util.UUID; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Duration; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.keyword.EnchantAbility; +import mage.cards.CardImpl; +import mage.target.TargetPermanent; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author Loki + */ +public class EldraziConscription extends CardImpl { + + public EldraziConscription (UUID ownerId) { + super(ownerId, 3, "Eldrazi Conscription", Rarity.RARE, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{8}"); + this.expansionSetCode = "ROE"; + this.subtype.add("Eldrazi"); + this.subtype.add("Aura"); + + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); + this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature)); + Ability ability = new EnchantAbility(auraTarget.getTargetName()); + this.addAbility(ability); + } + + public EldraziConscription (final EldraziConscription card) { + super(card); + } + + @Override + public EldraziConscription copy() { + return new EldraziConscription(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java index 8804ff9b15..730ea8b93a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java @@ -37,18 +37,14 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.RequirementEffect; -import mage.abilities.effects.common.BecomesCreatureSourceEOTEffect; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.PreventAllDamageSourceEffect; import mage.cards.CardImpl; -import mage.filter.common.FilterCreatureForCombat; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; -import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; -import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java new file mode 100644 index 0000000000..1b27bf028f --- /dev/null +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GlorySeeker.java @@ -0,0 +1,62 @@ +/* + * 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.sets.riseoftheeldrazi; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.cards.CardImpl; + +/** + * + * @author Loki + */ +public class GlorySeeker extends CardImpl { + + public GlorySeeker (UUID ownerId) { + super(ownerId, 22, "Glory Seeker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); + this.expansionSetCode = "ROE"; + this.subtype.add("Human"); + this.subtype.add("Soldier"); + this.color.setWhite(true); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + } + + public GlorySeeker (final GlorySeeker card) { + super(card); + } + + @Override + public GlorySeeker copy() { + return new GlorySeeker(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java index 4fcf97bf4f..32a82a4434 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonType; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java index 22881a5009..19c72edcc8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java @@ -40,7 +40,7 @@ import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.effects.common.ManaEffect; import mage.abilities.keyword.LevelAbility; import mage.abilities.keyword.LevelUpAbility; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java index 880fb5207d..566d22b7b4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java @@ -39,7 +39,7 @@ import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LevelAbility; import mage.abilities.keyword.LevelUpAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AccordersShield.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AccordersShield.java index 70c9ff8faa..9e8c24fad0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AccordersShield.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AccordersShield.java @@ -36,8 +36,8 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; -import mage.abilities.effects.common.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java index 83580aaa73..d6b8b080e7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java @@ -32,13 +32,12 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java index 35251376e2..3f1081a078 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java @@ -31,7 +31,7 @@ package mage.sets.scarsofmirrodin; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java index bfd1174843..d5a6cde126 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokEdgewright.java @@ -37,7 +37,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Metalcraft; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java index cabda607e8..65cfae61b4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AuriokSunchaser.java @@ -37,8 +37,8 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Metalcraft; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.common.BoostSourceEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BarbedBattlegear.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BarbedBattlegear.java index 3baf2f5ef7..d5f92f9214 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BarbedBattlegear.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BarbedBattlegear.java @@ -36,7 +36,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java index 07a651bedd..d0c41297df 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BellowingTanglewurm.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.filter.Filter; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BladedPinions.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BladedPinions.java index df6637a8f7..0b1fa97b3a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BladedPinions.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BladedPinions.java @@ -36,7 +36,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsofQuicksilver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsofQuicksilver.java index c28b45c177..1727141ad3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsofQuicksilver.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsofQuicksilver.java @@ -32,15 +32,9 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.abilities.Ability; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.BoostEnchantedEffect; import mage.abilities.effects.common.SkipEnchantedUntapEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlashAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java index 3c309bc6fa..e98c6c66a4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarapaceForger.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Metalcraft; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java index 7656d7e3d0..8b46b29f58 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java @@ -34,12 +34,11 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Metalcraft; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java new file mode 100644 index 0000000000..01eb97e11e --- /dev/null +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java @@ -0,0 +1,73 @@ +/* + * 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.sets.scarsofmirrodin; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Duration; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.counter.AddCountersTargetEffect; +import mage.abilities.effects.common.counter.ProliferateEffect; +import mage.cards.CardImpl; +import mage.counters.CounterType; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author Loki + */ +public class ContagionClasp extends CardImpl { + + public ContagionClasp (UUID ownerId) { + super(ownerId, 144, "Contagion Clasp", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + this.expansionSetCode = "SOM"; + Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), false); + ability.addTarget(new TargetCreaturePermanent()); + this.addAbility(ability); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new GenericManaCost(4)); + ability.addCost(new TapSourceCost()); + this.addAbility(ability); + } + + public ContagionClasp (final ContagionClasp card) { + super(card); + } + + @Override + public ContagionClasp copy() { + return new ContagionClasp(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelAxe.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelAxe.java index 7cc97b1816..d387dc470c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelAxe.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarksteelAxe.java @@ -32,12 +32,11 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java index 3afa2e0d53..45d63df699 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java @@ -36,8 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.effects.common.GainAbilitySourceEffect; -import mage.abilities.effects.common.RegenerateSourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java index a63d6502c5..b6523e5861 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzuriRenegadeLeader.java @@ -36,8 +36,8 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostControlledEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java index 099760f68a..6286f21756 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisBrigade.java @@ -39,8 +39,8 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Metalcraft; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.common.BoostSourceEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java index 5e010c84fc..14a132bb4a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Ferrovore.java @@ -38,10 +38,9 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; import mage.filter.Filter; -import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java index 3d140a1c16..eda39b6cf7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java @@ -38,11 +38,10 @@ import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DrawCardControllerEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java index 823aa86852..3c539e24f4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GhalmasWarden.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Metalcraft; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java index ff51f94203..fc56ba57fb 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java @@ -44,7 +44,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspofDarkness.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspofDarkness.java index c0447e12d0..3e1088409e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspofDarkness.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspofDarkness.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java index 21417f875e..53ba20d4fe 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/IndomitableArchangel.java @@ -39,14 +39,11 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Metalcraft; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.Effect; -import mage.abilities.effects.common.BoostControlledEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.filter.FilterPermanent; -import mage.filter.common.FilterCreaturePermanent; /** * @author nantuko diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java index ce5d182c63..668323935a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java @@ -40,7 +40,7 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.TapVariableTargetCost; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.BoostPowerXSourceEffect; +import mage.abilities.effects.common.continious.BoostPowerXSourceEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledCreaturePermanent; @@ -48,7 +48,6 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.MyrToken; -import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrGalvanizer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrGalvanizer.java index 0a31e27a59..4de88f7be9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrGalvanizer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrGalvanizer.java @@ -42,7 +42,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java index ab8b7fec89..73475f1806 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java @@ -32,7 +32,6 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; @@ -41,16 +40,11 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.BoostTargetEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; -import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.MyrToken; -import mage.game.permanent.token.Token; import mage.game.stack.Spell; -import mage.target.common.TargetCreaturePermanent; /** * diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java index 84af1d4e8a..c001d660a8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaDaredevil.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaDaredevil.java index 3ece8f0d93..325fa32dc8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaDaredevil.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaDaredevil.java @@ -35,7 +35,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.filter.Filter; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java index ab810eb5b3..6d0ac2ce6d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java @@ -30,22 +30,18 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.effects.common.BoostTargetEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java index 33f5daabe6..4ac8511406 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RustedRelic.java @@ -32,16 +32,13 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Metalcraft; -import mage.abilities.condition.common.MyTurn; import mage.abilities.decorator.ConditionalContinousEffect; -import mage.abilities.effects.common.BecomesCreatureSourceEOTEffect; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect; import mage.cards.CardImpl; import mage.game.permanent.token.Token; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SaberclawGolem.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SaberclawGolem.java index 09fcc2458c..515994205e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SaberclawGolem.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SaberclawGolem.java @@ -35,7 +35,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizetheInitiative.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizetheInitiative.java index 34ee8b1ffd..9a8a638a81 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizetheInitiative.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizetheInitiative.java @@ -31,8 +31,8 @@ package mage.sets.scarsofmirrodin; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostTargetEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Shatter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Shatter.java new file mode 100644 index 0000000000..1dc1544c76 --- /dev/null +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Shatter.java @@ -0,0 +1,53 @@ +/* + * 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.sets.scarsofmirrodin; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class Shatter extends mage.sets.mirrodin.Shatter { + + public Shatter (UUID ownerId) { + super(ownerId); + this.cardNumber = 103; + this.expansionSetCode = "SOM"; + } + + public Shatter (final Shatter card) { + super(card); + } + + @Override + public Shatter copy() { + return new Shatter(this); + } +} diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxtheBlightDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxtheBlightDragon.java index 89c004f98c..8168a59510 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxtheBlightDragon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxtheBlightDragon.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java index f329db893b..1b36cea34e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SnapsailGlider.java @@ -37,7 +37,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Metalcraft; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/StriderHarness.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/StriderHarness.java index 3156bad156..9d43d7bfdd 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/StriderHarness.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/StriderHarness.java @@ -36,8 +36,8 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; -import mage.abilities.effects.common.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java index 0fe2b93a63..c9e413fa26 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java @@ -32,16 +32,13 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.Equipped; -import mage.abilities.condition.common.Metalcraft; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordofBodyandMind.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordofBodyandMind.java index 884377b0a0..e5059887ca 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordofBodyandMind.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordofBodyandMind.java @@ -32,7 +32,6 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; @@ -40,13 +39,12 @@ import mage.ObjectColor; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.ProtectionAbility; -import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java index 7129b69ebb..5238d34fd1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java @@ -32,9 +32,8 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; -import mage.abilities.effects.common.BoostTargetEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java index fb5bbf5e2c..1a7b4d6d71 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TemperedSteel.java @@ -35,7 +35,7 @@ import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofRage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofRage.java index 34dc302ece..dce29c4cd3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofRage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofRage.java @@ -43,8 +43,8 @@ import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.effects.common.BoostTargetEffect; import mage.cards.CardImpl; import mage.counters.CounterType; import mage.target.Target; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java index 476a6a25d5..7965e1d6c3 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrueConviction.java @@ -34,10 +34,8 @@ import mage.Constants; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.BoostControlledEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java index a377b09208..64e1b40c5a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java @@ -32,8 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VectorAsp.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VectorAsp.java index 1b6e90fbfe..67c44fd9fb 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VectorAsp.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VectorAsp.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java index 498033d92a..0b122e5b1a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java @@ -37,13 +37,12 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.ControlEnchantedEffect; +import mage.abilities.effects.common.continious.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; -import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java index 009f3d0820..283ca310a4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java @@ -32,11 +32,10 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WallofTanglecord.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WallofTanglecord.java index f4985f5b80..dc8bfff7c8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WallofTanglecord.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WallofTanglecord.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java index 9d98635719..6b581cc917 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java index 22ae172e4d..f246a6139e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java @@ -38,7 +38,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java b/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java index 1fe4af6ee1..db545ee391 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java b/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java index ddeb7f449b..d77cb053d0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CavernThoctar.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java b/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java index 3d314cc0fa..765db6a0c1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CloudheathDrake.java @@ -37,7 +37,7 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java index 8d2163ec69..92f9f977c8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java @@ -40,9 +40,9 @@ import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.Effects; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java b/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java index e2c5e25966..fceb59176f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HellkiteOverlord.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java index 815f6c3e31..9556e90f26 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java index 02f52a6243..067bd59b2b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java @@ -35,11 +35,10 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.Effects; -import mage.abilities.effects.common.BoostControlledEffect; +import mage.abilities.effects.common.continious.*; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; -import mage.abilities.effects.common.GainControlTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SightedCasteSorcerer.java b/Mage.Sets/src/mage/sets/shardsofalara/SightedCasteSorcerer.java index 4562477120..56b8faee91 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SightedCasteSorcerer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SightedCasteSorcerer.java @@ -37,7 +37,7 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.ExaltedAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SigilofDistinction.java b/Mage.Sets/src/mage/sets/shardsofalara/SigilofDistinction.java index 3fe74d90e0..2d524a64d0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SigilofDistinction.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SigilofDistinction.java @@ -40,7 +40,7 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.BoostEquippedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.counters.CounterType; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java b/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java index 47a27a62d2..92aaeef3df 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/UndeadLeotau.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.UnearthAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java b/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java index cffdf80c19..0d79cf0c4d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VectisSilencers.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java index 3e6ae46925..087a8b219f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java @@ -34,7 +34,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.BoostSourceWhileControlsEffect; +import mage.abilities.effects.common.continious.BoostSourceWhileControlsEffect; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonScope; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java index 055dc8223e..1ab9977616 100644 --- a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java +++ b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java index 1d07378b48..e654a07fd8 100644 --- a/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java +++ b/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java @@ -35,8 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; -import mage.abilities.effects.common.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.ShroudAbility; import mage.abilities.keyword.UnblockableAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java b/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java index 8212fa5b98..4116f7e275 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java +++ b/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.LifelinkAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/BullRush.java b/Mage.Sets/src/mage/sets/worldwake/BullRush.java index 6c32c35e0c..19bf0c2980 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BullRush.java +++ b/Mage.Sets/src/mage/sets/worldwake/BullRush.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java b/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java index 756d3dfd09..e2aa92ee86 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java +++ b/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java @@ -36,7 +36,7 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BecomesCreatureSourceEOTEffect; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.abilities.mana.BlueManaAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/CreepingTarPit.java b/Mage.Sets/src/mage/sets/worldwake/CreepingTarPit.java index 23b622fd06..c0fe3ab85b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CreepingTarPit.java +++ b/Mage.Sets/src/mage/sets/worldwake/CreepingTarPit.java @@ -36,6 +36,7 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect; import mage.abilities.keyword.UnblockableAbility; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; @@ -54,7 +55,7 @@ public class CreepingTarPit extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlueManaAbility()); this.addAbility(new BlackManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new mage.abilities.effects.common.BecomesCreatureSourceEOTEffect(new CreepingTarPitToken(), "land"), new ManaCostsImpl("{1}{U}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEOTEffect(new CreepingTarPitToken(), "land"), new ManaCostsImpl("{1}{U}{B}"))); } public CreepingTarPit (final CreepingTarPit card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java b/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java index 2f9c265c2d..e6f7decdca 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java +++ b/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java @@ -35,7 +35,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BecomesCreatureSourceEOTEffect; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.game.permanent.token.Token; diff --git a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java index cfe797828c..8dfb696072 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java +++ b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java @@ -38,8 +38,8 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; import mage.abilities.effects.common.ManaEffect; import mage.abilities.keyword.MultikickerAbility; import mage.abilities.mana.ManaAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/FledglingGriffin.java b/Mage.Sets/src/mage/sets/worldwake/FledglingGriffin.java index 7193232fd3..71b8c78a4e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/FledglingGriffin.java +++ b/Mage.Sets/src/mage/sets/worldwake/FledglingGriffin.java @@ -34,7 +34,7 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/HedronRover.java b/Mage.Sets/src/mage/sets/worldwake/HedronRover.java index 964ed41b10..1bbd0b8b6d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HedronRover.java +++ b/Mage.Sets/src/mage/sets/worldwake/HedronRover.java @@ -34,7 +34,7 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java b/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java index 32f30757f0..77c7265636 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java +++ b/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java @@ -37,8 +37,8 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BecomesCreatureSourceEOTEffect; -import mage.abilities.effects.common.BoostPowerXSourceEffect; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect; +import mage.abilities.effects.common.continious.BoostPowerXSourceEffect; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java b/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java index 3c79e2897b..e86969da97 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java +++ b/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java @@ -37,8 +37,8 @@ import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.effects.common.BecomesCreatureSourceEOTEffect; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java index 79b6466341..378fbf8109 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java +++ b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java @@ -34,7 +34,7 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.GainProtectionFromColorTargetEffect; +import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; diff --git a/Mage.Sets/src/mage/sets/worldwake/SnappingCreeper.java b/Mage.Sets/src/mage/sets/worldwake/SnappingCreeper.java index 9e1defdd87..8d1d3e3028 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SnappingCreeper.java +++ b/Mage.Sets/src/mage/sets/worldwake/SnappingCreeper.java @@ -32,10 +32,9 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; import mage.abilities.common.LandfallAbility; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java b/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java index d37141d88d..0a376fd5ae 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java +++ b/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java @@ -36,7 +36,7 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.BecomesCreatureSourceEOTEffect; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect; import mage.abilities.keyword.ReachAbility; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; diff --git a/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java b/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java index d6dc27cc06..75ed453a3e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java +++ b/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java @@ -32,8 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java index 3cb1b33e97..16d3750d3a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java +++ b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java @@ -33,11 +33,9 @@ import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Outcome; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.abilities.common.LandfallAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.game.Game; diff --git a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java index ce40710073..60fa601025 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java +++ b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java @@ -37,7 +37,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.KickerAbility; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java index bf339f71ad..4d0163c55f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java @@ -36,8 +36,8 @@ import mage.Constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.effects.common.BoostControlledEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java b/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java index 30a7eb4eb1..8fff5bd219 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java +++ b/Mage.Sets/src/mage/sets/zendikar/Bloodghast.java @@ -32,7 +32,7 @@ import mage.Constants.Duration; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.TenOrLessLife; import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import java.util.UUID; import mage.Constants.CardType; diff --git a/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java b/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java index 8e58acc383..f664c8c401 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java +++ b/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java @@ -33,14 +33,13 @@ import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; import mage.abilities.Ability; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; -import mage.game.permanent.Permanent; /** * diff --git a/Mage.Sets/src/mage/sets/zendikar/CallerofGales.java b/Mage.Sets/src/mage/sets/zendikar/CallerofGales.java index 06fd8ab621..acecdfb83d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CallerofGales.java +++ b/Mage.Sets/src/mage/sets/zendikar/CallerofGales.java @@ -38,7 +38,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java index 39a6c1f853..71af3ff5fe 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java +++ b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java @@ -38,8 +38,8 @@ import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.BoostControlledEffect; -import mage.abilities.effects.common.GainAbilityControlledEffect; +import mage.abilities.effects.common.continious.BoostControlledEffect; +import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/GatekeeperofMalakir.java b/Mage.Sets/src/mage/sets/zendikar/GatekeeperofMalakir.java index 0e11206786..52b29cf77d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GatekeeperofMalakir.java +++ b/Mage.Sets/src/mage/sets/zendikar/GatekeeperofMalakir.java @@ -34,7 +34,7 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java index 08294b64f9..96580afa30 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java @@ -39,7 +39,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/MarkofMutiny.java b/Mage.Sets/src/mage/sets/zendikar/MarkofMutiny.java index eb51481cfe..adc3a33392 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarkofMutiny.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarkofMutiny.java @@ -32,9 +32,9 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; +import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; -import mage.abilities.effects.common.GainAbilityTargetEffect; -import mage.abilities.effects.common.GainControlTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java b/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java index a9b7c91e89..825b5c024e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java +++ b/Mage.Sets/src/mage/sets/zendikar/PlatedGeopede.java @@ -34,7 +34,7 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java index 77ab7e74ad..1c57efa551 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java +++ b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java @@ -34,7 +34,7 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java index f36fc1f069..0ee41b732d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java +++ b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/zendikar/TrustyMachete.java b/Mage.Sets/src/mage/sets/zendikar/TrustyMachete.java index 935944c625..e632b61c54 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TrustyMachete.java +++ b/Mage.Sets/src/mage/sets/zendikar/TrustyMachete.java @@ -36,7 +36,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.BoostEquippedEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java b/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java index 846de4df5e..b5f5ec8fab 100644 --- a/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java +++ b/Mage.Sets/src/mage/sets/zendikar/WindriderEel.java @@ -34,7 +34,7 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; -import mage.abilities.effects.common.BoostSourceEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage/src/mage/abilities/effects/common/AddDelayedTrigeredAbilityEffect.java b/Mage/src/mage/abilities/effects/common/AddDelayedTrigeredAbilityEffect.java deleted file mode 100644 index b879a1c58d..0000000000 --- a/Mage/src/mage/abilities/effects/common/AddDelayedTrigeredAbilityEffect.java +++ /dev/null @@ -1,35 +0,0 @@ -package mage.abilities.effects.common; - -import mage.Constants; -import mage.abilities.Ability; -import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.effects.OneShotEffect; -import mage.game.Game; -import mage.game.permanent.Permanent; - -public class AddDelayedTrigeredAbilityEffect extends OneShotEffect { - private DelayedTriggeredAbility ability; - - public AddDelayedTrigeredAbilityEffect(DelayedTriggeredAbility ability) { - super(Constants.Outcome.AddAbility); - this.ability = ability; - } - - public AddDelayedTrigeredAbilityEffect(final AddDelayedTrigeredAbilityEffect effect) { - super(effect); - this.ability = effect.ability.copy(); - } - - @Override - public boolean apply(Game game, Ability source) { - ability.setSourceId(source.getSourceId()); - ability.setControllerId(source.getControllerId()); - game.addDelayedTriggeredAbility(ability); - return true; - } - - @Override - public AddDelayedTrigeredAbilityEffect copy() { - return new AddDelayedTrigeredAbilityEffect(this); - } -} diff --git a/Mage/src/mage/abilities/effects/common/BecomesCreatureSourceEOTEffect.java b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureSourceEOTEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/BecomesCreatureSourceEOTEffect.java rename to Mage/src/mage/abilities/effects/common/continious/BecomesCreatureSourceEOTEffect.java index 6c1fd851b8..88213a6a4f 100644 --- a/Mage/src/mage/abilities/effects/common/BecomesCreatureSourceEOTEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BecomesCreatureSourceEOTEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/BoostControlledEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/BoostControlledEffect.java rename to Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java index 113694875a..ca98334770 100644 --- a/Mage/src/mage/abilities/effects/common/BoostControlledEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/BoostEnchantedEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostEnchantedEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/BoostEnchantedEffect.java rename to Mage/src/mage/abilities/effects/common/continious/BoostEnchantedEffect.java index 7cd2d66490..1687c81084 100644 --- a/Mage/src/mage/abilities/effects/common/BoostEnchantedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostEnchantedEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/BoostEquippedEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostEquippedEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/BoostEquippedEffect.java rename to Mage/src/mage/abilities/effects/common/continious/BoostEquippedEffect.java index b63e2859d3..e3709309dd 100644 --- a/Mage/src/mage/abilities/effects/common/BoostEquippedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostEquippedEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/BoostPowerXSourceEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostPowerXSourceEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/BoostPowerXSourceEffect.java rename to Mage/src/mage/abilities/effects/common/continious/BoostPowerXSourceEffect.java index fc04fe1e64..a17503f1f0 100644 --- a/Mage/src/mage/abilities/effects/common/BoostPowerXSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostPowerXSourceEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/BoostSourceEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostSourceEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/BoostSourceEffect.java rename to Mage/src/mage/abilities/effects/common/continious/BoostSourceEffect.java index aa4107aab8..7b20e576c6 100644 --- a/Mage/src/mage/abilities/effects/common/BoostSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostSourceEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/BoostSourceWhileControlsEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostSourceWhileControlsEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/BoostSourceWhileControlsEffect.java rename to Mage/src/mage/abilities/effects/common/continious/BoostSourceWhileControlsEffect.java index 1abdc1905c..8d9bc6a5b5 100644 --- a/Mage/src/mage/abilities/effects/common/BoostSourceWhileControlsEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostSourceWhileControlsEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.abilities.condition.common.ControlsPermanent; import mage.abilities.effects.WhileConditionContiniousEffect; diff --git a/Mage/src/mage/abilities/effects/common/BoostTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostTargetEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/BoostTargetEffect.java rename to Mage/src/mage/abilities/effects/common/continious/BoostTargetEffect.java index b6ae86815c..e10bfdaa0e 100644 --- a/Mage/src/mage/abilities/effects/common/BoostTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostTargetEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/ControlEnchantedEffect.java b/Mage/src/mage/abilities/effects/common/continious/ControlEnchantedEffect.java similarity index 93% rename from Mage/src/mage/abilities/effects/common/ControlEnchantedEffect.java rename to Mage/src/mage/abilities/effects/common/continious/ControlEnchantedEffect.java index 589d00432c..fcd3c34493 100644 --- a/Mage/src/mage/abilities/effects/common/ControlEnchantedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/ControlEnchantedEffect.java @@ -1,4 +1,4 @@ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants; import mage.abilities.Ability; diff --git a/Mage/src/mage/abilities/effects/common/GainAbilityAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/GainAbilityAttachedEffect.java rename to Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java index 262c328ba7..4fa81723d9 100644 --- a/Mage/src/mage/abilities/effects/common/GainAbilityAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/GainAbilityControlledEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilityControlledEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/GainAbilityControlledEffect.java rename to Mage/src/mage/abilities/effects/common/continious/GainAbilityControlledEffect.java index 7414301c6f..b8d0eaa4cd 100644 --- a/Mage/src/mage/abilities/effects/common/GainAbilityControlledEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilityControlledEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/GainAbilitySourceEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilitySourceEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/GainAbilitySourceEffect.java rename to Mage/src/mage/abilities/effects/common/continious/GainAbilitySourceEffect.java index 78a2910908..6680b6e354 100644 --- a/Mage/src/mage/abilities/effects/common/GainAbilitySourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilitySourceEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/GainAbilityTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/GainAbilityTargetEffect.java rename to Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java index 85c13ef6e8..a80b6707b5 100644 --- a/Mage/src/mage/abilities/effects/common/GainAbilityTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/GainControlTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainControlTargetEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/GainControlTargetEffect.java rename to Mage/src/mage/abilities/effects/common/continious/GainControlTargetEffect.java index 9d92419fff..6e8ab017bc 100644 --- a/Mage/src/mage/abilities/effects/common/GainControlTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainControlTargetEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/effects/common/GainProtectionFromColorTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromColorTargetEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/GainProtectionFromColorTargetEffect.java rename to Mage/src/mage/abilities/effects/common/continious/GainProtectionFromColorTargetEffect.java index 23712e7145..0335fb2a38 100644 --- a/Mage/src/mage/abilities/effects/common/GainProtectionFromColorTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainProtectionFromColorTargetEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.abilities.Ability; diff --git a/Mage/src/mage/abilities/effects/common/SetPowerToughnessTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/SetPowerToughnessTargetEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/SetPowerToughnessTargetEffect.java rename to Mage/src/mage/abilities/effects/common/continious/SetPowerToughnessTargetEffect.java index eac2119938..4280bc59b0 100644 --- a/Mage/src/mage/abilities/effects/common/SetPowerToughnessTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/SetPowerToughnessTargetEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.continious; import mage.Constants.Duration; import mage.Constants.Layer; diff --git a/Mage/src/mage/abilities/keyword/ExaltedAbility.java b/Mage/src/mage/abilities/keyword/ExaltedAbility.java index 8c500af143..8faee0f53c 100644 --- a/Mage/src/mage/abilities/keyword/ExaltedAbility.java +++ b/Mage/src/mage/abilities/keyword/ExaltedAbility.java @@ -31,7 +31,7 @@ package mage.abilities.keyword; import mage.Constants.Duration; import mage.Constants.Zone; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.common.BoostTargetEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage/src/mage/abilities/keyword/UnearthAbility.java b/Mage/src/mage/abilities/keyword/UnearthAbility.java index f836bcfc87..ec82ef18b5 100644 --- a/Mage/src/mage/abilities/keyword/UnearthAbility.java +++ b/Mage/src/mage/abilities/keyword/UnearthAbility.java @@ -39,7 +39,7 @@ import mage.abilities.costs.mana.ManaCosts; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.ExileSourceEffect; -import mage.abilities.effects.common.GainAbilitySourceEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; import mage.game.Game; import mage.game.events.GameEvent;