From eb3f4e0fcb4eba8104d5beaa554417d3e891a304 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 16:46:56 +0000
Subject: [PATCH] convert Manta Ray to a keyword

---
 res/cardsfolder/manta_ray.txt | 3 ++-
 src/forge/CombatUtil.java     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/res/cardsfolder/manta_ray.txt b/res/cardsfolder/manta_ray.txt
index d6191a8cde9..8229cdd1422 100644
--- a/res/cardsfolder/manta_ray.txt
+++ b/res/cardsfolder/manta_ray.txt
@@ -1,9 +1,10 @@
 Name:Manta Ray
 ManaCost:1 U U
 Types:Creature Fish
-Text:Manta Ray can't be blocked except by blue creatures.
+Text:no text
 PT:3/3
 K:CARDNAME can't attack unless defending player controls an Island.
+K:CARDNAME can't be blocked except by blue creatures.
 K:When you control no Islands, sacrifice CARDNAME.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manta_ray.jpg
diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java
index 547e3ab0be5..2b6cd06a607 100644
--- a/src/forge/CombatUtil.java
+++ b/src/forge/CombatUtil.java
@@ -328,14 +328,14 @@ public class CombatUtil {
                     && !blocker.isRed()) return false;
         }
         
-        if(attacker.getName().equals("Manta Ray")) {
-            if(!blocker.isBlue()) return false;
-        }
-        
         if(attacker.getKeyword().contains("CARDNAME can't be blocked except by black creatures.")) {
         	if(!blocker.isBlack())return false; 
         }
         
+        if(attacker.getKeyword().contains("CARDNAME can't be blocked except by blue creatures.")) {
+        	if(!blocker.isBlue())return false; 
+        }
+        
         if (attacker.getKeyword().contains("CARDNAME can't be blocked by Walls.") && blocker.isType("Wall")) return false;
         
         if (attacker.getKeyword().contains("CARDNAME can't be blocked except by Walls.") && !blocker.isType("Wall")) return false;