external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed a bug with AddToughness.

Browse Source
This commit is contained in:
Sloth
2013-02-05 09:21:53 +00:00
parent 39168be85a
commit d4d452270d
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/forge/card/staticability/StaticAbilityContinuous.java
View File

@@ -68,13 +68,9 @@ public class StaticAbilityContinuous {
se.setSource(hostCard); se.setSource(hostCard);
Singletons.getModel().getGame().getStaticEffects().addStaticEffect(se); Singletons.getModel().getGame().getStaticEffects().addStaticEffect(se);
String addP = "";
int powerBonus = 0; int powerBonus = 0;
String addT = "";
int toughnessBonus = 0; int toughnessBonus = 0;
String setP = "";
int setPower = -1; int setPower = -1;
String setT = "";
int setToughness = -1; int setToughness = -1;
int keywordMultiplier = 1; int keywordMultiplier = 1;
@@ -101,19 +97,19 @@ public class StaticAbilityContinuous {
} }
if (params.containsKey("SetPower")) { if (params.containsKey("SetPower")) {
setP = params.get("SetPower"); String setP = params.get("SetPower");
setPower = setP.matches("[0-9][0-9]?") ? Integer.parseInt(setP) setPower = setP.matches("[0-9][0-9]?") ? Integer.parseInt(setP)
: AbilityFactory.calculateAmount(hostCard, setP, null); : AbilityFactory.calculateAmount(hostCard, setP, null);
} }
if (params.containsKey("SetToughness")) { if (params.containsKey("SetToughness")) {
setT = params.get("SetToughness"); String setT = params.get("SetToughness");
setToughness = setT.matches("[0-9][0-9]?") ? Integer.parseInt(setT) setToughness = setT.matches("[0-9][0-9]?") ? Integer.parseInt(setT)
: AbilityFactory.calculateAmount(hostCard, setT, null); : AbilityFactory.calculateAmount(hostCard, setT, null);
} }
if (params.containsKey("AddPower")) { if (params.containsKey("AddPower")) {
addP = params.get("AddPower"); String addP = params.get("AddPower");
powerBonus = addP.matches("[0-9][0-9]?") ? Integer.parseInt(addP) powerBonus = addP.matches("[0-9][0-9]?") ? Integer.parseInt(addP)
: AbilityFactory.calculateAmount(hostCard, addP, null); : AbilityFactory.calculateAmount(hostCard, addP, null);
if (!addP.matches("[0-9][0-9]?") && !addP.equals("AffectedX")) { if (!addP.matches("[0-9][0-9]?") && !addP.equals("AffectedX")) {
@@ -122,11 +118,11 @@ public class StaticAbilityContinuous {
} }
if (params.containsKey("AddToughness")) { if (params.containsKey("AddToughness")) {
addT = params.get("AddToughness"); String addT = params.get("AddToughness");
toughnessBonus = addT.matches("[0-9][0-9]?") ? Integer.parseInt(addT) toughnessBonus = addT.matches("[0-9][0-9]?") ? Integer.parseInt(addT)
: AbilityFactory.calculateAmount(hostCard, addT, null); : AbilityFactory.calculateAmount(hostCard, addT, null);
if (!addT.matches("[0-9][0-9]?") && !addT.equals("AffectedX")) { if (!addT.matches("[0-9][0-9]?") && !addT.equals("AffectedX")) {
se.setXValue(powerBonus); se.setXValue(toughnessBonus);
} }
} }