From 7fff9c035494bdafffe20f7828c5aa770dd40dac Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 15:30:30 +0000
Subject: [PATCH] add Desert Nomads (from Arabian Nights)

---
 .gitattributes                    |  1 +
 res/cardsfolder/desert_nomads.txt | 10 ++++++++++
 src/forge/CombatUtil.java         |  9 +++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 res/cardsfolder/desert_nomads.txt

diff --git a/.gitattributes b/.gitattributes
index e3a0a568240..021b752e012 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1294,6 +1294,7 @@ res/cardsfolder/descendant_of_soramaro.txt -text svneol=native#text/plain
 res/cardsfolder/desecrated_earth.txt -text svneol=native#text/plain
 res/cardsfolder/desert.txt -text svneol=native#text/plain
 res/cardsfolder/desert_drake.txt -text svneol=native#text/plain
+res/cardsfolder/desert_nomads.txt -text svneol=native#text/plain
 res/cardsfolder/desert_sandstorm.txt -text svneol=native#text/plain
 res/cardsfolder/desert_twister.txt -text svneol=native#text/plain
 res/cardsfolder/deserted_temple.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/desert_nomads.txt b/res/cardsfolder/desert_nomads.txt
new file mode 100644
index 00000000000..03566674d19
--- /dev/null
+++ b/res/cardsfolder/desert_nomads.txt
@@ -0,0 +1,10 @@
+Name:Desert Nomads
+ManaCost:2 R
+Types:Creature Human Nomad
+Text:Prevent all damage that would be dealt to CARDNAME by Deserts.
+PT:2/2
+K:Desertwalk
+K:PreventAllDamageBy Desert
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/desert_nomads.jpg
+End
\ No newline at end of file
diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java
index 3db0487f31c..2e507b7079c 100644
--- a/src/forge/CombatUtil.java
+++ b/src/forge/CombatUtil.java
@@ -131,6 +131,15 @@ public class CombatUtil {
 	            if(!temp.isEmpty()) return false;
 	        }
 	        
+	        if(attacker.getKeyword().contains("Desertwalk")) {
+	            temp = blkCL.filter(new CardListFilter() {
+	                public boolean addCard(Card c) {
+	                    return c.isLand() && c.getType().contains("Desert");
+	                }
+	            });
+	            if(!temp.isEmpty()) return false;
+	        }
+	        
 	        if(attacker.getKeyword().contains("Nonbasic landwalk")) {
 	            temp = blkCL.filter(new CardListFilter() {
 	                public boolean addCard(Card c) {