From 0ec47fb705025dbb6696d41ecc3de7c152d96183 Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 8 Dec 2011 12:46:36 +0000 Subject: [PATCH] - Skeletal Vampire will now use his bats for his abilities. --- res/cardsfolder/s/skeletal_vampire.txt | 5 +++-- .../forge/card/abilityfactory/AbilityFactoryToken.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/res/cardsfolder/s/skeletal_vampire.txt b/res/cardsfolder/s/skeletal_vampire.txt index e481e9daa22..44061b8cd22 100644 --- a/res/cardsfolder/s/skeletal_vampire.txt +++ b/res/cardsfolder/s/skeletal_vampire.txt @@ -5,9 +5,10 @@ Text:no text PT:3/3 K:Flying T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put two 1/1 black Bat creature tokens with flying onto the battlefield. -SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | TokenOwner$ You | TokenAmount$ 2 -A:AB$ Token | Cost$ 3 B B Sac<1/Bat> | TokenAmount$ 2 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | TokenOwner$ You | SpellDescription$ Put two 1/1 black Bat creature tokens with flying onto the battlefield. +SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | TokenOwner$ You | TokenAmount$ 2 | TokenSVars$ Sac +A:AB$ Token | Cost$ 3 B B Sac<1/Bat> | TokenAmount$ 2 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | TokenOwner$ You | TokenSVars$ Sac | SpellDescription$ Put two 1/1 black Bat creature tokens with flying onto the battlefield. A:AB$ Regenerate | Cost$ Sac<1/Bat> | SpellDescription$ Regenerate CARDNAME. +SVar:Sac:SVar:SacMe:4 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/skeletal_vampire.jpg SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/62.jpg diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java index 3d086bfae63..c906d768c0a 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java @@ -527,9 +527,15 @@ public class AbilityFactoryToken extends AbilityFactory { // Grant SVars if (this.tokenSVars != null) { for (final String s : this.tokenSVars) { - final String actualSVar = this.abilityFactory.getHostCard().getSVar(s); + String actualSVar = this.abilityFactory.getHostCard().getSVar(s); + String name = s; + if (actualSVar.startsWith("SVar")) { + actualSVar = actualSVar.split("SVar:")[1]; + name = actualSVar.split(":")[0]; + actualSVar = actualSVar.split(":")[1]; + } for (final Card c : tokens) { - c.setSVar(s, actualSVar); + c.setSVar(name, actualSVar); } } }