Changeset 229 for trunk/UGame.pas

Timestamp:

Sep 18, 2018, 6:11:18 PM (6 years ago)

Author:

chronos

Message:

• Added: Support for cyclic map. Movement across map borders will take player units to opposite map border.

File:

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

trunk/UGame.pas

@@ -456 +456 @@
     VoidPercentage: Integer;
     SymetricMap: Boolean;
+    CyclicMap: Boolean;
     GrowCells: TGrowCells;
     GrowAmount: TGrowAmount;
@@ -1613 +1614 @@
 function TMap.IsValidIndex(Index: TPoint): Boolean;
 begin
-  Result := False;
+  Result := (Index.X >= 0) and (Index.X < Size.X) and
+    (Index.Y >= 0) and (Index.Y < Size.Y);
 end;
 
@@ -2085 +2087 @@
 procedure TCell.ConnectTo(Cell: TCell);
 begin
-  Cell.Neighbors.Add(Self);
-  Neighbors.Add(Cell);
+  // Connect only if already not connected
+  if Neighbors.IndexOf(Cell) < 0 then begin
+    Cell.Neighbors.Add(Self);
+    Neighbors.Add(Cell);
+  end;
 end;
 
@@ -3136 +3141 @@
   VoidPercentage := Source.VoidPercentage;
   SymetricMap := Source.SymetricMap;
+  CyclicMap := Source.CyclicMap;
   GrowCells := Source.GrowCells;
   GrowAmount := Source.GrowAmount;
@@ -3157 +3163 @@
     SetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName));
     SetValue(DOMString(Path + '/SymetricMap'), SymetricMap);
+    SetValue(DOMString(Path + '/CyclicMap'), CyclicMap);
     SetValue(DOMString(Path + '/FogOfWar'), FogOfWar);
     SetValue(DOMString(Path + '/VoidEnabled'), VoidEnabled);
@@ -3185 +3192 @@
     MapImageFileName := string(GetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName)));
     SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), False);
+    CyclicMap := GetValue(DOMString(Path + '/CyclicMap'), False);
     FogOfWar := GetValue(DOMString(Path + '/FogOfWar'), False);
     VoidEnabled := GetValue(DOMString(Path + '/VoidEnabled'), True);
@@ -3225 +3233 @@
     with RootNode do begin
       SymetricMap := ReadBoolean(RootNode, 'SymetricMap', False);
+      CyclicMap := ReadBoolean(RootNode, 'CyclicMap', False);
       FogOfWar := ReadBoolean(RootNode, 'FogOfWar', False);
       VoidEnabled := ReadBoolean(RootNode, 'VoidEnabled', False);
@@ -3276 +3285 @@
     with RootNode do begin
       WriteBoolean(RootNode, 'SymetricMap', SymetricMap);
+      WriteBoolean(RootNode, 'CyclicMap', CyclicMap);
       WriteBoolean(RootNode, 'FogOfWar', FogOfWar);
       WriteBoolean(RootNode, 'VoidEnabled', VoidEnabled);
@@ -3478 +3488 @@
   TurnCounter := 1;
 
+  Map.Cyclic := CyclicMap;
   Map.Generate;
   Map.MaxPower := MaxPower;