- Update external function signature

- Remove unused settings
TetrisAI · Aug 12, 2024 · 2368701 · 2368701
1 parent 47ed4b1
commit 2368701
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ZZZTOJ.Botris/ZZZBot.cs b/ZZZTOJ.Botris/ZZZBot.cs
@@ -24,7 +24,7 @@ class ZZZBot
         static int _garbage = 0;
         static object _lockQueue = new();
         static object _lockBoard = new();
-        public BotSetting BotSetting = new BotSetting() { BPM = 200, Level = 8, NextCnt = 6 };
+        public BotSetting BotSetting = new();
 
         static DateTime _startTime;
         static int _nowIdx = 0;
@@ -133,12 +133,12 @@ public MoveResult GetMove(RequestMovePayload requestMovePayload)
 
             //}
             int[] comboTable = new int[] { 0, 0, 0, 1, 1, 1, 2, 2, 3, 3, 4,4,4,4, -1 };
-            var path = ZZZTOJCore.BotrisAI2(field1, 10, 22, requestMovePayload.GameState.b2b ? 1 : 0,
+            var path = ZZZTOJCore.BotrisAI3(field1, 10, 22, requestMovePayload.GameState.b2b ? 1 : 0,
                     requestMovePayload.GameState.combo, 
                     requestMovePayload.GameState.queue.Select(s => s[0]).ToArray(),
 
                     requestMovePayload.GameState.held == null ? ' ': requestMovePayload.GameState.held[0],
-                    requestMovePayload.GameState.canHold, requestMovePayload.GameState.current.piece[0], 3, 1, 0, true, false, requestMovePayload.GameState.garbageQueued.Length, comboTable, BotSetting.NextCnt, BotSetting.Level, 0);
+                    requestMovePayload.GameState.canHold, requestMovePayload.GameState.current.piece[0], 3, 1, 0, true, false, requestMovePayload.GameState.garbageQueued.Length, comboTable, BotSetting.NextCnt, BotSetting.Duration);
             string resultpath = Marshal.PtrToStringAnsi(path);
             _IOBoard.NextQueue.Enqueue(TetrisMino.Z);
             Console.WriteLine(resultpath.PadRight(50));

diff --git a/ZZZTOJ.Botris/ZZZTOJCore.cs b/ZZZTOJ.Botris/ZZZTOJCore.cs
@@ -13,13 +13,13 @@ public static class ZZZTOJCore
             )]
         public static extern nint BotrisAI(int[] overfield, int[] field, int field_w, int field_h, int b2b, int combo,
             char[] next, char hold, [MarshalAs(UnmanagedType.I1)] bool curCanHold, char active, int x, int y, int spin,
-            [MarshalAs(UnmanagedType.I1)] bool canhold, [MarshalAs(UnmanagedType.I1)] bool can180spin, int upcomeAtt, int[] comboTable, int maxDepth, int level, int player);
+            [MarshalAs(UnmanagedType.I1)] bool canhold, [MarshalAs(UnmanagedType.I1)] bool can180spin, int upcomeAtt, int[] comboTable, int maxDepth, int level);
         [DllImport("zzz_botris"
            //, EntryPoint = "TetrisAI"
            )]
-        public static extern nint BotrisAI2(int[] field, int field_w, int field_h, int b2b, int combo,
+        public static extern nint BotrisAI3(int[] field, int field_w, int field_h, int b2b, int combo,
            char[] next, char hold, [MarshalAs(UnmanagedType.I1)] bool curCanHold, char active, int x, int y, int spin,
-           [MarshalAs(UnmanagedType.I1)] bool canhold, [MarshalAs(UnmanagedType.I1)] bool can180spin, int upcomeAtt, int[] comboTable, int maxDepth, int level, int player);
+           [MarshalAs(UnmanagedType.I1)] bool canhold, [MarshalAs(UnmanagedType.I1)] bool can180spin, int upcomeAtt, int[] comboTable, int maxDepth, int duration);
 
         [DllImport("zzz_botris"
            //, EntryPoint = "TetrisAI"