From cd74d2a7bf7d85a43805f99ae622ab983e5d959b Mon Sep 17 00:00:00 2001 From: Chris H Date: Mon, 15 Oct 2018 22:18:23 -0400 Subject: [PATCH] Convert FullCost to PermanentCreature --- .../main/java/forge/game/card/CardFactoryUtil.java | 13 ------------- forge-gui/res/cardsfolder/c/caller_of_the_hunt.txt | 2 +- forge-gui/res/cardsfolder/h/headless_skaab.txt | 2 +- forge-gui/res/cardsfolder/i/imperiosaur.txt | 3 +-- forge-gui/res/cardsfolder/m/makeshift_mauler.txt | 2 +- forge-gui/res/cardsfolder/m/myr_superion.txt | 2 +- forge-gui/res/cardsfolder/r/relentless_skaabs.txt | 2 +- forge-gui/res/cardsfolder/s/skaab_goliath.txt | 2 +- forge-gui/res/cardsfolder/s/skaab_ruinator.txt | 2 +- forge-gui/res/cardsfolder/s/stitched_drake.txt | 2 +- 10 files changed, 9 insertions(+), 23 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 3d62dde6fbe..acbefc4d72d 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -2014,18 +2014,6 @@ public class CardFactoryUtil { inst.createTraits(card, true); } - // AddCost - if (card.hasSVar("FullCost")) { - String k[] = card.getSVar("FullCost").split(":"); - final SpellAbility sa1 = card.getFirstSpellAbility(); - if (sa1 != null && sa1.isSpell()) { - sa1.setPayCosts(new Cost(k[0], sa1.isAbility())); - if (k.length > 1) { - sa1.getMapParams().put("AILogic", k[1]); - } - } - } - // AltCost String altCost = card.getSVar("AltCost"); if (StringUtils.isNotBlank(altCost)) { @@ -2034,7 +2022,6 @@ public class CardFactoryUtil { card.addSpellAbility(makeAltCostAbility(card, altCost, sa1)); } } - } private static ReplacementEffect createETBReplacement(final Card card, ReplacementLayer layer, diff --git a/forge-gui/res/cardsfolder/c/caller_of_the_hunt.txt b/forge-gui/res/cardsfolder/c/caller_of_the_hunt.txt index e973b31e704..84849bc4d9d 100644 --- a/forge-gui/res/cardsfolder/c/caller_of_the_hunt.txt +++ b/forge-gui/res/cardsfolder/c/caller_of_the_hunt.txt @@ -2,8 +2,8 @@ Name:Caller of the Hunt ManaCost:2 G Types:Creature Human PT:*/* +A:SP$ PermanentCreature | Cost$ 2 G ChooseCreatureType<1> | AILogic$ MostProminentOnBattlefield S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of creatures of the chosen type on the battlefield. SVar:X:Count$Valid Creature.ChosenType -SVar:FullCost:2 G ChooseCreatureType<1>:MostProminentOnBattlefield SVar:Picture:http://www.wizards.com/global/images/magic/general/caller_of_the_hunt.jpg Oracle:As an additional cost to cast this spell, choose a creature type.\nCaller of the Hunt's power and toughness are each equal to the number of creatures of the chosen type on the battlefield. diff --git a/forge-gui/res/cardsfolder/h/headless_skaab.txt b/forge-gui/res/cardsfolder/h/headless_skaab.txt index 7d321382402..44f9e3cc5d1 100644 --- a/forge-gui/res/cardsfolder/h/headless_skaab.txt +++ b/forge-gui/res/cardsfolder/h/headless_skaab.txt @@ -3,6 +3,6 @@ ManaCost:2 U Types:Creature Zombie Warrior PT:3/6 K:CARDNAME enters the battlefield tapped. -SVar:FullCost:2 U ExileFromGrave<1/Creature> +A:SP$ PermanentCreature | Cost$ 2 U ExileFromGrave<1/Creature> SVar:Picture:http://www.wizards.com/global/images/magic/general/headless_skaab.jpg Oracle:As an additional cost to cast Headless Skaab, exile a creature card from your graveyard.\nHeadless Skaab enters the battlefield tapped. diff --git a/forge-gui/res/cardsfolder/i/imperiosaur.txt b/forge-gui/res/cardsfolder/i/imperiosaur.txt index 1ac3fcee99d..53c761e7050 100644 --- a/forge-gui/res/cardsfolder/i/imperiosaur.txt +++ b/forge-gui/res/cardsfolder/i/imperiosaur.txt @@ -2,7 +2,6 @@ Name:Imperiosaur ManaCost:2 G G Types:Creature Dinosaur Text:Spend only mana produced by basic lands to cast CARDNAME. -PT:5/5 -SVar:FullCost:Mana<2 G G\Basic> +A:SP$ PermanentCreature | Cost$ Mana<2 G G\Basic> SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card130634.jpg Oracle:Spend only mana produced by basic lands to cast Imperiosaur. diff --git a/forge-gui/res/cardsfolder/m/makeshift_mauler.txt b/forge-gui/res/cardsfolder/m/makeshift_mauler.txt index 6e15a9ea94c..bf5f2173f5d 100644 --- a/forge-gui/res/cardsfolder/m/makeshift_mauler.txt +++ b/forge-gui/res/cardsfolder/m/makeshift_mauler.txt @@ -2,6 +2,6 @@ Name:Makeshift Mauler ManaCost:3 U Types:Creature Zombie Horror PT:4/5 -SVar:FullCost:3 U ExileFromGrave<1/Creature> +A:SP$ PermanentCreature | Cost$ 3 U ExileFromGrave<1/Creature> SVar:Picture:http://www.wizards.com/global/images/magic/general/makeshift_mauler.jpg Oracle:As an additional cost to cast Makeshift Mauler, exile a creature card from your graveyard. diff --git a/forge-gui/res/cardsfolder/m/myr_superion.txt b/forge-gui/res/cardsfolder/m/myr_superion.txt index 3d9a93a570d..b309044b89f 100644 --- a/forge-gui/res/cardsfolder/m/myr_superion.txt +++ b/forge-gui/res/cardsfolder/m/myr_superion.txt @@ -3,7 +3,7 @@ ManaCost:2 Types:Artifact Creature Myr PT:5/6 Text:Spend only mana produced by creatures to cast CARDNAME. -SVar:FullCost:Mana<2\Creature> +A:SP$ PermanentCreature | Cost$ Mana<2\Creature> SVar:RemRandomDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/myr_superion.jpg Oracle:Spend only mana produced by creatures to cast Myr Superion. diff --git a/forge-gui/res/cardsfolder/r/relentless_skaabs.txt b/forge-gui/res/cardsfolder/r/relentless_skaabs.txt index e487dab907b..6d0879aa058 100644 --- a/forge-gui/res/cardsfolder/r/relentless_skaabs.txt +++ b/forge-gui/res/cardsfolder/r/relentless_skaabs.txt @@ -3,6 +3,6 @@ ManaCost:3 U U Types:Creature Zombie PT:4/4 K:Undying -SVar:FullCost:3 U U ExileFromGrave<1/Creature> +A:SP$ PermanentCreature | Cost$ 3 U U ExileFromGrave<1/Creature> SVar:Picture:http://www.wizards.com/global/images/magic/general/relentless_skaabs.jpg Oracle:As an additional cost to cast Relentless Skaabs, exile a creature card from your graveyard.\nUndying (When this creature dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.) diff --git a/forge-gui/res/cardsfolder/s/skaab_goliath.txt b/forge-gui/res/cardsfolder/s/skaab_goliath.txt index 9b1f20a26f2..15f63a8a8e3 100644 --- a/forge-gui/res/cardsfolder/s/skaab_goliath.txt +++ b/forge-gui/res/cardsfolder/s/skaab_goliath.txt @@ -3,6 +3,6 @@ ManaCost:5 U Types:Creature Zombie Giant PT:6/9 K:Trample -SVar:FullCost:5 U ExileFromGrave<2/Creature> +A:SP$ PermanentCreature | Cost$ 5 U ExileFromGrave<2/Creature> SVar:Picture:http://www.wizards.com/global/images/magic/general/skaab_goliath.jpg Oracle:As an additional cost to cast Skaab Goliath, exile two creature cards from your graveyard.\nTrample diff --git a/forge-gui/res/cardsfolder/s/skaab_ruinator.txt b/forge-gui/res/cardsfolder/s/skaab_ruinator.txt index f13a8f42cae..38ab2d38e05 100644 --- a/forge-gui/res/cardsfolder/s/skaab_ruinator.txt +++ b/forge-gui/res/cardsfolder/s/skaab_ruinator.txt @@ -3,7 +3,7 @@ ManaCost:1 U U Types:Creature Zombie Horror PT:5/6 K:Flying -SVar:FullCost:1 U U ExileFromGrave<3/Creature> +A:SP$ PermanentCreature | Cost$ 1 U U ExileFromGrave<3/Creature> SVar:AltCost:Cost$ 1 U U ExileFromGrave<3/Creature.Other> | ActivationZone$ Graveyard | Description$ You may cast CARDNAME from your graveyard. SVar:Picture:http://www.wizards.com/global/images/magic/general/skaab_ruinator.jpg Oracle:As an additional cost to cast Skaab Ruinator, exile three creature cards from your graveyard.\nFlying\nYou may cast Skaab Ruinator from your graveyard. diff --git a/forge-gui/res/cardsfolder/s/stitched_drake.txt b/forge-gui/res/cardsfolder/s/stitched_drake.txt index a12f6807393..4330e399a22 100644 --- a/forge-gui/res/cardsfolder/s/stitched_drake.txt +++ b/forge-gui/res/cardsfolder/s/stitched_drake.txt @@ -3,6 +3,6 @@ ManaCost:1 U U Types:Creature Zombie Drake PT:3/4 K:Flying -SVar:FullCost:1 U U ExileFromGrave<1/Creature> +A:SP$ PermanentCreature | Cost$ 1 U U ExileFromGrave<1/Creature> SVar:Picture:http://www.wizards.com/global/images/magic/general/stitched_drake.jpg Oracle:As an additional cost to cast Stitched Drake, exile a creature card from your graveyard.\nFlying