Changeset 32

Timestamp:

Oct 12, 2019, 11:01:10 PM (5 years ago)

Author:

chronos

Message:

• Modified: In computer form allow to stop AI play.
• Modified: Optimized moves history computation using MoveAll without animation.

Location:

trunk

Files:

• Forms/UFormComputer.lfm (modified) (1 diff)
• Forms/UFormComputer.lrj (modified) (1 diff)
• Forms/UFormComputer.pas (modified) (8 diffs)
• Languages/Game2048.cs.mo (modified) ( previous)
• Languages/Game2048.cs.po (modified) (1 diff)
• Languages/Game2048.po (modified) (1 diff)
• UGame.pas (modified) (6 diffs)

trunk/Forms/UFormComputer.lfm

@@ -13 +13 @@
   OnShow = FormShow
   LCLVersion = '2.0.2.0'
-  object ButtonSolve: TButton
-    Left = 159
+  object ButtonStart: TButton
+    Left = 40
     Height = 38
-    Top = 281
+    Top = 24
     Width = 113
-    Caption = 'Solve'
-    OnClick = ButtonSolveClick
+    Caption = 'Start'
+    OnClick = ButtonStartClick
     TabOrder = 0
   end
+  object ButtonStop: TButton
+    Left = 208
+    Height = 38
+    Top = 24
+    Width = 113
+    Caption = 'Stop'
+    Enabled = False
+    OnClick = ButtonStopClick
+    TabOrder = 1
+  end
 end

trunk/Forms/UFormComputer.lrj

@@ -1 +1 @@
 {"version":1,"strings":[
 {"hash":1113,"name":"tformcomputer.caption","sourcebytes":[65,73],"value":"AI"},
-{"hash":5923781,"name":"tformcomputer.buttonsolve.caption","sourcebytes":[83,111,108,118,101],"value":"Solve"}
+{"hash":5941396,"name":"tformcomputer.buttonstart.caption","sourcebytes":[83,116,97,114,116],"value":"Start"},
+{"hash":371552,"name":"tformcomputer.buttonstop.caption","sourcebytes":[83,116,111,112],"value":"Stop"}
 ]}

trunk/Forms/UFormComputer.pas

@@ -28 +28 @@
 
   TFormComputer = class(TForm)
-    ButtonSolve: TButton;
-    procedure ButtonSolveClick(Sender: TObject);
+    ButtonStart: TButton;
+    ButtonStop: TButton;
+    procedure ButtonStartClick(Sender: TObject);
+    procedure ButtonStopClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -35 +37 @@
     procedure FormShow(Sender: TObject);
   private
+    Stop: Boolean;
     GameTries1: TGameTries;
     GameTries2: TGameTries;
@@ -147 +150 @@
 end;
 
-procedure TFormComputer.ButtonSolveClick(Sender: TObject);
+procedure TFormComputer.ButtonStartClick(Sender: TObject);
 var
   NewTry: TGameTry;
@@ -155 +158 @@
   GameTries: TGameTries;
 begin
+  ButtonStart.Enabled := False;
+  ButtonStop.Enabled := True;
+  Stop := False;
   with Core.Game do begin
-    while CanMove do begin
+    while CanMove and not Stop do begin
       NewTry := TGameTry.Create;
       NewTry.Game.Assign(Core.Game);
@@ -182 +188 @@
       end;
       MoveAllAndUpdate(GameTries[0].Moves[0]);
