diff --git a/res/cardsfolder/s/souls_of_the_faultless.txt b/res/cardsfolder/s/souls_of_the_faultless.txt index 52a6e0cb933..d64178190b0 100644 --- a/res/cardsfolder/s/souls_of_the_faultless.txt +++ b/res/cardsfolder/s/souls_of_the_faultless.txt @@ -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 diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory.java b/src/main/java/forge/card/abilityFactory/AbilityFactory.java index cad504de18f..5d0a5752c03 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory.java @@ -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 {