From 2368701b05b7d87bd4247f66ddd4609528230b95 Mon Sep 17 00:00:00 2001 From: ParticleG Date: Mon, 12 Aug 2024 12:47:23 +0800 Subject: [PATCH] - Update external function signature - Remove unused settings --- ZZZTOJ.Botris/ZZZBot.cs | 6 +++--- ZZZTOJ.Botris/ZZZTOJCore.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ZZZTOJ.Botris/ZZZBot.cs b/ZZZTOJ.Botris/ZZZBot.cs index 569c411..66b7123 100644 --- 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 index 219f697..4133e66 100644 --- 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"