Changeset 38

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.

Location:

trunk

Files:

• Forms/UFormNew.lfm (modified) (12 diffs)
• Forms/UFormNew.lrt (modified) (1 diff)
• Forms/UFormNew.pas (modified) (6 diffs)
• Languages/xtactics.cs.po (modified) (4 diffs)
• Languages/xtactics.po (modified) (3 diffs)
• UGame.pas (modified) (12 diffs)

trunk/Forms/UFormNew.lfm

@@ -1 +1 @@
 object FormNew: TFormNew
   Left = 706
-  Height = 516
+  Height = 526
   Top = 455
   Width = 716
   Caption = 'New game'
-  ClientHeight = 516
+  ClientHeight = 526
   ClientWidth = 716
   OnCreate = FormCreate
@@ -14 +14 @@
     Left = 632
     Height = 25
-    Top = 479
+    Top = 490
     Width = 75
+    Anchors = [akRight, akBottom]
     Caption = 'Ok'
     ModalResult = 1
@@ -23 +24 @@
     Left = 544
     Height = 25
-    Top = 480
+    Top = 491
     Width = 75
+    Anchors = [akBottom]
     Caption = 'Cancel'
     ModalResult = 2
@@ -32 +34 @@
     Left = 16
     Height = 24
-    Top = 172
-    Width = 175
+    Top = 276
+    Width = 194
     Caption = 'Inaccessible places'
     OnChange = CheckBoxVoidChange
@@ -89 +91 @@
     Left = 16
     Height = 22
-    Top = 224
-    Width = 88
+    Top = 184
+    Width = 99
     Caption = 'Map width:'
     ParentColor = False
@@ -97 +99 @@
     Left = 136
     Height = 32
-    Top = 219
+    Top = 179
     Width = 98
     MinValue = 2
@@ -107 +109 @@
     Left = 136
     Height = 32
-    Top = 270
+    Top = 230
     Width = 98
     MinValue = 2
@@ -127 +129 @@
     Left = 224
     Height = 32
-    Top = 168
+    Top = 272
     Width = 106
     MinValue = 1
@@ -136 +138 @@
     Left = 339
     Height = 22
-    Top = 173
-    Width = 15
+    Top = 277
+    Width = 17
     Caption = '%'
     ParentColor = False
@@ -144 +146 @@
     Left = 248
     Height = 43
-    Top = 216
+    Top = 176
     Width = 451
     Max = 100
@@ -157 +159 @@
     Left = 248
     Height = 43
-    Top = 264
+    Top = 224
     Width = 451
     Max = 100
@@ -170 +172 @@
     Left = 16
     Height = 22
+    Top = 232
+    Width = 106
+    Caption = 'Map height:'
+    ParentColor = False
+  end
+  object CheckBoxCity: TCheckBox
+    Left = 16
+    Height = 24
+    Top = 316
+    Width = 73
+    Caption = 'Cities'
+    OnChange = CheckBoxCityChange
+    TabOrder = 12
+  end
+  object SpinEditCityPercent: TSpinEdit
+    Left = 224
+    Height = 32
+    Top = 312
+    Width = 106
+    MinValue = 1
+    TabOrder = 13
+    Value = 1
+  end
+  object Label4: TLabel
+    Left = 339
+    Height = 22
+    Top = 317
+    Width = 17
+    Caption = '%'
+    ParentColor = False
+  end
+  object RadioGroupGrowAmount: TRadioGroup
+    Left = 376
+    Height = 76
     Top = 272
-    Width = 94
-    Caption = 'Map height:'
-    ParentColor = False
+    Width = 241
+    AutoFill = True
+    Caption = 'Per turn grow amount'
+    ChildSizing.LeftRightSpacing = 6
+    ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
+    ChildSizing.EnlargeVertical = crsHomogenousChildResize
+    ChildSizing.ShrinkHorizontal = crsScaleChilds
+    ChildSizing.ShrinkVertical = crsScaleChilds
+    ChildSizing.Layout = cclLeftToRightThenTopToBottom
+    ChildSizing.ControlsPerLine = 1
+    ClientHeight = 52
+    ClientWidth = 237
+    Items.Strings = (
+      'By one'
+      'By square root'
+    )
+    TabOrder = 14
+  end
+  object RadioGroupGrowCells: TRadioGroup
+    Left = 16
+    Height = 105
+    Top = 360
+    Width = 185
+    AutoFill = True
+    Caption = 'Growing cells'
+    ChildSizing.LeftRightSpacing = 6
+    ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
+    ChildSizing.EnlargeVertical = crsHomogenousChildResize
+    ChildSizing.ShrinkHorizontal = crsScaleChilds
+    ChildSizing.ShrinkVertical = crsScaleChilds
+    ChildSizing.Layout = cclLeftToRightThenTopToBottom
+    ChildSizing.ControlsPerLine = 1
+    ClientHeight = 81
+    ClientWidth = 181
+    Items.Strings = (
+      'None'
+      'Player cities'
+      'Player all'
+    )
+    TabOrder = 15
   end
 end

trunk/Forms/UFormNew.lrt

@@ -13 +13 @@
 TFORMNEW.LABEL3.CAPTION=%
 TFORMNEW.LABEL2.CAPTION=Map height:
