From e8e64694a72c65c650a5f16b127e4a55e963a488 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 09:34:22 +0000
Subject: [PATCH] - Added Nucklavee. - Made etbReturnTgt a while loop.

---
 .gitattributes                |  1 +
 res/cardsfolder/nucklavee.txt | 10 ++++++++++
 src/forge/CardFactory.java    |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 res/cardsfolder/nucklavee.txt

diff --git a/.gitattributes b/.gitattributes
index 5df56f62645..132c4936c85 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2917,6 +2917,7 @@ res/cardsfolder/nova_chaser.txt -text svneol=native#text/plain
 res/cardsfolder/novablast_wurm.txt -text svneol=native#text/plain
 res/cardsfolder/novijen_heart_of_progress.txt -text svneol=native#text/plain
 res/cardsfolder/noxious_hatchling.txt -text svneol=native#text/plain
+res/cardsfolder/nucklavee.txt -text svneol=native#text/plain
 res/cardsfolder/nullmage_shepherd.txt -text svneol=native#text/plain
 res/cardsfolder/nut_collector.txt -text svneol=native#text/plain
 res/cardsfolder/nyxathid.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/nucklavee.txt b/res/cardsfolder/nucklavee.txt
new file mode 100644
index 00000000000..73f6bb1a0e5
--- /dev/null
+++ b/res/cardsfolder/nucklavee.txt
@@ -0,0 +1,10 @@
+Name:Nucklavee
+ManaCost:4 UR UR
+Types:Creature Beast
+Text:When Nucklavee enters the battlefield, you may return target red sorcery card from your graveyard to your hand.\r\nWhen Nucklavee enters the battlefield, you may return target blue instant card from your graveyard to your hand.
+PT:4/4
+K:etbReturnTgt:1:Sorcery.Red:Hand
+K:etbReturnTgt:1:Instant.Blue:Hand
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nucklavee.jpg
+End
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 6cea231281c..54a71f8a4de 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -3919,7 +3919,7 @@ public class CardFactory implements NewConstants {
          *  
          *  Buyback and X Count/Costs are not yet implemented.
          */
-        if (hasKeyword(card, "etbReturnTgt") != -1) {
+        while (hasKeyword(card, "etbReturnTgt") != -1) {
             int n = hasKeyword(card, "etbReturnTgt");
             
             String parse = card.getKeyword().get(n).toString();