Add ExecutorType GoToBattlePhase etc. (#55)

IceYGO · Aug 20, 2018 · 702b093 · 702b093
1 parent 0d0f6f9
commit 702b093
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/Game/AI/ExecutorType.cs b/Game/AI/ExecutorType.cs
@@ -8,6 +8,9 @@ public enum ExecutorType
         MonsterSet,
         SpellSet,
         Activate,
-        SummonOrSet
+        SummonOrSet,
+        GoToBattlePhase,
+        GoToMainPhase2,
+        GoToEndPhase
     }
 }
diff --git a/Game/GameAI.cs b/Game/GameAI.cs
@@ -143,6 +143,14 @@ public BattlePhaseAction OnSelectBattleCmd(BattlePhase battle)
             Executor.SetBattle(battle);
             foreach (CardExecutor exec in Executor.Executors)
             {
+                if (exec.Type == ExecutorType.GoToMainPhase2 && battle.CanMainPhaseTwo && exec.Func()) // check if should enter main phase 2 directly
+                {
+                    return ToMainPhase2();
+                }
+                if (exec.Type == ExecutorType.GoToEndPhase && battle.CanEndPhase && exec.Func()) // check if should enter end phase directly
+                {
+                    return ToEndPhase();
+                }
                 for (int i = 0; i < battle.ActivableCards.Count; ++i)
                 {
                     ClientCard card = battle.ActivableCards[i];
@@ -383,6 +391,18 @@ public MainPhaseAction OnSelectIdleCmd(MainPhase main)
             Executor.SetMain(main);
             foreach (CardExecutor exec in Executor.Executors)
             {
+            	if (exec.Type == ExecutorType.GoToEndPhase && main.CanEndPhase && exec.Func()) // check if should enter end phase directly
+                {
+                    _dialogs.SendEndTurn();
+                    return new MainPhaseAction(MainPhaseAction.MainAction.ToEndPhase);
+                }
+                if (exec.Type==ExecutorType.GoToBattlePhase && main.CanBattlePhase && exec.Func()) // check if should enter battle phase directly
+                {
+                    return new MainPhaseAction(MainPhaseAction.MainAction.ToBattlePhase);
+                }
+                // NOTICE: GoToBattlePhase and GoToEndPhase has no "card" can be accessed to ShouldExecute(), so instead use exec.Func() to check ...
+                // enter end phase and enter battle pahse is in higher priority. 
+
                 for (int i = 0; i < main.ActivableCards.Count; ++i)
                 {
                     ClientCard card = main.ActivableCards[i];