Changeset 62 for trunk/UGame.pas

Timestamp:

Sep 26, 2014, 1:58:41 PM (10 years ago)

Author:

chronos

Message:

• Modified: Show one bigger arrow between two cells on unit move.
• Added: New move clear existing counter move.
• Modified: Move toolbar to left to have more space on top.

File:

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

trunk/UGame.pas

@@ -237 +237 @@
     procedure SetRunning(AValue: Boolean);
     procedure UpdateRepeatMoves(Player: TPlayer);
+    procedure CheckCounterMove(Move: TUnitMove);
   public
     Players: TPlayers;
@@ -524 +525 @@
   SetLength(Points, 8);
   SetLength(FPoints, 8);
-  ArrowSize := Point(Trunc(DefaultCellSize.X / 4 * View.Zoom),
-    Trunc(DefaultCellSize.Y / 4* View.Zoom));
+  ArrowSize := Point(Trunc(DefaultCellSize.X / 3 * View.Zoom),
+    Trunc(DefaultCellSize.Y / 3 * View.Zoom));
   FPoints[0] := FloatPoint(+0.5 * ArrowSize.X, +0 * ArrowSize.Y);
   FPoints[1] := FloatPoint(+0 * ArrowSize.X, +0.5 * ArrowSize.Y);
@@ -546 +547 @@
     Brush.Style := bsClear;
     Font.Color := clBlack;
-    Font.Size := Trunc(16 * View.Zoom);
+    Font.Size := Trunc(26 * View.Zoom);
     TextOut(Pos.X - TextWidth(Text) div 2,
       Pos.Y - TextHeight(Text) div 2, Text);
@@ -1288 +1289 @@
   end;
   if Confirm then begin
-  if Assigned(OldMove) then begin
-    // Already have such move
-    if (CountOnce = 0) and (CountRepeat = 0) then Moves.Delete(I)
-      else begin
-        TUnitMove(Moves[I]).CountOnce := CountOnce;
-        TUnitMove(Moves[I]).CountRepeat := CountRepeat;
+    if Assigned(OldMove) then begin
+      // Already have such move
+      if (CountOnce = 0) and (CountRepeat = 0) then Moves.Delete(I)
+        else begin
+          OldMove.CountOnce := CountOnce;
+          OldMove.CountRepeat := CountRepeat;
+          CheckCounterMove(OldMove);
+        end;
+    end else begin
+      // Add new move
+      if (CountOnce > 0) or (CountRepeat > 0) then begin
+        NewMove := TUnitMove(Moves[Moves.Add(TUnitMove.Create)]);
+        NewMove.List := Moves;
+        NewMove.CellFrom := CellFrom;
+        NewMove.CellTo := CellTo;
+        NewMove.CountOnce := CountOnce;
+        NewMove.CountRepeat := CountRepeat;
+        CheckCounterMove(NewMove);
       end;
-  end else begin
-    // Add new move
-    if (CountOnce > 0) or (CountRepeat > 0) then begin
-      NewMove := TUnitMove(Moves[Moves.Add(TUnitMove.Create)]);
-      NewMove.List := Moves;
-      NewMove.CellFrom := CellFrom;
-      NewMove.CellTo := CellTo;
-      NewMove.CountOnce := CountOnce;
-      NewMove.CountRepeat := CountRepeat;
-    end;
-  end;
+    end;
+
   end;
 end;
@@ -1336 +1340 @@
         CountOnce := CountRepeat
         else CountOnce := CellFrom.GetAvialPower;
+  end;
+end;
+
+procedure TGame.CheckCounterMove(Move: TUnitMove);
+var
+  I: Integer;
+  CounterMove: TUnitMove;
+begin
+  I := 0;
+  while (I < Moves.Count) and ((TUnitMove(Moves[I]).CellTo <> Move.CellFrom) and
+    (TUnitMove(Moves[I]).CellFrom <> Move.CellTo)) do Inc(I);
+  if I < Moves.Count then CounterMove := TUnitMove(Moves[I])
+    else CounterMove := nil;
+  if Assigned(CounterMove) then begin
+    // For now, just remove counter move
+    Moves.Remove(CounterMove);
   end;
 end;
@@ -1644 +1664 @@
   Angle: Double;
   ArrowCenter: TPoint;
+  Move: TUnitMove;
 begin
   with Canvas, View do
@@ -1658 +1679 @@
         Pen.Color := clBlack;
         PaintCell(Canvas, Cell.PosPx, IntToStr(Cell.GetAvialPower), View, Cell);
-
-        // Draw arrows
-        Pen.Color := clCream;
-        for I := 0 to Cell.MovesFrom.Count - 1 do begin
-          PosFrom := CellToPos(Cell);
-          PosTo := CellToPos(TUnitMove(Cell.MovesFrom[I]).CellTo);
-          if TUnitMove(Cell.MovesFrom[I]).CountRepeat > 0 then Pen.Width := 2
-            else Pen.Width := 1;
-          Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
-          if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
-          ArrowCenter := View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 3),
-            Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 3)));
-          DrawArrow(Canvas, View, ArrowCenter,
-            Angle, IntToStr(TUnitMove(Cell.MovesFrom[I]).CountOnce));
-        end;
       end;
+
+    end;
+
+    // Draw arrows
+    Pen.Color := clCream;
+    for I := 0 to Game.Moves.Count - 1 do begin
+      Move := TUnitMove(Game.Moves[I]);
+      PosFrom := CellToPos(Move.CellFrom);
+      PosTo := CellToPos(Move.CellTo);
+      if Move.CountRepeat > 0 then Pen.Width := 2
+        else Pen.Width := 1;
+      Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
+      if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
+      ArrowCenter := View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
+        Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2)));
+      DrawArrow(Canvas, View, ArrowCenter,
+        Angle, IntToStr(Move.CountOnce));
     end;
   finally