Changeset 342 for trunk/Game.pas

Timestamp:

Dec 22, 2024, 10:52:26 AM (10 hours ago)

Author:

chronos

Message:

• Added: More tests.

File:

• trunk/Game.pas (modified) (8 diffs)

trunk/Game.pas

@@ -6 +6 @@
   Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite, Forms,
   DOM, Math, LazFileUtils, XML, Dialogs, LCLType, LCLIntf, Building, Geometry,
-  Player, Map, MapType, &Unit, GameSystem;
+  Player, Map, MapType, Units, GameSystem;
 
 const
@@ -49 +49 @@
     procedure SetRunning(AValue: Boolean);
     procedure BuildTerrain;
+    procedure PlaceUnits;
     procedure PlaceCities;
     procedure InitPlayers;
@@ -91 +92 @@
     procedure LoadFromFile(FileName: string);
     procedure SaveToFile(FileName: string);
+    function ToString: string; override;
     procedure ComputePlayerStats;
     procedure NextPlayer;
@@ -301 +303 @@
     (Map.IsOutsideShape(PosPx)) then Terrain := ttVoid
       else Terrain := ttNormal;
+  end;
+end;
+
+procedure TGame.PlaceUnits;
+var
+  Cell: TCell;
+  NewPower: Integer;
+begin
+  if GameSystem.UnitKinds.Count = 0 then Exit;
+
+  for Cell in Map.Cells do
+  with Cell do begin
     NewPower := Random(MaxNeutralUnits + 1);
     if (NewPower > 0) and not Assigned(OneUnit) then begin
@@ -348 +362 @@
         end;
         StartCell.Player := Player;
-        if not Assigned(StartCell.OneUnit) then
-          StartCell.OneUnit := Self.Units.AddNew(TUnitKind(GameSystem.UnitKinds[0]), Player.StartUnits);
-        StartCell.OneUnit.Power := Player.StartUnits;
-        StartCell.OneUnit.Kind := TUnitKind(GameSystem.UnitKinds[0]);
-        StartCell.OneUnit.Player := Player;
+        if GameSystem.UnitKinds.Count > 0 then begin
+          if not Assigned(StartCell.OneUnit) then
+            StartCell.OneUnit := Self.Units.AddNew(TUnitKind(GameSystem.UnitKinds[0]), Player.StartUnits);
+          StartCell.OneUnit.Power := Player.StartUnits;
+          StartCell.OneUnit.Kind := TUnitKind(GameSystem.UnitKinds[0]);
+          StartCell.OneUnit.Player := Player;
+        end;
       end;
     end;
@@ -694 +710 @@
 end;
 
+function TGame.ToString: string;
+begin
+  Result := 'StoredRandSeed: ' + IntToStr(StoredRandSeed) + LineEnding;
+  Result := Result + 'MapType: ' + IntToStr(Integer(MapType)) + LineEnding;
+  Result := Result + 'SymetricMap: ' + BoolToStr(SymetricMap) + LineEnding;
+  Result := Result + 'CyclicMap: ' + BoolToStr(CyclicMap) + LineEnding;
+  Result := Result + 'FogOfWar: ' + BoolToStr(FogOfWar) + LineEnding;
+  Result := Result + 'VoidEnabled: ' + BoolToStr(VoidEnabled) + LineEnding;
+  Result := Result + 'VoidPercentage: ' + IntToStr(VoidPercentage) + LineEnding;
+  Result := Result + 'MaxNeutralUnits: ' + IntToStr(MaxNeutralUnits) + LineEnding;
+  Result := Result + 'MaxPower: ' + IntToStr(MaxPower) + LineEnding;
+  Result := Result + 'GrowCells: ' + IntToStr(Integer(GrowCells)) + LineEnding;
+  Result := Result + 'GrowAmount: ' + IntToStr(Integer(GrowAmount)) + LineEnding;
+  Result := Result + 'CityEnabled: ' + BoolToStr(CityEnabled) + LineEnding;
+  Result := Result + 'CityPercentage: ' + IntToStr(CityPercentage) + LineEnding;
+  Result := Result + 'BridgeEnabled: ' + BoolToStr(BridgeEnabled) + LineEnding;
+  Result := Result + 'TurnCounter: ' + IntToStr(TurnCounter) + LineEnding;
+  Result := Result + 'WinObjective: ' + IntToStr(Integer(WinObjective)) + LineEnding;
+  Result := Result + 'StayAliveForDefinedTurns: ' + IntToStr(StayAliveForDefinedTurns) + LineEnding;
+  Result := Result + 'Running: ' + BoolToStr(Running) + LineEnding;
+  Result := Result + 'GameSystem: ' + LineEnding + GameSystem.ToString + LineEnding;
+  Result := Result + 'Map: ' + LineEnding + Map.ToString + LineEnding;
+  Result := Result + 'Players: ' + LineEnding + Players.ToString + LineEnding;
+  Result := Result + 'Units: ' + LineEnding + Units.ToString + LineEnding;
+end;
+
 procedure TGame.ComputePlayerStats;
 var
@@ -905 +947 @@
   Map.MaxPower := MaxPower;
   BuildTerrain;
+  PlaceUnits;
   PlaceCities;
   WinObjectiveMapPrepare;
@@ -931 +974 @@
 function TGame.Compare(Game: TGame): Boolean;
 begin
-  Result := BridgeEnabled = Game.BridgeEnabled;
+  Result := (StoredRandSeed = Game.StoredRandSeed) and
+    (DevelMode = Game.DevelMode) and
+    Players.Compare(Game.Players) and
+    (MapType = Game.MapType) and
+    Map.Compare(Game.Map) and
+    (MapImageFileName = Game.MapImageFileName) and
+    (VoidEnabled = Game.VoidEnabled) and
+    (VoidPercentage = Game.VoidPercentage) and
+    (SymetricMap = Game.SymetricMap) and
+    (CyclicMap = Game.CyclicMap) and
+    (GrowCells = Game.GrowCells) and
+    (GrowAmount = Game.GrowAmount) and
+    (CityEnabled = Game.CityEnabled) and
+    (CityPercentage = Game.CityPercentage) and
+    (TurnCounter = Game.TurnCounter) and
+    (WinObjective = Game.WinObjective) and
+    (SpecialCaptureCellCount = Game.SpecialCaptureCellCount) and
+    (StayAliveForDefinedTurns = Game.StayAliveForDefinedTurns) and
+    (MaxNeutralUnits = Game.MaxNeutralUnits) and
+    (FileName = Game.FileName) and
+    (FogOfWar = Game.FogOfWar) and
+    (BridgeEnabled = Game.BridgeEnabled) and
+    (MaxPower = Game.MaxPower) and
+    GameSystem.Compare(Game.GameSystem);
 end;