+TFORMNEW.CHECKBOXCITY.CAPTION=Cities
+TFORMNEW.LABEL4.CAPTION=%
+TFORMNEW.RADIOGROUPGROWAMOUNT.CAPTION=Per turn grow amount
+TFORMNEW.RADIOGROUPGROWCELLS.CAPTION=Growing cells

trunk/Forms/UFormNew.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, Spin, UGame;
+  ComCtrls, Spin, ExtCtrls, UGame;
 
 type
@@ -20 +20 @@
     ButtonPlayerModify: TButton;
     CheckBoxVoid: TCheckBox;
+    CheckBoxCity: TCheckBox;
     Label1: TLabel;
     Label2: TLabel;
     Label3: TLabel;
+    Label4: TLabel;
     ListView1: TListView;
+    RadioGroupGrowCells: TRadioGroup;
+    RadioGroupGrowAmount: TRadioGroup;
     SpinEditVoidPercent: TSpinEdit;
     SpinEditMapSizeX: TSpinEdit;
     SpinEditMapSizeY: TSpinEdit;
+    SpinEditCityPercent: TSpinEdit;
     TrackBarSizeX: TTrackBar;
     TrackBarSizeY: TTrackBar;
@@ -33 +38 @@
     procedure ButtonPlayerModifyClick(Sender: TObject);
     procedure ButtonPlayerRemoveClick(Sender: TObject);
+    procedure CheckBoxCityChange(Sender: TObject);
     procedure CheckBoxVoidChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -128 +134 @@
 end;
 
+procedure TFormNew.CheckBoxCityChange(Sender: TObject);
+begin
+  SpinEditCityPercent.Enabled := CheckBoxCity.Checked;
+end;
+
 procedure TFormNew.CheckBoxVoidChange(Sender: TObject);
 begin
@@ -177 +188 @@
     TPlayer(Players[I]).Assign(TPlayer(Game.Players[I]));
   end;
+  CheckBoxCity.Checked := Game.CityEnabled;
+  SpinEditCityPercent.Value := Game.CityPercentage;
   SpinEditMapSizeX.Value := Game.Map.Size.X;
   SpinEditMapSizeY.Value := Game.Map.Size.Y;
+  RadioGroupGrowAmount.ItemIndex := Integer(Game.GrowAmount);
+  RadioGroupGrowCells.ItemIndex := Integer(Game.GrowCells);
 end;
 
@@ -195 +210 @@
   Game.VoidEnabled := CheckBoxVoid.Checked;
   Game.VoidPercentage := SpinEditVoidPercent.Value;
+  Game.CityEnabled := CheckBoxCity.Checked;
+  Game.CityPercentage := SpinEditCityPercent.Value;
   Game.Map.Size := Point(SpinEditMapSizeX.Value, SpinEditMapSizeY.Value);
+  Game.GrowAmount := TGrowAmount(RadioGroupGrowAmount.ItemIndex);
+  Game.GrowCells := TGrowCells(RadioGroupGrowCells.ItemIndex);
 end;
 

trunk/Languages/xtactics.cs.po

@@ -149 +149 @@
 msgstr "Nová hra"
 
+#: tformnew.checkboxcity.caption
+msgid "Cities"
+msgstr "Města"
+
 #: tformnew.checkboxvoid.caption
 msgid "Inaccessible places"
@@ -154 +158 @@
 
 #: tformnew.label1.caption
-#, fuzzy
 #| msgid "Map size:"
 msgid "Map width:"
-msgstr "Velikost mapy:"
+msgstr "Šířka mapy:"
 
 #: tformnew.label2.caption
-#, fuzzy
 #| msgid "x"
 msgid "Map height:"
-msgstr "x"
+msgstr "Výška mapy:"
 
 #: tformnew.label3.caption
+msgctxt "tformnew.label3.caption"
+msgid "%"
+msgstr "%"
+
+#: tformnew.label4.caption
+msgctxt "tformnew.label4.caption"
 msgid "%"
 msgstr "%"
@@ -184 +192 @@
 msgid "Start units"
 msgstr "Počátečních jednotek"
+
+#: tformnew.radiogroupgrowamount.caption
+msgid "Per turn grow amount"
+msgstr "Množství růstu za tah"
+
+#: tformnew.radiogroupgrowcells.caption
+msgid "Growing cells"
+msgstr "Rostoucí buňky:"
 
 #: tformplayer.buttoncancel.caption
@@ -256 +272 @@
 msgid "You need at least two players"
 msgstr "Potřebujete alespoň dva hráče"
-

trunk/Languages/xtactics.po

@@ -139 +139 @@
 msgstr ""
 
+#: tformnew.checkboxcity.caption
+msgid "Cities"
+msgstr ""
+
 #: tformnew.checkboxvoid.caption
 msgid "Inaccessible places"
@@ -152 +156 @@
 
 #: tformnew.label3.caption
+msgctxt "tformnew.label3.caption"
+msgid "%"
+msgstr ""
+
+#: tformnew.label4.caption
+msgctxt "TFORMNEW.LABEL4.CAPTION"
 msgid "%"
 msgstr ""
@@ -169 +179 @@
 #: tformnew.listview1.columns[3].caption
 msgid "Start units"
+msgstr ""
+
+#: tformnew.radiogroupgrowamount.caption
+msgid "Per turn grow amount"
+msgstr ""
+
+#: tformnew.radiogroupgrowcells.caption
+msgid "Growing cells"
 msgstr ""
 

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;