From b7b8f9f086d88730bea8cc93968aa58f2a812a8f Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 04:06:04 +0000 Subject: [PATCH] Added the keyword "CARDNAME can't be blocked except by Walls and/or creatures with flying.". I also added Elven Riders via this keyword and it's LQ pic url. --- res/card-pictures.txt | 1 + res/cards.txt | 7 +++++++ src/forge/CombatUtil.java | 3 +++ 3 files changed, 11 insertions(+) diff --git a/res/card-pictures.txt b/res/card-pictures.txt index c3b7d05b1ad..ce60ceec3c7 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 +elven_riders.jpg http://www.wizards.com/global/images/magic/general/elven_riders.jpg invisibility.jpg http://www.wizards.com/global/images/magic/general/invisibility.jpg bog_rats.jpg http://www.wizards.com/global/images/magic/general/bog_rats.jpg rampart_crawler.jpg http://www.wizards.com/global/images/magic/general/rampart_crawler.jpg diff --git a/res/cards.txt b/res/cards.txt index 9360d608f7e..51521e1f62f 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,10 @@ +Elven Riders +3 G G +Creature Elf +no text +3/3 +CARDNAME can't be blocked except by Walls and/or creatures with flying. + Invisibility U U Enchantment Aura diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index 1ce744577d0..10f7418dea8 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -225,6 +225,9 @@ public class CombatUtil { if (attacker.getKeyword().contains("CARDNAME can't be blocked except by Walls.") && !blocker.getType().contains("Wall")) return false; + if (attacker.getKeyword().contains("CARDNAME can't be blocked except by Walls and/or creatures with flying.") && + !(blocker.getType().contains("Wall") || blocker.getKeyword().contains("Flying"))) return false; + return true; }//canBlock()