diff --git a/res/cardsfolder/wydwen_the_biting_gale.txt b/res/cardsfolder/wydwen_the_biting_gale.txt index 95cc15b9954..04f92434ba1 100644 --- a/res/cardsfolder/wydwen_the_biting_gale.txt +++ b/res/cardsfolder/wydwen_the_biting_gale.txt @@ -5,6 +5,7 @@ Text:no text PT:3/3 K:Flying K:Flash +A:AB$Bounce|Cost$U B PayLife<1>|Destination$Hand|SpellDescription$Return Wydwen, the Biting Gale to its owner's hand. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/wydwen_the_biting_gale.jpg End diff --git a/src/forge/AbilityFactory_Bounce.java b/src/forge/AbilityFactory_Bounce.java index 6d8e9e1f0ce..8f1be54c8df 100644 --- a/src/forge/AbilityFactory_Bounce.java +++ b/src/forge/AbilityFactory_Bounce.java @@ -23,22 +23,30 @@ public class AbilityFactory_Bounce { StringBuilder sb = new StringBuilder(); String name = af.getHostCard().getName(); + String targetname = ""; + + + Card tgt = getTargetCard(); + if (tgt != null) + targetname = tgt.getName(); + else + targetname = name; if(destination.equals("Hand")) - sb.append(name).append(" - Return ").append(getTargetCard().getName()).append(" to its owners hand."); + sb.append(name).append(" - Return ").append(targetname).append(" to its owners hand."); if(destination.equals("TopofLibrary")) - sb.append(name).append(" - Put ").append(getTargetCard().getName()).append(" on top of its owner's library."); + sb.append(name).append(" - Put ").append(targetname).append(" on top of its owner's library."); if(destination.equals("BottomofLibrary")) - sb.append(name).append(" - Put ").append(getTargetCard().getName()).append(" on the bottom of its owner's library."); + sb.append(name).append(" - Put ").append(targetname).append(" on the bottom of its owner's library."); if(destination.equals("ShuffleIntoLibrary")) - sb.append(name).append(" - Shuffle ").append(getTargetCard().getName()).append(" into its owner's library."); + sb.append(name).append(" - Shuffle ").append(targetname).append(" into its owner's library."); if(destination.equals("Exile")) - sb.append(name).append(" - Exile ").append(getTargetCard().getName()); - + sb.append(name).append(" - Exile ").append(targetname); + return sb.toString(); } @@ -202,7 +210,7 @@ public class AbilityFactory_Bounce { public static void bounceResolve(final AbilityFactory af, final SpellAbility sa, final String Destination){ HashMap params = af.getMapParams(); String DrawBack = params.get("SubAbility"); - Card card = af.getHostCard(); + Card card = sa.getSourceCard(); ArrayList tgtCards; diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 98bc01baad2..5598c8d9686 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -13845,7 +13845,7 @@ public class CardFactory_Creatures { card.addComesIntoPlayCommand(gain2Life); }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Wydwen, the Biting Gale")) { final SpellAbility a1 = new Ability(card, "U B PayLife<1>") { @@ -13858,10 +13858,10 @@ public class CardFactory_Creatures { @Override public void resolve() { PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card.getOwner()); - /* + AllZone.getZone(card).remove(card); hand.add(card); - */ + if(card.isToken()) AllZone.getZone(card).remove(card); else AllZone.GameAction.moveTo(hand, card); } @@ -13875,7 +13875,7 @@ public class CardFactory_Creatures { a1.setDescription("U B, Pay 1 life: Return Wydwen, the Biting Gale to its owner's hand."); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Tradewind Rider")) {