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

- Fixed xCount "Kicked" (normal kicker) interfering with "TimesKicked" (multikicker)

Browse Source
This commit is contained in:
moomarc
2012-09-26 09:09:02 +00:00
parent 4c3b020367
commit c3e97da64c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -478,7 +478,7 @@ public class CardFactoryUtil {
value += power * 10;
}
if (power > 1 && c.hasKeyword("Trample")) {
value += (power -1) * 5;
value += (power - 1) * 5;
}
if (c.hasKeyword("Vigilance")) {
value += (power * 5) + (toughness * 5);
@@ -499,7 +499,7 @@ public class CardFactoryUtil {
value += 3;
}
}
value += c.getKeywordMagnitude("Bushido") * 16;
value += c.getAmountOfKeyword("Flanking") * 15;
value += c.getAmountOfKeyword("Exalted") * 15;
@@ -577,7 +577,7 @@ public class CardFactoryUtil {
} else if (c.hasStartOfKeyword("(Echo unpaid)")) {
value -= 10;
}
if (c.hasStartOfKeyword("At the beginning of your upkeep, CARDNAME deals")) {
value -= 20;
}
@@ -1189,7 +1189,7 @@ public class CardFactoryUtil {
@Override
public void resolve() {
final Card c = Singletons.getModel().getGameAction().exile(sourceCard);
int counters = AbilityFactory.calculateAmount(c, timeCounters, this);
c.addCounter(Counters.TIME, counters);
@@ -2334,7 +2334,7 @@ public class CardFactoryUtil {
if (sa != null) {
// Count$Kicked.<numHB>.<numNotHB>
if (sq[0].contains("Kicked")) {
if (sq[0].startsWith("Kicked")) {
if (sa.isKicked()) {
return CardFactoryUtil.doXMath(Integer.parseInt(sq[1]), m, c); // Kicked
} else {
@@ -2753,8 +2753,8 @@ public class CardFactoryUtil {
return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c);
}
}
if (sq[0].contains("Kicked")) {
if(c.isOptionalAdditionalCostsPaid("Kicker")) {
if (sq[0].startsWith("Kicked")) {
if (c.isOptionalAdditionalCostsPaid("Kicker")) {
return CardFactoryUtil.doXMath(Integer.parseInt(sq[1]), m, c);
} else {
return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c);