From ef9fa1c75feacce008c2a37aec3db2eff9b820e7 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 03:56:25 +0000 Subject: [PATCH] 1) Added Gnat Alley Creeper and Stone Spirit and their LQ pic urls. 2) Added a short test for a new keyword "CARDNAME can't be blocked by creatures with flying.". 3) Added Lone Missionary, it's LQ pic url and a small bit of code in the CardFactroy_Creatures code block for these types of creatures. --- res/card-pictures.txt | 3 +++ res/cards.txt | 20 ++++++++++++++++++++ src/forge/CardFactory_Creatures.java | 3 ++- src/forge/CombatUtil.java | 3 +++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/res/card-pictures.txt b/res/card-pictures.txt index 82fca1f51df..1cdf5cdc34b 100644 --- a/res/card-pictures.txt +++ b/res/card-pictures.txt @@ -38,6 +38,9 @@ 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 +lone_missionary.jpg http://www.wizards.com/global/images/magic/general/lone_missionary.jpg +gnat_alley_creeper.jpg http://www.wizards.com/global/images/magic/general/gnat_alley_creeper.jpg +stone_spirit.jpg http://www.wizards.com/global/images/magic/general/stone_spirit.jpg bloodrite_invoker.jpg http://www.wizards.com/global/images/magic/general/bloodrite_invoker.jpg daggerback_basilisk.jpg http://www.wizards.com/global/images/magic/general/daggerback_basilisk.jpg deathless_angel.jpg http://www.wizards.com/global/images/magic/general/deathless_angel.jpg diff --git a/res/cards.txt b/res/cards.txt index f60fe3b6556..472ed217054 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,23 @@ +Lone Missionary +1 W +Creature Kor Monk +When Lone Missionary enters the battlefield, you gain 4 life. +2/1 + +Gnat Alley Creeper +2 R +Creature Human Rogue +no text +3/1 +CARDNAME can't be blocked by creatures with flying. + +Stone Spirit +4 R +Creature Elemental Spirit +no text +4/3 +CARDNAME can't be blocked by creatures with flying. + Bloodrite Invoker 2 B Creature Vampire Shaman diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index e543bf8e990..473d3e8ada3 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -1516,7 +1516,8 @@ public class CardFactory_Creatures { //*************** START *********** START ************************** else if(cardName.equals("Shu Soldier-Farmers") || cardName.equals("Staunch Defenders") || cardName.equals("Spiritual Guardian") || cardName.equals("Teroh's Faithful") - || cardName.equals("Jedit's Dragoons") || cardName.equals("Loxodon Hierarch")) { + || cardName.equals("Jedit's Dragoons") || cardName.equals("Loxodon Hierarch") + || cardName.equals("Lone Missionary")) { final SpellAbility ability = new Ability(card, "0") { @Override public void resolve() { diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index bac4ca5c556..c6d4b93df2b 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -150,6 +150,9 @@ public class CombatUtil { if(blocker.getKeyword().contains("This creature can block only creatures with flying.") && !attacker.getKeyword().contains("Flying")) return false; + if (attacker.getKeyword().contains("CARDNAME can't be blocked by creatures with flying.") + && blocker.getKeyword().contains("Flying")) return false; + if(attacker.getKeyword().contains("Unblockable")) return false; if(blocker.getKeyword().contains("This creature cannot block")