Changeset 265 for trunk/UMap.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/UMap.pas (modified) (12 diffs)

trunk/UMap.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Graphics, ExtCtrls, UGeometry, DOM, fgl,
-  UXMLUtils;
+  UXMLUtils, UUnit;
 
 const
@@ -30 +30 @@
     FMap: TMap;
     FPower: Integer;
+    FUnit: TUnit;
+    function GetPower: Integer;
     procedure SetArea(AValue: TMapArea);
     procedure SetId(AValue: Integer);
     procedure SetPower(AValue: Integer);
+    procedure SetUnit(AValue: TUnit);
   public
     PosPx: TPoint;
     Polygon: TPolygon;
     Terrain: TTerrainType;
-    PlayerId: Integer;
+    PlayerId: Integer; // Temporary value
     Player: TObject; // TPlayer;
     NeighborsId: array of Integer;
@@ -44 +47 @@
     Weight: Integer; // Temporary value
     Angle: Double; // Temporary value
-    PlayerCell: Pointer; // Temporary value
+    PlayerCell: TObject; // Temporary value
     Links: TCellLinks;
     Extra: TExtraType;
-    property Id: Integer read FId write SetId;
+    OneUnitId: Integer; // Temporary value
     procedure ConnectTo(Cell: TCell);
     procedure DisconnectFrom(Cell: TCell);
@@ -60 +63 @@
     constructor Create;
     destructor Destroy; override;
-    property Power: Integer read FPower write SetPower;
+    property Id: Integer read FId write SetId;
     property Map: TMap read FMap write FMap;
     property Area: TMapArea read FArea write SetArea;
+    property OneUnit: TUnit read FUnit write SetUnit;
+    //property Power: Integer read GetPower;
   end;
 
@@ -612 +617 @@
     with TPlayer(Player) do begin
       Inc(TotalCells);
-      Inc(TotalUnits, Power);
+      if Assigned(OneUnit) then
+        Inc(TotalUnits, OneUnit.Power);
       if Terrain = ttCity then
         Inc(TotalCities);
@@ -656 +662 @@
   for C := 0 to (Cells.Count div 2) - 1 do begin
     Cells[C].Terrain := Cells[Cells.Count - 1 - C].Terrain;
-    Cells[C].Power := Cells[Cells.Count - 1 - C].Power;
+    Cells[C].OneUnit.Power := Cells[Cells.Count - 1 - C].OneUnit.Power;
 
     for I := Cells[C].Links.Count - 1 downto 0 do begin
@@ -908 +914 @@
 end;
 
+procedure TCell.SetUnit(AValue: TUnit);
+var
+  OldValue: TUnit;
+begin
+  if FUnit = AValue then Exit;
+  OldValue := FUnit;
+  FUnit := nil;
+  if Assigned(OldValue) then OldValue.MapCell := nil;
+  FUnit := AValue;
+  if Assigned(FUnit) then FUnit.MapCell := Self;
+end;
+
 procedure TCell.ConnectTo(Cell: TCell);
 begin
@@ -950 +968 @@
 end;
 
+function TCell.GetPower: Integer;
+begin
+  if Assigned(OneUnit) then Result := OneUnit.Power
+    else Result := 0;
+end;
+
 procedure TCell.SetId(AValue: Integer);
 begin
@@ -973 +997 @@
 begin
   Player := TGame(Map.Game).Players.FindById(PlayerId);
+  OneUnit := TGame(Map.Game).Units.FindById(OneUnitId);
 
   Neighbors.Count := Length(NeighborsId);
@@ -993 +1018 @@
 begin
   Id := ReadInteger(Node, 'Id', 0);
-  Power := ReadInteger(Node, 'Power', 0);
+  OneUnitId := ReadInteger(Node, 'Unit', 0);
   Terrain := TTerrainType(ReadInteger(Node, 'Terrain', Integer(ttVoid)));
   Extra := TExtraType(ReadInteger(Node, 'Extra', Integer(etNone)));
@@ -1029 +1054 @@
 begin
   WriteInteger(Node, 'Id', Id);
-  WriteInteger(Node, 'Power', Power);
+  if Assigned(OneUnit) then
+    WriteInteger(Node, 'Unit', OneUnit.Id)
+    else WriteInteger(Node, 'Unit', 0);
   WriteInteger(Node, 'Terrain', Integer(Terrain));
   WriteInteger(Node, 'Extra', Integer(Extra));
@@ -1090 +1117 @@
   I: Integer;
 begin
+  OneUnit := nil;
   for I := Links.Count - 1 downto 0 do
     FMap.CellLinks.Remove(Links[I]);