Changeset 148 for trunk/UGame.pas

Timestamp:

Nov 12, 2017, 11:06:20 PM (7 years ago)

Author:

chronos

Message:

• Modified: Unit moves moved from TGame to TPlayer. Moves belong to player rather then to game so one player can't see and change moves of other players.
• Added: New Unit moves window available from Tools menu.

File:

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

trunk/UGame.pas

@@ -71 +71 @@
     function GetAvialPower: Integer;
     function GetAttackPower: Integer;
+    function ToString: ansistring; override;
     constructor Create;
     destructor Destroy; override;
@@ -267 +268 @@
   TPlayerMode = (pmHuman, pmComputer);
   TComputerAgressivity = (caLow, caMedium, caHigh);
+  TComputer = class;
+  TUnitMove = class;
 
   { TPlayer }
@@ -274 +277 @@
     FClient: TClient;
     FGame: TGame;
+    FMode: TPlayerMode;
     procedure SetClient(AValue: TClient);
     procedure SetGame(AValue: TGame);
+    procedure Attack(var AttackPower, DefendPower: Integer);
+    procedure ClearMovesFromCell(Cell: TCell);
+    procedure MoveAll;
+    procedure CheckCounterMove(Move: TUnitMove);
+    procedure SetMode(AValue: TPlayerMode);
+    function SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
+    procedure UpdateRepeatMoves;
   public
     Id: Integer;
     Name: string;
     Color: TColor;
-    Mode: TPlayerMode;
     TotalUnits: Integer;
     TotalCells: Integer;
@@ -291 +301 @@
     Agressivity: TComputerAgressivity;
     TurnStats: TGameTurnStats;
+    Moves: TUnitMoves;
+    Computer: TComputer;
     procedure Clear;
     procedure LoadFromNode(Node: TDOMNode);
@@ -300 +312 @@
     property Game: TGame read FGame write SetGame;
     property Client: TClient read FClient write SetClient;
-  end;
-
-
-  { TComputer }
+    property Mode: TPlayerMode read FMode write SetMode;
+  end;
+
+    { TComputer }
 
   TComputer = class
@@ -309 +321 @@
     //Targets: TFPGObjectList<TPlayer>;
     CellProcessDirection: Boolean;
+    Player: TPlayer;
     procedure AttackNeutral;
     procedure AttackPlayers;
@@ -358 +371 @@
   TUnitMoves = class(TFPGObjectList<TUnitMove>)
     Game: TGame;
+    function SearchByFromTo(CellFrom, CellTo: TCell): TUnitMove;
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -390 +404 @@
   TMoveEvent = procedure(CellFrom, CellTo: TCell; var CountOnce, CountRepeat: Integer;
     Update: Boolean; var Confirm: Boolean) of object;
+  TMoveUpdatedEvent = procedure(UnitMove: TUnitMove) of object;
+
   TWinEvent = procedure(Player: TPlayer) of object;
   TGrowAmount = (gaByOne, gaBySquareRoot);
@@ -401 +417 @@
     FMapType: TMapType;
     FOnMove: TMoveEvent;
+    FOnMoveUpdated: TMoveUpdatedEvent;
     FOnNewTurn: TNotifyEvent;
     FOnPlayerChange: TNotifyEvent;
@@ -407 +424 @@
     LoadedImageFileName: string;
     ProbabilityMatrix: array of array of Single;
-    procedure Attack(var AttackPower, DefendPower: Integer);
-    procedure MoveAll(Player: TPlayer);
-    procedure ClearMovesFromCell(Cell: TCell);
     procedure RecordTurnStats;
     procedure SetMapType(AValue: TMapType);
-    function SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
     procedure SetRunning(AValue: Boolean);
-    procedure UpdateRepeatMoves(Player: TPlayer);
-    procedure CheckCounterMove(Move: TUnitMove);
     function SearchDifferentCellArea(List: TCells; SourceArea, DestArea: TMapArea): TCell;
     procedure BuildTerrain;
@@ -437 +448 @@
     CityPercentage: Integer;
     CurrentPlayer: TPlayer;
-    Moves: TUnitMoves;
     TurnCounter: Integer;
     WinObjective: TWinObjective;
@@ -464 +474 @@
   published
     property OnMove: TMoveEvent read FOnMove write FOnMove;
+    property OnMoveUpdated: TMoveUpdatedEvent read FOnMoveUpdated write FOnMoveUpdated;
     property OnWin: TWinEvent read FOnWin write FOnWin;
     property OnNewTurn: TNotifyEvent read FOnNewTurn write FOnNewTurn;
