From d4d452270d425ad89a4be97feb14b31d7d1b58e3 Mon Sep 17 00:00:00 2001 From: Sloth Date: Tue, 5 Feb 2013 09:21:53 +0000 Subject: [PATCH] - Fixed a bug with AddToughness. --- .../staticability/StaticAbilityContinuous.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java index a3e85406bb7..36cc4d1de54 100644 --- a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java +++ b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java @@ -68,13 +68,9 @@ public class StaticAbilityContinuous { se.setSource(hostCard); Singletons.getModel().getGame().getStaticEffects().addStaticEffect(se); - String addP = ""; int powerBonus = 0; - String addT = ""; int toughnessBonus = 0; - String setP = ""; int setPower = -1; - String setT = ""; int setToughness = -1; int keywordMultiplier = 1; @@ -101,19 +97,19 @@ public class StaticAbilityContinuous { } if (params.containsKey("SetPower")) { - setP = params.get("SetPower"); + String setP = params.get("SetPower"); setPower = setP.matches("[0-9][0-9]?") ? Integer.parseInt(setP) : AbilityFactory.calculateAmount(hostCard, setP, null); } if (params.containsKey("SetToughness")) { - setT = params.get("SetToughness"); + String setT = params.get("SetToughness"); setToughness = setT.matches("[0-9][0-9]?") ? Integer.parseInt(setT) : AbilityFactory.calculateAmount(hostCard, setT, null); } if (params.containsKey("AddPower")) { - addP = params.get("AddPower"); + String addP = params.get("AddPower"); powerBonus = addP.matches("[0-9][0-9]?") ? Integer.parseInt(addP) : AbilityFactory.calculateAmount(hostCard, addP, null); if (!addP.matches("[0-9][0-9]?") && !addP.equals("AffectedX")) { @@ -122,11 +118,11 @@ public class StaticAbilityContinuous { } if (params.containsKey("AddToughness")) { - addT = params.get("AddToughness"); + String addT = params.get("AddToughness"); toughnessBonus = addT.matches("[0-9][0-9]?") ? Integer.parseInt(addT) : AbilityFactory.calculateAmount(hostCard, addT, null); if (!addT.matches("[0-9][0-9]?") && !addT.equals("AffectedX")) { - se.setXValue(powerBonus); + se.setXValue(toughnessBonus); } }