From 578ec400329c240b32c729b2f3d47641b8dd86d3 Mon Sep 17 00:00:00 2001 From: Sol Date: Tue, 20 Sep 2011 03:27:10 +0000 Subject: [PATCH] XPaid can now be used with XMath Converted Banshee to Script --- res/cardsfolder/b/banshee.txt | 5 +++ .../card/cardFactory/CardFactoryUtil.java | 2 +- .../cardFactory/CardFactory_Creatures.java | 38 ------------------- 3 files changed, 6 insertions(+), 39 deletions(-) diff --git a/res/cardsfolder/b/banshee.txt b/res/cardsfolder/b/banshee.txt index 30e80660abe..ca164c47e99 100644 --- a/res/cardsfolder/b/banshee.txt +++ b/res/cardsfolder/b/banshee.txt @@ -3,6 +3,11 @@ ManaCost:2 B B Types:Creature Spirit Text:no text PT:0/1 +A:AB$ DealDamage | Cost$ X T | Tgt$ TgtCP | NumDmg$ HalfXDown | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals half X damage, rounded down, to target creature or player, and half X damage, rounded up, to you. +SVar:DBDamage:DB$ DealDamage | Defined$ You | NumDmg$ HalfXUp +SVar:X:Count$xPaid +SVar:HalfXDown:Count$xPaid/HalfDown +SVar:HalfXUp:Count$xPaid/HalfUp SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/banshee.jpg diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index 19c6398ecd6..341d2350581 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -2909,7 +2909,7 @@ public class CardFactoryUtil { sq = l[0].split("\\."); if (sq[0].contains("xPaid")) { - return c.getXManaCostPaid(); + return doXMath(c.getXManaCostPaid(), m, c); } if (sq[0].contains("xLifePaid")) { diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java index ffc3b0c097d..05688910215 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java @@ -2341,44 +2341,6 @@ public class CardFactory_Creatures { }//*************** END ************ END ************************** - //*************** START *********** START ************************** - else if (cardName.equals("Banshee")) { - /* - * X, Tap: Banshee deals half X damage, rounded down, to target creature or - * player, and half X damage, rounded up, to you. - */ - - Cost abCost = new Cost("X T", cardName, true); - Target tgt = new Target(card, "TgtCP"); - - final Ability_Activated ability = new Ability_Activated(card, abCost, tgt) { - private static final long serialVersionUID = 2755743211116192949L; - - @Override - public void resolve() { - int x = card.getXManaCostPaid(); - if (getTargetPlayer() == null) { - getTargetCard().addDamage((int) Math.floor(x / 2.0), card); - } else { - getTargetPlayer().addDamage((int) Math.floor(x / 2.0), card); - } - card.getController().addDamage((int) Math.ceil(x / 2.0), card); - card.setXManaCostPaid(0); - }//resolve() - - @Override - public boolean canPlayAI() { - return false; - } - - };//SpellAbility - - ability.setDescription("X, tap: " + "Banshee deals half X damage, rounded down, to target creature or player, and half X damage, rounded up, to you."); - ability.setStackDescription(card.getName() + " - Banshee deals half X damage, rounded down, to target creature or player, and half X damage, rounded up, to you."); - card.addSpellAbility(ability); - }//*************** END ************ END ************************** - - //*************** START *********** START ************************** else if (cardName.equals("Shapeshifter")) { Command intoPlay = new Command() {