Fix soft drop bug

TetrisAI · Aug 12, 2024 · 49eac12 · 49eac12
1 parent 3338d0e
commit 49eac12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/BotrisBattle.NET/BotrisType.cs b/BotrisBattle.NET/BotrisType.cs
@@ -96,10 +96,11 @@ public enum Block
     // Enum for Command
     public enum Command
     {
-        hold, move_left, move_right, sonic_left, sonic_right,
+        hold, move_left, move_right, sonic_left, sonic_right, hard_drop,
         rotate_cw, rotate_ccw, drop, sonic_drop
     }
 
+
     // Enum for ClearName
     public enum ClearName
     {

diff --git a/ZZZTOJ.Botris/ZZZBot.cs b/ZZZTOJ.Botris/ZZZBot.cs
@@ -140,7 +140,7 @@ public MoveResult GetMove(RequestMovePayload requestMovePayload)
 
                     requestMovePayload.GameState.held == null ? ' ': requestMovePayload.GameState.held[0],
                     requestMovePayload.GameState.canHold, requestMovePayload.GameState.current.piece[0],
-                    requestMovePayload.GameState.current.x, 21 - requestMovePayload.GameState.current.y, requestMovePayload.GameState.current.rotation,
+                    requestMovePayload.GameState.current.x, 20 - requestMovePayload.GameState.current.y, requestMovePayload.GameState.current.rotation,
                     true, false, requestMovePayload.GameState.garbageQueued.Length, comboTable, BotSetting.NextCnt, BotSetting.Level, 0);
             string resultpath = Marshal.PtrToStringAnsi(path);
             _IOBoard.NextQueue.Enqueue(TetrisMino.Z);
@@ -153,22 +153,16 @@ public MoveResult GetMove(RequestMovePayload requestMovePayload)
                     case 'z':
                     case 'Z':
                         _IOBoard.LeftRotation();
-
                         moveResult.moves.Add(Command.rotate_ccw);
                         break;
                     case 'c':
                     case 'C':
                         _IOBoard.RightRotation();
-
                         moveResult.moves.Add(Command.rotate_cw);
-
                         break;
                     case 'l':
                         _IOBoard.MoveLeft();
-
                         moveResult.moves.Add(Command.move_left);
-
-
                         break;
                     case 'L':
                         while (_IOBoard.MoveLeft()) ;
@@ -182,14 +176,14 @@ public MoveResult GetMove(RequestMovePayload requestMovePayload)
                     case 'R':
                         while (_IOBoard.MoveRight()) ;
                         moveResult.moves.Add(Command.sonic_right);
-
                         break;
                     case 'd':
+                        _IOBoard.SoftDrop();
+                        moveResult.moves.Add(Command.drop);
+                        break;
                     case 'D':
                         _IOBoard.SonicDrop();
-
                         moveResult.moves.Add(Command.sonic_drop);
-
                         break;
                     case 'v':
                         //_IOBoard.OnHold();
@@ -232,9 +226,7 @@ public MoveResult GetMove(RequestMovePayload requestMovePayload)
                         //    moveResult.expected_cells[i][0] = list[i].Y;
                         //}
                         _IOBoard.HardDrop();
-
-                        moveResult.moves.Add(Command.drop);
-
+                        //moveResult.moves.Add(Command.hard_drop);
                         break;
                     default:
                         break;