From f192b6db7538d7c4b13cd7656843e2cb13fd4d14 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 13:23:39 +0000 Subject: [PATCH] - Converted these cards to AF_Fog: Angelsong, Darkness, Fog, Holy Day, Lull, Moment's Peace and Respite. Commented out the now unused code block for these 7 spells. --- res/cardsfolder/angelsong.txt | 5 +++-- res/cardsfolder/darkness.txt | 5 +++-- res/cardsfolder/fog.txt | 5 +++-- res/cardsfolder/holy_day.txt | 5 +++-- res/cardsfolder/lull.txt | 10 ++++++++-- res/cardsfolder/moments_peace.txt | 11 +++++++++-- res/cardsfolder/respite.txt | 6 ++++-- src/forge/CardFactory_Instants.java | 4 ++-- 8 files changed, 35 insertions(+), 16 deletions(-) diff --git a/res/cardsfolder/angelsong.txt b/res/cardsfolder/angelsong.txt index d82a5827224..95235b63258 100644 --- a/res/cardsfolder/angelsong.txt +++ b/res/cardsfolder/angelsong.txt @@ -1,10 +1,11 @@ Name:Angelsong ManaCost:1 W Types:Instant -Text:no text +Text:no text +A:SP$Fog | Cost$ 1 W | SpellDescription$ Prevent all combat damage that would be dealt this turn. K:Cycling:2 SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/angelsong.jpg SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/4.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/darkness.txt b/res/cardsfolder/darkness.txt index ac9ea72f97e..1b9a1d191ce 100644 --- a/res/cardsfolder/darkness.txt +++ b/res/cardsfolder/darkness.txt @@ -1,10 +1,11 @@ Name:Darkness ManaCost:B Types:Instant -Text:Prevent all combat damage that would be dealt this turn. +Text:no text +A:SP$Fog | Cost$ B | SpellDescription$ Prevent all combat damage that would be dealt this turn. SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/darkness.jpg SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/40.jpg SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/8.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/fog.txt b/res/cardsfolder/fog.txt index fce053c351f..a27b25c4b35 100644 --- a/res/cardsfolder/fog.txt +++ b/res/cardsfolder/fog.txt @@ -1,7 +1,8 @@ Name:Fog ManaCost:G Types:Instant -Text:Prevent all combat damage that would be dealt this turn. +Text:no text +A:SP$Fog | Cost$ G | SpellDescription$ Prevent all combat damage that would be dealt this turn. SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/fog.jpg @@ -15,4 +16,4 @@ SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/230.jpg SetInfo:3ED|Common|http://magiccards.info/scans/en/rv/102.jpg SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/114.jpg SetInfo:2ED|Common|http://magiccards.info/scans/en/un/102.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/holy_day.txt b/res/cardsfolder/holy_day.txt index 033d3d67e71..b68a2cea7bd 100644 --- a/res/cardsfolder/holy_day.txt +++ b/res/cardsfolder/holy_day.txt @@ -1,7 +1,8 @@ Name:Holy Day ManaCost:W Types:Instant -Text:Prevent all combat damage that would be dealt this turn. +Text:no text +A:SP$Fog | Cost$ W | SpellDescription$ Prevent all combat damage that would be dealt this turn. SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/holy_day.jpg @@ -10,4 +11,4 @@ SetInfo:INV|Common|http://magiccards.info/scans/en/in/20.jpg SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/189.jpg SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/18.jpg SetInfo:10E|Common|http://magiccards.info/scans/en/10e/21.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/lull.txt b/res/cardsfolder/lull.txt index 77833c6712e..7ee5bcc6352 100644 --- a/res/cardsfolder/lull.txt +++ b/res/cardsfolder/lull.txt @@ -1,10 +1,16 @@ Name:Lull ManaCost:1 G Types:Instant -Text:no text +Text:no text +A:SP$Fog | Cost$ 1 G | SpellDescription$ Prevent all combat damage that would be dealt this turn. K:Cycling:2 SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/lull.jpg SetInfo:USG|Common|http://magiccards.info/scans/en/us/267.jpg -End \ No newline at end of file +End + + + + + diff --git a/res/cardsfolder/moments_peace.txt b/res/cardsfolder/moments_peace.txt index 36905e304e5..5d2bef43057 100644 --- a/res/cardsfolder/moments_peace.txt +++ b/res/cardsfolder/moments_peace.txt @@ -1,9 +1,16 @@ Name:Moment's Peace ManaCost:1 G Types:Instant -Text:Prevent all combat damage that would be dealt this turn. +Text:no text +A:SP$Fog | Cost$ 1 G | SpellDescription$ Prevent all combat damage that would be dealt this turn. +K:Flashback:2 G SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/moments_peace.jpg SetInfo:ODY|Common|http://magiccards.info/scans/en/od/251.jpg -End \ No newline at end of file +End + + + + + diff --git a/res/cardsfolder/respite.txt b/res/cardsfolder/respite.txt index aaf4c93f2e0..c45ef0bd63f 100644 --- a/res/cardsfolder/respite.txt +++ b/res/cardsfolder/respite.txt @@ -1,9 +1,11 @@ Name:Respite ManaCost:1 G Types:Instant -Text:Prevent all combat damage that would be dealt this turn. You gain 1 life for each attacking creature. +Text:no text +A:SP$Fog | Cost$ 1 G | SubAbility$ YouGainLife/dX | SpellDescription$ Prevent all combat damage that would be dealt this turn. You gain 1 life for each attacking creature. +SVar:dX:Count$Valid Creature.attacking+YouDontCtrl SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/respite.jpg SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/143.jpg -End \ No newline at end of file +End diff --git a/src/forge/CardFactory_Instants.java b/src/forge/CardFactory_Instants.java index e0eccc58426..486373f6b44 100644 --- a/src/forge/CardFactory_Instants.java +++ b/src/forge/CardFactory_Instants.java @@ -3356,7 +3356,7 @@ public class CardFactory_Instants { spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell)); }//*************** END ************ END ************************** - + /* Cards converted to AF_SP$Fog //*************** START *********** START ************************** else if(cardName.equals("Fog") || cardName.equals("Angelsong") || cardName.equals("Darkness") || cardName.equals("Holy Day") || cardName.equals("Lull") || cardName.equals("Moment's Peace") || @@ -3397,7 +3397,7 @@ public class CardFactory_Instants { card.addSpellAbility(CardFactoryUtil.ability_Flashback(card, "2 G")); } }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if (cardName.equals("Starstorm"))