Changeset 131 for trunk

Timestamp:

Jun 18, 2017, 1:37:51 PM (7 years ago)

Author:

chronos

Message:

• Modified: Allow cells to have more then 99 units. Additional units over 99 will die according twice of root square of units over 99. This allows to quick resolution even in case of narrow connections where two players send maximum units against each other.

File:

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

trunk/UGame.pas

@@ -1394 +1394 @@
   I: Integer;
   Addition: Integer;
-begin
-for I := 0 to Cells.Count - 1 do
+  Dies: Integer;
+begin
+  for I := 0 to Cells.Count - 1 do
   with TCell(Cells[I]) do begin
     if (Player = APlayer) and ((Game.GrowCells = gcPlayerAll) or
     ((Game.GrowCells = gcPlayerCities) and (Terrain = ttCity))) then begin
-      if Game.GrowAmount = gaByOne then Addition := 1
-        else if Game.GrowAmount = gaBySquareRoot then begin
-          Addition := Trunc(Sqrt(Power));
-          if Addition = 0 then Addition := 1;
-        end;
-      Power := Power + Addition;
-      if Power > MaxPower then Power := MaxPower;
+      if Power < MaxPower then begin
+        // Increase units count
+        if Game.GrowAmount = gaByOne then Addition := 1
+          else if Game.GrowAmount = gaBySquareRoot then begin
+            Addition := Trunc(Sqrt(Power));
+            if Addition = 0 then Addition := 1;
+          end;
+        Power := Min(Power + Addition, MaxPower);
+      end else
+      if Power > MaxPower then begin
+        // Reduce units count
+        // If cell has more then MaxPower units then additional units dies
+        // in twice of squeare root of unites over MaxPower
+        Dies := 2 * Trunc(Sqrt(Power - MaxPower));
+        Power := Max(Power - Dies, 0);
+      end;
     end;
   end;
@@ -1501 +1511 @@
   MaxPower := 99;
   DefaultCellSize := Point(220, 220);
-  Cells := TCells.create;
+  Cells := TCells.Create;
   Cells.Map := Self;
   Size := Point(0, 0);
@@ -2392 +2402 @@
     S := 'Att:';
     for I := 0 to AttackerDiceCount - 1 do
-      S := S + InTToStr(Integer(AttackRolls[I])) + ', ';
+      S := S + IntToStr(Integer(AttackRolls[I])) + ', ';
     DefendRolls.Count := DefenderDiceCount;
     for I := 0 to DefenderDiceCount - 1 do begin