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

*Moved and consolidated the running of Phase-mode triggers.

Browse Source
This commit is contained in:
jendave
2011-08-06 19:03:52 +00:00
parent 66766d5d6e
commit e2fb5912d5
3 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/EndOfTurn.java
View File

@@ -21,12 +21,6 @@ public class EndOfTurn implements java.io.Serializable
{ {
AllZone.GameAction.checkWheneverKeyword(AllZone.CardFactory.HumanNullCard,"BeginningOfEndStep",null); AllZone.GameAction.checkWheneverKeyword(AllZone.CardFactory.HumanNullCard,"BeginningOfEndStep",null);
//Run Triggers
HashMap<String,Object> runParams = new HashMap<String,Object>();
runParams.put("Phase", Constant.Phase.End_Of_Turn);
runParams.put("Player", AllZone.Phase.getPlayerTurn());
AllZone.TriggerHandler.runTrigger("Phase", runParams);
//Pyrohemia and Pestilence //Pyrohemia and Pestilence
CardList all = AllZoneUtil.getCardsInPlay(); CardList all = AllZoneUtil.getCardsInPlay();

17
src/forge/Phase.java
View File

@@ -163,6 +163,12 @@ public class Phase extends MyObservable
final Player turn = AllZone.Phase.getPlayerTurn(); final Player turn = AllZone.Phase.getPlayerTurn();
AllZone.Phase.setSkipPhase(true); AllZone.Phase.setSkipPhase(true);
//Run triggers
HashMap<String,Object> runParams = new HashMap<String,Object>();
runParams.put("Phase", phase);
runParams.put("Player", turn);
AllZone.TriggerHandler.runTrigger("Phase", runParams);
if(phase.equals(Constant.Phase.Untap)) { if(phase.equals(Constant.Phase.Untap)) {
PhaseUtil.handleUntap(); PhaseUtil.handleUntap();
} }
@@ -199,12 +205,6 @@ 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)){
@@ -277,11 +277,6 @@ public class Phase extends MyObservable
else{ else{
AllZone.EndOfCombat.executeUntil(); AllZone.EndOfCombat.executeUntil();
AllZone.EndOfCombat.executeAt(); AllZone.EndOfCombat.executeAt();
HashMap<String,Object> runParams = new HashMap<String,Object>();
runParams.put("Phase", phase);
runParams.put("Player", getPlayerTurn());
AllZone.TriggerHandler.runTrigger("Phase", runParams);
} }
} }

18
src/forge/PhaseUtil.java
View File

@@ -47,12 +47,6 @@ public class PhaseUtil {
return; return;
} }
//Run triggers
HashMap<String,Object> runParams = new HashMap<String,Object>();
runParams.put("Phase", Constant.Phase.Untap);
runParams.put("Player", AllZone.Phase.getPlayerTurn());
AllZone.TriggerHandler.runTrigger("Phase", runParams);
// Phasing would happen here // Phasing would happen here
doUntap(); doUntap();
@@ -310,12 +304,6 @@ public class PhaseUtil {
return; return;
} }
//Run triggers
HashMap<String,Object> runParams = new HashMap<String,Object>();
runParams.put("Phase", Constant.Phase.Upkeep);
runParams.put("Player", AllZone.Phase.getPlayerTurn());
AllZone.TriggerHandler.runTrigger("Phase", runParams);
GameActionUtil.executeUpkeepEffects(); GameActionUtil.executeUpkeepEffects();
} }
@@ -341,12 +329,6 @@ public class PhaseUtil {
return; return;
} }
//Run triggers
HashMap<String,Object> runParams = new HashMap<String,Object>();
runParams.put("Phase", Constant.Phase.Draw);
runParams.put("Player", playerTurn);
AllZone.TriggerHandler.runTrigger("Phase", runParams);
playerTurn.drawCard(); playerTurn.drawCard();
GameActionUtil.executeDrawStepEffects(); GameActionUtil.executeDrawStepEffects();
} }