Changeset 32 for trunk/UGame.pas

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.

File:

• trunk/UGame.pas (modified) (6 diffs)

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;