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

- "TriggerCount" will now look at the rootSpellAbility (fixes Souls of the Faultless).

Browse Source
This commit is contained in:
Sloth
2011-09-11 08:02:53 +00:00
parent 39b492a969
commit 224c2e0aae
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/s/souls_of_the_faultless.txt
View File

@@ -6,7 +6,7 @@ PT:0/4
K:Defender
T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigGain | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME is dealt combat damage, you gain that much life and attacking player loses that much life.
SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | SubAbility$ SVar=DBDrain
SVar:DBDrain:DB$LoseLife | Defined$ AttackingPlayer | LifeAmount$ X
SVar:DBDrain:DB$LoseLife | Defined$ Opponent | LifeAmount$ X
SVar:X:TriggerCount$DamageAmount
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/souls_of_the_faultless.jpg

3
src/main/java/forge/card/abilityFactory/AbilityFactory.java
View File

@@ -1283,9 +1283,10 @@ public class AbilityFactory {
list.add((Card) root.getTriggeringObject(calcX[0].substring(9)));
} else if (calcX[0].startsWith("TriggerCount")) {
// TriggerCount is similar to a regular Count, but just pulls Integer Values from Trigger objects
SpellAbility root = ability.getRootSpellAbility();
String[] l = calcX[1].split("/");
String[] m = CardFactoryUtil.parseMath(l);
int count = (Integer) ability.getTriggeringObject(l[0]);
int count = (Integer) root.getTriggeringObject(l[0]);
return CardFactoryUtil.doXMath(count, m, card) * multiplier;
} else {