From d7aa97a45848b27d659c5158a51a0c5d85afad88 Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 17 Sep 2012 08:43:30 +0000 Subject: [PATCH] - Converted the Lair lands to script. --- res/cardsfolder/c/crosiss_catacombs.txt | 4 +++- res/cardsfolder/d/darigaazs_caldera.txt | 4 +++- res/cardsfolder/d/dromars_cavern.txt | 4 +++- res/cardsfolder/r/riths_grove.txt | 4 +++- res/cardsfolder/t/trevas_ruins.txt | 4 +++- src/main/java/forge/card/cardfactory/CardFactoryLands.java | 4 ++-- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/res/cardsfolder/c/crosiss_catacombs.txt b/res/cardsfolder/c/crosiss_catacombs.txt index 2b694434549..00384775f95 100644 --- a/res/cardsfolder/c/crosiss_catacombs.txt +++ b/res/cardsfolder/c/crosiss_catacombs.txt @@ -1,10 +1,12 @@ Name:Crosis's Catacombs ManaCost:no cost Types:Land Lair -Text:When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +Text:no text A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool. A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool. A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You SVar:NeedsToPlay:Land.nonLair+YouCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/crosiss_catacombs.jpg diff --git a/res/cardsfolder/d/darigaazs_caldera.txt b/res/cardsfolder/d/darigaazs_caldera.txt index 42d0f630d76..e8974822c43 100644 --- a/res/cardsfolder/d/darigaazs_caldera.txt +++ b/res/cardsfolder/d/darigaazs_caldera.txt @@ -1,10 +1,12 @@ Name:Darigaaz's Caldera ManaCost:no cost Types:Land Lair -Text:When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +Text:no text A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool. A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool. A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You SVar:NeedsToPlay:Land.nonLair+YouCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/darigaazs_caldera.jpg diff --git a/res/cardsfolder/d/dromars_cavern.txt b/res/cardsfolder/d/dromars_cavern.txt index 6abac12226d..7e0cbd93118 100644 --- a/res/cardsfolder/d/dromars_cavern.txt +++ b/res/cardsfolder/d/dromars_cavern.txt @@ -1,10 +1,12 @@ Name:Dromar's Cavern ManaCost:no cost Types:Land Lair -Text:When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +Text:no text A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool. A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool. A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You SVar:NeedsToPlay:Land.nonLair+YouCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/dromars_cavern.jpg diff --git a/res/cardsfolder/r/riths_grove.txt b/res/cardsfolder/r/riths_grove.txt index b605488c306..2a23cddbb3c 100644 --- a/res/cardsfolder/r/riths_grove.txt +++ b/res/cardsfolder/r/riths_grove.txt @@ -1,10 +1,12 @@ Name:Rith's Grove ManaCost:no cost Types:Land Lair -Text:When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +Text:no text A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool. A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool. A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You SVar:NeedsToPlay:Land.nonLair+YouCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/riths_grove.jpg diff --git a/res/cardsfolder/t/trevas_ruins.txt b/res/cardsfolder/t/trevas_ruins.txt index 50aa24a8b68..896912dd936 100644 --- a/res/cardsfolder/t/trevas_ruins.txt +++ b/res/cardsfolder/t/trevas_ruins.txt @@ -1,10 +1,12 @@ Name:Treva's Ruins ManaCost:no cost Types:Land Lair -Text:When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +Text:no text A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool. A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool. A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. +SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You SVar:NeedsToPlay:Land.nonLair+YouCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/trevas_ruins.jpg diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java index 46eb77123d6..6c63b6f1e18 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java @@ -663,7 +663,7 @@ class CardFactoryLands { } // *************** END ************ END ************************** // *************** START *********** START ************************** - else if (cardName.equals("Crosis's Catacombs") || cardName.equals("Darigaaz's Caldera") + /*else if (cardName.equals("Crosis's Catacombs") || cardName.equals("Darigaaz's Caldera") || cardName.equals("Dromar's Cavern") || cardName.equals("Rith's Grove") || cardName.equals("Treva's Ruins")) { final Command comesIntoPlay = new Command() { @@ -721,7 +721,7 @@ class CardFactoryLands { }; card.addComesIntoPlayCommand(comesIntoPlay); - } // *************** END ************ END ************************** + } */// *************** END ************ END ************************** // *************** START *********** START ************************** else if (cardName.equals("Coral Atoll") || cardName.equals("Dormant Volcano") || cardName.equals("Everglades")