@@ -990 +1001 @@
     // Draw arrows
     Pen.Color := clCream;
-    for I := 0 to Game.Moves.Count - 1 do begin
-      Move := TUnitMove(Game.Moves[I]);
+    for I := 0 to Player.Moves.Count - 1 do begin
+      Move := TUnitMove(Player.Moves[I]);
       PosFrom := Player.Game.Map.CellToPos(Move.CellFrom);
       PosTo := Player.Game.Map.CellToPos(Move.CellTo);
@@ -1191 +1202 @@
 
 { TUnitMoves }
+
+function TUnitMoves.SearchByFromTo(CellFrom, CellTo: TCell): TUnitMove;
+var
+  UnitMove: TUnitMove;
+begin
+  Result := nil;
+  for UnitMove in Self do
+  if (UnitMove.CellFrom = CellFrom) and (UnitMove.CellTo = CellTo) then begin
+    Result := UnitMove;
+    Break;
+  end;
+end;
 
 procedure TUnitMoves.LoadFromNode(Node: TDOMNode);
@@ -1823 +1846 @@
 function TCell.GetAvialPower: Integer;
 var
-  I: Integer;
+  UnitMove: TUnitMove;
 begin
   Result := Power;
-  for I := 0 to MovesFrom.Count - 1 do
-    Result := Result - TUnitMove(MovesFrom[I]).CountOnce;
-  if Result < 0 then Result := 0;
+  for UnitMove in MovesFrom do
+    Result := Result - UnitMove.CountOnce;
+  if Result < 0 then raise Exception.Create('Unit move power mismatch. Cell power is ' +
+    IntToStr(Power) + ' but ' + IntToStr(- (Result - Power)) + ' moved away.');
 end;
 
@@ -1838 +1862 @@
   for I := 0 to MovesTo.Count - 1 do
     Result := Result + TUnitMove(MovesTo[I]).CountOnce;
+end;
+
+function TCell.ToString: ansistring;
+begin
+  Result := IntToStr(Id);
 end;
 
@@ -1912 +1941 @@
   if FGame = AValue then Exit;
   FGame := AValue;
+  Moves.Game := AValue;
+  Computer.Game := AValue;
 end;
 
@@ -1917 +1948 @@
 begin
   TurnStats.Clear;
+  Moves.Clear;
 end;
 
@@ -1946 +1978 @@
   end;
   with Node do begin
+    NewNode := FindNode('UnitMoves');
+    if Assigned(NewNode) then
+      Moves.LoadFromNode(NewNode);
+  end;
+  with Node do begin
     NewNode := FindNode('TurnStats');
     if Assigned(NewNode) then
@@ -1971 +2008 @@
   end;
   with Node do begin
+    NewNode := OwnerDocument.CreateElement('UnitMoves');
+    AppendChild(NewNode);
+    Moves.SaveToNode(NewNode);
+  end;
+  with Node do begin
     NewNode := OwnerDocument.CreateElement('TurnStats');
     AppendChild(NewNode);
@@ -1997 +2039 @@
   AttackPower: Integer;
   TotalAttackPower: Integer;
-  I: Integer;
-  C: Integer;
   CanAttack: Integer;
   TargetCells: TCells;
+  Cell: TCell;
+  NeighborCell: TCell;
 const
   AttackDiff = 1;
@@ -2009 +2051 @@
 
   // Get list of all attack target cells
-  for C := 0 to AllCells.Count - 1 do
-  with TCell(AllCells[C]) do begin
+  for Cell in AllCells do
+  with Cell do begin
     if (Terrain <> ttVoid) and (Player = nil) then begin
       CanAttack := 0;
-      for I := 0 to Neighbors.Count - 1 do
-      if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
+      for NeighborCell in Neighbors do
+      if NeighborCell.Player = Game.CurrentPlayer then begin
         Inc(CanAttack);
       end;
-      if CanAttack > 0 then TargetCells.Add(AllCells[C]);
+      if CanAttack > 0 then TargetCells.Add(Cell);
     end;
   end;
@@ -2025 +2067 @@
   TargetCells.Sort(CellCompare);
 
-  for C := 0 to TargetCells.Count - 1 do
-  with TCell(TargetCells[C]) do begin
+  for Cell in TargetCells do
+  with Cell do begin
       // Attack to not owned cell yet
       // Count own possible power
       TotalPower := 0;
