From f161cd6979109eef52e3801d2ef56650b5089895 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 03:44:54 +0000 Subject: [PATCH] Converted the cards Braidwood Cup; Tanglebloom; Silent Attendant; Wellwisher from code to keywords. --- res/cards.txt | 5 +++++ src/forge/CardFactory.java | 10 ++++++---- src/forge/CardFactory_Creatures.java | 9 +++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/res/cards.txt b/res/cards.txt index f5a07064e7a..e4ea9dee1a3 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -4626,6 +4626,7 @@ Braidwood Cup 3 Artifact no text +abGainLife T:1 Onyx Goblet 2 B @@ -5787,6 +5788,7 @@ Silent Attendant Creature Human Cleric no text 0/2 +abGainLife T:1 Zephid's Embrace 2 U U @@ -16123,6 +16125,8 @@ Wellwisher Creature Elf no text 1/1 +abGainLife T:X:You gain 1 life for each Elf on the battlefield.:Wellwisher - you gain life +SVar:X:Count$TypeOnBattlefield.Elf Sylvan Messenger 3 G @@ -17173,6 +17177,7 @@ Tanglebloom 1 Artifact no text +abGainLife 1 T:1 Nevinyrral's Disk 4 diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 00311b65c1f..6c2b4cbc47f 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -3863,7 +3863,8 @@ public class CardFactory implements NewConstants { ability.setStackDescription("Destroy all artifacts, creatures, and enchantments."); }//*************** END ************ END ************************** - + +/* //*************** START *********** START ************************** else if(cardName.equals("Tanglebloom")) { final SpellAbility a1 = new Ability_Tap(card, "1") { @@ -3885,6 +3886,7 @@ public class CardFactory implements NewConstants { a1.setBeforePayMana(new Input_PayManaCost(a1)); }//*************** END ************ END ************************** +*/ //*************** START *********** START ************************** @@ -13947,7 +13949,8 @@ public class CardFactory implements NewConstants { card.addSpellAbility(DamageCP); }//*************** END ************ END ************************** - + +/* //*************** START *********** START ************************** else if(cardName.equals("Braidwood Cup")) { final Ability_Tap ability = new Ability_Tap(card) { @@ -13968,8 +13971,7 @@ public class CardFactory implements NewConstants { ability.setStackDescription("Braidwood Cup - " + card.getController() + " gains 1 life."); ability.setBeforePayMana(new Input_NoCost_TapAbility(ability)); }//*************** END ************ END ************************** - - +*/ //*************** START *********** START ************************** diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 8cbbcc3871b..064162fe774 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -828,7 +828,8 @@ public class CardFactory_Creatures { }//*************** END ************ END ************************** */ - + +/* //*************** START *********** START ************************** else if(cardName.equals("Wellwisher")) { final SpellAbility ability = new Ability_Tap(card, "0") { @@ -860,6 +861,7 @@ public class CardFactory_Creatures { ability.setBeforePayMana(new Input_NoCost_TapAbility((Ability_Tap) ability)); card.addSpellAbility(ability); }//*************** END ************ END ************************** +*/ //*************** START *********** START ************************** @@ -8795,7 +8797,8 @@ public class CardFactory_Creatures { }//*************** END ************ END ************************** - + +/* //*************** START *********** START ************************** else if(cardName.equals("Silent Attendant")) { final Ability_Tap ability = new Ability_Tap(card) { @@ -8823,6 +8826,8 @@ public class CardFactory_Creatures { ability.setStackDescription(card.getName() + " - you gain 1 life."); ability.setBeforePayMana(new Input_NoCost_TapAbility(ability)); }//*************** END ************ END ************************** +*/ + //*************** START *********** START ************************** else if(cardName.equals("Ghost-Lit Redeemer")) {