From 9f4a3181dce34a9233e6960c04a7030ed79e9567 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 17:01:12 +0000 Subject: [PATCH] - Converted to AF: Illusions of Grandeur and Elixir of Immortality. - Removed SVar:RemAIDeck:True from 2 cards. --- res/cardsfolder/elixir_of_immortality.txt | 2 + res/cardsfolder/illusions_of_grandeur.txt | 6 +- res/cardsfolder/sunspring_expedition.txt | 1 - res/cardsfolder/zektar_shrine_expedition.txt | 1 - src/forge/CardFactory.java | 78 ++++---------------- 5 files changed, 21 insertions(+), 67 deletions(-) diff --git a/res/cardsfolder/elixir_of_immortality.txt b/res/cardsfolder/elixir_of_immortality.txt index 85a79ba6b33..4b8f5389a14 100644 --- a/res/cardsfolder/elixir_of_immortality.txt +++ b/res/cardsfolder/elixir_of_immortality.txt @@ -2,6 +2,8 @@ Name:Elixir of Immortality ManaCost:1 Types:Artifact Text:no text +A:AB$GainLife | Cost$ 2 T Sac<1/CARDNAME> | LifeAmount$ 5 | SubAbility$ SVar=DBShuffle | SpellDescription$ You gain 5 life. Shuffle Elixir of Immortality and your graveyard into your library. +SVar:DBShuffle:DB$ChangeZone | Origin$ Graveyard | Destination$ Library | Shuffle$ True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/elixir_of_immortality.jpg SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/206.jpg diff --git a/res/cardsfolder/illusions_of_grandeur.txt b/res/cardsfolder/illusions_of_grandeur.txt index c110f3ead3b..eabf764eecc 100644 --- a/res/cardsfolder/illusions_of_grandeur.txt +++ b/res/cardsfolder/illusions_of_grandeur.txt @@ -1,8 +1,12 @@ Name:Illusions of Grandeur ManaCost:3 U Types:Enchantment -Text:When Illusions of Grandeur enters the battlefield, you gain 20 life. When Illusions of Grandeur leaves the battlefield, you lose 20 life. +Text:no text K:Cumulative upkeep:2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 20 life. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME leaves the battlefield, you lose 20 life. +SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 20 +SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 20 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/illusions_of_grandeur.jpg SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/79.jpg diff --git a/res/cardsfolder/sunspring_expedition.txt b/res/cardsfolder/sunspring_expedition.txt index 9deb28d5313..a0e2347368a 100644 --- a/res/cardsfolder/sunspring_expedition.txt +++ b/res/cardsfolder/sunspring_expedition.txt @@ -5,7 +5,6 @@ Text:no text A:AB$GainLife | Cost$ SubCounter<3/QUEST> Sac<1/CARDNAME> | Defined$ You | LifeAmount$ 8 | SpellDescription$ You gain 8 life. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on CARDNAME. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1 -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/sunspring_expedition.jpg SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/37.jpg diff --git a/res/cardsfolder/zektar_shrine_expedition.txt b/res/cardsfolder/zektar_shrine_expedition.txt index a0a3be3cd41..8fe75f5932c 100644 --- a/res/cardsfolder/zektar_shrine_expedition.txt +++ b/res/cardsfolder/zektar_shrine_expedition.txt @@ -5,7 +5,6 @@ Text:no text A:AB$Token | Cost$ SubCounter<3/QUEST> Sac<1/CARDNAME> | TokenAmount$ 1 | TokenImage$ R 7 1 Elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenPower$ 7 | TokenToughness$ 1 | TokenKeywords$ Haste<>Trample<>At the beginning of the end step, exile CARDNAME | TokenOwner$ Controller | TokenAmount$ 1 | SpellDescription$ Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on CARDNAME. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1 -SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/Zektar_Shrine_Expedition.jpg SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/155.jpg diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 419cb14b768..9b9a07c53ec 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -4872,8 +4872,7 @@ public class CardFactory implements NewConstants { card.addFirstSpellAbility(spell); } //*************** END ************ END ************************* - - + //*************** START *********** START ************************** else if(cardName.equals("Bridge from Below")) { @@ -5022,6 +5021,7 @@ public class CardFactory implements NewConstants { }//*************** END ************ END ************************** + //*************** START *********** START ************************** else if(cardName.equals("Eternity Vessel")) { Command intoPlay = new Command() { @@ -5036,6 +5036,7 @@ public class CardFactory implements NewConstants { card.addComesIntoPlayCommand(intoPlay); }//*************** END ************ END ************************** + //*************** START *********** START ************************** else if(cardName.equals("Oubliette")) { final SpellAbility enchantment = new Spell(card) { @@ -5149,6 +5150,7 @@ public class CardFactory implements NewConstants { card.addSpellAbility(ability); }//*************** END ************ END ************************** + //*************** START *********** START ************************** else if(cardName.equals("Necrogenesis")) { final SpellAbility necrogen = new Ability(card, "2") { @@ -5375,34 +5377,7 @@ public class CardFactory implements NewConstants { ability.setBeforePayMana(payLife); }//*************** END ************ END ************************** - - /* - //*************** START *********** START ************************** - else if(cardName.equals("Hatching Plans")) { - - final Ability ability = new Ability(card, "0") { - @Override - public void resolve() { - card.getController().drawCards(3); - } - }; - - Command draw3Cards = new Command() { - private static final long serialVersionUID = -4919203791300685078L; - - public void execute() { - - StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - draw three cards."); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); - } - }; - - card.addDestroyCommand(draw3Cards); - }//*************** END ************ END ************************** - */ + //*************** START *********** START ************************** else if(cardName.equals("Lifespark Spellbomb")) { @@ -5468,8 +5443,7 @@ public class CardFactory implements NewConstants { }//resolve() };//SpellAbility card.addSpellAbility(ability); - ability.setDescription("G, Sacrifice Lifespark Spellbomb: Target land becomes a 3/3 Creature until end of turn. It is still a land."); - + ability.setDescription("G, Sacrifice Lifespark Spellbomb: Target land becomes a 3/3 Creature until end of turn. It is still a land."); }//*************** END ************ END ************************** @@ -5661,6 +5635,7 @@ public class CardFactory implements NewConstants { } //*************** END ************ END ************************** + //*************** START *********** START ************************** else if(cardName.equals("Volrath's Dungeon")) { @@ -5995,7 +5970,7 @@ public class CardFactory implements NewConstants { card.addSpellAbility(ability); }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Illusions of Grandeur")) { final SpellAbility gainLife = new Ability(card, "0") { @@ -6041,10 +6016,9 @@ public class CardFactory implements NewConstants { }; card.addComesIntoPlayCommand(intoPlay); - card.addLeavesPlayCommand(leavesPlay); - + card.addLeavesPlayCommand(leavesPlay); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Isochron Scepter")) @@ -6431,37 +6405,13 @@ public class CardFactory implements NewConstants { }; card.addComesIntoPlayCommand(comesIntoPlay); }//*************** END ************ END ************************** - + /* - //*************** START *********** START ************************** - else if(cardName.equals("Chromatic Star")) { - final SpellAbility ability = new Ability(card, "0") { - @Override - public void resolve() { - card.getController().drawCard(); - } - }; - Command destroy = new Command() { - private static final long serialVersionUID = 7982507967024313067L; - - public void execute() { - - StringBuilder sb = new StringBuilder(); - sb.append(card.getName()).append(" - ").append(card.getController()).append(" draws a card"); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); - } - }; - card.addDestroyCommand(destroy); - }//*************** END ************ END ************************** - */ - //*************** START *********** START ************************** else if(cardName.equals("Elixir of Immortality")) { - /* + * * 2, Tap: You gain 5 life. Shuffle Elixir of Immortality and your graveyard into your library. - */ + * Ability_Cost abCost = new Ability_Cost("2 T", cardName, true); final Ability_Activated ability = new Ability_Activated(card, abCost, null) { private static final long serialVersionUID = -1299603105585632846L; @@ -6495,7 +6445,7 @@ public class CardFactory implements NewConstants { ability.setDescription(abCost+"You gain 5 life. Shuffle Elixir of Immortality and your graveyard into your library."); card.addSpellAbility(ability); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Curse of Wizardry")) {