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

- Bugfix for -X situation that caused a crash. Now strips out the minus sign before searching for Variable amount in AFs

Browse Source
This commit is contained in:
jendave
2011-08-06 12:29:13 +00:00
parent 96b8cf6a19
commit 6f9ca45d29
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/forge/AbilityFactory.java
View File

@@ -461,6 +461,14 @@ public class AbilityFactory {
public static int calculateAmount(Card card, String amount, SpellAbility ability){ public static int calculateAmount(Card card, String amount, SpellAbility ability){
// amount can be anything, not just 'X' as long as sVar exists // amount can be anything, not just 'X' as long as sVar exists
// If Amount is -X, strip the minus sign before looking for an SVar of that kind
int multiplier = 1;
if (amount.startsWith("-")){
multiplier = -1;
amount = amount.substring(1);
}
if (!card.getSVar(amount).equals("")) if (!card.getSVar(amount).equals(""))
{ {
String calcX[] = card.getSVar(amount).split("\\$"); String calcX[] = card.getSVar(amount).split("\\$");
@@ -469,26 +477,26 @@ public class AbilityFactory {
if (calcX[0].startsWith("Count")) if (calcX[0].startsWith("Count"))
{ {
return CardFactoryUtil.xCount(card, calcX[1]); return CardFactoryUtil.xCount(card, calcX[1]) * multiplier;
} }
else if (ability != null && calcX[0].startsWith("Sacrificed")) else if (ability != null && calcX[0].startsWith("Sacrificed"))
{ {
return CardFactoryUtil.handlePaid(ability.getSacrificedCost(), calcX[1]); return CardFactoryUtil.handlePaid(ability.getSacrificedCost(), calcX[1]) * multiplier;
} }
else if (ability != null && calcX[0].startsWith("Discarded")) else if (ability != null && calcX[0].startsWith("Discarded"))
{ {
return CardFactoryUtil.handlePaid(ability.getDiscardedCost(), calcX[1]); return CardFactoryUtil.handlePaid(ability.getDiscardedCost(), calcX[1]) * multiplier;
} }
else if (ability != null && calcX[0].startsWith("Targeted")) else if (ability != null && calcX[0].startsWith("Targeted"))
{ {
CardList list = new CardList(ability.getTarget().getTargetCards().toArray()); CardList list = new CardList(ability.getTarget().getTargetCards().toArray());
return CardFactoryUtil.handlePaid(list, calcX[1]); return CardFactoryUtil.handlePaid(list, calcX[1]) * multiplier;
} }
else else
return 0; return 0;
} }
return Integer.parseInt(amount); return Integer.parseInt(amount) * multiplier;
} }
} }