From 3db077b9586c8305ffa53d02b3ac0675895050e6 Mon Sep 17 00:00:00 2001 From: Jon Lin Date: Thu, 9 Oct 2014 00:04:50 -0700 Subject: [PATCH 1/3] fixed #595 also added a couple new cards --- .../sets/ajanivsnicolbolas/PrideOfLions.java | 52 ++++++++++++++ .../src/mage/sets/dissension/Overrule.java | 52 ++++++++++++++ .../src/mage/sets/exodus/ScareTactics.java | 59 ++++++++++++++++ .../sets/journeyintonyx/ScourgeOfFleets.java | 4 +- .../src/mage/sets/portal/HowlingFury.java | 54 +++++++++++++++ .../sets/seventhedition/PrideOfLions.java | 52 ++++++++++++++ .../mage/sets/starter1999/HowlingFury.java | 60 ++++++++++++++++ .../mage/sets/starter1999/PrideOfLions.java | 64 +++++++++++++++++ .../src/mage/sets/venservskoth/Overrule.java | 68 +++++++++++++++++++ 9 files changed, 463 insertions(+), 2 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java create mode 100644 Mage.Sets/src/mage/sets/dissension/Overrule.java create mode 100644 Mage.Sets/src/mage/sets/exodus/ScareTactics.java create mode 100644 Mage.Sets/src/mage/sets/portal/HowlingFury.java create mode 100644 Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java create mode 100644 Mage.Sets/src/mage/sets/starter1999/HowlingFury.java create mode 100644 Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java create mode 100644 Mage.Sets/src/mage/sets/venservskoth/Overrule.java diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java new file mode 100644 index 00000000000..fee71ccd439 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java @@ -0,0 +1,52 @@ +/* + * 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.ajanivsnicolbolas; + +import java.util.UUID; + +/** + * + * @author anonymous + */ +public class PrideOfLions extends mage.sets.starter1999.PrideOfLions { + + public PrideOfLions(UUID ownerId) { + super(ownerId); + this.cardNumber = 19; + this.expansionSetCode = "DDH"; + } + + public PrideOfLions(final PrideOfLions card) { + super(card); + } + + @Override + public PrideOfLions copy() { + return new PrideOfLions(this); + } +} diff --git a/Mage.Sets/src/mage/sets/dissension/Overrule.java b/Mage.Sets/src/mage/sets/dissension/Overrule.java new file mode 100644 index 00000000000..1f36a285a67 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dissension/Overrule.java @@ -0,0 +1,52 @@ +/* + * 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.dissension; + +import java.util.UUID; + +/** + * + * @author anonymous + */ +public class Overrule extends mage.sets.venservskoth.Overrule { + + public Overrule(UUID ownerId) { + super(ownerId); + this.cardNumber = 120; + this.expansionSetCode = "DIS"; + } + + public Overrule(final Overrule card) { + super(card); + } + + @Override + public Overrule copy() { + return new Overrule(this); + } +} diff --git a/Mage.Sets/src/mage/sets/exodus/ScareTactics.java b/Mage.Sets/src/mage/sets/exodus/ScareTactics.java new file mode 100644 index 00000000000..9b20b2f7380 --- /dev/null +++ b/Mage.Sets/src/mage/sets/exodus/ScareTactics.java @@ -0,0 +1,59 @@ +/* + * 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.exodus; + +import java.util.UUID; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; + +/** + * + * @author anonymous + */ +public class ScareTactics extends CardImpl { + + public ScareTactics(UUID ownerId) { + super(ownerId, 73, "Scare Tactics", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); + this.expansionSetCode = "EXO"; + + this.color.setBlack(true); + + // Creatures you control get +1/+0 until end of turn. + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 0, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); + } + + public ScareTactics(final ScareTactics card) { + super(card); + } + + @Override + public ScareTactics copy() { + return new ScareTactics(this); + } +} diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java b/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java index 6826fa5e220..fd05b4a7505 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java @@ -42,7 +42,7 @@ import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.PowerPredicate; +import mage.filter.predicate.mageobject.ToughnessPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -107,7 +107,7 @@ class ScourgeOfFleetsEffect extends OneShotEffect { int islands = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game); FilterPermanent creatureFilter = new FilterCreaturePermanent(); creatureFilter.add(new ControllerPredicate(TargetController.OPPONENT)); - creatureFilter.add(new PowerPredicate(Filter.ComparisonType.LessThan, islands +1)); + creatureFilter.add(new ToughnessPredicate(Filter.ComparisonType.LessThan, islands +1)); for (Permanent permanent: game.getBattlefield().getActivePermanents(creatureFilter, source.getControllerId(), source.getSourceId(), game)) { controller.moveCardToHandWithInfo(permanent, source.getSourceId(), game, Zone.BATTLEFIELD); } diff --git a/Mage.Sets/src/mage/sets/portal/HowlingFury.java b/Mage.Sets/src/mage/sets/portal/HowlingFury.java new file mode 100644 index 00000000000..ec10aff5b70 --- /dev/null +++ b/Mage.Sets/src/mage/sets/portal/HowlingFury.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.portal; + +import java.util.UUID; +import mage.constants.Rarity; + +/** + * + * @author anonymous + */ +public class HowlingFury extends mage.sets.starter1999.HowlingFury { + + public HowlingFury(UUID ownerId) { + super(ownerId); + this.cardNumber = 20; + this.expansionSetCode = "POR"; + this.rarity = Rarity.COMMON; + } + + public HowlingFury(final HowlingFury card) { + super(card); + } + + @Override + public HowlingFury copy() { + return new HowlingFury(this); + } +} diff --git a/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java b/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java new file mode 100644 index 00000000000..7d23111a393 --- /dev/null +++ b/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java @@ -0,0 +1,52 @@ +/* + * 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.seventhedition; + +import java.util.UUID; + +/** + * + * @author anonymous + */ +public class PrideOfLions extends mage.sets.starter1999.PrideOfLions { + + public PrideOfLions(UUID ownerId) { + super(ownerId); + this.cardNumber = 261; + this.expansionSetCode = "7ED"; + } + + public PrideOfLions(final PrideOfLions card) { + super(card); + } + + @Override + public PrideOfLions copy() { + return new PrideOfLions(this); + } +} diff --git a/Mage.Sets/src/mage/sets/starter1999/HowlingFury.java b/Mage.Sets/src/mage/sets/starter1999/HowlingFury.java new file mode 100644 index 00000000000..d4196da5727 --- /dev/null +++ b/Mage.Sets/src/mage/sets/starter1999/HowlingFury.java @@ -0,0 +1,60 @@ +/* + * 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.starter1999; + +import java.util.UUID; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; + +/** + * + * @author anonymous + */ +public class HowlingFury extends CardImpl { + + public HowlingFury(UUID ownerId) { + super(ownerId, 82, "Howling Fury", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); + this.expansionSetCode = "S99"; + + this.color.setBlack(true); + + // Target creature gets +4/+0 until end of turn. + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addEffect(new BoostTargetEffect(4, 0, Duration.EndOfTurn)); + } + + public HowlingFury(final HowlingFury card) { + super(card); + } + + @Override + public HowlingFury copy() { + return new HowlingFury(this); + } +} diff --git a/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java b/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java new file mode 100644 index 00000000000..afd48abe07c --- /dev/null +++ b/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java @@ -0,0 +1,64 @@ +/* + * 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.starter1999; + +import java.util.UUID; +import mage.MageInt; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.abilities.common.DamageAsThoughNotBlockedAbility; + +/** + * + * @author anonymous + */ +public class PrideOfLions extends CardImpl { + + public PrideOfLions(UUID ownerId) { + super(ownerId, 139, "Pride of Lions", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); + this.expansionSetCode = "S99"; + this.subtype.add("Cat"); + + this.color.setGreen(true); + this.power = new MageInt(4); + this.toughness = new MageInt(4); + + // You may have Pride of Lions assign its combat damage as though it weren't blocked. + this.addAbility(DamageAsThoughNotBlockedAbility.getInstance()); + } + + public PrideOfLions(final PrideOfLions card) { + super(card); + } + + @Override + public PrideOfLions copy() { + return new PrideOfLions(this); + } +} diff --git a/Mage.Sets/src/mage/sets/venservskoth/Overrule.java b/Mage.Sets/src/mage/sets/venservskoth/Overrule.java new file mode 100644 index 00000000000..339167c9e33 --- /dev/null +++ b/Mage.Sets/src/mage/sets/venservskoth/Overrule.java @@ -0,0 +1,68 @@ +/* + * 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.venservskoth; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.dynamicvalue.common.ManacostVariableValue; +import mage.abilities.effects.common.CounterUnlessPaysEffect; +import mage.abilities.effects.common.GainLifeEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.target.TargetSpell; + +/** + * + * @author anonymous + */ +public class Overrule extends CardImpl { + + public Overrule(UUID ownerId) { + super(ownerId, 32, "Overrule", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{W}{U}"); + this.expansionSetCode = "DDI"; + + this.color.setBlue(true); + this.color.setWhite(true); + + // Counter target spell unless its controller pays {X}. You gain X life. + ManacostVariableValue manaX = new ManacostVariableValue(); + this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(manaX); + this.getSpellAbility().addTarget(new TargetSpell()); + this.getSpellAbility().addEffect(new GainLifeEffect(manaX)); + } + + public Overrule(final Overrule card) { + super(card); + } + + @Override + public Overrule copy() { + return new Overrule(this); + } +} From 610d781fefcac28ac03f9d6f15586fcf141f548d Mon Sep 17 00:00:00 2001 From: Jon Lin Date: Thu, 9 Oct 2014 00:07:11 -0700 Subject: [PATCH 2/3] Revert "fixed #595" This reverts commit 3db077b9586c8305ffa53d02b3ac0675895050e6. --- .../sets/ajanivsnicolbolas/PrideOfLions.java | 52 -------------- .../src/mage/sets/dissension/Overrule.java | 52 -------------- .../src/mage/sets/exodus/ScareTactics.java | 59 ---------------- .../sets/journeyintonyx/ScourgeOfFleets.java | 4 +- .../src/mage/sets/portal/HowlingFury.java | 54 --------------- .../sets/seventhedition/PrideOfLions.java | 52 -------------- .../mage/sets/starter1999/HowlingFury.java | 60 ---------------- .../mage/sets/starter1999/PrideOfLions.java | 64 ----------------- .../src/mage/sets/venservskoth/Overrule.java | 68 ------------------- 9 files changed, 2 insertions(+), 463 deletions(-) delete mode 100644 Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java delete mode 100644 Mage.Sets/src/mage/sets/dissension/Overrule.java delete mode 100644 Mage.Sets/src/mage/sets/exodus/ScareTactics.java delete mode 100644 Mage.Sets/src/mage/sets/portal/HowlingFury.java delete mode 100644 Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java delete mode 100644 Mage.Sets/src/mage/sets/starter1999/HowlingFury.java delete mode 100644 Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java delete mode 100644 Mage.Sets/src/mage/sets/venservskoth/Overrule.java diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java deleted file mode 100644 index fee71ccd439..00000000000 --- a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.ajanivsnicolbolas; - -import java.util.UUID; - -/** - * - * @author anonymous - */ -public class PrideOfLions extends mage.sets.starter1999.PrideOfLions { - - public PrideOfLions(UUID ownerId) { - super(ownerId); - this.cardNumber = 19; - this.expansionSetCode = "DDH"; - } - - public PrideOfLions(final PrideOfLions card) { - super(card); - } - - @Override - public PrideOfLions copy() { - return new PrideOfLions(this); - } -} diff --git a/Mage.Sets/src/mage/sets/dissension/Overrule.java b/Mage.Sets/src/mage/sets/dissension/Overrule.java deleted file mode 100644 index 1f36a285a67..00000000000 --- a/Mage.Sets/src/mage/sets/dissension/Overrule.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.dissension; - -import java.util.UUID; - -/** - * - * @author anonymous - */ -public class Overrule extends mage.sets.venservskoth.Overrule { - - public Overrule(UUID ownerId) { - super(ownerId); - this.cardNumber = 120; - this.expansionSetCode = "DIS"; - } - - public Overrule(final Overrule card) { - super(card); - } - - @Override - public Overrule copy() { - return new Overrule(this); - } -} diff --git a/Mage.Sets/src/mage/sets/exodus/ScareTactics.java b/Mage.Sets/src/mage/sets/exodus/ScareTactics.java deleted file mode 100644 index 9b20b2f7380..00000000000 --- a/Mage.Sets/src/mage/sets/exodus/ScareTactics.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.exodus; - -import java.util.UUID; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; - -/** - * - * @author anonymous - */ -public class ScareTactics extends CardImpl { - - public ScareTactics(UUID ownerId) { - super(ownerId, 73, "Scare Tactics", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); - this.expansionSetCode = "EXO"; - - this.color.setBlack(true); - - // Creatures you control get +1/+0 until end of turn. - this.getSpellAbility().addEffect(new BoostControlledEffect(1, 0, Duration.EndOfTurn, new FilterCreaturePermanent(), false)); - } - - public ScareTactics(final ScareTactics card) { - super(card); - } - - @Override - public ScareTactics copy() { - return new ScareTactics(this); - } -} diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java b/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java index fd05b4a7505..6826fa5e220 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ScourgeOfFleets.java @@ -42,7 +42,7 @@ import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.ToughnessPredicate; +import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -107,7 +107,7 @@ class ScourgeOfFleetsEffect extends OneShotEffect { int islands = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game); FilterPermanent creatureFilter = new FilterCreaturePermanent(); creatureFilter.add(new ControllerPredicate(TargetController.OPPONENT)); - creatureFilter.add(new ToughnessPredicate(Filter.ComparisonType.LessThan, islands +1)); + creatureFilter.add(new PowerPredicate(Filter.ComparisonType.LessThan, islands +1)); for (Permanent permanent: game.getBattlefield().getActivePermanents(creatureFilter, source.getControllerId(), source.getSourceId(), game)) { controller.moveCardToHandWithInfo(permanent, source.getSourceId(), game, Zone.BATTLEFIELD); } diff --git a/Mage.Sets/src/mage/sets/portal/HowlingFury.java b/Mage.Sets/src/mage/sets/portal/HowlingFury.java deleted file mode 100644 index ec10aff5b70..00000000000 --- a/Mage.Sets/src/mage/sets/portal/HowlingFury.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.portal; - -import java.util.UUID; -import mage.constants.Rarity; - -/** - * - * @author anonymous - */ -public class HowlingFury extends mage.sets.starter1999.HowlingFury { - - public HowlingFury(UUID ownerId) { - super(ownerId); - this.cardNumber = 20; - this.expansionSetCode = "POR"; - this.rarity = Rarity.COMMON; - } - - public HowlingFury(final HowlingFury card) { - super(card); - } - - @Override - public HowlingFury copy() { - return new HowlingFury(this); - } -} diff --git a/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java b/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java deleted file mode 100644 index 7d23111a393..00000000000 --- a/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.seventhedition; - -import java.util.UUID; - -/** - * - * @author anonymous - */ -public class PrideOfLions extends mage.sets.starter1999.PrideOfLions { - - public PrideOfLions(UUID ownerId) { - super(ownerId); - this.cardNumber = 261; - this.expansionSetCode = "7ED"; - } - - public PrideOfLions(final PrideOfLions card) { - super(card); - } - - @Override - public PrideOfLions copy() { - return new PrideOfLions(this); - } -} diff --git a/Mage.Sets/src/mage/sets/starter1999/HowlingFury.java b/Mage.Sets/src/mage/sets/starter1999/HowlingFury.java deleted file mode 100644 index d4196da5727..00000000000 --- a/Mage.Sets/src/mage/sets/starter1999/HowlingFury.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.starter1999; - -import java.util.UUID; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; - -/** - * - * @author anonymous - */ -public class HowlingFury extends CardImpl { - - public HowlingFury(UUID ownerId) { - super(ownerId, 82, "Howling Fury", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); - this.expansionSetCode = "S99"; - - this.color.setBlack(true); - - // Target creature gets +4/+0 until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new BoostTargetEffect(4, 0, Duration.EndOfTurn)); - } - - public HowlingFury(final HowlingFury card) { - super(card); - } - - @Override - public HowlingFury copy() { - return new HowlingFury(this); - } -} diff --git a/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java b/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java deleted file mode 100644 index afd48abe07c..00000000000 --- a/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.starter1999; - -import java.util.UUID; -import mage.MageInt; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.abilities.common.DamageAsThoughNotBlockedAbility; - -/** - * - * @author anonymous - */ -public class PrideOfLions extends CardImpl { - - public PrideOfLions(UUID ownerId) { - super(ownerId, 139, "Pride of Lions", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); - this.expansionSetCode = "S99"; - this.subtype.add("Cat"); - - this.color.setGreen(true); - this.power = new MageInt(4); - this.toughness = new MageInt(4); - - // You may have Pride of Lions assign its combat damage as though it weren't blocked. - this.addAbility(DamageAsThoughNotBlockedAbility.getInstance()); - } - - public PrideOfLions(final PrideOfLions card) { - super(card); - } - - @Override - public PrideOfLions copy() { - return new PrideOfLions(this); - } -} diff --git a/Mage.Sets/src/mage/sets/venservskoth/Overrule.java b/Mage.Sets/src/mage/sets/venservskoth/Overrule.java deleted file mode 100644 index 339167c9e33..00000000000 --- a/Mage.Sets/src/mage/sets/venservskoth/Overrule.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.venservskoth; - -import java.util.UUID; -import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.ManacostVariableValue; -import mage.abilities.effects.common.CounterUnlessPaysEffect; -import mage.abilities.effects.common.GainLifeEffect; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.target.TargetSpell; - -/** - * - * @author anonymous - */ -public class Overrule extends CardImpl { - - public Overrule(UUID ownerId) { - super(ownerId, 32, "Overrule", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{W}{U}"); - this.expansionSetCode = "DDI"; - - this.color.setBlue(true); - this.color.setWhite(true); - - // Counter target spell unless its controller pays {X}. You gain X life. - ManacostVariableValue manaX = new ManacostVariableValue(); - this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(manaX); - this.getSpellAbility().addTarget(new TargetSpell()); - this.getSpellAbility().addEffect(new GainLifeEffect(manaX)); - } - - public Overrule(final Overrule card) { - super(card); - } - - @Override - public Overrule copy() { - return new Overrule(this); - } -} From cafc5d79174b1444380253d23bce4f597a24c121 Mon Sep 17 00:00:00 2001 From: Jon Lin Date: Thu, 9 Oct 2014 00:15:56 -0700 Subject: [PATCH 3/3] --- .../sets/ajanivsnicolbolas/PrideOfLions.java | 52 +++++++++++++++ .../sets/seventhedition/PrideOfLions.java | 52 +++++++++++++++ .../mage/sets/starter1999/PrideOfLions.java | 64 +++++++++++++++++++ 3 files changed, 168 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java create mode 100644 Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java create mode 100644 Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java diff --git a/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java new file mode 100644 index 00000000000..fee71ccd439 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ajanivsnicolbolas/PrideOfLions.java @@ -0,0 +1,52 @@ +/* + * 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.ajanivsnicolbolas; + +import java.util.UUID; + +/** + * + * @author anonymous + */ +public class PrideOfLions extends mage.sets.starter1999.PrideOfLions { + + public PrideOfLions(UUID ownerId) { + super(ownerId); + this.cardNumber = 19; + this.expansionSetCode = "DDH"; + } + + public PrideOfLions(final PrideOfLions card) { + super(card); + } + + @Override + public PrideOfLions copy() { + return new PrideOfLions(this); + } +} diff --git a/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java b/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java new file mode 100644 index 00000000000..7d23111a393 --- /dev/null +++ b/Mage.Sets/src/mage/sets/seventhedition/PrideOfLions.java @@ -0,0 +1,52 @@ +/* + * 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.seventhedition; + +import java.util.UUID; + +/** + * + * @author anonymous + */ +public class PrideOfLions extends mage.sets.starter1999.PrideOfLions { + + public PrideOfLions(UUID ownerId) { + super(ownerId); + this.cardNumber = 261; + this.expansionSetCode = "7ED"; + } + + public PrideOfLions(final PrideOfLions card) { + super(card); + } + + @Override + public PrideOfLions copy() { + return new PrideOfLions(this); + } +} diff --git a/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java b/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java new file mode 100644 index 00000000000..afd48abe07c --- /dev/null +++ b/Mage.Sets/src/mage/sets/starter1999/PrideOfLions.java @@ -0,0 +1,64 @@ +/* + * 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.starter1999; + +import java.util.UUID; +import mage.MageInt; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.abilities.common.DamageAsThoughNotBlockedAbility; + +/** + * + * @author anonymous + */ +public class PrideOfLions extends CardImpl { + + public PrideOfLions(UUID ownerId) { + super(ownerId, 139, "Pride of Lions", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); + this.expansionSetCode = "S99"; + this.subtype.add("Cat"); + + this.color.setGreen(true); + this.power = new MageInt(4); + this.toughness = new MageInt(4); + + // You may have Pride of Lions assign its combat damage as though it weren't blocked. + this.addAbility(DamageAsThoughNotBlockedAbility.getInstance()); + } + + public PrideOfLions(final PrideOfLions card) { + super(card); + } + + @Override + public PrideOfLions copy() { + return new PrideOfLions(this); + } +}