From 1b0a5488778e9a112b0bec1425cabe35d8e2d3f9 Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Sat, 13 Oct 2012 20:58:23 +0000
Subject: [PATCH] *Turned keyword "CARDNAME enters the battlefield tapped."
 into an ETBReplacement Macro.

---
 .../card/cardfactory/CardFactoryUtil.java      | 18 ++++++++++++++++++
 .../forge/game/zone/PlayerZoneBattlefield.java |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index 5adbcc7957c..6b27446cd34 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -4289,6 +4289,24 @@ public class CardFactoryUtil {
                 ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, card);
                 re.setLayer(ReplacementLayer.Other);
 
+                card.addReplacementEffect(re);
+            } else if(kw.equals("CARDNAME enters the battlefield tapped.")) {
+                String parse = kw;
+                card.removeIntrinsicKeyword(parse);
+                
+                String abStr = "AB$ Tap | Cost$ 0 | Defined$ Self | ETB$ True | SubAbility$ MoveETB";
+                String dbStr = "DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield" +
+                        "| Defined$ ReplacedCard";
+
+                card.setSVar("ETBTappedSVar", abStr);
+                card.setSVar("MoveETB", dbStr);
+
+                String repeffstr = "Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield " +
+                        "| ReplaceWith$ ETBTappedSVar | Description$ CARDNAME enters the battlefield tapped.";
+
+                ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, card);
+                re.setLayer(ReplacementLayer.Other);
+
                 card.addReplacementEffect(re);
             }
         }
diff --git a/src/main/java/forge/game/zone/PlayerZoneBattlefield.java b/src/main/java/forge/game/zone/PlayerZoneBattlefield.java
index 3b79965e6de..fb8aa9b40ee 100644
--- a/src/main/java/forge/game/zone/PlayerZoneBattlefield.java
+++ b/src/main/java/forge/game/zone/PlayerZoneBattlefield.java
@@ -79,7 +79,7 @@ public class PlayerZoneBattlefield extends PlayerZone {
         final Card c = (Card) o;
 
         if (this.trigger) {
-            if (c.hasKeyword("CARDNAME enters the battlefield tapped.") || c.hasKeyword("Hideaway")) {
+            if (c.hasKeyword("Hideaway")) {
                 // it enters the battlefield this way, and should not fire
                 // triggers
                 c.setTapped(true);