- Added Sentinel Dispatch

.gitattributes

@@ -11738,6 +11738,7 @@ forge-gui/res/cardsfolder/s/senseis_divining_top.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/s/sensor_splicer.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/s/sensory_deprivation.txt -text
 forge-gui/res/cardsfolder/s/sentinel.txt -text
+forge-gui/res/cardsfolder/s/sentinel_dispatch.txt -text
 forge-gui/res/cardsfolder/s/sentinel_sliver.txt -text
 forge-gui/res/cardsfolder/s/sentinel_spider.txt -text
 forge-gui/res/cardsfolder/s/sentinels_of_glen_elendra.txt svneol=native#text/plain

forge-game/src/main/java/forge/game/phase/PhaseHandler.java

@@ -67,6 +67,7 @@ public class PhaseHandler implements java.io.Serializable {
     private final transient Map<PhaseType, Stack<PhaseType>> extraPhases = new HashMap<PhaseType, Stack<PhaseType>>();
 
     private int nUpkeepsThisTurn = 0;
+    private int nUpkeepsThisGame = 0;
     private int nCombatsThisTurn = 0;
     private boolean bPreventCombatDamageThisTurn  = false;
     private int planarDiceRolledthisTurn = 0;
@@ -259,6 +260,7 @@ public class PhaseHandler implements java.io.Serializable {
 
                 case UPKEEP:
                     this.nUpkeepsThisTurn++;
+                    this.nUpkeepsThisGame++;
                     game.getUpkeep().executeUntil(this.getPlayerTurn());
                     game.getUpkeep().executeAt();
                     break;
@@ -930,6 +932,17 @@ public class PhaseHandler implements java.io.Serializable {
         return (this.nUpkeepsThisTurn == 1);
     }
 
+    /**
+     * <p>
+     * isFirstUpkeepThisGame.
+     * </p>
+     * 
+     * @return a boolean.
+     */
+    public final boolean isFirstUpkeepThisGame() {
+        return (this.nUpkeepsThisGame == 1);
+    }
+
     /**
      * <p>
      * isPreCombatMain.

forge-game/src/main/java/forge/game/trigger/Trigger.java

@@ -188,6 +188,12 @@ public abstract class Trigger extends TriggerReplacementBase {
             }
         }
 
+        if (this.mapParams.containsKey("FirstUpkeepThisGame")) {
+            if (!phaseHandler.isFirstUpkeepThisGame()) {
+                return false;
+            }
+        }
+
         if (this.mapParams.containsKey("FirstCombat")) {
             if (!phaseHandler.isFirstCombat()) {
                 return false;

forge-gui/res/cardsfolder/s/sentinel_dispatch.txt

@@ -0,0 +1,6 @@
+Name:Sentinel Dispatch
+ManaCost:no cost
+Types:Conspiracy
+T:Mode$ Phase | Phase$ Upkeep | FirstUpkeepThisGame$ True | Execute$ TrigToken | TriggerDescription$ At the beginning of the first upkeep, put a 1/1 colorless Construct artifact creature token with defender onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Construct | TokenTypes$ Artifact,Creature,Construct | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Defender
+Oracle:(Start the game with this conspiracy face up in the command zone.)\nAt the beginning of the first upkeep, put a 1/1 colorless Construct artifact creature token with defender onto the battlefield.