From bbbb02ea21f69da6ea9d1818a1ccaa6606c893cb Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 17:33:44 +0000
Subject: [PATCH] *Added Battle-Rattle Shaman. *Let Phase mode triggers go off
 at "BeginCombat".

---
 .gitattributes                           |  1 +
 res/cardsfolder/battle_rattle_shaman.txt | 10 ++++++++++
 src/forge/Phase.java                     |  6 ++++++
 3 files changed, 17 insertions(+)
 create mode 100644 res/cardsfolder/battle_rattle_shaman.txt

diff --git a/.gitattributes b/.gitattributes
index 982b216047e..bf1e48fa62c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -495,6 +495,7 @@ res/cardsfolder/battle_mad_ronin.txt -text svneol=native#text/plain
 res/cardsfolder/battle_mastery.txt -text svneol=native#text/plain
 res/cardsfolder/battle_of_wits.txt -text svneol=native#text/plain
 res/cardsfolder/battle_rampart.txt -text svneol=native#text/plain
+res/cardsfolder/battle_rattle_shaman.txt -text svneol=native#text/plain
 res/cardsfolder/battle_screech.txt -text svneol=native#text/plain
 res/cardsfolder/battle_squadron.txt -text svneol=native#text/plain
 res/cardsfolder/battle_strain.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/battle_rattle_shaman.txt b/res/cardsfolder/battle_rattle_shaman.txt
new file mode 100644
index 00000000000..a4c7b82b806
--- /dev/null
+++ b/res/cardsfolder/battle_rattle_shaman.txt
@@ -0,0 +1,10 @@
+Name:Battle-Rattle Shaman
+ManaCost:3 R
+Types:Creature Goblin Shaman
+Text:no text
+PT:2/2
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, you may have target creature get +2/+0 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Tgt$ TgtC | NumAtt$ 2
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/battle_rattle_shaman.jpg
+End
\ No newline at end of file
diff --git a/src/forge/Phase.java b/src/forge/Phase.java
index 93f28e84905..4198f44617a 100644
--- a/src/forge/Phase.java
+++ b/src/forge/Phase.java
@@ -199,6 +199,12 @@ public class Phase extends MyObservable
         
 	    else if(phase.equals(Constant.Phase.Combat_Begin)){
 	    	PhaseUtil.verifyCombat();
+	    	
+	    	//Run triggers
+	    	HashMap<String,Object> runParams = new HashMap<String,Object>();
+	    	runParams.put("Phase", phase);
+	    	runParams.put("Player", getPlayerTurn());
+	    	AllZone.TriggerHandler.runTrigger("Phase", runParams);
 	    }
         
 	    else if (phase.equals(Constant.Phase.Combat_Declare_Attackers_InstantAbility)){