-      for I := 0 to Neighbors.Count - 1 do
-      if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
-        TotalPower := TotalPower + TCell(Neighbors[I]).GetAvialPower;
-      end;
+      for NeighborCell in Neighbors do
+      if NeighborCell.Player = Game.CurrentPlayer then
+        TotalPower := TotalPower + NeighborCell.GetAvialPower;
+
       // Attack if target is weaker
       if TotalPower >= (Power + AttackDiff) then begin
         TotalAttackPower := 0;
-        for I := 0 to Neighbors.Count - 1 do
-        if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
+        for NeighborCell in Neighbors do
+        if NeighborCell.Player = Game.CurrentPlayer then begin
           // Use only necessary power
           AttackPower := Power - TotalAttackPower + AttackDiff;
-          if TCell(Neighbors[I]).GetAvialPower < AttackPower then
-            AttackPower := TCell(Neighbors[I]).GetAvialPower;
-          Game.SetMove(Tcell(Neighbors[I]), TCell(TargetCells[C]), AttackPower, False);
+          if NeighborCell.GetAvialPower < AttackPower then
+            AttackPower := NeighborCell.GetAvialPower;
+          Self.Player.SetMove(NeighborCell, Cell, AttackPower, False);
           TotalAttackPower := TotalAttackPower + AttackPower;
         end;
@@ -2049 +2091 @@
   end;
 
-  TargetCells.Free;
+  FreeAndNil(TargetCells);
 end;
 
@@ -2058 +2100 @@
   AttackPower: Integer;
   TotalAttackPower: Integer;
-  I: Integer;
-  C: Integer;
   CanAttack: Integer;
   TargetCells: TCells;
+  TargetCell: TCell;
+  NeighborCell: TCell;
 begin
   if Game.CurrentPlayer.Defensive then Exit;
@@ -2070 +2112 @@
 
   // Get list of all attack target cells
-  for C := 0 to AllCells.Count - 1 do
-  with TCell(AllCells[C]) do begin
-    if (Terrain <> ttVoid) and (Player <> Game.CurrentPlayer) and (Player <> nil) then begin
+  for TargetCell in AllCells do begin
+    if (TargetCell.Terrain <> ttVoid) and (TargetCell.Player <> Player) and
+      (TargetCell.Player <> nil) then begin
       CanAttack := 0;
-      for I := 0 to Neighbors.Count - 1 do
-      if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
+      for NeighborCell in TargetCell.Neighbors do
+      if NeighborCell.Player = Player then begin
         Inc(CanAttack);
       end;
-      if CanAttack > 0 then TargetCells.Add(AllCells[C]);
+      if CanAttack > 0 then TargetCells.Add(TargetCell);
     end;
   end;
@@ -2086 +2128 @@
   TargetCells.Sort(CellCompareDescending);
 
-  for C := 0 to TargetCells.Count - 1 do
-  with TCell(TargetCells[C]) do begin
+  for TargetCell in TargetCells do begin
       // Attack to not owned cell yet
       // Count own possible power
       TotalPower := 0;
-      for I := 0 to Neighbors.Count - 1 do
-      if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
-        TotalPower := TotalPower + TCell(Neighbors[I]).GetAvialPower;
+      for NeighborCell in TargetCell.Neighbors do
+      if NeighborCell.Player = Player then begin
+        TotalPower := TotalPower + NeighborCell.GetAvialPower;
       end;
       // Attack if target is weaker
-      if Game.AttackProbability(TotalPower, Power) >= ComputerAggroProbability[Game.CurrentPlayer.Agressivity] then begin
+      if Game.AttackProbability(TotalPower, TargetCell.Power) >=
+        ComputerAggroProbability[Player.Agressivity] then begin
         // Try to limit total attacking power to necessary minimum
-        while Game.AttackProbability(TotalPower - 1, Power) >= ComputerAggroProbability[Game.CurrentPlayer.Agressivity] do
+        while Game.AttackProbability(TotalPower - 1, TargetCell.Power) >=
+          ComputerAggroProbability[Player.Agressivity] do
           Dec(TotalPower);
 
         // Collect required attack units from our cells
         TotalAttackPower := 0;
-        for I := 0 to Neighbors.Count - 1 do
-        if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
+        for NeighborCell in TargetCell.Neighbors do
+        if NeighborCell.Player = Player then begin
           // Use only necessary power
           AttackPower := TotalPower - TotalAttackPower;
