Changeset 38 for trunk/UGame.pas

Timestamp:

Mar 8, 2014, 10:34:55 PM (11 years ago)

Author:

chronos

Message:

• Added: Support for cities. Cities can be used as only growing cells.
• Added: Allow to set grow rate as square root of cell power.

File:

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

trunk/UGame.pas

@@ -24 +24 @@
   TPointArray = array of TPoint;
 
-  TTerrainType = (ttVoid, ttNormal);
+  TTerrainType = (ttVoid, ttNormal, ttCity);
 
   { TCell }
@@ -160 +160 @@
     Update: Boolean; var Confirm: Boolean) of object;
   TWinEvent = procedure(Player: TPlayer) of object;
+  TGrowAmount = (gaByOne, gaBySquareRoot);
+  TGrowCells = (gcNone, gcPlayerCities, gcPlayerAll);
 
   TGame = class
@@ -177 +179 @@
     VoidEnabled: Boolean;
     VoidPercentage: Integer;
+    GrowCells: TGrowCells;
+    GrowAmount: TGrowAmount;
+    CityEnabled: Boolean;
+    CityPercentage: Integer;
     CurrentPlayer: TPlayer;
     Moves: TObjectList; // TList<TMove>
@@ -499 +505 @@
       CanAttack := 0;
       for I := 0 to Length(Cells) - 1 do
-      if (Cells[I].Player <> Self) then begin
+      if (Cells[I].Player <> Self) and (Cells[I].Terrain <> ttVoid) then begin
         Inc(CanAttack);
       end;
@@ -729 +735 @@
     SetValue(Path + '/MapSizeX', Map.Size.X);
     SetValue(Path + '/MapSizeY', Map.Size.Y);
+    SetValue(Path + '/CityEnabled', CityEnabled);
+    SetValue(Path + '/CityPercentage', CityPercentage);
+    SetValue(Path + '/GrowAmount', Integer(GrowAmount));
+    SetValue(Path + '/GrowCells', Integer(GrowCells));
   end;
 end;
@@ -739 +749 @@
     Map.Size := Point(GetValue(Path + '/MapSizeX', 15),
       GetValue(Path + '/MapSizeY', 15));
+    CityEnabled := GetValue(Path + '/CityEnabled', True);
+    CityPercentage := GetValue(Path + '/CityPercentage', 10);
+    GrowAmount := TGrowAmount(GetValue(Path + '/GrowAmount', Integer(gaBySquareRoot)));
+    GrowCells := TGrowCells(GetValue(Path + '/GrowCells', Integer(gcPlayerAll)));
   end;
 end;
@@ -841 +855 @@
   with Map.Cells[Y, X] do begin
     if VoidEnabled and (Random < VoidPercentage / 100) then Terrain := ttVoid
-      else Terrain := ttNormal;
+      else begin
+        if CityEnabled and (Random < CityPercentage / 100) then Terrain := ttCity
+          else Terrain := ttNormal;
+      end;
     Power := Random(4);
     Player := nil;
@@ -858 +875 @@
           raise Exception.Create('Cannot choose start cell for player');
       end;
-      StartCell.Terrain := ttNormal;
+      if CityEnabled then StartCell.Terrain := ttCity
+        else StartCell.Terrain := ttNormal;
       StartCell.Player := TPlayer(Players[I]);
       StartCell.Power := TPlayer(Players[I]).StartUnits;
@@ -950 +968 @@
       end;
       if (CX >= 0) and (CY >= 0) and (CY < Size.Y) and (CX < Size.X) then
-      if Cells[CY, CX].Terrain = ttNormal then begin
+      if Cells[CY, CX].Terrain <> ttVoid then begin
         Points := GetHexagonPolygon(Point(Trunc(X * CellSize.X),
           Trunc(Y * CellSize.Y)),
@@ -1004 +1022 @@
       Pen.Style := psSolid;
       Pen.Width := 1;
+    end else
+    if TCell(Cells[CY, CX]).Terrain = ttCity then begin
+      // Cannot set clear border as it will display shifted on gtk2
+      //Pen.Style := psClear;
+      Pen.Color := clBlack;
+      Pen.Style := psSolid;
+      Pen.Width := 3;
     end else begin
-      Pen.Color := clBlack;
       // Cannot set clear border as it will display shifted on gtk2
       //Pen.Style := psClear;
@@ -1038 +1062 @@
       if (CX >= 0) and (CY >= 0) and (CY < Size.Y) and (CX < Size.X) then begin
         Cell := Cells[CY, CX];
-        if Cell.Terrain = ttNormal then begin
+        if Cell.Terrain <> ttVoid then begin
           if Assigned(SelectedCell) and (SelectedCell = TCell(Cells[CY, CX])) then Brush.Color := clGreen
             else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell, TCell(Cells[CY, CX])) then Brush.Color := clPurple
@@ -1082 +1106 @@
 var
   X, Y: Integer;
+  Addition: Integer;
 begin
   for Y := 0 to Size.Y - 1 do
   for X := 0 to Size.X - 1 do
   with TCell(Cells[Y, X]) do begin
-    if Player = APlayer then begin
-      Power := Power + 1;
+    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;
     end;