external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge latest trunk

Browse Source
This commit is contained in:
myk
2013-03-12 10:12:09 +00:00
parent 93976e4638 592ab5752d
commit 17e1c1a52c
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -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_chamber_guard.txt svneol=native#text/plain
res/cardsfolder/i/inner_fire.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_acolyte.txt svneol=native#text/plain
res/cardsfolder/i/inner_flame_igniter.txt -text
res/cardsfolder/i/inner_sanctum.txt -text res/cardsfolder/i/inner_sanctum.txt -text
res/cardsfolder/i/innocence_kami.txt svneol=native#text/plain res/cardsfolder/i/innocence_kami.txt svneol=native#text/plain
res/cardsfolder/i/innocent_blood.txt svneol=native#text/plain res/cardsfolder/i/innocent_blood.txt svneol=native#text/plain

16
res/cardsfolder/i/inner_flame_igniter.txt Normal file
View File

@@ -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

1
res/token-images.txt
View File

@@ -215,6 +215,7 @@ wu_1_1_bird.jpg http://www.cardforge.org/fpics/tokens/wu_
# //Emblems and extras # //Emblems and extras
chandra_the_firebrand_effect.jpg http://www.cardforge.org/fpics/effects/chandra_the_firebrand_effect.jpg 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 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 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 liliana_of_the_dark_realms_emblem.jpg http://www.cardforge.org/fpics/effects/liliana_of_the_dark_realms_emblem.jpg

2
src/main/java/forge/card/ability/effects/EffectEffect.java
View File

@@ -104,7 +104,7 @@ public class EffectEffect extends SpellAbilityEffect {
// nuked // nuked
eff.addController(controller); eff.addController(controller);
eff.setOwner(controller); eff.setOwner(controller);
eff.setImageFilename(hostCard.getImageFilename()); eff.setImageFilename(sa.hasParam("Image") ? sa.getParam("Image") : hostCard.getImageFilename());
eff.setColor(hostCard.getColor()); eff.setColor(hostCard.getColor());
eff.setImmutable(true); eff.setImmutable(true);
eff.setEffectSource(hostCard); eff.setEffectSource(hostCard);