WIP redo timings without singletons

#2035 (comment)

Author: dagguh

Assets/Scripts/AsyncAction.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 
+public delegate Task AsyncAction();
 public delegate Task AsyncAction<in T1>(T1 arg1);
 public delegate Task AsyncAction<in T1, in T2>(T1 arg1, T2 arg2);
-
-

Assets/Scripts/Model/Cards/Corp/AdvancedAssemblyLines.cs

@@ -6,6 +6,7 @@
 using model.choices.trash;
 using model.costs;
 using model.play;
+using model.timing;
 using model.zones;
 
 namespace model.cards.corp
@@ -18,7 +19,7 @@ public AdvancedAssemblyLines(Game game) : base(game) { }
         override public Faction Faction => Factions.HAAS_BIOROID;
         override public int InfluenceCost => 2;
         override public ICost PlayCost => game.corp.credits.PayingForPlaying(this, 1);
-        override public IEffect Activation => new AdvancedAssemblyLinesActivation(this, game.corp);
+        override public IEffect Activation => new AdvancedAssemblyLinesActivation(this, game);
         override public IType Type => new Asset(game);
         override public IList<ITrashOption> TrashOptions() => new List<ITrashOption> {
             new Leave(),
@@ -30,21 +31,25 @@ private class AdvancedAssemblyLinesActivation : IEffect
             public bool Impactful => true;
             public event Action<IEffect, bool> ChangedImpact = delegate { };
             private readonly Card aal;
-            private readonly Corp corp;
+            private readonly Game game;
             IEnumerable<string> IEffect.Graphics => new string[] { };
 
-            public AdvancedAssemblyLinesActivation(Card aal, Corp corp)
+            public AdvancedAssemblyLinesActivation(Card aal, Game game)
             {
                 this.aal = aal;
-                this.corp = corp;
+                this.game = game;
             }
 
             async Task IEffect.Resolve()
             {
-                await corp.credits.Gaining(3).Resolve();
-                var paidWindow = corp.paidWindow;
-                var archives = corp.zones.archives.Zone;
-                var aalInstall = new AdvancedAssemblyLinesInstall(corp);
+                await game.corp.credits.Gaining(3).Resolve();
+                game.Timing.PaidWindowDefined += DefineTrashAbility;
+            }
+
+            private void DefineTrashAbility(PaidWindow paidWindow)
+            {
+                var archives = game.corp.zones.archives.Zone;
+                var aalInstall = new AdvancedAssemblyLinesInstall(game.corp);
                 var pop = new Ability(
                     cost: new Conjunction(paidWindow.Permission(), new Trash(aal, archives), new Active(aal)),
                     effect: aalInstall
@@ -58,7 +63,7 @@ async Task IEffect.Resolve()
             }
         }
 
-        private class AdvancedAssemblyLinesInstall : IEffect
+        private class AdvancedAssemblyLinesInstall : IEffect, IDisposable
         {
             public bool Impactful => Installables().Count > 0;
             public event Action<IEffect, bool> ChangedImpact = delegate { };
@@ -84,7 +89,7 @@ private void UpdateInstallables(Zone hqZone)
                 ChangedImpact(this, Impactful);
             }
 
-            internal void Dispose()
+            public void Dispose()
             {
                 corp.zones.hq.Zone.Changed -= UpdateInstallables;
             }

Assets/Scripts/Model/Cards/Corp/HaarpsichordStudios.cs

@@ -31,8 +31,8 @@ private class HaarpsichordEffect : IEffect
             async Task IEffect.Resolve()
             {
                 var memory = new HaarpsichordMemory();
-                game.corp.turn.Started += memory.Reset;
-                game.runner.turn.Started += memory.Reset;
+                game.corp.turn.Opened += memory.Reset;
+                game.runner.turn.Opened += memory.Reset;
                 var mod = new HaarpsichordModifier(memory);
                 game.runner.Stealing.ModifyStealing(mod);
                 await Task.CompletedTask;

Assets/Scripts/Model/Cards/Corp/PadCampaign.cs

@@ -3,6 +3,8 @@
 using System.Threading.Tasks;
 using model.cards.types;
 using model.choices.trash;
+using model.timing;
+using model.timing.corp;
 
 namespace model.cards.corp
 {
@@ -14,7 +16,7 @@ public PadCampaign(Game game) : base(game) { }
         override public Faction Faction => Factions.SHADOW;
         override public int InfluenceCost => 0;
         override public ICost PlayCost => game.corp.credits.PayingForPlaying(this, 2);
-        override public IEffect Activation => new PadCampaignActivation(game.corp);
+        override public IEffect Activation => new PadCampaignActivation(game);
         override public IType Type => new Asset(game);
         override public IList<ITrashOption> TrashOptions() => new List<ITrashOption> {
             new Leave(),
@@ -26,15 +28,20 @@ private class PadCampaignActivation : IEffect
             public bool Impactful => true;
             public event Action<IEffect, bool> ChangedImpact = delegate { };
             IEnumerable<string> IEffect.Graphics => new string[] { };
-            private Corp corp;
+            private Game game;
 
-            public PadCampaignActivation(Corp corp) => this.corp = corp;
+            public PadCampaignActivation(Game game) => this.game = game;
 
             async Task IEffect.Resolve()
             {
-                corp.turn.WhenBegins(corp.credits.Gaining(1));
+                game.Timing.CorpTurnDefined += RegisterDrip;
                 await Task.CompletedTask;
             }
+
+            private void RegisterDrip(CorpTurn turn)
+            {
+                turn.WhenBegins(game.corp.credits.Gaining(1));
+            }
         }
     }
 }

Assets/Scripts/Model/Corp.cs

@@ -5,7 +5,6 @@
 using model.player;
 using model.rez;
 using model.timing;
-using model.timing.corp;
 using model.zones;
 using model.zones.corp;
 
@@ -14,8 +13,6 @@ namespace model
     public class Corp
     {
         public readonly IPilot pilot;
-        public readonly CorpTurn turn;
-        public readonly PaidWindow paidWindow;
         public readonly zones.corp.Zones zones;
         public readonly ClickPool clicks;
         public readonly CreditPool credits;
@@ -25,16 +22,12 @@ public class Corp
 
         public Corp(
             IPilot pilot,
-            CorpTurn turn,
-            PaidWindow paidWindow,
             Zone playArea,
             Shuffling shuffling,
             Random random
         )
         {
             this.pilot = pilot;
-            this.turn = turn;
-            this.paidWindow = paidWindow;
             clicks = new ClickPool(3);
             credits = new CreditPool();
             zones = new Zones(this, playArea, shuffling);

Assets/Scripts/Model/Game.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using model.player;
 using model.timing;
 using model.zones;
@@ -11,143 +9,24 @@ public class Game
     {
         public readonly Corp corp;
         public readonly Runner runner;
+        public readonly Timing Timing;
         private readonly Zone playArea;
-        public readonly Checkpoint checkpoint;
-        public event Action<ITurn> CurrentTurn = delegate { };
-        public event Action<ITurn> NextTurn = delegate { };
-        public event Action<GameFinish> Finished = delegate { };
-        private bool ended = false;
-        private Queue<ITurn> turns = new Queue<ITurn>();
         private Shuffling shuffling;
 
         public Game(IPilot corpPilot, IPilot runnerPilot, Shuffling shuffling)
         {
             this.shuffling = shuffling;
             playArea = new Zone("Play area", true);
-            corp = CreateCorp(corpPilot);
-            runner = CreateRunner(runnerPilot);
-            this.checkpoint = new Checkpoint(this);
-            corp.zones.rd.Decked += DeckCorp;
-            runner.zones.score.StolenEnough += StealEnough;
-        }
-
-        private Corp CreateCorp(IPilot pilot)
-        {
-            var turn = new timing.corp.CorpTurn(this);
-            var paidWindow = new PaidWindow("corp");
-            return new Corp(pilot, turn, paidWindow, playArea, shuffling, new Random());
-        }
-
-        private Runner CreateRunner(IPilot pilot)
-        {
-            var turn = new timing.runner.RunnerTurn(this);
-            var paidWindow = new PaidWindow("runner");
-            return new Runner(pilot, turn, paidWindow, playArea, shuffling, this);
+            corp = new Corp(corpPilot, playArea, shuffling, new Random());
+            runner = new Runner(runnerPilot, playArea, shuffling, this);
+            this.Timing = new Timing(this);
         }
 
         async public void Start(Deck corpDeck, Deck runnerDeck)
         {
             await corp.Start(this, corpDeck);
             await runner.Start(this, runnerDeck);
-            await StartTurns();
-        }
-
-        async private Task StartTurns()
-        {
-            turns.Enqueue(corp.turn);
-            turns.Enqueue(runner.turn);
-            try
-            {
-                while (!ended)
-                {
-                    turns.Enqueue(corp.turn);
-                    turns.Enqueue(runner.turn);
-                    await StartNextTurn();
-                    await StartNextTurn();
-                }
-            }
-            catch (Exception e)
-            {
-                if (ended)
-                {
-                    UnityEngine.Debug.Log("The game is over! " + e.Message);
-                }
-                else
-                {
-                    throw new Exception("Failed a turn", e);
-                }
-            }
-        }
-
-        private async Task StartNextTurn()
-        {
-            var currentTurn = turns.Dequeue();
-            CurrentTurn(currentTurn);
-            NextTurn(turns.Peek());
-            await currentTurn.Start();
-        }
-
-        async public Task OpenPaidWindow(PaidWindow acting, PaidWindow reacting)
-        {
-            var bothPlayersCouldAct = false;
-            while (true)
-            {
-                var actingDeclined = await acting.AwaitPass();
-                if (actingDeclined && bothPlayersCouldAct)
-                {
-                    break;
-                }
-                var reactingDeclined = await reacting.AwaitPass();
-                bothPlayersCouldAct = true;
-                if (reactingDeclined && bothPlayersCouldAct)
-                {
-                    break;
-                }
-            }
-        }
-
-        private void DeckCorp(Corp corp)
-        {
-            Finish(new GameFinish(
-                winner: "The Runner",
-                loser: "The Corp",
-                reason: "Corp R&D is empty"
-            ));
-        }
-
-        private void StealEnough()
-        {
-            Finish(new GameFinish(
-                winner: "The Runner",
-                loser: "The Corp",
-                reason: "Runner has stolen enough"
-            ));
-        }
-
-        private void Finish(GameFinish finish)
-        {
-            ended = true;
-            Finished(finish);
-            throw new Exception("Game over, " + finish.reason);
-        }
-
-        async public Task Checkpoint()
-        {
-            await checkpoint.Check();
-        }
-    }
-
-    public class GameFinish
-    {
-        public string winner;
-        public string loser;
-        public string reason;
-
-        public GameFinish(string winner, string loser, string reason)
-        {
-            this.winner = winner;
-            this.loser = loser;
-            this.reason = reason;
+            await Timing.StartTurns();
         }
     }
 }

Assets/Scripts/Model/Runner.cs

@@ -14,8 +14,6 @@ namespace model
     public class Runner
     {
         public readonly IPilot pilot;
-        public readonly RunnerTurn turn;
-        public readonly PaidWindow paidWindow;
         public int tags = 0;
         public readonly Zones zones;
         public readonly ClickPool clicks;
@@ -27,16 +25,12 @@ public class Runner
 
         public Runner(
             IPilot pilot,
-            RunnerTurn turn,
-            PaidWindow paidWindow,
             Zone playArea,
             Shuffling shuffling,
             Game game
         )
         {
             this.pilot = pilot;
-            this.turn = turn;
-            this.paidWindow = paidWindow;
             zones = new Zones(
                new Grip(),
                new Stack(shuffling),

Assets/Scripts/Model/Timing/Corp/CorpActionPhase.cs

@@ -0,0 +1,43 @@
+using System.Threading.Tasks;
+using model.play;
+
+namespace model.timing.corp
+{
+    public class CorpActionPhase : ITimingStructure<CorpActionPhase>
+    {
+        private Corp corp;
+        private Timing timing;
+        public string Name => "Corp action phase";
+        public event AsyncAction<CorpActionPhase> Opened;
+        public event AsyncAction<CorpActionPhase> Closed;
+        public event AsyncAction TakingAction;
+        public event AsyncAction<Ability> ActionTaken;
+
+        public CorpActionPhase(Corp corp, Timing timing)
+        {
+            this.corp = corp;
+            this.timing = timing;
+        }
+
+        public async Task Open()
+        {
+            Opened?.Invoke(this);
+            var paidWindow = timing.DefinePaidWindow(rezzing: true, scoring: true)
+            await paidWindow.Open(); // CR: 5.6.2.a
+            while (corp.clicks.Remaining > 0) // CR: 5.6.2.c
+            {
+                await TakeAction(); // CR: 5.6.2.b
+            }
+            await timing.Checkpoint(); // CR: 5.6.2.d
+        }
+
+        async private Task TakeAction()
+        {
+            var actionTaking = corp.Acting.TakeAction();
+            TakingAction?.Invoke();
+            var action = await actionTaking;
+            ActionTaken?.Invoke(action);
+            await timing.OpenPaidWindow(rezzing: true, scoring: true);
+        }
+    }
+}