From 1e0ab37abcf6cd5258404e62686c65c162664721 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 04:06:42 +0000 Subject: [PATCH] 1) Changed "comes into play" to "enters the battlefield" as part of the cards.txt entries for the previous cards. 2) Added Flight of Fancy via keyword and I included it's LQ pic url. 3) Made some modifications to the comes into play, draw a card. keyword method. --- res/card-pictures.txt | 1 + res/cards.txt | 56 ++++++++++++++++++++++---------------- src/forge/CardFactory.java | 22 +++++++++++++-- 3 files changed, 52 insertions(+), 27 deletions(-) diff --git a/res/card-pictures.txt b/res/card-pictures.txt index 5d4ba0ecec4..6befb72826f 100644 --- a/res/card-pictures.txt +++ b/res/card-pictures.txt @@ -38,6 +38,7 @@ snow_covered_mountain.jpg http://www.wizards.com/global/images/magic/gene snow_covered_mountain1.jpg http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg snow_covered_mountain2.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg snow_covered_mountain3.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg +flight_of_fancy.jpg http://www.wizards.com/global/images/magic/general/flight_of_fancy.jpg elvish_vanguard.jpg http://www.wizards.com/global/images/magic/general/elvish_vanguard.jpg tribal_forcemage.jpg http://www.wizards.com/global/images/magic/general/tribal_forcemage.jpg nirkana_cutthroat.jpg http://www.wizards.com/global/images/magic/general/nirkana_cutthroat.jpg diff --git a/res/cards.txt b/res/cards.txt index 4d5f8cd3ddd..0f70ec13b90 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,8 +1,10 @@ -Elvish Vanguard -1 G -Creature Elf -Whenever another Elf enters the battlefield, put a +1/+1 counter on Elvish Vanguard. -1/1 +Flight of Fancy +3 U +Enchantment Aura +Enchanted creature has flying. +Enchant creature +enPump:Flying +When CARDNAME enters the battlefield, draw two cards. Arctic Wolves 3 G G @@ -10,7 +12,7 @@ Creature Wolf no text 4/5 Cumulative upkeep:2 -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Carven Caryatid 1 G G @@ -18,21 +20,21 @@ Creature Spirit no text 2/5 Defender -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Council of Advisors 2 U Creature Human Advisor no text 1/1 -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Elvish Visionary 1 G Creature Elf Shaman no text 1/1 -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Eternity Snare 5 U @@ -40,7 +42,7 @@ Enchantment Aura Enchanted creature doesn't untap during its controller's untap step. Enchant creature enPumpCurse:This card doesn't untap during your untap step. -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Frog Tongue G @@ -48,7 +50,7 @@ Enchantment Aura Enchanted creature has reach. Enchant creature enPump:Reach -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Jungle Barrier 2 G U @@ -56,21 +58,21 @@ Creature Plant Wall no text 2/6 Defender -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Kavu Climber 3 G G Creature Kavu no text 3/3 -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Merchant of Secrets 2 U Creature Human Wizard no text 1/1 -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Messenger Falcons 2 GU W @@ -78,21 +80,21 @@ Creature Bird no text 2/2 Flying -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Multani's Acolyte G G Creature Elf no text 2/1 -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Echo:G G Prophetic Prism 2 Artifact no text -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. tap: add W tap: add B tap: add U @@ -105,7 +107,7 @@ Enchantment Aura Enchanted creature gets +1/+1. Enchant creature enPump:+1/+1 -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Shielding Plax 2 GU @@ -113,14 +115,14 @@ Enchantment Aura Enchanted creature can't be the target of spells or abilities your opponents control. Enchant creature enPump:This card can't be the target of spells or abilities your opponents control. -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Striped Bears 3 G Creature Bear no text 2/2 -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Unquestioned Authority 2 W @@ -128,7 +130,7 @@ Enchantment Aura Enchanted creature has protection from creatures. Enchant creature enPump:Protection from creatures -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Wall of Blossoms 1 G @@ -136,7 +138,7 @@ Creature Wall no text 0/4 Defender -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Wall of Omens 1 W @@ -144,14 +146,20 @@ Creature Wall no text 0/4 Defender -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. Wistful Selkie GU GU GU Creature Merfolk Wizard no text 2/2 -When CARDNAME comes into play, draw a card. +When CARDNAME enters the battlefield, draw a card. + +Elvish Vanguard +1 G +Creature Elf +Whenever another Elf enters the battlefield, put a +1/+1 counter on Elvish Vanguard. +1/1 Tribal Forcemage 1 G diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index ab760233f4d..b044b553cdd 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -3382,12 +3382,19 @@ public class CardFactory implements NewConstants { //////////////////////////////////////////////////////////////// - if(card.getKeyword().contains("When CARDNAME comes into play, draw a card.")) { + if (card.getKeyword().contains("When CARDNAME enters the battlefield, draw a card.") || + card.getKeyword().contains("When CARDNAME enters the battlefield, draw two cards.")) { final SpellAbility ability = new Ability(card, "0") { @Override public void resolve() { - AllZone.GameAction.drawCard(card.getController()); + int drawCardsNum = 1; + if (card.getKeyword().contains("When CARDNAME enters the battlefield, draw two cards.")) { + drawCardsNum = 2; + } + for (int i = 0; i < drawCardsNum; i++) { + AllZone.GameAction.drawCard(card.getController()); + }//for loop }//resolve() };//SpellAbility Command intoPlay = new Command() { @@ -3395,7 +3402,16 @@ public class CardFactory implements NewConstants { private static final long serialVersionUID = 1707519783018941582L; public void execute() { - ability.setStackDescription(card.getName() + " - " + card.getController() + " draws a card."); + StringBuilder sb = new StringBuilder(); + sb.append(card.getName()); + sb.append(" - "); + sb.append(card.getController()); + sb.append(" draws "); + if (card.getKeyword().contains("When CARDNAME enters the battlefield, draw a card.")) { + sb.append("a card."); + } else sb.append("two cards."); + + ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); } };