diff --git a/.gitattributes b/.gitattributes index 1f990f4c354..e95c148e8ff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -979,6 +979,7 @@ res/cardsfolder/b/blaze.txt svneol=native#text/plain res/cardsfolder/b/blazethorn_scarecrow.txt svneol=native#text/plain res/cardsfolder/b/blazing_archon.txt svneol=native#text/plain res/cardsfolder/b/blazing_blade_askari.txt svneol=native#text/plain +res/cardsfolder/b/blazing_effigy.txt -text res/cardsfolder/b/blazing_salvo.txt -text res/cardsfolder/b/blazing_shoal.txt svneol=native#text/plain res/cardsfolder/b/blazing_specter.txt svneol=native#text/plain diff --git a/res/cardsfolder/b/blazing_effigy.txt b/res/cardsfolder/b/blazing_effigy.txt new file mode 100644 index 00000000000..35e9602f6c2 --- /dev/null +++ b/res/cardsfolder/b/blazing_effigy.txt @@ -0,0 +1,17 @@ +Name:Blazing Effigy +ManaCost:1 R +Types:Creature Elemental +PT:0/3 +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ BlazeDmg | TriggerDescription$ When CARDNAME dies, it deals X damage to target creature, where X is 3 plus the amount of damage dealt to CARDNAME this turn by other sources named Blazing Effigy. +SVar:BlazeDmg:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature to deal damage to | NumDmg$ BlazeSize | References$ BlazeSize,Contributions | SubAbility$ TrigReset +T:Mode$ DamageDone | ValidSource$ Card.Other+namedBlazing Effigy | ValidTarget$ Card.Self | Execute$ StoreContribution | Static$ True +SVar:StoreContribution:DB$ StoreSVar | SVar$ Contributions | Type$ CountSVar | Expression$ Contributions/Plus.Blazed +T:Mode$ Phase | Phase$ Cleanup | Execute$ TrigReset | Static$ True +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Ante,Library,Hand,Exile | ValidCard$ Card.Self | Execute$ TrigReset | Static$ True +SVar:TrigReset:DB$ StoreSVar | SVar$ Contributions | Type$ Number | Expression$ 0 +SVar:BlazeSize:SVar$Contributions/Plus.3 +SVar:Contributions:Number$0 +SVar:Blazed:TriggerCount$DamageAmount +SVar:Picture:http://www.wizards.com/global/images/magic/general/blazing_effigy.jpg +Oracle:When Blazing Effigy dies, it deals X damage to target creature, where X is 3 plus the amount of damage dealt to Blazing Effigy this turn by other sources named Blazing Effigy. +SetInfo:LEG Common \ No newline at end of file diff --git a/src/main/java/forge/card/ability/effects/StoreSVarEffect.java b/src/main/java/forge/card/ability/effects/StoreSVarEffect.java index 8a4f832bf3d..bedc3520e03 100644 --- a/src/main/java/forge/card/ability/effects/StoreSVarEffect.java +++ b/src/main/java/forge/card/ability/effects/StoreSVarEffect.java @@ -1,6 +1,7 @@ package forge.card.ability.effects; import forge.Card; +import forge.card.ability.AbilityUtils; import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; @@ -42,6 +43,11 @@ public class StoreSVarEffect extends SpellAbilityEffect { value = Integer.valueOf(expr); } else if (type.equals("CountSVar")) { + if (expr.contains("/")) { + final String exprMathVar = expr.split("\\/")[1].split("\\.")[1]; + int exprMath = AbilityUtils.calculateAmount(source, exprMathVar, sa); + expr = expr.replace(exprMathVar, Integer.toString(exprMath)); + } value = CardFactoryUtil.xCount(source, "SVar$" + expr); } else if (type.equals("Targeted")) {