-          if TCell(Neighbors[I]).GetAvialPower < AttackPower then
-            AttackPower := TCell(Neighbors[I]).GetAvialPower;
-          Game.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), AttackPower, False);
+          if NeighborCell.GetAvialPower < AttackPower then
+            AttackPower := NeighborCell.GetAvialPower;
+          Self.Player.SetMove(NeighborCell, TargetCell, AttackPower, False);
           TotalAttackPower := TotalAttackPower + AttackPower;
           if TotalAttackPower >= TotalPower then Break;
@@ -2116 +2159 @@
   end;
 
-  TargetCells.Free;
+  FreeAndNil(TargetCells);
 end;
 
@@ -2185 +2228 @@
               if (TCell(TargetCells[C]).GetAvialPower + TCell(TargetCells[C]).GetAttackPower + MovedPower) > Game.Map.MaxPower then
                 MovedPower := Game.Map.MaxPower - TCell(TargetCells[C]).GetAvialPower - TCell(TargetCells[C]).GetAttackPower;
-              Game.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), MovedPower, False);
+              Player.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), MovedPower, False);
             end;
           end;
@@ -2195 +2238 @@
 
     // Use source cells NewTargetCells as new TargetCells
-    TargetCells.Free;
+    FreeAndNil(TargetCells);
     TargetCells := NewTargetCells;
     NewTargetCells := TCells.Create;
@@ -2201 +2244 @@
   end;
 
-  TargetCells.Free;
-  NewTargetCells.Free;
+  FreeAndNil(TargetCells);
+  FreeAndNil(NewTargetCells);
 end;
 
@@ -2211 +2254 @@
 begin
   // If available power remains then use all for existed unit moves
-  for I := 0 to Game.Moves.Count - 1 do
-  with TUnitMove(Game.Moves[I]) do begin
+  for I := 0 to Player.Moves.Count - 1 do
+  with TUnitMove(Player.Moves[I]) do begin
     if CellFrom.GetAvialPower > 0 then begin
       AvailPower := CellFrom.GetAvialPower;
@@ -2266 +2309 @@
         TUnitMove(MovesTo[I]).Free;
       for I := 0 to Neighbors.Count - 1 do
-      if (TCell(Neighbors[I]).Player = Game.CurrentPlayer) and (AttackersCount(TCell(Neighbors[I])) = 0) then begin
-
-        Game.SetMove(TCell(BorderCells[C]), TCell(Neighbors[I]), GetAvialPower, False);
+      if (TCell(Neighbors[I]).Player = Player) and (AttackersCount(TCell(Neighbors[I])) = 0) then begin
+        Player.SetMove(TCell(BorderCells[C]), TCell(Neighbors[I]), GetAvialPower, False);
         Break;
       end;
@@ -2274 +2316 @@
   end;
 
-  BorderCells.Free;
+  FreeAndNil(BorderCells);
 end;
 
@@ -2302 +2344 @@
         for I := SelectedCell.MovesFrom.Count - 1 downto 0 do
           TUnitMove(SelectedCell.MovesFrom[I]).Free;
-        Game.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power, False);
+        Game.CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power, False);
         SelectedCell := nil;
       end else
@@ -2310 +2352 @@
         for I := SelectedCell.MovesFrom.Count - 1 downto 0 do
           TUnitMove(SelectedCell.MovesFrom[I]).Free;
-        UnitMove := Game.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power, False);
+        UnitMove := Game.CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power, False);
         if Assigned(UnitMove) then
           UnitMove.CountRepeat := Player.Game.Map.MaxPower;
@@ -2316 +2358 @@
           else SelectedCell := nil;
       end else begin
-        Game.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power);
+        Game.CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power);
         SelectedCell := nil;
       end;
@@ -2354 +2396 @@
 constructor TPlayer.Create;
 begin
+  Moves := TUnitMoves.Create;
   StartUnits := DefaultPlayerStartUnits;
   StartCell := nil;
@@ -2359 +2402 @@
   PlayerMap.Player := Self;
   TurnStats := TGameTurnStats.Create;
+  Computer := TComputer.Create;
+  Computer.Player := Self;
 end;
 
 destructor TPlayer.Destroy;
 begin
+  FreeAndNil(Computer);
   FreeAndNil(TurnStats);
   FreeAndNil(PlayerMap);
+  FreeAndNil(Moves);
   inherited Destroy;
 end;
@@ -2390 +2437 @@
 end;
 
-procedure TGame.Attack(var AttackPower, DefendPower: Integer);
+procedure TPlayer.Attack(var AttackPower, DefendPower: Integer);
 var
   AttackerDiceCount: Integer;
