Changeset 265 for trunk/UGame.pas

Timestamp:

Jan 15, 2019, 1:03:40 AM (6 years ago)

Author:

chronos

Message:

• Modified: Cell power is now internally represented as unit power (TUnit class).
• Modified: Allow to have only one player in the game.
• Added: New win objective None to just play freely without any win objective.
• Added: New win objective to capture entire map.
• Added: TGameSystem class to represent various game play systems of other existing games.
• Fixed: Clear correctly defender player from unit moves if his cell is captured.
• Fixed: Do not allow to remove too many players to have at least minimum players.

File:

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

trunk/UGame.pas

@@ -8 +8 @@
   Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite, Forms,
   DOM, Math, LazFileUtils, UXMLUtils, Dialogs, LCLType, LCLIntf, fgl,
-  UGeometry, UPlayer, UMap, UMapType;
+  UGeometry, UPlayer, UMap, UMapType, UUnit, UGameSystem;
 
 const
   DefaultPlayerStartUnits = 5;
+  MinPlayerCount = 1;
   MaxPlayerCount = 8;
 
@@ -28 +29 @@
   TGrowCells = (gcNone, gcPlayerCities, gcPlayerAll);
   TMapType = (mtNone, mtHexagon, mtSquare, mtTriangle, mtRandom, mtIsometric);
-  TWinObjective = (woDefeatAllOponents, woDefeatAllOponentsCities,
-    woSpecialCaptureCell, woStayAliveForDefinedTurns);
+  TWinObjective = (woNone, woDefeatAllOponents, woDefeatAllOponentsCities,
+    woSpecialCaptureCell, woStayAliveForDefinedTurns, woCaptureEntireMap);
 
   { TGame }
@@ -35 +36 @@
   TGame = class
   private
+    FGameSystem: TGameSystem;
     FMapType: TMapType;
     FOnChange: TNotifyEvent;
@@ -46 +48 @@
     ProbabilityMatrix: array of array of Single;
     procedure RecordTurnStats;
+    procedure SetGameSystem(AValue: TGameSystem);
     procedure SetMapType(AValue: TMapType);
     procedure SetRunning(AValue: Boolean);
@@ -57 +60 @@
     DevelMode: Boolean;
     Players: TPlayers;
+    Units: TUnits;
     Map: TMap;
     MapImageFileName: string;
@@ -77 +81 @@
     BridgeEnabled: Boolean;
     MaxPower: Integer;
-    EmptyCellsNeutral: Boolean;
     procedure PostConfig;
     procedure Assign(Source: TGame);
@@ -95 +98 @@
     property Running: Boolean read FRunning write SetRunning;
     property MapType: TMapType read FMapType write SetMapType;
+    property GameSystem: TGameSystem read FGameSystem write SetGameSystem;
   published
     property OnMoveUpdated: TMoveUpdatedEvent read FOnMoveUpdated write FOnMoveUpdated;
@@ -123 +127 @@
 
 resourcestring
-  SMinimumPlayers = 'You need at least two players';
+  SMinimumPlayers = 'You need at least one player';
   SHuman = 'Human';
   SComputer = 'Computer';
@@ -263 +267 @@
   if FRunning = AValue then Exit;
   if AValue then begin
-    if Players.Count < 2 then raise Exception.Create(SMinimumPlayers);
+    if Players.Count < 1 then raise Exception.Create(SMinimumPlayers);
     FRunning := AValue;
   end else begin
@@ -284 +288 @@
           else Terrain := ttNormal;
       end;
-    Power := Random(MaxNeutralUnits + 1);
+    if not Assigned(OneUnit) then
+      OneUnit := Units.AddNew(GameSystem.UnitKinds[0], Random(MaxNeutralUnits + 1));
     Player := nil;
   end;
@@ -428 +433 @@
   BridgeEnabled := Source.BridgeEnabled;
   MaxPower := Source.MaxPower;
-  EmptyCellsNeutral := Source.EmptyCellsNeutral;
+  GameSystem := Source.GameSystem;
 end;
 
@@ -452 +457 @@
     SetValue(DOMString(Path + '/StayAliveForDefinedTurns'), StayAliveForDefinedTurns);
     SetValue(DOMString(Path + '/SpecialCaptureCellCount'), SpecialCaptureCellCount);
-    SetValue(DOMString(Path + '/EmptyCellsNeutral'), EmptyCellsNeutral);
     Players.SaveConfig(Config, Path + '/Players');
   end;
@@ -488 +492 @@
     StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), 20);
     SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), 1);
