Changeset 273 for trunk/UGame.pas

Timestamp:

Jan 30, 2019, 8:08:44 AM (6 years ago)

Author:

chronos

Message:

• Added: Show units shape to see in which cell units are placed.
• Fixed: Do not place units with zero power in zero power cells.
• Fixed: Better checks of cell power if cell is without unit.

File:

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

trunk/UGame.pas

@@ -24 +24 @@
     class procedure PolygonEx(Canvas: TCanvas; const Points: array of Classes.TPoint; Winding: Boolean);
     class procedure PolyLineEx(Canvas: TCanvas; const Points: array of Classes.TPoint);
+    class procedure Ellipse(Canvas: TCanvas; const ARect: TRect);
   end;
 
@@ -191 +192 @@
 end;
 
+class procedure TCanvasEx.Ellipse(Canvas: TCanvas; const ARect: TRect);
+begin
+  LCLIntf.Ellipse(Canvas.Handle, ARect.P1.X, ARect.P1.Y, ARect.P2.X, ARect.P2.Y);
+end;
+
 { TGame }
 
@@ -289 +295 @@
 var
   Cell: TCell;
+  NewPower: Integer;
 begin
   // Randomize map terrain
@@ -296 +303 @@
     (Map.IsOutsideShape(PosPx)) then Terrain := ttVoid
       else Terrain := ttNormal;
-    if not Assigned(OneUnit) then
-      OneUnit := Units.AddNew(GameSystem.UnitKinds[0], Random(MaxNeutralUnits + 1));
+    NewPower := Random(MaxNeutralUnits + 1);
+    if (NewPower > 0) and not Assigned(OneUnit) then begin
+      OneUnit := Units.AddNew(GameSystem.UnitKinds[0], NewPower);
+    end;
     Player := nil;
   end;
@@ -512 +521 @@
     SetValue(DOMString(Path + '/StayAliveForDefinedTurns'), StayAliveForDefinedTurns);
     SetValue(DOMString(Path + '/SpecialCaptureCellCount'), SpecialCaptureCellCount);
+    SetValue(DOMString(Path + '/MaxNeutralUnits'), MaxNeutralUnits);
+    SetValue(DOMString(Path + '/MaxPower'), MaxPower);
     Players.SaveConfig(Config, Path + '/Players');
   end;
@@ -548 +559 @@
     StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), 20);
     SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), 1);
+    MaxNeutralUnits := GetValue(DOMString(Path + '/MaxNeutralUnits'), 5);
+    MaxPower := GetValue(DOMString(Path + '/MaxPower'), 99);
     Players.LoadConfig(Config, Path + '/Players');
   end;
@@ -730 +743 @@
   CurrentPlayer.Grow;
   CurrentPlayer.UpdateEmptyCellsNeutral;
+  CurrentPlayer.RemoveEmptyUnits;
   CurrentPlayer.UpdateRepeatMoves;
   ComputePlayerStats;