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

- Generalized the xcount functions available in continuous static abilities (fixes Mwonvuli Ooze).

Browse Source
This commit is contained in:
Sloth
2011-09-04 20:29:34 +00:00
parent 25b1fe6cf3
commit aefb076f23
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java
View File

@@ -50,22 +50,22 @@ public class StaticAbility_Continuous {
if (params.containsKey("SetPower")) { if (params.containsKey("SetPower")) {
String 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)
: CardFactoryUtil.xCount(hostCard, hostCard.getSVar(setP).split("\\$")[1]); : CardFactoryUtil.xCount(hostCard, hostCard.getSVar(setP));
} }
if (params.containsKey("SetToughness")) { if (params.containsKey("SetToughness")) {
String 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)
: CardFactoryUtil.xCount(hostCard, hostCard.getSVar(setT).split("\\$")[1]); : CardFactoryUtil.xCount(hostCard, hostCard.getSVar(setT));
} }
if (params.containsKey("AddPower")) { if (params.containsKey("AddPower")) {
if (params.get("AddPower").equals("X")) { if (params.get("AddPower").equals("X")) {
powerBonus = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("X").split("\\$")[1]); powerBonus = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("X"));
se.setXValue(powerBonus); se.setXValue(powerBonus);
} }
else if (params.get("AddPower").equals("Y")) { else if (params.get("AddPower").equals("Y")) {
powerBonus = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("Y").split("\\$")[1]); powerBonus = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("Y"));
se.setYValue(powerBonus); se.setYValue(powerBonus);
} }
else powerBonus = Integer.valueOf(params.get("AddPower")); else powerBonus = Integer.valueOf(params.get("AddPower"));
@@ -73,11 +73,11 @@ public class StaticAbility_Continuous {
if (params.containsKey("AddToughness")) { if (params.containsKey("AddToughness")) {
if (params.get("AddToughness").equals("X")) { if (params.get("AddToughness").equals("X")) {
toughnessBonus = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("X").split("\\$")[1]); toughnessBonus = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("X"));
se.setXValue(toughnessBonus); se.setXValue(toughnessBonus);
} }
else if (params.get("AddToughness").equals("Y")) { else if (params.get("AddToughness").equals("Y")) {
toughnessBonus = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("Y").split("\\$")[1]); toughnessBonus = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("Y"));
se.setYValue(toughnessBonus); se.setYValue(toughnessBonus);
} }
else toughnessBonus = Integer.valueOf(params.get("AddToughness")); else toughnessBonus = Integer.valueOf(params.get("AddToughness"));