diff --git a/.gitattributes b/.gitattributes index 0890b0db42d..d0c3e056a1a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5248,6 +5248,7 @@ res/cardsfolder/i/inner_calm_outer_strength.txt svneol=native#text/plain res/cardsfolder/i/inner_chamber_guard.txt svneol=native#text/plain res/cardsfolder/i/inner_fire.txt svneol=native#text/plain res/cardsfolder/i/inner_flame_acolyte.txt svneol=native#text/plain +res/cardsfolder/i/inner_flame_igniter.txt -text res/cardsfolder/i/inner_sanctum.txt -text res/cardsfolder/i/innocence_kami.txt svneol=native#text/plain res/cardsfolder/i/innocent_blood.txt svneol=native#text/plain diff --git a/res/cardsfolder/i/inner_flame_igniter.txt b/res/cardsfolder/i/inner_flame_igniter.txt new file mode 100644 index 00000000000..5172f9addfa --- /dev/null +++ b/res/cardsfolder/i/inner_flame_igniter.txt @@ -0,0 +1,16 @@ +Name:Inner-Flame Igniter +ManaCost:2 R +Types:Creature Elemental Warrior +Text:no text +PT:2/2 +A:AB$ PumpAll | Cost$ 2 R | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | SubAbility$ StoreNum | StackDescription$ SpellDescription | SpellDescription$ Creatures you control get +1/+0 until end of turn. If this is the third time this ability has resolved this turn, creatures you control gain first strike until end of turn. +SVar:StoreNum:DB$ StoreSVar | SVar$ InnerFlameStrength | Type$ CountSVar | Expression$ InnerFlameStrength/Plus.1 | SubAbility$ InnerHeatStrike +SVar:InnerHeatStrike:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike | ConditionCheckSVar$ InnerFlameStrength | ConditionSVarCompare$ EQ3 | StackDescription$ None +SVar:InnerFlameStrength:Number$0 +SVar:X:Count$RememberedSize +T:Mode$ Phase | Phase$ Cleanup | Execute$ TrigReset | Static$ True +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReset | Static$ True +SVar:TrigReset:AB$ StoreSVar | Cost$ 0 | SVar$ InnerFlameStrength | Type$ Number | Expression$ 0 +SVar:Picture:http://www.wizards.com/global/images/magic/general/inner_flame_igniter.jpg +Oracle:{2}{R}: Creatures you control get +1/+0 until end of turn. If this is the third time this ability has resolved this turn, creatures you control gain first strike until end of turn. +SetInfo:LRW Uncommon \ No newline at end of file diff --git a/res/token-images.txt b/res/token-images.txt index fbbd54a8a87..fce1837b712 100644 --- a/res/token-images.txt +++ b/res/token-images.txt @@ -215,6 +215,7 @@ wu_1_1_bird.jpg http://www.cardforge.org/fpics/tokens/wu_ # //Emblems and extras chandra_the_firebrand_effect.jpg http://www.cardforge.org/fpics/effects/chandra_the_firebrand_effect.jpg +domri_rade_emblem.jpg http://www.cardforge.org/fpics/effects/domri_rade_emblem.jpg elspeth_knight_errant_emblem.jpg http://www.cardforge.org/fpics/effects/elspeth_knight_errant_emblem.jpg koth_of_the_hammer_emblem.jpg http://www.cardforge.org/fpics/effects/koth_of_the_hammer_emblem.jpg liliana_of_the_dark_realms_emblem.jpg http://www.cardforge.org/fpics/effects/liliana_of_the_dark_realms_emblem.jpg diff --git a/src/main/java/forge/card/ability/effects/EffectEffect.java b/src/main/java/forge/card/ability/effects/EffectEffect.java index df9dd9867ae..d2608001f07 100644 --- a/src/main/java/forge/card/ability/effects/EffectEffect.java +++ b/src/main/java/forge/card/ability/effects/EffectEffect.java @@ -104,7 +104,7 @@ public class EffectEffect extends SpellAbilityEffect { // nuked eff.addController(controller); eff.setOwner(controller); - eff.setImageFilename(hostCard.getImageFilename()); + eff.setImageFilename(sa.hasParam("Image") ? sa.getParam("Image") : hostCard.getImageFilename()); eff.setColor(hostCard.getColor()); eff.setImmutable(true); eff.setEffectSource(hostCard);