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

*Adapted TriggerPhases$ to support ranges like AF's do.

Browse Source
This commit is contained in:
jendave
2011-08-06 18:20:18 +00:00
parent 80efdbe6e9
commit cfa5a8b9f9
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/forge/Trigger.java
View File

@@ -102,12 +102,23 @@ public abstract class Trigger {
return true;
}
public boolean phaseCheck()
public boolean phasesCheck()
{
if(mapParams.containsKey("TriggerPhases"))
{
String phases = mapParams.get("TriggerPhases");
if (phases.contains("->")){
// If phases lists a Range, split and Build Activate String
// Combat_Begin->Combat_End (During Combat)
// Draw-> (After Upkeep)
// Upkeep->Combat_Begin (Before Declare Attackers)
String[] split = phases.split("->", 2);
phases = AllZone.Phase.buildActivateString(split[0], split[1]);
}
ArrayList<String> triggerPhases = new ArrayList<String>();
for(String s : mapParams.get("TriggerPhases").split(","))
for(String s : phases.split(","))
{
triggerPhases.add(s);
}

2
src/forge/TriggerHandler.java
View File

@@ -209,7 +209,7 @@ public class TriggerHandler {
{
return;
}
if(!regtrig.phaseCheck())
if(!regtrig.phasesCheck())
{
return;
}