From db10a53dd28451fc16809e95967be9029567df5d Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 4 Jul 2017 06:50:59 +0200 Subject: [PATCH] [HOU] Added 4 cards, some fixes. --- Mage.Sets/src/mage/cards/a/ActOfHeroism.java | 14 +- .../src/mage/cards/c/ConsignOblivion.java | 72 ++++++++++ Mage.Sets/src/mage/cards/d/DrivenDespair.java | 81 ++++++++++++ Mage.Sets/src/mage/cards/f/FarmMarket.java | 71 ++++++++++ Mage.Sets/src/mage/cards/l/LeaveChance.java | 124 ++++++++++++++++++ .../src/mage/cards/s/StruggleSurvive.java | 2 +- .../src/mage/sets/HourOfDevastation.java | 9 +- Utils/cardSplitClass.tmpl | 14 +- Utils/gen-card.pl | 16 ++- Utils/mtg-cards-data.txt | 2 +- 10 files changed, 377 insertions(+), 28 deletions(-) create mode 100644 Mage.Sets/src/mage/cards/c/ConsignOblivion.java create mode 100644 Mage.Sets/src/mage/cards/d/DrivenDespair.java create mode 100644 Mage.Sets/src/mage/cards/f/FarmMarket.java create mode 100644 Mage.Sets/src/mage/cards/l/LeaveChance.java diff --git a/Mage.Sets/src/mage/cards/a/ActOfHeroism.java b/Mage.Sets/src/mage/cards/a/ActOfHeroism.java index eb8192306f..1035431c89 100644 --- a/Mage.Sets/src/mage/cards/a/ActOfHeroism.java +++ b/Mage.Sets/src/mage/cards/a/ActOfHeroism.java @@ -27,6 +27,8 @@ */ package mage.cards.a; +import java.util.UUID; +import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureEffect; @@ -36,19 +38,17 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; -import java.util.UUID; -import mage.abilities.Ability; - /** * * @author Archer262 */ public class ActOfHeroism extends CardImpl { - + public ActOfHeroism(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}"); // Untap target creature. Effect effect = new UntapTargetEffect(); @@ -59,8 +59,8 @@ public class ActOfHeroism extends CardImpl { effect = new BoostTargetEffect(2, 2, Duration.EndOfTurn); effect.setText("It gets +2/+2"); this.getSpellAbility().addEffect(effect); - effect = new GainAbilityTargetEffect((Ability) new CanBlockAdditionalCreatureEffect(), Duration.EndOfTurn); - effect.setText("and can block an additional creature this turn."); + effect = new GainAbilityTargetEffect(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect()), Duration.EndOfTurn); + effect.setText("and can block an additional creature this turn"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/ConsignOblivion.java b/Mage.Sets/src/mage/cards/c/ConsignOblivion.java new file mode 100644 index 0000000000..54d3599a86 --- /dev/null +++ b/Mage.Sets/src/mage/cards/c/ConsignOblivion.java @@ -0,0 +1,72 @@ +/* + * 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.cards.c; + +import java.util.UUID; +import mage.abilities.effects.common.ReturnToHandTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; +import mage.abilities.keyword.AftermathAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.cards.SplitCard; +import mage.constants.CardType; +import mage.constants.SpellAbilityType; +import mage.target.common.TargetNonlandPermanent; +import mage.target.common.TargetOpponent; + +/** + * + * @author LevelX2 + */ +public class ConsignOblivion extends SplitCard { + + public ConsignOblivion(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, new CardType[]{CardType.SORCERY}, "{1}{U}", "{4}{B}", SpellAbilityType.SPLIT_AFTERMATH); + + // Return target nonland permanent to its owner's hand. + getLeftHalfCard().getSpellAbility().addEffect(new ReturnToHandTargetEffect()); + getLeftHalfCard().getSpellAbility().addTarget(new TargetNonlandPermanent()); + + // Oblivion {4}{B} + // Sorcery + // Aftermath + ((CardImpl) (getRightHalfCard())).addAbility(new AftermathAbility().setRuleAtTheTop(true)); + // Target opponent discards two cards. + getRightHalfCard().getSpellAbility().addEffect(new DiscardTargetEffect(2)); + getRightHalfCard().getSpellAbility().addTarget(new TargetOpponent()); + } + + public ConsignOblivion(final ConsignOblivion card) { + super(card); + } + + @Override + public ConsignOblivion copy() { + return new ConsignOblivion(this); + } +} diff --git a/Mage.Sets/src/mage/cards/d/DrivenDespair.java b/Mage.Sets/src/mage/cards/d/DrivenDespair.java new file mode 100644 index 0000000000..1003942763 --- /dev/null +++ b/Mage.Sets/src/mage/cards/d/DrivenDespair.java @@ -0,0 +1,81 @@ +/* + * 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.cards.d; + +import java.util.UUID; +import mage.abilities.TriggeredAbility; +import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; +import mage.abilities.keyword.AftermathAbility; +import mage.abilities.keyword.MenaceAbility; +import mage.abilities.keyword.TrampleAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.cards.SplitCard; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SpellAbilityType; + +/** + * + * @author LevelX2 + */ +public class DrivenDespair extends SplitCard { + + public DrivenDespair(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, new CardType[]{CardType.SORCERY}, "{1}{G}", "{1}{B}", SpellAbilityType.SPLIT_AFTERMATH); + + // Until end of turn, creatures you control gain trample and "Whenever this creature deals combat damage to a player, draw a card." + getLeftHalfCard().getSpellAbility().addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); + TriggeredAbility ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1), false); + getLeftHalfCard().getSpellAbility().addEffect(new GainAbilityControlledEffect(ability, Duration.EndOfTurn) + .setText("and \"Whenever this creature deals combat damage to a player, draw a card.\"")); + + // Despair {1}{B} + // Sorcery + // Aftermath + ((CardImpl) (getRightHalfCard())).addAbility(new AftermathAbility().setRuleAtTheTop(true)); + // Until end of turn, creatures you control gain menace and "Whenever this creature deals combat damage to a player, that player discards a card." + getRightHalfCard().getSpellAbility().addEffect(new GainAbilityControlledEffect(new MenaceAbility(), Duration.EndOfTurn)); + ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true); + getRightHalfCard().getSpellAbility().addEffect(new GainAbilityControlledEffect(ability, Duration.EndOfTurn) + .setText("and \"Whenever this creature deals combat damage to a player, that player discards a card.\"")); + + } + + public DrivenDespair(final DrivenDespair card) { + super(card); + } + + @Override + public DrivenDespair copy() { + return new DrivenDespair(this); + } +} diff --git a/Mage.Sets/src/mage/cards/f/FarmMarket.java b/Mage.Sets/src/mage/cards/f/FarmMarket.java new file mode 100644 index 0000000000..f907b6a332 --- /dev/null +++ b/Mage.Sets/src/mage/cards/f/FarmMarket.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.cards.f; + +import java.util.UUID; +import mage.abilities.effects.common.DestroyTargetEffect; +import mage.abilities.effects.common.DrawDiscardControllerEffect; +import mage.abilities.keyword.AftermathAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.cards.SplitCard; +import mage.constants.CardType; +import mage.constants.SpellAbilityType; +import mage.target.common.TargetAttackingOrBlockingCreature; + +/** + * + * @author LevelX2 + */ +public class FarmMarket extends SplitCard { + + public FarmMarket(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, new CardType[]{CardType.SORCERY}, "{2}{W}", "{2}{U}", SpellAbilityType.SPLIT_AFTERMATH); + + // Destroy target attacking or blocking creature. + getLeftHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect()); + getLeftHalfCard().getSpellAbility().addTarget(new TargetAttackingOrBlockingCreature()); + + // Market {2}{U} + // Sorcery + // Aftermath + ((CardImpl) (getRightHalfCard())).addAbility(new AftermathAbility().setRuleAtTheTop(true)); + // Draw two cards, then discard two cards + getRightHalfCard().getSpellAbility().addEffect(new DrawDiscardControllerEffect(2, 2)); + + } + + public FarmMarket(final FarmMarket card) { + super(card); + } + + @Override + public FarmMarket copy() { + return new FarmMarket(this); + } +} diff --git a/Mage.Sets/src/mage/cards/l/LeaveChance.java b/Mage.Sets/src/mage/cards/l/LeaveChance.java new file mode 100644 index 0000000000..51998a2ae8 --- /dev/null +++ b/Mage.Sets/src/mage/cards/l/LeaveChance.java @@ -0,0 +1,124 @@ +/* + * 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.cards.l; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.ReturnToHandTargetEffect; +import mage.abilities.keyword.AftermathAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.cards.Cards; +import mage.cards.SplitCard; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.SpellAbilityType; +import mage.constants.TargetController; +import mage.filter.FilterCard; +import mage.filter.FilterPermanent; +import mage.filter.predicate.other.OwnerPredicate; +import mage.game.Game; +import mage.players.Player; +import mage.target.TargetCard; +import mage.target.TargetPermanent; +import mage.target.common.TargetCardInHand; + +/** + * + * @author LevelX2 + */ +public class LeaveChance extends SplitCard { + + public LeaveChance(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, new CardType[]{CardType.SORCERY}, "{1}{W}", "{3}{R}", SpellAbilityType.SPLIT_AFTERMATH); + + // Return any number of target permanents you own to your hand. + FilterPermanent filter = new FilterPermanent("permanents you own"); + filter.add(new OwnerPredicate(TargetController.YOU)); + getLeftHalfCard().getSpellAbility().addEffect(new ReturnToHandTargetEffect()); + getLeftHalfCard().getSpellAbility().addTarget(new TargetPermanent(0, Integer.MAX_VALUE, filter, false)); + + // Chance + // Sorcery + // Aftermath + ((CardImpl) (getRightHalfCard())).addAbility(new AftermathAbility().setRuleAtTheTop(true)); + // Discard any number of cards, then draw that many cards. + getRightHalfCard().getSpellAbility().addEffect(new ChanceEffect()); + + } + + public LeaveChance(final LeaveChance card) { + super(card); + } + + @Override + public LeaveChance copy() { + return new LeaveChance(this); + } +} + +class ChanceEffect extends OneShotEffect { + + ChanceEffect() { + super(Outcome.DrawCard); + this.staticText = "Discard any number of cards, then draw that many cards"; + } + + ChanceEffect(final ChanceEffect effect) { + super(effect); + } + + @Override + public ChanceEffect copy() { + return new ChanceEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + Cards cardsInHand = controller.getHand().copy(); + TargetCard target = new TargetCardInHand(0, cardsInHand.size(), new FilterCard()); + controller.chooseTarget(outcome, cardsInHand, target, source, game); + if (!target.getTargets().isEmpty()) { + for (UUID cardId : target.getTargets()) { + Card card = game.getCard(cardId); + if (card != null) { + controller.discard(card, source, game); + } + } + game.applyEffects(); + controller.drawCards(target.getTargets().size(), game); + } + return true; + } + return false; + } +} diff --git a/Mage.Sets/src/mage/cards/s/StruggleSurvive.java b/Mage.Sets/src/mage/cards/s/StruggleSurvive.java index 8071b9c1b0..5b7ac2f61e 100644 --- a/Mage.Sets/src/mage/cards/s/StruggleSurvive.java +++ b/Mage.Sets/src/mage/cards/s/StruggleSurvive.java @@ -59,7 +59,7 @@ public class StruggleSurvive extends SplitCard { // Struggle // Struggle deals damage to target creature equal to the number of lands you control. Effect effect = new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledLandPermanent("the number of lands you control"))); - effect.setText("{this} deals damage to target creature equal to the number of lands you control"); + effect.setText("Struggle deals damage to target creature equal to the number of lands you control"); getLeftHalfCard().getSpellAbility().addEffect(effect); getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/HourOfDevastation.java b/Mage.Sets/src/mage/sets/HourOfDevastation.java index d09e4c2736..dc2c4ac298 100644 --- a/Mage.Sets/src/mage/sets/HourOfDevastation.java +++ b/Mage.Sets/src/mage/sets/HourOfDevastation.java @@ -27,6 +27,8 @@ */ package mage.sets; +import java.util.ArrayList; +import java.util.List; import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; import mage.cards.FrameStyle; @@ -36,9 +38,6 @@ import mage.cards.repository.CardRepository; import mage.constants.Rarity; import mage.constants.SetType; -import java.util.ArrayList; -import java.util.List; - /** * @author fireshoes */ @@ -84,6 +83,7 @@ public class HourOfDevastation extends ExpansionSet { cards.add(new SetCardInfo("Chaos Maw", 87, Rarity.RARE, mage.cards.c.ChaosMaw.class)); cards.add(new SetCardInfo("Cinder Barrens", 209, Rarity.COMMON, mage.cards.c.CinderBarrens.class)); cards.add(new SetCardInfo("Claim // Fame", 150, Rarity.UNCOMMON, mage.cards.c.ClaimFame.class)); + cards.add(new SetCardInfo("Consign // Oblivion", 149, Rarity.UNCOMMON, mage.cards.c.ConsignOblivion.class)); cards.add(new SetCardInfo("Crook of Condemnation", 159, Rarity.UNCOMMON, mage.cards.c.CrookOfCondemnation.class)); cards.add(new SetCardInfo("Dauntless Aven", 7, Rarity.COMMON, mage.cards.d.DauntlessAven.class)); cards.add(new SetCardInfo("Defiant Khenra", 89, Rarity.COMMON, mage.cards.d.DefiantKhenra.class)); @@ -98,8 +98,10 @@ public class HourOfDevastation extends ExpansionSet { cards.add(new SetCardInfo("Djeru, With Eyes Open", 10, Rarity.RARE, mage.cards.d.DjeruWithEyesOpen.class)); cards.add(new SetCardInfo("Doomfall", 62, Rarity.UNCOMMON, mage.cards.d.Doomfall.class)); cards.add(new SetCardInfo("Dreamstealer", 63, Rarity.RARE, mage.cards.d.Dreamstealer.class)); + cards.add(new SetCardInfo("Driven // Despair", 157, Rarity.RARE, mage.cards.d.DrivenDespair.class)); cards.add(new SetCardInfo("Dutiful Servants", 12, Rarity.COMMON, mage.cards.d.DutifulServants.class)); cards.add(new SetCardInfo("Earthshaker Khenra", 90, Rarity.RARE, mage.cards.e.EarthshakerKhenra.class)); + cards.add(new SetCardInfo("Farm // Market", 148, Rarity.UNCOMMON, mage.cards.f.FarmMarket.class)); cards.add(new SetCardInfo("Feral Prowler", 115, Rarity.COMMON, mage.cards.f.FeralProwler.class)); cards.add(new SetCardInfo("Fervent Paincaster", 91, Rarity.UNCOMMON, mage.cards.f.FerventPaincaster.class)); cards.add(new SetCardInfo("Forest", 189, Rarity.LAND, mage.cards.basiclands.Forest.class, new CardGraphicInfo(FrameStyle.BFZ_FULL_ART_BASIC, true))); @@ -114,6 +116,7 @@ public class HourOfDevastation extends ExpansionSet { cards.add(new SetCardInfo("Khenra Eternal", 66, Rarity.COMMON, mage.cards.k.KhenraEternal.class)); cards.add(new SetCardInfo("Khenra Scrapper", 100, Rarity.COMMON, mage.cards.k.KhenraScrapper.class)); cards.add(new SetCardInfo("Kindled Fury", 101, Rarity.COMMON, mage.cards.k.KindledFury.class)); + cards.add(new SetCardInfo("Leave // Chance", 153, Rarity.RARE, mage.cards.l.LeaveChance.class)); cards.add(new SetCardInfo("Liliana's Defeat", 68, Rarity.UNCOMMON, mage.cards.l.LilianasDefeat.class)); cards.add(new SetCardInfo("Lurching Rotbeast", 69, Rarity.COMMON, mage.cards.l.LurchingRotbeast.class)); cards.add(new SetCardInfo("Manalith", 164, Rarity.COMMON, mage.cards.m.Manalith.class)); diff --git a/Utils/cardSplitClass.tmpl b/Utils/cardSplitClass.tmpl index ca0c7bcf70..477c5b1b83 100644 --- a/Utils/cardSplitClass.tmpl +++ b/Utils/cardSplitClass.tmpl @@ -39,19 +39,15 @@ import mage.constants.SpellAbilityType; * @author [=$author=] */ public class [=$className=] extends SplitCard { - public [=$className=](UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{[=$type=]}, new CardType[]{[=$type=]}, "[=$manaCost=]", "[=$manaCost=]", SpellAbilityType.SPLIT_AFTERMATH); + super(ownerId, setInfo, new CardType[]{[=$type=]}, new CardType[]{??}, "[=$manaCost=]", "??", SpellAbilityType.SPLIT_AFTERMATH); [=$subType=][=$colors=] -[= -if ($power || $power eq 0) { +[= if ($power || $power eq 0) { $OUT .= "\n this.power = new MageInt($power);"; - $OUT .= "\n this.toughness = new MageInt($toughness);"; -} -=][=$abilities=] - getLeftHalfCard().getSpellAbility().addEffect(new Effect...); + $OUT .= "\n this.toughness = new MageInt($toughness);";} =][=$abilities=] + // getLeftHalfCard().getSpellAbility().addEffect(new Effect()); - getRightHalfCard().getSpellAbility().addEffect(new Effect...); + // getRightHalfCard().getSpellAbility().addEffect(new Effect()); } diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl index 62529529c7..9f011e081f 100755 --- a/Utils/gen-card.pl +++ b/Utils/gen-card.pl @@ -111,6 +111,7 @@ my $cardTemplate = 'cardClass.tmpl'; my $splitDelimiter = '//'; my $empty = ''; my $splitSpell = 'false'; +my $originalName = $cardName; # Remove the // from name of split cards if (index($cardName, $splitDelimiter) != -1) { @@ -132,11 +133,10 @@ $vars{'className'} = toCamelCase($cardName); $vars{'cardNameFirstLetter'} = lc substr($cardName, 0, 1); my @card; -foreach my $setName (keys %{$cards{$cardName}}) { +foreach my $setName (keys %{$cards{$originalName}}) { my $setFileName = "../Mage.Sets/src/mage/sets/".$knownSets{$setName}.".java"; - @card = @{${cards{$cardName}{$setName}}}; - my $line = " cards.add(new SetCardInfo(\"".$card[0]."\", ".$card[2].", Rarity.".$raritiesConversion{$card[3]}.", mage.cards.".$vars{'cardNameFirstLetter'}.".".$vars{'className'}.".class));\n"; - + @card = @{${cards{$originalName}{$setName}}}; + my $line = " cards.add(new SetCardInfo(\"".$card[0]."\", ".$card[2].", Rarity.".$raritiesConversion{$card[3]}.", mage.cards.".$vars{'cardNameFirstLetter'}.".".$vars{'className'}.".class));\n"; @ARGV = ($setFileName); $^I = '.bak'; my $last; @@ -174,13 +174,12 @@ foreach my $setName (keys %{$cards{$cardName}}) { unlink $setFileName.".bak"; print "$setFileName\n"; } -print "Generate the card: ".$card[0]."\n"; + # Generate the card my $result; my $template = Text::Template->new(TYPE => 'FILE', SOURCE => $cardTemplate, DELIMITERS => [ '[=', '=]' ]); $vars{'author'} = $author; $vars{'manaCost'} = fixCost($card[4]); -print "cost ".$vars{'manaCost'}."\n"; $vars{'power'} = $card[6]; $vars{'toughness'} = $card[7]; @@ -192,7 +191,6 @@ my $type = $card[5]; while ($type =~ m/([a-zA-Z]+)( )*/g) { if (exists($cardTypes{$1})) { push(@types, $cardTypes{$1}); -print $cardTypes{$1}."\n"; if ($cardTypes{$1} eq $cardTypes{'Planeswalker'}) { $vars{'planeswalker'} = 'true'; $cardAbilities = $card[7]; @@ -211,6 +209,10 @@ $vars{'type'} = join(', ', @types); $vars{'abilitiesImports'} = ''; $vars{'abilities'} = ''; +my $strong = ""; +$cardAbilities =~ s/$strong/$empty/g; +$strong = ""; +$cardAbilities =~ s/$strong/$empty/g; my @abilities = split('\$', $cardAbilities); foreach my $ability (@abilities) { diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index f15401f2f6..859ca9acd3 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -31773,7 +31773,7 @@ Samut, the Tested|Hour of Devastation|144|M|{2}{R}{G}|Planeswalker - Samut|4|+1: The Scarab God|Hour of Devastation|145|M|{3}{U}{B}|Legendary Creature - God|5|5|At the beginning of your upkeep, each opponent loses X life and you scry X, where X is the number of Zombies you control.${2}{U}{B}: Exile target creature card from a graveyard. Create a token that's a copy of it, except it's a 4/4 black Zombie.$When The Scarab God dies, return it to its owner's hand at the beginning of the next upkeep.| The Scorpion God|Hour of Devastation|146|M|{3}{B}{R}|Legendary Creature - God|6|5|Whenever a creature with a -1/-1 counter on it dies, draw a card.${1}{B}{R}: Put a -1/-1 counter on another target creature.$When The Scorpion God dies, return it to its owner's hand at the beginning of the next end step.| Unraveling Mummy|Hour of Devastation|147|U|{1}{W}{B}|Creature - Zombie|2|3|{1}{W}: Target attacking Zombie gains lifelink until end of turn.${1}{B}: Target attacking Zombie gains deathtouch until end of turn.| -Farm // Market|Hour of Devastation|148|U|{2}{W}|Instant|||Destroy target attacking or blocking creature.$Market {2}{U}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Draw two cards, then destroy two cards| +Farm // Market|Hour of Devastation|148|U|{2}{W}|Instant|||Destroy target attacking or blocking creature.$Market {2}{U}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Draw two cards, then discard two cards| Consign // Oblivion|Hour of Devastation|149|U|{1}{U}|Instant|||Return target nonland permanent to its owner's hand.$Oblivion {4}{B}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Target opponent discards two cards.| Claim // Fame|Hour of Devastation|150|U|{B}|Sorcery|||Return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.$Fame {1}{R}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Target creature gets +2/+0 and gains haste until end of turn.| Struggle // Survive|Hour of Devastation|151|U|{2}{R}|Instant|||Struggle deals damage to target creature equal to the number of lands you control.$Survive {1}{G}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Each player shuffles his or graveyard into his or her library.|