-    EmptyCellsNeutral := GetValue(DOMString(Path + '/EmptyCellsNeutral'), False);
     Players.LoadConfig(Config, Path + '/Players');
   end;
@@ -524 +527 @@
       WinObjective := TWinObjective(ReadInteger(RootNode, 'WinObjective', Integer(woDefeatAllOponents)));
       StayAliveForDefinedTurns := ReadInteger(RootNode, 'StayAliveForDefinedTurns', 10);
-      EmptyCellsNeutral := ReadBoolean(RootNode, 'EmptyCellsNeutral', False);
+
+      NewNode := FindNode('GameSystem');
+      if Assigned(NewNode) then
+        GameSystem.LoadFromNode(NewNode);
 
       NewNode := FindNode('Map');
@@ -536 +542 @@
         else CurrentPlayer := nil;
 
+      NewNode := FindNode('Units');
+      if Assigned(NewNode) then
+        Units.LoadFromNode(NewNode);
+
       Map.Cells.FixRefId;
+      Units.FixRefId;
 
       for I := 0 to Players.Count - 1 do begin
@@ -578 +589 @@
       WriteInteger(RootNode, 'WinObjective', Integer(WinObjective));
       WriteInteger(RootNode, 'StayAliveForDefinedTurns', StayAliveForDefinedTurns);
-      WriteBoolean(RootNode, 'EmptyCellsNeutral', EmptyCellsNeutral);
       WriteBoolean(RootNode, 'Running', Running);
+
+      NewNode := OwnerDocument.CreateElement('GameSystem');
+      AppendChild(NewNode);
+      GameSystem.SaveToNode(NewNode);
 
       NewNode := OwnerDocument.CreateElement('Map');
@@ -588 +602 @@
       AppendChild(NewNode);
       Players.SaveToNode(NewNode);
+
+      NewNode := OwnerDocument.CreateElement('Units');
+      AppendChild(NewNode);
+      Units.SaveToNode(NewNode);
     end;
     if ExtractFileDir(FileName) <> '' then
@@ -633 +651 @@
     TurnStats.Add(NewStat);
   end;
+end;
+
+procedure TGame.SetGameSystem(AValue: TGameSystem);
+begin
+  if FGameSystem = AValue then Exit;
+  FGameSystem := AValue;
 end;
 
@@ -687 +711 @@
   R: Boolean;
   I: Integer;
+  PlayersCount: Integer;
 begin
   Winner := nil;
@@ -724 +749 @@
     if TurnCounter > StayAliveForDefinedTurns then
       EndGame(nil);
+  end else
+  if WinObjective = woCaptureEntireMap then begin
+    Player := nil;
+    for I := 0 to Map.Cells.Count - 1 do
+    if TCell(Map.Cells[I]).Terrain <> ttVoid then begin
+      if (TCell(Map.Cells[I]).Player <> nil) then begin
+        if Player = nil then begin
+          // First player found
+          Player := TPlayer(TCell(Map.Cells[I]).Player);
+        end else
+        if Player <> TCell(Map.Cells[I]).Player then begin
+          // Multiple players still alive
+          Player := nil;
+          Break;
+        end;
+      end else begin
+        // Neutral cell
+        Player := nil;
+        Break;
+      end;
+    end;
+    if Player <> nil then
+      EndGame(Player);
   end;
 end;
@@ -729 +777 @@
 constructor TGame.Create;
 begin
+  Units := TUnits.Create;
+  Units.Game := Self;
   Map := TMap.Create;
+  Map.Game := Self;
   Players := TPlayers.Create;
   Players.Game := Self;
@@ -742 +793 @@
   MaxNeutralUnits := Min(4, MaxPower);
 
-  Map.Game := Self;
   Map.Size := TPoint.Create(3, 3);
 end;
@@ -750 +800 @@
   FreeAndNil(Players);
   FreeAndNil(Map);
+  FreeAndNil(Units);
   inherited Destroy;
 end;
@@ -784 +835 @@
   end;
 
-  for Player in Players do Player.StartCell := nil;
+  for Player in Players do begin
+    Player.Reset;
+    Player.StartCell := nil;
+  end;
   I := 0;
   for Player in Players do
@@ -797 +851 @@
         StartCell.Terrain := ttCity;
         StartCell.Player := Player;
-        StartCell.Power := Player.StartUnits;
+        if not Assigned(StartCell.OneUnit) then
+          StartCell.OneUnit := Units.AddNew(GameSystem.UnitKinds[0], Player.StartUnits);
+        StartCell.OneUnit.Power := Player.StartUnits;
+        StartCell.OneUnit.Kind := GameSystem.UnitKinds[0];
       end;
     end;