From cfffda23526ecc9edb863eb879eadd1fa857a9a7 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 15:06:18 +0000
Subject: [PATCH] *Added TurnFaceUp trigger-mode.

---
 .gitattributes                         |  1 +
 src/forge/Card.java                    |  5 +++++
 src/forge/TriggerHandler.java          |  4 ++++
 src/forge/Trigger_AttackerBlocked.java |  4 ----
 src/forge/Trigger_TurnFaceUp.java      | 24 ++++++++++++++++++++++++
 5 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 src/forge/Trigger_TurnFaceUp.java

diff --git a/.gitattributes b/.gitattributes
index cadb10d0d5b..103c4ac7124 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6677,6 +6677,7 @@ src/forge/Trigger_Phase.java -text svneol=native#text/plain
 src/forge/Trigger_Sacrificed.java -text svneol=native#text/plain
 src/forge/Trigger_SpellCast.java -text svneol=native#text/plain
 src/forge/Trigger_Taps.java -text svneol=native#text/plain
+src/forge/Trigger_TurnFaceUp.java -text svneol=native#text/plain
 src/forge/Trigger_Untaps.java -text svneol=native#text/plain
 src/forge/UndoCommand.java svneol=native#text/plain
 src/forge/Wait.java svneol=native#text/plain
diff --git a/src/forge/Card.java b/src/forge/Card.java
index 75f26be844f..972f082b440 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -1377,6 +1377,11 @@ public class Card extends MyObservable {
     public void turnFaceUp() {
         for(Command var:turnFaceUpCommandList)
             var.execute();
+        
+        //Run triggers
+        HashMap<String,Object> runParams = new HashMap<String,Object>();
+        runParams.put("Morpher", this);
+        AllZone.TriggerHandler.runTrigger("TurnFaceUp", runParams);
     }
     
     public void addDestroyCommand(Command c) {
diff --git a/src/forge/TriggerHandler.java b/src/forge/TriggerHandler.java
index fd0c5d0a475..e2c492d4eda 100644
--- a/src/forge/TriggerHandler.java
+++ b/src/forge/TriggerHandler.java
@@ -65,6 +65,10 @@ public class TriggerHandler {
 		{
 			ret = new Trigger_Taps(mapParams,host);
 		}
+		else if(mode.equals("TurnFaceUp"))
+		{
+			ret = new Trigger_TurnFaceUp(mapParams,host);
+		}
 		else if(mode.equals("Untaps"))
 		{
 			ret = new Trigger_Untaps(mapParams,host);
diff --git a/src/forge/Trigger_AttackerBlocked.java b/src/forge/Trigger_AttackerBlocked.java
index bcfafbe359c..2b68670f654 100644
--- a/src/forge/Trigger_AttackerBlocked.java
+++ b/src/forge/Trigger_AttackerBlocked.java
@@ -14,8 +14,6 @@ public class Trigger_AttackerBlocked extends Trigger {
 		{
 			if(!matchesValid(runParams.get("Attacker"),mapParams.get("ValidCard").split(","),hostCard))
 			{
-				System.out.println("Attacker = " + ((Card)runParams.get("Attacker")).getName());
-				System.out.println("Test failed: Attacker not valid.");
 				return false;
 			}
 		}
@@ -23,8 +21,6 @@ public class Trigger_AttackerBlocked extends Trigger {
 		{
 			if(!matchesValid(runParams.get("Blocker"),mapParams.get("ValidBlocker").split(","),hostCard))
 			{
-				System.out.println("Blocker = " + ((Card)runParams.get("Blocker")).getName());
-				System.out.println("Test failed: Blocker not valid.");
 				return false;
 			}
 		}
diff --git a/src/forge/Trigger_TurnFaceUp.java b/src/forge/Trigger_TurnFaceUp.java
new file mode 100644
index 00000000000..3329477fe51
--- /dev/null
+++ b/src/forge/Trigger_TurnFaceUp.java
@@ -0,0 +1,24 @@
+package forge;
+
+import java.util.HashMap;
+
+public class Trigger_TurnFaceUp extends Trigger {
+
+	public Trigger_TurnFaceUp(HashMap<String, String> params, Card host) {
+		super(params, host);
+	}
+
+	@Override
+	public boolean performTest(HashMap<String, Object> runParams) {
+		if(mapParams.containsKey("ValidCard"))
+		{
+			if(!matchesValid(runParams.get("Morpher"),mapParams.get("ValidCard").split(","),hostCard))
+			{	
+				return false;
+			}
+		}
+		
+		return true;
+	}
+
+}