external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

*Added Battle-Rattle Shaman.

Browse Source 
*Let Phase mode triggers go off at "BeginCombat".
This commit is contained in:
jendave
2011-08-06 17:33:44 +00:00
parent d20d8bc5b4
commit bbbb02ea21
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -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_mastery.txt -text svneol=native#text/plain
res/cardsfolder/battle_of_wits.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_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_screech.txt -text svneol=native#text/plain
res/cardsfolder/battle_squadron.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 res/cardsfolder/battle_strain.txt -text svneol=native#text/plain

10
res/cardsfolder/battle_rattle_shaman.txt Normal file
View File

@@ -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

6
src/forge/Phase.java
View File

@@ -199,6 +199,12 @@ public class Phase extends MyObservable
else if(phase.equals(Constant.Phase.Combat_Begin)){ else if(phase.equals(Constant.Phase.Combat_Begin)){
PhaseUtil.verifyCombat(); 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)){ else if (phase.equals(Constant.Phase.Combat_Declare_Attackers_InstantAbility)){