Changeset 154 for trunk

Timestamp:

Nov 16, 2017, 12:16:36 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Avoid possible negative cell power if player unit was previously unsucessfully attacked and weaken by enemy.
• Fixed: Same game structures were not correctly initialized during load from file.

File:

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

trunk/UGame.pas

@@ -204 +204 @@
     procedure ComputePlayerStats; virtual;
     procedure Generate; virtual;
+    procedure Clear;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -284 +285 @@
     procedure ClearMovesFromCell(Cell: TCell);
     procedure MoveAll;
+    procedure ReduceMovesPower;
     procedure CheckCounterMove(Move: TUnitMove);
     procedure SetMode(AValue: TPlayerMode);
     function SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
     procedure UpdateRepeatMoves;
+    procedure RemoveEmptyUnitMoves;
   public
     Id: Integer;
@@ -441 +444 @@
     procedure CalculatePlayersDistance;
     procedure PropagatePlayerDistance(List: TCells);
+    procedure InitDefaultPlayers;
   public
     Players: TPlayers;
@@ -474 +478 @@
     constructor Create;
     destructor Destroy; override;
+    procedure Clear;
     procedure New;
     procedure EndGame(Winner: TPlayer = nil);
@@ -963 +968 @@
   Move: TUnitMove;
   CellText: string;
+  CellLink: TCellLink;
 begin
   with Canvas, View do
@@ -971 +977 @@
     Pen.Style := psSolid;
     Pen.Width := 3;
-    for C := 0 to Player.Game.Map.CellLinks.Count - 1 do
-    with TCellLink(Player.Game.Map.CellLinks[C]) do begin
+    for CellLink in Player.Game.Map.CellLinks do
+    with CellLink do begin
       if Length(Points) >= 2 then begin
         MoveTo(View.CellToCanvasPos(Points[0]));
@@ -981 +987 @@
 
     // Draw cells
-    for C := 0 to Cells.Count - 1 do begin
-      Cell := TPlayerCell(Cells[C]);
+    for Cell in Cells do begin
       if (Cell.MapCell.Terrain <> ttVoid) and Cell.MapCell.IsVisible(View) then begin
         if Cell.MapCell.Player = Player then
@@ -1014 +1019 @@
     // Draw arrows
     Pen.Color := clCream;
-    for I := 0 to Player.Moves.Count - 1 do begin
-      Move := TUnitMove(Player.Moves[I]);
+    for Move in Player.Moves do begin
       PosFrom := Player.Game.Map.CellToPos(Move.CellFrom);
       PosTo := Player.Game.Map.CellToPos(Move.CellTo);
@@ -1236 +1240 @@
   with Config do begin
     NewCount := GetValue(DOMString(Path + '/Count'), -1);
+    NewPlayerId := 1;
     if NewCount >= 2 then begin
       Self.Clear;
@@ -1241 +1246 @@
       for I := 0 to Count - 1 do begin
         Items[I] := TPlayer.Create;
+        TPlayer(Items[I]).Id := GetNewPlayerId;
         TPlayer(Items[I]).Game := Game;
         TPlayer(Items[I]).LoadConfig(Config, Path + '/Player' + IntToStr(I));
@@ -1604 +1610 @@
 end;
 
+procedure TMap.Clear;
+begin
+  CellLinks.Clear;
+  Cells.Clear;
+end;
+
 constructor TMap.Create;
 begin
@@ -1760 +1772 @@
     raise Exception.Create(SNegativeCellPowerNotAllowed);
   FPower := AValue;
+  //Check;
 end;
 
@@ -2023 +2036 @@
 var
   NewNode: TDOMNode;
+  Move: TUnitMove;
 begin
   Id := ReadInteger(Node, 'Id', 0);
@@ -2311 +2325 @@
 procedure TComputer.IncreaseMoves;
 var
-  I: Integer;
+  Move: TUnitMove;
   AvailPower: Integer;
 begin
   // If available power remains then use all for existed unit moves