@@ -2433 +2480 @@
       else Dec(AttackPower);
   end;
-  AttackRolls.Free;
-  DefendRolls.Free;
+  FreeAndNil(AttackRolls);
+  FreeAndNil(DefendRolls);
 end;
 
@@ -2495 +2542 @@
 end;
 
-procedure TGame.MoveAll(Player: TPlayer);
+procedure TPlayer.MoveAll;
 var
   I: Integer;
@@ -2501 +2548 @@
   DefenderPower: Integer;
   UnitCount: Integer;
-begin
-  I := 0;
-  while I < Moves.Count do
-  with TUnitMove(Moves[I]) do begin
+  UnitMove: TUnitMove;
+begin
+  for UnitMove in Moves do
+  with UnitMove do begin
   if CountOnce > 0 then begin
-    if CellFrom.Player = Player then begin
+    if CellFrom.Player = Self then begin
       UnitCount := CountOnce;
       if CountOnce > CellFrom.Power then
         UnitCount := CellFrom.Power;
-      if CellTo.Player = Player then begin
+      if CellTo.Player = Self then begin
         // Inner move
         CellTo.Power := CellTo.Power + UnitCount;
@@ -2520 +2567 @@
           // Attacker wins with possible loses
           ClearMovesFromCell(CellTo);
-          CellTo.Player := Player;
+          CellTo.Player := Self;
           CellTo.Power := AttackerPower;
         end else
@@ -2533 +2580 @@
     end;
     end;
-    Inc(I);
   end;
   // Remove empty moves
   for I := Moves.Count - 1 downto 0 do
-  if (TUnitMove(Moves[I]).CellFrom.Player = Player) and
+  if (TUnitMove(Moves[I]).CellFrom.Player = Self) and
     (TUnitMove(Moves[I]).CountOnce = 0) and (TUnitMove(Moves[I]).CountRepeat = 0) then
     Moves.Delete(I);
 end;
 
-procedure TGame.ClearMovesFromCell(Cell: TCell);
-var
-  I: Integer;
-begin
-  for I := Moves.Count - 1 downto 0 do
-  if TUnitMove(Moves[I]).CellFrom = Cell then
-    Moves.Delete(I);
+procedure TPlayer.ClearMovesFromCell(Cell: TCell);
+var
+  I: Integer;
+begin
+  if Assigned(Cell.Player) then
+  for I := Cell.Player.Moves.Count - 1 downto 0 do
+  if TUnitMove(Cell.Player.Moves[I]).CellFrom = Cell then
+    Cell.Player.Moves.Delete(I);
 end;
 
@@ -2566 +2613 @@
   end;
   Map.Assign(OldMap);
-  OldMap.Free;
+  FreeAndNil(OldMap);
   FMapType := AValue;
 end;
 
-function TGame.SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
+function TPlayer.SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
 var
   NewMove: TUnitMove;
-  OldMove: TUnitMove;
   I: Integer;
   CountOnce: Integer;
@@ -2581 +2627 @@
   I := 0;
   Confirm := True;
-  while (I < Moves.Count) and ((TUnitMove(Moves[I]).CellFrom <> CellFrom) or
-    (TUnitMove(Moves[I]).CellTo <> CellTo)) do Inc(I);
-  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 Confirmation and
-      Assigned(FOnMove) then FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, True, Confirm);
+  Result := Moves.SearchByFromTo(CellFrom, CellTo);
+
+  if Assigned(Result) then begin
+    CountOnce := Result.CountOnce;
+    CountRepeat := Result.CountRepeat;
+    if (Mode = pmHuman) and Confirmation and
+      Assigned(Game.FOnMove) then Game.FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, True, Confirm);
   end else begin
     CountOnce := Power;
     CountRepeat := 0;
-    if Assigned(CurrentPlayer) and Confirmation and
-      Assigned(FOnMove) then FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, False, Confirm);
+    if (Mode = pmHuman) and Confirmation and
+      Assigned(Game.FOnMove) then Game.FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, False, Confirm);
   end;
   if Confirm then begin
-    if Assigned(OldMove) then begin
+    if Assigned(Result) 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);
+          Result.CountOnce := CountOnce;
+          Result.CountRepeat := CountRepeat;
+          CheckCounterMove(Result);
         end;
     end else begin
@@ -2619 +2662 @@
       end;
     end;
+    if Assigned(Game.FOnMoveUpdated) then Game.FOnMoveUpdated(Result);
   end;
 end;
