Changeset 38 for trunk

Timestamp:

Oct 13, 2019, 5:34:57 PM (5 years ago)

Author:

chronos

Message:

• Added: In computer AI form allow to set delay of steps computation. Set to zero means fastest processing.

Location:

trunk

Files:

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

trunk/Forms/UFormComputer.lfm

@@ -32 +32 @@
     TabOrder = 1
   end
+  object TrackBar1: TTrackBar
+    Left = 24
+    Height = 58
+    Top = 104
+    Width = 430
+    Max = 1000
+    Position = 0
+    Anchors = [akTop, akLeft, akRight]
+    TabOrder = 2
+  end
+  object Label1: TLabel
+    Left = 21
+    Height = 26
+    Top = 76
+    Width = 127
+    Caption = 'Delay per step:'
+    ParentColor = False
+  end
 end

trunk/Forms/UFormComputer.lrj

@@ -2 +2 @@
 {"hash":1113,"name":"tformcomputer.caption","sourcebytes":[65,73],"value":"AI"},
 {"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"}
+{"hash":371552,"name":"tformcomputer.buttonstop.caption","sourcebytes":[83,116,111,112],"value":"Stop"},
+{"hash":116494394,"name":"tformcomputer.label1.caption","sourcebytes":[68,101,108,97,121,32,112,101,114,32,115,116,101,112,58],"value":"Delay per step:"}
 ]}

trunk/Forms/UFormComputer.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, UGame, fgl;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
+  UGame, fgl;
 
 type
@@ -30 +31 @@
     ButtonStart: TButton;
     ButtonStop: TButton;
+    Label1: TLabel;
+    TrackBar1: TTrackBar;
     procedure ButtonStartClick(Sender: TObject);
     procedure ButtonStopClick(Sender: TObject);
@@ -135 +138 @@
   );
 begin
+  ButtonStopClick(Self);
   Core.PersistentForm1.Save(Self);
 end;
@@ -187 +191 @@
         S := S + '), ';
       end;
-      MoveAllAndUpdate(GameTries[0].Moves[0]);
+      MoveAllAndUpdate(GameTries[0].Moves[0], False);
 {      if CanMergeDirection(drDown) then MoveAllAnimate(drDown)
       else if CanMergeDirection(drRight) then MoveAllAnimate(drRight)
@@ -198 +202 @@
       }
       Application.ProcessMessages;
-      Sleep(10);
+      Sleep(TrackBar1.Position);
     end;
   end;
@@ -243 +247 @@
       NewTry.Game.UndoEnabled := False;
       NewTry.Game.AnimationDuration := 0;
-      NewTry.Game.MoveAllAnimate(Direction);
+      NewTry.Game.MoveAll(Direction, False);
       SetLength(NewTry.Moves, Length(NewTry.Moves) + 1);
       NewTry.Moves[Length(NewTry.Moves) - 1] := Direction;

trunk/Forms/UFormMain.pas

@@ -57 +57 @@
   if Core.Game.Running and not Core.Game.Moving then begin
     case Key of
-      37: Core.Game.MoveAllAndUpdate(drLeft);
-      38: Core.Game.MoveAllAndUpdate(drUp);
-      39: Core.Game.MoveAllAndUpdate(drRight);
-      40: Core.Game.MoveAllAndUpdate(drDown);
+      37: Core.Game.MoveAllAndUpdate(drLeft, True);
+      38: Core.Game.MoveAllAndUpdate(drUp, True);
+      39: Core.Game.MoveAllAndUpdate(drRight, True);
+      40: Core.Game.MoveAllAndUpdate(drDown, True);
     end;
   end;

trunk/Languages/Game2048.cs.po

@@ -85 +85 @@
 msgstr "AI"
 
+#: tformcomputer.label1.caption
+msgid "Delay per step:"
+msgstr "Pauza každý krok:"
+
 #: tformhelp.caption
 msgctxt "tformhelp.caption"

trunk/Languages/Game2048.po

@@ -75 +75 @@
 msgstr ""
 
+#: tformcomputer.label1.caption
+msgid "Delay per step:"
+msgstr ""
+
 #: tformhelp.caption
 msgctxt "tformhelp.caption"

trunk/UGame.pas

@@ -111 +111 @@
     function FillRandomTile(Value4Change: Double = 0.1): TTile;
     function GetMoveArea(Direction: TMoveDirection): TArea;
+    procedure MoveAllAnimate(Direction: TMoveDirection);
   public
     Board: TBoard;
@@ -126 +127 @@
     procedure New;
     procedure Render(Canvas: TCanvas; CanvasSize: TPoint);
-    procedure MoveAll(Direction: TMoveDirection);
-    procedure MoveAllAnimate(Direction: TMoveDirection);
-    procedure MoveAllAndUpdate(Direction: TMoveDirection);
+    procedure MoveAll(Direction: TMoveDirection; Animation: Boolean);
+    procedure MoveAllAndUpdate(Direction: TMoveDirection; Animation: Boolean);
     procedure MoveTile(SourceTile, TargetTile: TTile);
     function IsValidPos(Pos: TPoint): Boolean;
@@ -226 +226 @@
   for I := 0 to Step - 1 do
   with Moves[I] do begin
-    GameStep.MoveAll(Direction);
+    GameStep.MoveAll(Direction, False);
     if GameStep.Board.Tiles[NewItemPos.Y, NewItemPos.X].Value = 0 then
       GameStep.Board.Tiles[NewItemPos.Y, NewItemPos.X].Value := NewItemValue
@@ -608 +608 @@
 end;
 
-procedure TGame.MoveAll(Direction: TMoveDirection);
+procedure TGame.MoveAll(Direction: TMoveDirection; Animation: Boolean);
 var
   P: TPoint;
@@ -615 +615 @@
   Area: TArea;
 begin
+  if Animation then begin
+    MoveAllAnimate(Direction);
+    Exit;
+  end;
   if Direction = drNone then Exit;
   if not CanMoveDirection(Direction) then Exit;
@@ -856 +860 @@
 end;
 
-procedure TGame.MoveAllAndUpdate(Direction: TMoveDirection);
+procedure TGame.MoveAllAndUpdate(Direction: TMoveDirection; Animation: Boolean);
 var
   HighestValue: Integer;
@@ -864 +868 @@
   if CanMoveDirection(Direction) then begin
     HighestValue := Board.GetHighestTileValue;
-    MoveAllAnimate(Direction);
+    MoveAll(Direction, Animation);
 
     NewTile := FillRandomTile;