From 6f9ca45d29911093082d54fb94168e3bdeaf06eb Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 12:29:13 +0000
Subject: [PATCH] - Bugfix for -X situation that caused a crash. Now strips out
 the minus sign before searching for Variable amount in AFs

---
 src/forge/AbilityFactory.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/forge/AbilityFactory.java b/src/forge/AbilityFactory.java
index 8abac871222..caf7af2c0de 100644
--- a/src/forge/AbilityFactory.java
+++ b/src/forge/AbilityFactory.java
@@ -461,6 +461,14 @@ public class AbilityFactory {
 	
 	public static int calculateAmount(Card card, String amount, SpellAbility ability){
 		// amount can be anything, not just 'X' as long as sVar exists
+		
+		// If Amount is -X, strip the minus sign before looking for an SVar of that kind
+		int multiplier = 1;
+		if (amount.startsWith("-")){
+			multiplier = -1;
+			amount = amount.substring(1);
+		}
+		
 		if (!card.getSVar(amount).equals(""))
 		{
 			String calcX[] = card.getSVar(amount).split("\\$");
@@ -469,26 +477,26 @@ public class AbilityFactory {
 			
 			if (calcX[0].startsWith("Count"))
 			{
-				return CardFactoryUtil.xCount(card, calcX[1]);
+				return CardFactoryUtil.xCount(card, calcX[1]) * multiplier;
 			}
 			else if (ability != null && calcX[0].startsWith("Sacrificed"))
 			{
-				return CardFactoryUtil.handlePaid(ability.getSacrificedCost(), calcX[1]);
+				return CardFactoryUtil.handlePaid(ability.getSacrificedCost(), calcX[1]) * multiplier;
 			}
 			else if (ability != null && calcX[0].startsWith("Discarded"))
 			{
-				return CardFactoryUtil.handlePaid(ability.getDiscardedCost(), calcX[1]);
+				return CardFactoryUtil.handlePaid(ability.getDiscardedCost(), calcX[1]) * multiplier;
 			}
 			else if (ability != null && calcX[0].startsWith("Targeted"))
 			{
 				CardList list = new CardList(ability.getTarget().getTargetCards().toArray());
-				return CardFactoryUtil.handlePaid(list, calcX[1]);
+				return CardFactoryUtil.handlePaid(list, calcX[1]) * multiplier;
 			}
 			else
 				return 0;
 		}
 
-		return Integer.parseInt(amount);
+		return Integer.parseInt(amount) * multiplier;
 	}
 }