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

Rumbling Aftershocks implemented

Browse Source
This commit is contained in:
Maxmtg
2013-04-16 19:42:41 +00:00
parent 89b81fc689
commit 4d7b221eb5
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/forge/card/ability/AbilityUtils.java
View File

@@ -304,7 +304,9 @@ public class AbilityUtils {
// Try to fetch variable, try ability first, then card.
String svarval = null;
if (ability != null) {
if (amount.indexOf('$') > 0 ) // when there is a dollar sign, it's not a reference, it's a raw value!
svarval = amount;
else if (ability != null) {
svarval = ability.getSVar(amount);
}
if (StringUtils.isBlank(svarval)) {
@@ -339,7 +341,7 @@ public class AbilityUtils {
}
// Parse Object$Property string
final String[] calcX = svarval.split("\\$");
final String[] calcX = svarval.split("\\$", 2);
// Incorrect parses mean zero.
if ((calcX.length == 1) || calcX[1].equals("none")) {
@@ -500,6 +502,11 @@ public class AbilityUtils {
}
return CardFactoryUtil.playerXCount(players, calcX[1], card) * multiplier;
}
if(calcX[0].equals("TriggeredSpellAbility")) {
final SpellAbility root = ability.getRootAbility();
SpellAbility sat = (SpellAbility) root.getTriggeringObject("SpellAbility");
return calculateAmount(sat.getSourceCard(), calcX[1], sat);
}
// Added on 9/30/12 (ArsenalNut) - Ended up not using but might be useful in future
/*
if (calcX[0].startsWith("EnchantedController")) {