From a02f6a3c3a207a51a983ff01868b9a2e21fac880 Mon Sep 17 00:00:00 2001 From: MarcoMarin Date: Tue, 12 Apr 2016 16:27:47 -0300 Subject: [PATCH] Testing Git commands with card: Dwarven Catapult --- .../mage/sets/arabiannights/Oubliette.java | 15 ++- .../sets/fallenempires/DwarvenCatapult.java | 52 ++++++++++ .../sets/fifthedition/DwarvenCatapult.java | 95 +++++++++++++++++++ .../sets/mastersedition/DwarvenCatapult.java | 52 ++++++++++ 4 files changed, 205 insertions(+), 9 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/fallenempires/DwarvenCatapult.java create mode 100644 Mage.Sets/src/mage/sets/fifthedition/DwarvenCatapult.java create mode 100644 Mage.Sets/src/mage/sets/mastersedition/DwarvenCatapult.java diff --git a/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java b/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java index 6c6b2c2e6e..ec1e072e2a 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java +++ b/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java @@ -99,7 +99,7 @@ class OublietteEffect extends OneShotEffect { public OublietteEffect() { super(Outcome.Detriment); - this.staticText = "Exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature. When Oubliette leaves the battlefield, return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it. If you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent."; + this.staticText = "4Exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature. When Oubliette leaves the battlefield, return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it. If you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent."; } public OublietteEffect(final OublietteEffect effect) { @@ -117,13 +117,9 @@ class OublietteEffect extends OneShotEffect { Permanent enchantment = game.getPermanent(source.getSourceId()); if (enchantment == null) { enchantment = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); - } + } + UUID targetId=source.getFirstTarget(); - UUID targetId=null; - for(Ability abil: enchantment.getAbilities(game)){ - targetId=abil.getFirstTarget(); - if(targetId!=null) break; //Oubliette should have only 1 - } if (targetId==null) return false; // if previous scan somehow failed, simply quit if (enchantment != null) { //back to code (mostly) copied from Flickerform @@ -138,14 +134,15 @@ class OublietteEffect extends OneShotEffect { } } - ((Oubliette)enchantment).godHelpMe = enchantedCreature.getCounters(game); + //((Oubliette)enchantment.getMainCard()).godHelpMe = enchantedCreature.getCounters(game); + //((Oubliette)game.getCard(source.getSourceId())).godHelpMe = enchantedCreature.getCounters(game).copy(); if (!(enchantedCreature instanceof Token)) { // If you do, return the other cards exiled this way to the battlefield under their owners' control attached to that creature LeavesBattlefieldTriggeredAbility triggeredAbility = new LeavesBattlefieldTriggeredAbility( new OublietteReturnEffect(enchantedCreature.getId(), exileZoneId, enchantment), false); - enchantment.addAbility(triggeredAbility, game); + enchantment.addAbility(triggeredAbility, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/sets/fallenempires/DwarvenCatapult.java b/Mage.Sets/src/mage/sets/fallenempires/DwarvenCatapult.java new file mode 100644 index 0000000000..71435ecf8d --- /dev/null +++ b/Mage.Sets/src/mage/sets/fallenempires/DwarvenCatapult.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.fallenempires; + +import java.util.UUID; + +/** + * + * @author MarcoMarin + */ +public class DwarvenCatapult extends mage.sets.fifthedition.DwarvenCatapult { + + public DwarvenCatapult(UUID ownerId) { + super(ownerId); + this.cardNumber = 105; + this.expansionSetCode = "FEM"; + } + + public DwarvenCatapult(final DwarvenCatapult card) { + super(card); + } + + @Override + public DwarvenCatapult copy() { + return new DwarvenCatapult(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fifthedition/DwarvenCatapult.java b/Mage.Sets/src/mage/sets/fifthedition/DwarvenCatapult.java new file mode 100644 index 0000000000..3aa1c56575 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fifthedition/DwarvenCatapult.java @@ -0,0 +1,95 @@ +/* + * 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.fifthedition; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.DamageAllControlledTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.filter.common.FilterCreaturePermanent; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.common.TargetOpponent; + +/** + * + * @author MarcoMarin + */ +public class DwarvenCatapult extends CardImpl { + + public DwarvenCatapult(UUID ownerId) { + super(ownerId, 220, "Dwarven Catapult", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{R}"); + this.expansionSetCode = "5ED"; + + // Dwarven Catapult deals X damage divided evenly, rounded down, among all creatures target opponent controls. + this.getSpellAbility().addTarget(new TargetOpponent()); + this.getSpellAbility().addEffect(new DwarvenCatapultEffect()); + } + + public DwarvenCatapult(final DwarvenCatapult card) { + super(card); + } + + @Override + public DwarvenCatapult copy() { + return new DwarvenCatapult(this); + } +} + + +class DwarvenCatapultEffect extends OneShotEffect { + + public DwarvenCatapultEffect() { + super(Outcome.Damage); + staticText = "{this} deals X damage divided evenly, rounded down, among all creatures target opponent controls."; + } + + public DwarvenCatapultEffect(final DwarvenCatapultEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + int howMany = game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), source.getFirstTarget(), game).size(); + int amount = source.getManaCostsToPay().getX()/howMany; + + DamageAllControlledTargetEffect dmgEffect = new DamageAllControlledTargetEffect(amount, new FilterCreaturePermanent()); + return dmgEffect.apply(game, source); + } + + @Override + public DwarvenCatapultEffect copy() { + return new DwarvenCatapultEffect(this); + } + +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/mastersedition/DwarvenCatapult.java b/Mage.Sets/src/mage/sets/mastersedition/DwarvenCatapult.java new file mode 100644 index 0000000000..b6235477f6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mastersedition/DwarvenCatapult.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.mastersedition; + +import java.util.UUID; + +/** + * + * @author MarcoMarin + */ +public class DwarvenCatapult extends mage.sets.fifthedition.DwarvenCatapult { + + public DwarvenCatapult(UUID ownerId) { + super(ownerId); + this.cardNumber = 91; + this.expansionSetCode = "MED"; + } + + public DwarvenCatapult(final DwarvenCatapult card) { + super(card); + } + + @Override + public DwarvenCatapult copy() { + return new DwarvenCatapult(this); + } +}