@@ -2639 +2683 @@
 end;
 
-procedure TGame.UpdateRepeatMoves(Player: TPlayer);
-var
-  I: Integer;
-begin
-  for I := 0 to Moves.Count - 1 do
-  with TUnitMove(Moves[I]) do begin
-    if CellFrom.Player = Player then
+procedure TPlayer.UpdateRepeatMoves;
+var
+  Move: TUnitMove;
+begin
+  for Move in Moves do
+  with Move do begin
+    if CellFrom.Player = Self then
       if CountRepeat <= CellFrom.GetAvialPower then
         CountOnce := CountRepeat
@@ -2652 +2696 @@
 end;
 
-procedure TGame.CheckCounterMove(Move: TUnitMove);
-var
-  I: Integer;
+procedure TPlayer.CheckCounterMove(Move: TUnitMove);
+var
   CounterMove: TUnitMove;
 begin
-  I := 0;
-  while (I < Moves.Count) and ((TUnitMove(Moves[I]).CellTo <> Move.CellFrom) or
-    (TUnitMove(Moves[I]).CellFrom <> Move.CellTo)) do Inc(I);
-  if I < Moves.Count then CounterMove := TUnitMove(Moves[I])
-    else CounterMove := nil;
+  CounterMove := Moves.SearchByFromTo(Move.CellTo, Move.CellFrom);
   if Assigned(CounterMove) then begin
     // For now, just remove counter move
     Moves.Remove(CounterMove);
   end;
+end;
+
+procedure TPlayer.SetMode(AValue: TPlayerMode);
+begin
+  if FMode = AValue then Exit;
+  FMode := AValue;
 end;
 
@@ -2704 +2749 @@
   end;
 
-  NewListVoid.Free;
-  NewList.Free;
+  FreeAndNil(NewListVoid);
+  FreeAndNil(NewList);
 end;
 
@@ -2793 +2838 @@
 
   end;
-  List.Free;
-  BorderList.Free;
+  FreeAndNil(List);
+  FreeAndNil(BorderList);
 end;
 
@@ -2998 +3043 @@
       InitClients;
 
-      NewNode := FindNode('UnitMoves');
-      if Assigned(NewNode) then
-        Moves.LoadFromNode(NewNode);
-
       Map.Cells.FixRefId;
 
@@ -3011 +3052 @@
     end;
   finally
-    Doc.Free;
+    FreeAndNil(Doc);
   end;
 end;
@@ -3049 +3090 @@
       AppendChild(NewNode);
       Players.SaveToNode(NewNode);
-
-      NewNode := OwnerDocument.CreateElement('UnitMoves');
-      AppendChild(NewNode);
-      Moves.SaveToNode(NewNode);
   end;
     ForceDirectoriesUTF8(ExtractFileDir(FileName));
     WriteXMLFile(Doc, FileName);
   finally
-    Doc.Free;
+    FreeAndNil(Doc);
   end;
 end;
@@ -3127 +3164 @@
 begin
   //TODO CurrentPlayer.View.SelectedCell := nil;
-  MoveAll(CurrentPlayer);
+  CurrentPlayer.MoveAll;
   Map.Grow(CurrentPlayer);
-  UpdateRepeatMoves(CurrentPlayer);
+  CurrentPlayer.UpdateRepeatMoves;
   ComputePlayerStats;
   PrevPlayer := CurrentPlayer;
@@ -3183 +3220 @@
 constructor TGame.Create;
 begin
-  Moves := TUnitMoves.Create;
-  Moves.Game := Self;
   Map := TMap.Create;
   Players := TPlayers.Create;
@@ -3208 +3243 @@
 begin
   FreeAndNil(Clients);
-  FreeAndNil(Moves);
   FreeAndNil(Players);
   FreeAndNil(Map);
@@ -3223 +3257 @@
   FileName := SNewGameFile;
   TurnCounter := 1;
-  Moves.Clear;
 
   BuildTerrain;
@@ -3322 +3355 @@
     // Draw arrows
     Pen.Color := clCream;
-    for I := 0 to Game.Moves.Count - 1 do begin
-      Move := TUnitMove(Game.Moves[I]);
+    for I := 0 to Game.CurrentPlayer.Moves.Count - 1 do begin
+      Move := TUnitMove(Game.CurrentPlayer.Moves[I]);
       PosFrom := CellToPos(Move.CellFrom);
       PosTo := CellToPos(Move.CellTo);