From 81df41de1fbf3934bf5dbb9501801b286c53e72a Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 13:05:08 +0000 Subject: [PATCH] - Converted these cards to AF_LoseLife: Absorb Vis, Brush With Death, Death of a Thousand Stings, Exotic Disease, Last Caress, Morsel Theft, Soul Feast and Stronghold Discipline. - Commented out the now unused code block for the spLoseLife keyword. --- res/cardsfolder/absorb_vis.txt | 4 ++-- res/cardsfolder/brush_with_death.txt | 4 ++-- res/cardsfolder/death_of_a_thousand_stings.txt | 4 ++-- res/cardsfolder/exotic_disease.txt | 4 ++-- res/cardsfolder/last_caress.txt | 4 ++-- res/cardsfolder/morsel_theft.txt | 4 ++-- res/cardsfolder/soul_feast.txt | 4 ++-- res/cardsfolder/stronghold_discipline.txt | 9 +++++---- src/forge/CardFactory.java | 3 ++- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/res/cardsfolder/absorb_vis.txt b/res/cardsfolder/absorb_vis.txt index 862b66cbb83..e644b3146f8 100644 --- a/res/cardsfolder/absorb_vis.txt +++ b/res/cardsfolder/absorb_vis.txt @@ -2,9 +2,9 @@ Name:Absorb Vis ManaCost:6 B Types:Sorcery Text:no text -K:spLoseLifeTgt:4:Drawback$YouGainLife/4:Target player loses 4 life and you gain 4 life. +A:SP$LoseLife | Cost$ 6 B | ValidTgts$ Player | TgtPrompt$ Select a player to lose 4 life | LifeAmount$ 4 | SubAbility$ YouGainLife/4 | SpellDescription$ Target player loses 4 life and you gain 4 life. K:TypeCycling:Basic:1 B SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/absorb_vis.jpg SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/40.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/brush_with_death.txt b/res/cardsfolder/brush_with_death.txt index b33243f781f..d20b7d620f0 100644 --- a/res/cardsfolder/brush_with_death.txt +++ b/res/cardsfolder/brush_with_death.txt @@ -2,9 +2,9 @@ Name:Brush With Death ManaCost:2 B Types:Sorcery Text:no text -K:spLoseLifeTgt:2:Drawback$YouGainLife/2:Target opponent loses 2 life and you gain 2 life. +A:SP$LoseLife | Cost$ 2 B | ValidTgts$ Opponent | LifeAmount$ 2 | SubAbility$ YouGainLife/2 | SpellDescription$ Target opponent loses 2 life and you gain 2 life. SVar:Buyback:2 B B SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/brush_with_death.jpg SetInfo:STH|Common|http://magiccards.info/scans/en/sh/2.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/death_of_a_thousand_stings.txt b/res/cardsfolder/death_of_a_thousand_stings.txt index 541a1e71f38..7e50f5d7b13 100644 --- a/res/cardsfolder/death_of_a_thousand_stings.txt +++ b/res/cardsfolder/death_of_a_thousand_stings.txt @@ -2,9 +2,9 @@ Name:Death of a Thousand Stings ManaCost:4 B Types:Instant Arcane Text:no text -K:spLoseLifeTgt:1:Drawback$YouGainLife/1:Target player loses 1 life and you gain 1 life. +A:SP$LoseLife | Cost$ 4 B | ValidTgts$ Player | TgtPrompt$ Select a player to lose 1 life | LifeAmount$ 1 | SubAbility$ YouGainLife/1 | SpellDescription$ Target player loses 1 life and you gain 1 life. K:WheneverKeyword:BeginningOfUpkeep:No_Initiator:Graveyard:MoveFrom-Graveyard-Hand:Self:ASAP:Yes_No:ControllerUpkeep!MoreCardsInHand:At the beginning of your upkeep, if you have more cards in hand than each opponent, you may return Death of a Thousand Stings from your graveyard to your hand. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/death_of_a_thousand_stings.jpg SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/64.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/exotic_disease.txt b/res/cardsfolder/exotic_disease.txt index 78d068db6c8..c08fc45f4da 100644 --- a/res/cardsfolder/exotic_disease.txt +++ b/res/cardsfolder/exotic_disease.txt @@ -2,9 +2,9 @@ Name:Exotic Disease ManaCost:4 B Types:Sorcery Text:no text -K:spLoseLifeTgt:X:Drawback$YouGainLife/X:Domain - Target player loses X life and you gain X life, where X is the number of basic land types among lands you control. +A:SP$LoseLife | Cost$ 4 B | ValidTgts$ Player | TgtPrompt$ Select a player to lose X life | LifeAmount$ X | SubAbility$ YouGainLife/X | PrecostDesc$ Domain - | SpellDescription$ Target player loses X life and you gain X life, where X is the number of basic land types among lands you control. SVar:X:Count$Domain SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/exotic_disease.jpg SetInfo:PLS|Uncommon|http://magiccards.info/scans/en/ps/43.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/last_caress.txt b/res/cardsfolder/last_caress.txt index 925e1e361bb..836455ac964 100644 --- a/res/cardsfolder/last_caress.txt +++ b/res/cardsfolder/last_caress.txt @@ -2,9 +2,9 @@ Name:Last Caress ManaCost:2 B Types:Sorcery Text:no text -K:spLoseLifeTgt:1:Drawback$YouGainLife/1:Target player loses 1 life and you gain 1 life. +A:SP$LoseLife | Cost$ 2 B | ValidTgts$ Player | TgtPrompt$ Select a player to lose 1 life | LifeAmount$ 1 | SubAbility$ YouGainLife/1 | SpellDescription$ Target player loses 1 life and you gain 1 life. K:Draw a card. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/last_caress.jpg SetInfo:APC|Common|http://magiccards.info/scans/en/ap/41.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/morsel_theft.txt b/res/cardsfolder/morsel_theft.txt index e674b5264f5..9c457d0b25f 100644 --- a/res/cardsfolder/morsel_theft.txt +++ b/res/cardsfolder/morsel_theft.txt @@ -2,8 +2,8 @@ Name:Morsel Theft ManaCost:2 B B Types:Tribal Sorcery Rogue Text:(NOTE: "Prowl" is not implemented.) -K:spLoseLifeTgt:3:Drawback$YouGainLife/3:Target player loses 3 life and you gain 3 life.:Morsel Theft - target player 3 loses life and you gain 3 life. +A:SP$LoseLife | Cost$ 2 B B | ValidTgts$ Player | TgtPrompt$ Select a player to lose 3 life | LifeAmount$ 3 | SubAbility$ YouGainLife/3 | SpellDescription$ Target player loses 3 life and you gain 3 life. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/morsel_theft.jpg SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/68.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/soul_feast.txt b/res/cardsfolder/soul_feast.txt index 7cb3da510f3..383b16a796b 100644 --- a/res/cardsfolder/soul_feast.txt +++ b/res/cardsfolder/soul_feast.txt @@ -2,7 +2,7 @@ Name:Soul Feast ManaCost:3 B B Types:Sorcery Text:no text -K:spLoseLifeTgt:4:Drawback$YouGainLife/4:Target player loses 4 life and you gain 4 life. +A:SP$LoseLife | Cost$ 3 B B | ValidTgts$ Player | TgtPrompt$ Select a player to lose 4 life | LifeAmount$ 4 | SubAbility$ YouGainLife/4 | SpellDescription$ Target player loses 4 life and you gain 4 life. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_feast.jpg SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/165.jpg @@ -11,4 +11,4 @@ SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/163.jpg SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/164.jpg SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/179.jpg SetInfo:S99|Uncommon|http://magiccards.info/scans/en/st/90.jpg -End \ No newline at end of file +End diff --git a/res/cardsfolder/stronghold_discipline.txt b/res/cardsfolder/stronghold_discipline.txt index ef974154919..cb06fd324e1 100644 --- a/res/cardsfolder/stronghold_discipline.txt +++ b/res/cardsfolder/stronghold_discipline.txt @@ -2,11 +2,12 @@ Name:Stronghold Discipline ManaCost:2 B B Types:Sorcery Text:no text -K:spLoseLife:X:Drawback$OppLoseLife/dX:Each player loses 1 life for each creature he or she controls.:Stronghold Discipline - each player loses life -SVar:X:Count$TypeYouCtrl.Creature -SVar:dX:Count$TypeOppCtrl.Creature +A:SP$LoseLife | Cost$ 2 B B | Defined$ Opponent | LifeAmount$ X | SubAbility$ YouLoseLife/dX | SpellDescription$ Each player loses 1 life for each creature he or she controls. +SVar:X:Count$TypeOppCtrl.Creature +SVar:dX:Count$TypeYouCtrl.Creature +SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/stronghold_discipline.jpg SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/73.jpg SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/181.jpg -End \ No newline at end of file +End diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 59a11587353..b8249488f2d 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -4491,6 +4491,7 @@ public class CardFactory implements NewConstants { }//spDrawCards */ + /* Cards converted to AF_SP$LoseLife if (hasKeyword(card, "spLoseLife") != -1) { int n = hasKeyword(card, "spLoseLife"); @@ -4635,7 +4636,7 @@ public class CardFactory implements NewConstants { } } }//spLoseLife - + */ /* Cards converted to AF_AB$LoseLife if (hasKeyword(card, "abLoseLife") != -1)