From 6a9f8175dffc6479d88432227bc65ede47cf04d1 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 07:13:50 +0000 Subject: [PATCH] - Bugfix for spBounceTgt: Removed Drawback$ from the Drawback$ string which caused any spBounceTgt spell to draw X cards along with it's normal Drawback ability. --- src/forge/CardFactory.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index eee16d388df..c5eaece74cf 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -625,7 +625,6 @@ public class CardFactory implements NewConstants { }); } - // Support for using string variables to define Count$ for X or Y // Or just about any other String that a card object needs at any given time while(hasKeyword(card, "SVar") != -1) { @@ -3087,8 +3086,10 @@ public class CardFactory implements NewConstants { final String Drawback[] = {"none"}; if (k.length > 3) { - if (k[3].contains("Drawback$")) - Drawback[0] = k[3]; + if (k[3].contains("Drawback$")){ + String kk[] = k[3].split("\\$"); + Drawback[0] = kk[1]; + } } final String Selec[] = {"Select a target "}; @@ -10372,7 +10373,7 @@ public class CardFactory implements NewConstants { else if (card.getManaCost().startsWith("X")) sa.setXManaCost("1"); }//X - + return card; }//getCard2