diff --git a/.gitattributes b/.gitattributes index bf146491ee3..dddbf88b3b7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2118,6 +2118,7 @@ res/cardsfolder/d/dawn_elemental.txt svneol=native#text/plain res/cardsfolder/d/dawn_of_the_dead.txt svneol=native#text/plain res/cardsfolder/d/dawnfluke.txt -text res/cardsfolder/d/dawnglare_invoker.txt svneol=native#text/plain +res/cardsfolder/d/dawnglow_infusion.txt -text res/cardsfolder/d/dawning_purist.txt svneol=native#text/plain res/cardsfolder/d/dawnray_archer.txt svneol=native#text/plain res/cardsfolder/d/dawnstrider.txt svneol=native#text/plain diff --git a/res/cardsfolder/d/dawnglow_infusion.txt b/res/cardsfolder/d/dawnglow_infusion.txt new file mode 100644 index 00000000000..a6e2b6a844d --- /dev/null +++ b/res/cardsfolder/d/dawnglow_infusion.txt @@ -0,0 +1,12 @@ +Name:Dawnglow Infusion +ManaCost:X GW +Types:Sorcery +Text:no text +A:SP$ GainLife | Cost$ X WG | LifeAmount$ X | References$ X | ConditionManaSpent$ G | SubAbility$ WPaid | SpellDescription$ You gain X life if G was spent to cast CARDNAME and X life if W was spent to cast it. (Do both if G W was spent.) +SVar:WPaid:DB$GainLife | Cost$ 0 | LifeAmount$ X | References$ X | ConditionManaSpent$ W +SVar:X:Count$xPaid +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/dawnglow_infusion.jpg +SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/225.jpg +Oracle:You gain X life if {G} was spent to cast Dawnglow Infusion and X life if {W} was spent to cast it. (Do both if {G}{W} was spent.) +End \ No newline at end of file diff --git a/src/main/java/forge/card/cost/CostMana.java b/src/main/java/forge/card/cost/CostMana.java index aaf6d847b6f..f35a3c56413 100644 --- a/src/main/java/forge/card/cost/CostMana.java +++ b/src/main/java/forge/card/cost/CostMana.java @@ -259,7 +259,7 @@ public class CostMana extends CostPart { final Input payX = new InputMana() { private static final long serialVersionUID = -6900234444347364050L; private int xPaid = 0; - private String colorsPaid = ""; + private String colorsPaid = sa.getSourceCard().getColorsPaid(); private ManaCost manaCost = new ManaCost(Integer.toString(numX)); @Override