diff --git a/Mage.Sets/src/mage/sets/odyssey/DiligentFarmhand.java b/Mage.Sets/src/mage/sets/odyssey/DiligentFarmhand.java index fbd76745f5..eff14e8701 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DiligentFarmhand.java +++ b/Mage.Sets/src/mage/sets/odyssey/DiligentFarmhand.java @@ -31,10 +31,8 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.InfoEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -63,7 +61,7 @@ public class DiligentFarmhand extends CardImpl { ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); // If Diligent Farmhand is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst. - this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("If Diligent Farmhand is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst"))); + this.addAbility(MuscleBurst.getCountAsAbility()); } public DiligentFarmhand(final DiligentFarmhand card) { diff --git a/Mage.Sets/src/mage/sets/odyssey/FlameBurst.java b/Mage.Sets/src/mage/sets/odyssey/FlameBurst.java new file mode 100644 index 0000000000..b10502aa3e --- /dev/null +++ b/Mage.Sets/src/mage/sets/odyssey/FlameBurst.java @@ -0,0 +1,122 @@ +/* + * 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.odyssey; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.InfoEffect; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.FilterCard; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.AbilityPredicate; +import mage.filter.predicate.mageobject.NamePredicate; +import mage.game.Game; +import mage.target.common.TargetCreatureOrPlayer; + +/** + * + * @author LoneFox + */ +public class FlameBurst extends CardImpl { + + private static final FilterCard filter = new FilterCard(); + + static { + filter.add(Predicates.or(new NamePredicate("Flame Burst"), + new AbilityPredicate(CountAsFlameBurstAbility.class))); + } + + public FlameBurst(UUID ownerId) { + super(ownerId, 194, "Flame Burst", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); + this.expansionSetCode = "ODY"; + + // Flame Burst deals X damage to target creature or player, where X is 2 plus the number of cards named Flame Burst in all graveyards. + Effect effect = new DamageTargetEffect(new FlameBurstCount(filter)); + effect.setText("{this} deals X damage to target creature or player, where X is 2 plus the number of cards named Flame Burst in all graveyards."); + this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + } + + public FlameBurst(final FlameBurst card) { + super(card); + } + + @Override + public FlameBurst copy() { + return new FlameBurst(this); + } + + public static Ability getCountAsAbility() { + return new CountAsFlameBurstAbility(); + } +} + +class FlameBurstCount extends CardsInAllGraveyardsCount { + + public FlameBurstCount(FilterCard filter) { + super(filter); + } + + public FlameBurstCount(FlameBurstCount value) { + super(value); + } + + public FlameBurstCount copy() { + return new FlameBurstCount(this); + } + + @Override + public int calculate(Game game, Ability source, Effect effect) { + return super.calculate(game, source, effect) + 2; + } + +} + +class CountAsFlameBurstAbility extends SimpleStaticAbility { + + public CountAsFlameBurstAbility() { + super(Zone.GRAVEYARD, new InfoEffect("If {this} is in a graveyard, effects from spells named Flame Burst count it as a card named Flame Burst")); + } + + public CountAsFlameBurstAbility(CountAsFlameBurstAbility ability) { + super(ability); + } + + @Override + public CountAsFlameBurstAbility copy() { + return new CountAsFlameBurstAbility(this); + } +} diff --git a/Mage.Sets/src/mage/sets/odyssey/MuscleBurst.java b/Mage.Sets/src/mage/sets/odyssey/MuscleBurst.java new file mode 100644 index 0000000000..d2108c88c4 --- /dev/null +++ b/Mage.Sets/src/mage/sets/odyssey/MuscleBurst.java @@ -0,0 +1,123 @@ +/* + * 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.odyssey; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.dynamicvalue.common.CardsInAllGraveyardsCount; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.InfoEffect; +import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.FilterCard; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.AbilityPredicate; +import mage.filter.predicate.mageobject.NamePredicate; +import mage.game.Game; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author LoneFox + */ +public class MuscleBurst extends CardImpl { + + private static final FilterCard filter = new FilterCard(); + + static { + filter.add(Predicates.or(new NamePredicate("Muscle Burst"), + new AbilityPredicate(CountAsMuscleBurstAbility.class))); + } + + public MuscleBurst(UUID ownerId) { + super(ownerId, 252, "Muscle Burst", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); + this.expansionSetCode = "ODY"; + + // Target creature gets +X/+X until end of turn, where X is 3 plus the number of cards named Muscle Burst in all graveyards. + MuscleBurstCount count = new MuscleBurstCount(filter); + Effect effect = new BoostTargetEffect(count, count, Duration.EndOfTurn, true); + effect.setText("Target creature gets +X/+X until end of turn, where X is 3 plus the number of cards named Muscle Burst in all graveyards."); + this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + } + + public MuscleBurst(final MuscleBurst card) { + super(card); + } + + @Override + public MuscleBurst copy() { + return new MuscleBurst(this); + } + + public static Ability getCountAsAbility() { + return new CountAsMuscleBurstAbility(); + } +} + +class MuscleBurstCount extends CardsInAllGraveyardsCount { + + public MuscleBurstCount(FilterCard filter) { + super(filter); + } + + public MuscleBurstCount(MuscleBurstCount value) { + super(value); + } + + public MuscleBurstCount copy() { + return new MuscleBurstCount(this); + } + + @Override + public int calculate(Game game, Ability source, Effect effect) { + return super.calculate(game, source, effect) + 3; + } + +} + +class CountAsMuscleBurstAbility extends SimpleStaticAbility { + + public CountAsMuscleBurstAbility() { + super(Zone.GRAVEYARD, new InfoEffect("If {this} is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst")); + } + + public CountAsMuscleBurstAbility(CountAsMuscleBurstAbility ability) { + super(ability); + } + + @Override + public CountAsMuscleBurstAbility copy() { + return new CountAsMuscleBurstAbility(this); + } +} diff --git a/Mage.Sets/src/mage/sets/odyssey/PardicFirecat.java b/Mage.Sets/src/mage/sets/odyssey/PardicFirecat.java new file mode 100644 index 0000000000..fa4acba366 --- /dev/null +++ b/Mage.Sets/src/mage/sets/odyssey/PardicFirecat.java @@ -0,0 +1,65 @@ +/* + * 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.odyssey; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; + +/** + * + * @author LoneFox + */ +public class PardicFirecat extends CardImpl { + + public PardicFirecat(UUID ownerId) { + super(ownerId, 211, "Pardic Firecat", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); + this.expansionSetCode = "ODY"; + this.subtype.add("Elemental"); + this.subtype.add("Cat"); + this.power = new MageInt(2); + this.toughness = new MageInt(3); + + // Haste + this.addAbility(HasteAbility.getInstance()); + // If Pardic Firecat is in a graveyard, effects from spells named Flame Burst count it as a card named Flame Burst. + this.addAbility(FlameBurst.getCountAsAbility()); + } + + public PardicFirecat(final PardicFirecat card) { + super(card); + } + + @Override + public PardicFirecat copy() { + return new PardicFirecat(this); + } +} diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java b/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java index caec5c530a..901845974a 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java @@ -51,8 +51,8 @@ public class CardsInAllGraveyardsCount implements DynamicValue { this.filter = filter; } - private CardsInAllGraveyardsCount(CardsInAllGraveyardsCount dynamicValue) { - this.filter = dynamicValue.filter; + public CardsInAllGraveyardsCount(CardsInAllGraveyardsCount dynamicValue) { + this.filter = dynamicValue.filter.copy(); } @Override