-  for I := 0 to Player.Moves.Count - 1 do
-  with TUnitMove(Player.Moves[I]) do begin
+  for Move in Player.Moves do
+  with Move do begin
     if CellFrom.GetAvialPower > 0 then begin
       AvailPower := CellFrom.GetAvialPower;
@@ -2470 +2484 @@
 destructor TPlayer.Destroy;
 begin
+  Client := nil;
   FreeAndNil(Computer);
   FreeAndNil(TurnStats);
@@ -2645 +2660 @@
       if CountOnce > CellFrom.Power then
         UnitCount := CellFrom.Power;
+      CountOnce := 0;
       if CellTo.Player = Self then begin
         // Inner move
@@ -2665 +2681 @@
       end;
       CellFrom.Power := CellFrom.Power - UnitCount;
-      CountOnce := 0;
-    end;
-    end;
-  end;
-
-  // Remove empty moves
-  for I := Moves.Count - 1 downto 0 do
-  if (TUnitMove(Moves[I]).CellFrom.Player = Self) and
-    (TUnitMove(Moves[I]).CountOnce = 0) and (TUnitMove(Moves[I]).CountRepeat = 0) then
-    Moves.Delete(I);
+    end;
+    end;
+  end;
+
+  RemoveEmptyUnitMoves;
+end;
+
+procedure TPlayer.ReduceMovesPower;
+var
+  UnitMove: TUnitMove;
+  Power: Integer;
+begin
+  // Power of cell can be reduced by unsucessful enemy attack
+  for UnitMove in Moves do begin
+    Power := UnitMove.CellFrom.GetAvialPower;
+    if Power < 0 then begin
+      if Abs(Power) <= UnitMove.CountOnce then
+        UnitMove.CountOnce := UnitMove.CountOnce - Abs(Power)
+    end;
+  end;
 end;
 
@@ -2740 +2766 @@
       // Add new move
       if (CountOnce > 0) or (CountRepeat > 0) then begin
-        NewMove := TUnitMove(Moves[Moves.Add(TUnitMove.Create)]);
+        NewMove := TUnitMove.Create;
         NewMove.List := Moves;
         NewMove.CellFrom := CellFrom;
@@ -2746 +2772 @@
         NewMove.CountOnce := CountOnce;
         NewMove.CountRepeat := CountRepeat;
+        Moves.Add(NewMove);
         Result := NewMove;
         CheckCounterMove(NewMove);
@@ -2783 +2810 @@
         else CountOnce := CellFrom.GetAvialPower;
   end;
+  RemoveEmptyUnitMoves;
+end;
+
+procedure TPlayer.RemoveEmptyUnitMoves;
+var
+  I: Integer;
+begin
+  // Remove empty moves
+  for I := Moves.Count - 1 downto 0 do
+  if (TUnitMove(Moves[I]).CellFrom.Player = Self) and
+    (TUnitMove(Moves[I]).CountOnce = 0) and (TUnitMove(Moves[I]).CountRepeat = 0) then
+    Moves.Delete(I);
 end;
 
@@ -2844 +2883 @@
 procedure TGame.BuildTerrain;
 var
-  C: Integer;
+  Cell: TCell;
 begin
   if (Map.Shape = msImage) and FileExists(MapImageFileName) and
@@ -2853 +2892 @@
 
   // Randomize map terrain
-  for C := 0 to Map.Cells.Count - 1 do
-  with TCell(Map.Cells[C]) do begin
+  for Cell in Map.Cells do
+  with Cell do begin
     if (VoidEnabled and (Random < VoidPercentage / 100)) or
     (Map.IsOutsideShape(PosPx)) then Terrain := ttVoid
@@ -2954 +2993 @@
 procedure TGame.InitClients;
 var
-  I: Integer;
+  Client: TClient;
+  Player: TPlayer;
 begin
   Clients.Clear;
   Clients.New('Spectator');
-  for I := 0 to Players.Count - 1 do
-  with TPlayer(Players[I]) do
+
+  for Player in Players do
+  with Player do
   if Mode = pmHuman then begin