-{      if CanMergeDirection(drDown) then MoveAll(drDown)
-      else if CanMergeDirection(drRight) then MoveAll(drRight)
-      else if CanMergeDirection(drLeft) then MoveAll(drLeft)
-      else if CanMoveDirection(drDown) then MoveAll(drDown)
-      else if CanMoveDirection(drRight) then MoveAll(drRight)
-      else if CanMoveDirection(drLeft) then MoveAll(drLeft)
-      else if CanMoveDirection(drUp) then MoveAll(drUp)
+{      if CanMergeDirection(drDown) then MoveAllAnimate(drDown)
+      else if CanMergeDirection(drRight) then MoveAllAnimate(drRight)
+      else if CanMergeDirection(drLeft) then MoveAllAnimate(drLeft)
+      else if CanMoveDirection(drDown) then MoveAllAnimate(drDown)
+      else if CanMoveDirection(drRight) then MoveAllAnimate(drRight)
+      else if CanMoveDirection(drLeft) then MoveAllAnimate(drLeft)
+      else if CanMoveDirection(drUp) then MoveAllAnimate(drUp)
       else Break;
       }
@@ -195 +201 @@
     end;
   end;
+  ButtonStart.Enabled := True;
+  ButtonStop.Enabled := False;
+end;
+
+procedure TFormComputer.ButtonStopClick(Sender: TObject);
+begin
+  Stop := True;
 end;
 
@@ -224 +237 @@
   NewTry: TGameTry;
 begin
-  for Direction := Low(TMoveDirection) to High(TMoveDirection) do begin
+  for Direction := drLeft to drDown do begin
     if GameTry.Game.CanMoveDirection(Direction) then begin
       NewTry := TGameTry.Create;
@@ -230 +243 @@
       NewTry.Game.UndoEnabled := False;
       NewTry.Game.AnimationDuration := 0;
-      NewTry.Game.MoveAll(Direction);
+      NewTry.Game.MoveAllAnimate(Direction);
       SetLength(NewTry.Moves, Length(NewTry.Moves) + 1);
       NewTry.Moves[Length(NewTry.Moves) - 1] := Direction;

trunk/Languages/Game2048.cs.po

@@ -72 +72 @@
 msgstr "   "
 
-#: tformcomputer.buttonsolve.caption
-msgid "Solve"
-msgstr "Vyřešit"
+#: tformcomputer.buttonstart.caption
+msgid "Start"
+msgstr "Spustit"
+
+#: tformcomputer.buttonstop.caption
+msgid "Stop"
+msgstr "Zastavit"
 
 #: tformcomputer.caption

trunk/Languages/Game2048.po

@@ -62 +62 @@
 msgstr ""
 
-#: tformcomputer.buttonsolve.caption
-msgid "Solve"
+#: tformcomputer.buttonstart.caption
+msgid "Start"
+msgstr ""
+
+#: tformcomputer.buttonstop.caption
+msgid "Stop"
 msgstr ""
 

trunk/UGame.pas

@@ -124 +124 @@
     procedure Render(Canvas: TCanvas; CanvasSize: TPoint);
     procedure MoveAll(Direction: TMoveDirection);
+    procedure MoveAllAnimate(Direction: TMoveDirection);
     procedure MoveAllAndUpdate(Direction: TMoveDirection);
     procedure MoveTile(SourceTile, TargetTile: TTile);
@@ -505 +506 @@
 begin
   case Direction of
-    drLeft: begin
-      Result := TArea.Create(1, 0, Board.Size.X - 1, Board.Size.Y - 1);
-    end;
-    drUp: begin
-      Result := TArea.Create(0, 1, Board.Size.X - 1, Board.Size.Y - 1);
-    end;
-    drRight: begin
-      Result := TArea.Create(Board.Size.X - 2, 0, 0, Board.Size.Y - 1);
-    end;
-    drDown: begin
-      Result := TArea.Create(0, Board.Size.Y - 2, Board.Size.X - 1, 0);
-    end;
+    drNone: Result := TArea.Create(0, 0, 0, 0);
+    drLeft: Result := TArea.Create(1, 0, Board.Size.X - 1, Board.Size.Y - 1);
+    drUp: Result := TArea.Create(0, 1, Board.Size.X - 1, Board.Size.Y - 1);
+    drRight: Result := TArea.Create(Board.Size.X - 2, 0, 0, Board.Size.Y - 1);
+    drDown: Result := TArea.Create(0, Board.Size.Y - 2, Board.Size.X - 1, 0);
   end;
 end;
@@ -629 +623 @@
       RenderTile(Canvas, Board.Tiles[Y, X], TileRect);
     end;
+end;
+
+procedure TGame.MoveAll(Direction: TMoveDirection);
+var
+  P: TPoint;
+  PNew: TPoint;
+  I: Integer;
+  Area: TArea;
+begin
+  if Direction = drNone then Exit;
+  if not CanMoveDirection(Direction) then Exit;
+  FMoving := True;
+  FBoardUndo.Assign(Board);
+  FCanUndo := True;
+  Area := GetMoveArea(Direction);
+  Board.ClearMerged;
+  for I := 0 to Max(Board.Size.X, Board.Size.Y) - 1 do begin
+    P := Area.P1;
+    while P.Y <> Area.P2.Y + Area.Increment.Y do begin
+      P.X := Area.P1.X;
+      while P.X <> Area.P2.X + Area.Increment.X do begin
+        PNew := P + DirectionDiff[Direction];
+        if IsValidPos(PNew) then begin
+          if (Board.Tiles[P.Y, P.X].Value <> 0) then begin
+            if (Board.Tiles[PNew.Y, PNew.X].Value = 0) then begin
+              Board.Tiles[P.Y, P.X].Moving := True;
+              Board.Tiles[PNew.Y, PNew.X].Value := Board.Tiles[P.Y, P.X].Value;
+              Board.Tiles[PNew.Y, PNew.X].Merged := Board.Tiles[P.Y, P.X].Merged;
+              Board.Tiles[P.Y, P.X].Value := 0;
+              Board.Tiles[P.Y, P.X].Merged := False;
+            end else
+            if (not Board.Tiles[P.Y, P.X].Merged) and (not Board.Tiles[PNew.Y, PNew.X].Merged) and
+            (Board.Tiles[PNew.Y, PNew.X].Value = Board.Tiles[P.Y, P.X].Value) then begin
+              Board.Tiles[P.Y, P.X].Moving := True;
+              Board.Tiles[PNew.Y, PNew.X].Value := Board.Tiles[PNew.Y, PNew.X].Value + Board.Tiles[P.Y, P.X].Value;
+              Board.Tiles[PNew.Y, PNew.X].Merged := True;
+              Board.Tiles[P.Y, P.X].Value := 0;
+              Board.Tiles[P.Y, P.X].Merged := False;
+              Score := Score + Board.Tiles[PNew.Y, PNew.X].Value;
+            end;
+          end;
+        end;
+        Inc(P.X, Area.Increment.X);
+      end;
+      Inc(P.Y, Area.Increment.Y);
+    end;
+    DoChange;
+  end;
+  FMoving := False;
 end;
 
@@ -707 +750 @@
 begin
   Result := False;
+  if Direction = drNone then Exit;
   Area := GetMoveArea(Direction);
   P := Area.P1;
@@ -729 +773 @@
 end;
 
-procedure TGame.MoveAll(Direction: TMoveDirection);
+procedure TGame.MoveAllAnimate(Direction: TMoveDirection);
 var
   P: TPoint;
@@ -823 +867 @@
 begin
   HighestValue := Board.GetHighestTileValue;
-  MoveAll(Direction);
+  MoveAllAnimate(Direction);
 
   NewTile := FillRandomTile;