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

- Fixed Coalition Relic.

Browse Source
This commit is contained in:
Sloth
2012-12-01 12:31:38 +00:00
parent 92c3d3ba96
commit 3b69bbf6bf
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/card/abilityfactory/AbilityFactory.java
View File

@@ -531,9 +531,7 @@ public class AbilityFactory {
if (calcX[0].startsWith("Count")) {
return CardFactoryUtil.xCount(card, calcX[1], ability) * multiplier;
}
if (calcX[0].startsWith("Number")) {
} else if (calcX[0].startsWith("Number")) {
return CardFactoryUtil.xCount(card, svarval) * multiplier;
} else if (calcX[0].startsWith("SVar")) {
final String[] l = calcX[1].split("/");

2
src/main/java/forge/card/abilityfactory/effects/CountersRemoveEffect.java
View File

@@ -147,7 +147,6 @@ public class CountersRemoveEffect extends SpellEffect {
counterAmount = Integer.parseInt(o);
}
}
tgtCard.subtractCounter(CounterType.valueOf(type), counterAmount);
if (rememberRemoved) {
if (counterAmount > tgtCard.getCounters(CounterType.valueOf(type))) {
counterAmount = tgtCard.getCounters(CounterType.valueOf(type));
@@ -156,6 +155,7 @@ public class CountersRemoveEffect extends SpellEffect {
card.addRemembered(CounterType.valueOf(type));
}
}
tgtCard.subtractCounter(CounterType.valueOf(type), counterAmount);
}
}
}