-    Clients.New(TPlayer(Players[I]).Name);
-    TPlayer(Players[I]).Client := TClient(Clients.Last);
-  end;
-
-  for I := 0 to Clients.Count - 1 do
-  with TClient(Clients[I]) do begin
+    Clients.New(Player.Name);
+    Player.Client := TClient(Clients.Last);
+  end;
+
+  for Client in Clients do
+  with Client do begin
     View.Clear;
     View.Zoom := 1;
@@ -3041 +3082 @@
     PropagatePlayerDistance(NeighborList);
   FreeAndNil(NeighborList);
+end;
+
+procedure TGame.InitDefaultPlayers;
+begin
+  Players.Clear;
+  Players.New(SPlayer + ' 1', clBlue, pmHuman);
+  Players.New(SPlayer + ' 2', clRed, pmComputer);
 end;
 
@@ -3103 +3151 @@
   RootNode: TDOMNode;
   I: Integer;
+  Move: TUnitMove;
 begin
   Self.FileName := FileName;
+  Clear;
   ReadXMLFile(Doc, FileName);
   with Doc do try
@@ -3136 +3186 @@
 
       InitClients;
-
       Map.Cells.FixRefId;
 
@@ -3277 +3326 @@
   CheckWinObjective;
   CurrentPlayer.PlayerMap.CheckVisibility;
+  CurrentPlayer.ReduceMovesPower;
   // For computers take view from previous human
   //if CurrentPlayer.Mode = pmComputer then CurrentPlayer.View.Assign(PrevPlayer.View);
@@ -3323 +3373 @@
   Randomize;
 
-  Players.New(SPlayer + ' 1', clBlue, pmHuman);
-  Players.New(SPlayer + ' 2', clRed, pmComputer);
-
   VoidEnabled := True;
   VoidPercentage := 20;
@@ -3342 +3389 @@
 end;
 
+procedure TGame.Clear;
+begin
+  Clients.Clear;
+  Players.Clear;
+  Map.Clear;
+end;
+
 procedure TGame.New;
 var
@@ -3349 +3403 @@
   Player: TPlayer;
 begin
+  Clear;
   FileName := SNewGameFile;
   TurnCounter := 1;
 
+  Map.Generate;
   BuildTerrain;
 
   // Build bridges
-  Map.CellLinks.Clear;
   if BridgeEnabled then begin
     BuildMapAreas;
@@ -3375 +3430 @@
   end;
 
+  InitDefaultPlayers;
   for Player in Players do Player.StartCell := nil;
   I := 0;
   for Player in Players do
   with Player do begin
-    Clear;
     PlayerMap.Update;
     if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
@@ -3414 +3469 @@
   ArrowCenter: TPoint;
   Move: TUnitMove;
+  CellLink: TCellLink;
 begin
   with Canvas, View do
@@ -3423 +3479 @@
     Pen.Style := psSolid;
     Pen.Width := 3;
-    for C := 0 to CellLinks.Count - 1 do
-    with TCellLink(CellLinks[C]) do begin
+    for CellLink in CellLinks do
+    with CellLink do begin
       if Length(Points) >= 2 then begin
         MoveTo(View.CellToCanvasPos(Points[0]));
@@ -3433 +3489 @@
 
     // Draw cells
-    for C := 0 to Cells.Count - 1 do begin
-      Cell := TCell(Cells[C]);
+    for Cell in Cells do begin
       if (Cell.Terrain <> ttVoid) and Cell.IsVisible(View) then begin
         if Assigned(SelectedCell) and (SelectedCell = Cell) then
@@ -3449 +3504 @@
     // Draw arrows
     Pen.Color := clCream;
-    for I := 0 to Game.CurrentPlayer.Moves.Count - 1 do begin
-      Move := TUnitMove(Game.CurrentPlayer.Moves[I]);
+    for Move in Game.CurrentPlayer.Moves do begin
       PosFrom := CellToPos(Move.CellFrom);
       PosTo := CellToPos(Move.CellTo);