Unify delay player

Author: ApmeM

TurnBase.KaNoBu.Console/Program.cs

@@ -8,15 +8,15 @@ public static async Task Main(string[] args)
     {
         var rules = new KaNoBuRules(8);
         var game = new Game<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(rules, "test");
-        game.AddPlayer(new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(new KaNoBuPlayerEasy(), 1, 500));
-        game.AddPlayer(new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(new KaNoBuPlayerEasy(), 1, 500));
-        game.AddPlayer(new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(new KaNoBuPlayerEasy(), 1, 500));
-        
-        game.AddPlayer(new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(new KaNoBuPlayerEasy(), 1, 500));
+        game.AddPlayer(new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(new KaNoBuPlayerEasy(), async (delay) => await Task.Delay(delay), 1, 500));
+        game.AddPlayer(new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(new KaNoBuPlayerEasy(), async (delay) => await Task.Delay(delay), 1, 500));
+        game.AddPlayer(new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(new KaNoBuPlayerEasy(), async (delay) => await Task.Delay(delay), 1, 500));
+
+        game.AddPlayer(new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(new KaNoBuPlayerEasy(), async (delay) => await Task.Delay(delay), 1, 500));
 
         // game.AddPlayer(new KaNoBuPlayerConsole());
         game.AddGameLogListener(new ReadableLogger<KaNoBuMoveNotificationModel>(new ConsoleLogger()));
-        
+
         await game.Play();
     }
 }

TurnBase.KaNoBu.Godot/Presentation/DelayedPlayer.cs

@@ -2,6 +2,7 @@
 using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Godot;
 using TurnBase;
 using TurnBase.KaNoBu;
@@ -129,10 +130,10 @@ public IGame BuildGame(GameField field)
             default:
                 throw new InvalidOperationException("Unknown game type");
         }
-        
+
         kanobu.AddGameLogListener(new ReadableLogger<KaNoBuMoveNotificationModel>(new GDLogger()));
 
-        if(!humanFound)
+        if (!humanFound)
         {
             kanobu.AddGameLogListener(field);
         }
@@ -153,15 +154,23 @@ public IPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBu
             case 2:
                 // Computer Easy
                 var playerEasy = new KaNoBuPlayerEasy();
-                return new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(playerEasy, 1, 300, this);
+                return new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(
+                    playerEasy, 
+                    async (delay) => await this.ToSignal(this.GetTree().CreateTimer(delay / 1000f), "timeout"),
+                    1,
+                    300);
             case 3:
                 // Remote
                 this.server.StartServer();
                 return new ServerPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(server, gameId);
             case 4:
                 // Computer Medium
                 var playerMedium = new KaNoBuPlayerMedium();
-                return new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(playerMedium, 1, 300, this);
+                return new DelayedPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(
+                    playerMedium,
+                    async (delay) => await this.ToSignal(this.GetTree().CreateTimer(delay / 1000f), "timeout"),
+                    1,
+                    300);
             default:
                 throw new InvalidOperationException("Unknown Player Type");
         }

TurnBase.KaNoBu.Godot/Presentation/UI.cs

@@ -67,6 +67,11 @@ public async Task<InitResponseModel<KaNoBuInitResponseModel>> Init(InitModel<KaN
 
         public async Task<MakeTurnResponseModel<KaNoBuMoveResponseModel>> MakeTurn(MakeTurnModel<KaNoBuMoveModel> model)
         {
+            // if (r.Next(100) < 20)
+            // {
+            //     return null;
+            // }
+
             var from = this.findAllMovement(model.Request.Field);
 
             if (from == null || from.Count == 0)

TurnBase.KaNoBu/KaNoBuPlayerEasy.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace TurnBase.KaNoBu
@@ -6,25 +8,31 @@ public class DelayedPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResp
         IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel>
     {
         private IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> player;
+        private readonly Func<int, Task> delayAction;
         private readonly int initDelay;
         private readonly int turnDelay;
 
-        public DelayedPlayer(IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> originalPlayer, int initDelay, int turnDelay)
+        public DelayedPlayer(
+            IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> originalPlayer, 
+            Func<int, Task> delayAction,
+            int initDelay, 
+            int turnDelay)
         {
             this.player = originalPlayer;
+            this.delayAction = delayAction;
             this.initDelay = initDelay;
             this.turnDelay = turnDelay;
         }
 
         public async Task<InitResponseModel<TInitResponseModel>> Init(InitModel<TInitModel> model)
         {
-            await Task.Delay(this.initDelay);
+            await delayAction(this.initDelay);
             return await this.player.Init(model);
         }
 
         public async Task<MakeTurnResponseModel<TMoveResponseModel>> MakeTurn(MakeTurnModel<TMoveModel> model)
         {
-            await Task.Delay(this.turnDelay);
+            await delayAction(this.turnDelay);
             return await this.player.MakeTurn(model);
         }