Changeset 85 for trunk

Timestamp:

Nov 5, 2014, 10:38:34 PM (10 years ago)

Author:

chronos

Message:

• Added: With mouse click and with CTRL key pressed new move will set maximum one time and repeated unit counts to selected target cell.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• UGame.pas (modified) (9 diffs)

trunk/Forms/UFormMain.pas

@@ -378 +378 @@
   if (Abs(StartMousePoint.X - X) < MouseMinDiff) and (Abs(StartMousePoint.Y - Y) < MouseMinDiff) then begin
     if Core.Game.Running and (Core.Game.CurrentPlayer.Mode = pmHuman) then begin
-      Core.Game.CurrentPlayer.View.SelectCell(Point(X, Y), Core.Game.CurrentPlayer);
+      Core.Game.CurrentPlayer.View.SelectCell(Point(X, Y), Core.Game.CurrentPlayer, Shift);
       Redraw;
     end;

trunk/UGame.pas

@@ -96 +96 @@
     constructor Create;
     destructor Destroy; override;
-    procedure SelectCell(Pos: TPoint; Player: TPlayer);
+    procedure SelectCell(Pos: TPoint; Player: TPlayer; ShiftState: TShiftState);
     procedure CenterMap;
     function CanvasToCellPos(Pos: TPoint): TPoint;
@@ -347 +347 @@
     procedure ClearMovesFromCell(Cell: TCell);
     procedure SetMapType(AValue: TMapType);
-    procedure SetMove(CellFrom, CellTo: TCell; Power: Integer);
+    function SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
     procedure SetRunning(AValue: Boolean);
     procedure UpdateRepeatMoves(Player: TPlayer);
@@ -1748 +1748 @@
           if TCell(Neighbors[I]).GetAvialPower < AttackPower then
             AttackPower := TCell(Neighbors[I]).GetAvialPower;
-          Game.SetMove(Tcell(Neighbors[I]), TCell(TargetCells[C]), AttackPower);
+          Game.SetMove(Tcell(Neighbors[I]), TCell(TargetCells[C]), AttackPower, False);
           TotalAttackPower := TotalAttackPower + AttackPower;
         end;
@@ -1810 +1810 @@
           if TCell(Neighbors[I]).GetAvialPower < AttackPower then
             AttackPower := TCell(Neighbors[I]).GetAvialPower;
-          Game.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), AttackPower);
+          Game.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), AttackPower, False);
           TotalAttackPower := TotalAttackPower + AttackPower;
         end;
@@ -1883 +1883 @@
             end;
             if CanAttack = 0 then
-              Game.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), TCell(Neighbors[I]).GetAvialPower);
+              Game.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), TCell(Neighbors[I]).GetAvialPower, False);
           end;
           TCell(Neighbors[I]).Mark := True;
@@ -1923 +1923 @@
 end;
 
-procedure TView.SelectCell(Pos: TPoint; Player: TPlayer);
+procedure TView.SelectCell(Pos: TPoint; Player: TPlayer; ShiftState: TShiftState);
 var
   NewSelectedCell: TCell;
+  UnitMove: TUnitMove;
+  I: Integer;
 begin
   NewSelectedCell := Game.Map.PosToCell(CanvasToCellPos(Pos), Self);
   if Assigned(NewSelectedCell) then begin
     if Assigned(SelectedCell) and Game.Map.IsCellsNeighbor(NewSelectedCell, SelectedCell) then begin
-      Game.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power);
-      SelectedCell := nil;
+      if ssCtrl in ShiftState then begin
+        // If CTRL key pressed then storno all moved from selected cell and
+        // move all power to new selected cell
+        for I := SelectedCell.MovesFrom.Count - 1 downto 0 do
+          TUnitMove(SelectedCell.MovesFrom[I]).Free;
+        UnitMove := Game.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power, False);
+        if Assigned(UnitMove) then
+          UnitMove.CountRepeat := Player.Game.Map.MaxPower;
+        if NewSelectedCell.Player = Player then SelectedCell := NewSelectedCell
+          else SelectedCell := nil;
+      end else begin
+        Game.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power);
+        SelectedCell := nil;
+      end;
     end else
     if (NewSelectedCell <> SelectedCell) and (NewSelectedCell.Player = Player) then
@@ -2155 +2169 @@
 end;
 
-procedure TGame.SetMove(CellFrom, CellTo: TCell; Power: Integer);
+function TGame.SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
 var
   NewMove: TUnitMove;
@@ -2170 +2184 @@
   if I < Moves.Count then OldMove := TUnitMove(Moves[I])
     else OldMove := nil;
+  Result := OldMove;
   if Assigned(OldMove) then begin
     CountOnce := OldMove.CountOnce;
     CountRepeat := OldMove.CountRepeat;
-    if Assigned(CurrentPlayer) and (CurrentPlayer.Mode = pmHuman) and
+    if Assigned(CurrentPlayer) and Confirmation and
       Assigned(FOnMove) then FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, True, Confirm);
   end else begin
     CountOnce := Power;
     CountRepeat := 0;
-    if Assigned(CurrentPlayer) and (CurrentPlayer.Mode = pmHuman) and
+    if Assigned(CurrentPlayer) and Confirmation and
       Assigned(FOnMove) then FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, False, Confirm);
   end;
@@ -2199 +2214 @@
         NewMove.CountOnce := CountOnce;
         NewMove.CountRepeat := CountRepeat;
+        Result := NewMove;
         CheckCounterMove(NewMove);
       end;
     end;
-
   end;
 end;