Changeset 265 for trunk

Timestamp:

Jan 15, 2019, 1:03:40 AM (6 years ago)

Author:

chronos

Message:

• Modified: Cell power is now internally represented as unit power (TUnit class).
• Modified: Allow to have only one player in the game.
• Added: New win objective None to just play freely without any win objective.
• Added: New win objective to capture entire map.
• Added: TGameSystem class to represent various game play systems of other existing games.
• Fixed: Clear correctly defender player from unit moves if his cell is captured.
• Fixed: Do not allow to remove too many players to have at least minimum players.

Location:

trunk

Files:

• Forms/UFormClient.lfm (modified) (3 diffs)
• Forms/UFormClient.pas (modified) (1 diff)
• Forms/UFormNew.lfm (modified) (33 diffs)
• Forms/UFormNew.pas (modified) (7 diffs)
• Languages/xtactics.cs.po (modified) (5 diffs)
• Languages/xtactics.po (modified) (4 diffs)
• UBuilding.pas (added)
• UClientAI.pas (modified) (4 diffs)
• UClientGUI.pas (modified) (6 diffs)
• UCore.pas (modified) (7 diffs)
• UGame.pas (modified) (25 diffs)
• UGameSystem.pas (added)
• UMap.pas (modified) (12 diffs)
• UPlayer.pas (modified) (21 diffs)
• UUnit.pas (added)
• xtactics.lpi (modified) (2 diffs)

trunk/Forms/UFormClient.lfm

@@ -13 +13 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '1.8.2.0'
+  LCLVersion = '1.8.4.0'
   WindowState = wsMaximized
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 30
-    Top = 591
+    Height = 28
+    Top = 593
     Width = 775
     Panels = <    
@@ -34 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 591
+    Height = 593
     Top = 0
     Width = 32
@@ -80 +80 @@
   object PaintBox1: TPaintBox
     Left = 32
-    Height = 591
+    Height = 593
     Top = 0
     Width = 743

trunk/Forms/UFormClient.pas

@@ -152 +152 @@
     FormMove.TrackBarRepeat.Max := FormMove.SpinEditRepeat.MaxValue;
     FormMove.TrackBarRepeat.Position := FormMove.SpinEditRepeat.Value;
-    FormMove.DefendCount := CellTo.MapCell.Power;
+    if Assigned(CellTo.MapCell.OneUnit) then
+      FormMove.DefendCount := CellTo.MapCell.OneUnit.Power
+      else FormMove.DefendCount := 0;
     // Attack count from other surrounding cells without current move if already exists
     FormMove.AttackCount := 0;

trunk/Forms/UFormNew.lfm

@@ -15 +15 @@
   OnShow = FormShow
   Position = poMainFormCenter
-  LCLVersion = '1.8.2.0'
+  LCLVersion = '1.8.4.0'
   object PageControl1: TPageControl
     Left = 4
@@ -21 +21 @@
     Top = 4
     Width = 749
-    ActivePage = TabSheetMap
+    ActivePage = TabSheetRules
     Align = alClient
     BorderSpacing.Around = 4
-    TabIndex = 2
+    TabIndex = 3
     TabOrder = 0
     object TabSheetMode: TTabSheet
       Caption = 'Mode'
-      ClientHeight = 651
-      ClientWidth = 743
+      ClientHeight = 655
+      ClientWidth = 739
       object Panel3: TPanel
         Left = 0
@@ -113 +113 @@
             item
               Caption = 'Address'
-              Width = 214
+              Width = 219
             end>
           MultiSelect = True
@@ -158 +158 @@
     object TabSheetPlayers: TTabSheet
       Caption = 'Players'
-      ClientHeight = 651
-      ClientWidth = 743
+      ClientHeight = 655
+      ClientWidth = 739
       object Panel2: TPanel
         Left = 0
-        Height = 651
+        Height = 655
         Top = 0
-        Width = 743
+        Width = 739
         Align = alClient
         BevelOuter = bvNone
-        ClientHeight = 651
-        ClientWidth = 743
+        ClientHeight = 655
+        ClientWidth = 739
         TabOrder = 0
         object ListViewPlayers: TListView
           Left = 4
-          Height = 601
+          Height = 605
           Top = 4
-          Width = 735
+          Width = 731
           Align = alTop
           Anchors = [akTop, akLeft, akRight, akBottom]
@@ -212 +212 @@
           Left = 16
           Height = 25
-          Top = 613
+          Top = 617
           Width = 83
           Action = APlayerAdd
@@ -221 +221 @@
           Left = 120
           Height = 25
-          Top = 613
+          Top = 617
           Width = 83
           Action = APlayerModify
@@ -230 +230 @@
           Left = 224
           Height = 25
-          Top = 613
+          Top = 617
           Width = 83
           Action = APlayerRemove
@@ -240 +240 @@
     object TabSheetMap: TTabSheet
       Caption = 'Map'
-      ClientHeight = 651
-      ClientWidth = 743
+      ClientHeight = 655
+      ClientWidth = 739
       object Panel1: TPanel
         Left = 0
-        Height = 651
+        Height = 655
         Top = 0
-        Width = 743
+        Width = 739
         Align = alClient
         BevelOuter = bvNone
-        ClientHeight = 651
-        ClientWidth = 743
+        ClientHeight = 655
+        ClientWidth = 739
         TabOrder = 0
         object Label1: TLabel
@@ -270 +270 @@
         object SpinEditMapSizeX: TSpinEdit
           Left = 128
-          Height = 36
+          Height = 43
           Top = 4
           Width = 98
@@ -280 +280 @@
         object SpinEditMapSizeY: TSpinEdit
           Left = 128
-          Height = 36
+          Height = 43
           Top = 55
           Width = 98
@@ -290 +290 @@
         object TrackBarSizeX: TTrackBar
           Left = 240
-          Height = 47
+          Height = 58
           Top = 8
-          Width = 492
+          Width = 488
           Max = 100
           Min = 2
@@ -303 +303 @@
         object TrackBarSizeY: TTrackBar
           Left = 240
-          Height = 47
+          Height = 58
           Top = 49
-          Width = 492
+          Width = 488
           Max = 100
           Min = 2
@@ -324 +324 @@
         object ComboBoxGridType: TComboBox
           Left = 146
-          Height = 36
+          Height = 42
           Top = 104
           Width = 208
@@ -340 +340 @@
         object ComboBoxMapShape: TComboBox
           Left = 146
-          Height = 36
+          Height = 42
           Top = 144
           Width = 208
@@ -365 +365 @@
           Height = 27
           Top = 110
-          Width = 255
+          Width = 251
           Anchors = [akTop, akLeft, akRight]
           AutoSize = False
@@ -373 +373 @@
         object SpinEditVoidPercent: TSpinEdit
           Left = 216
-          Height = 36
+          Height = 43
           Top = 224
           Width = 106
@@ -384 +384 @@
           Height = 30
           Top = 232
-          Width = 187
+          Width = 189
           Caption = 'Inaccessible places'
           OnChange = CheckBoxVoidChange
@@ -393 +393 @@
           Height = 30
           Top = 272
-          Width = 71
+          Width = 73
           Caption = 'Cities'
           OnChange = CheckBoxCityChange
@@ -400 +400 @@
         object SpinEditCityPercent: TSpinEdit
           Left = 216
-          Height = 36
+          Height = 43
           Top = 272
           Width = 106
@@ -425 +425 @@
         object SpinEditNeutralUnits: TSpinEdit
           Left = 408
-          Height = 36
+          Height = 43
           Top = 384
           Width = 98
@@ -442 +442 @@
         object EditImageFile: TEdit
           Left = 144
-          Height = 36
+          Height = 43
           Top = 184
-          Width = 476
+          Width = 472
           Anchors = [akTop, akLeft, akRight]
           TabOrder = 12
         end
         object ButtonImageBrowse: TButton
-          Left = 628
+          Left = 624
           Height = 25
           Top = 192
@@ -470 +470 @@
           Height = 30
           Top = 310
-          Width = 210
+          Width = 212
           Caption = 'Bridges between cells'
           TabOrder = 14
@@ -476 +476 @@
         object SpinEditMaxPower: TSpinEdit
           Left = 408
-          Height = 36
+          Height = 43
           Top = 344
           Width = 98
@@ -497 +497 @@
           Height = 27
           Top = 137
-          Width = 255
+          Width = 251
           Anchors = [akTop, akLeft, akRight]
           AutoSize = False
@@ -507 +507 @@
     object TabSheetRules: TTabSheet
       Caption = 'Rules'
-      ClientHeight = 651
-      ClientWidth = 743
+      ClientHeight = 655
+      ClientWidth = 739
       object Panel4: TPanel
         Left = 0
-        Height = 651
+        Height = 655
         Top = 0
-        Width = 743
+        Width = 739
         Align = alClient
         BevelOuter = bvNone
-        ClientHeight = 651
-        ClientWidth = 743
+        ClientHeight = 655
+        ClientWidth = 739
         TabOrder = 0
         object RadioGroupGrowCells: TRadioGroup
@@ -533 +533 @@
           ChildSizing.Layout = cclLeftToRightThenTopToBottom
           ChildSizing.ControlsPerLine = 1
-          ClientHeight = 77
-          ClientWidth = 308
+          ClientHeight = 78
+          ClientWidth = 310
           Items.Strings = (
             'None'
@@ -552 +552 @@
         object ComboBoxWinObjective: TComboBox
           Left = 224
-          Height = 36
+          Height = 38
           Top = 244
           Width = 328
@@ -580 +580 @@
           ChildSizing.Layout = cclLeftToRightThenTopToBottom
           ChildSizing.ControlsPerLine = 1
-          ClientHeight = 48
-          ClientWidth = 301
+          ClientHeight = 49
+          ClientWidth = 303
           Items.Strings = (
             'By one'
@@ -592 +592 @@
           Height = 30
           Top = 24
-          Width = 113
+          Width = 115
           Caption = 'Fog of war'
           TabOrder = 3
@@ -600 +600 @@
           Height = 78
           Top = 290
-          Width = 720
+          Width = 716
           ActivePage = TabSheetCaptureCities
           Anchors = [akTop, akLeft, akRight]
@@ -611 +611 @@
           end
           object TabSheetCaptureCells: TTabSheet
-            ClientHeight = 72
-            ClientWidth = 714
+            ClientHeight = 74
+            ClientWidth = 706
             object Label14: TLabel
               Left = 8
@@ -633 +633 @@
           end
           object TabSheetStayAliveTurns: TTabSheet
-            ClientHeight = 72
-            ClientWidth = 714
+            ClientHeight = 74
+            ClientWidth = 706
             object Label13: TLabel
               Left = 8
@@ -659 +659 @@
           Height = 30
           Top = 62
-          Width = 360
+          Width = 362
           Caption = 'Set cells without player units as neutral'
           TabOrder = 5

trunk/Forms/UFormNew.pas

@@ -163 +163 @@
   SGridTypeRandom = 'Random';
   SGridTypeIsometric = 'Isometric';
+  SWinObjectiveNone = 'None';
   SWinObjectiveDefeatAllOponents = 'Defeat all oponents';
   SWinObjectiveDefeatAllCities = 'Defeat all oponents cities';
   SWinObjectiveCapturePosition = 'Capture all special cells';
   SWinObjectiveStayAliveForTurns = 'Stay alive for number of turns';
+  SWinObjectiveCaptureEntireMap = 'Capture entire map';
   SGrowNone = 'None';
   SGrowPlayerCities = 'Player cities';
@@ -283 +285 @@
     LastIndex := ItemIndex;
     Clear;
+    Items.Add(SWinObjectiveNone);
     Items.Add(SWinObjectiveDefeatAllOponents);
     Items.Add(SWinObjectiveDefeatAllCities);
     Items.Add(SWinObjectiveCapturePosition);
     Items.Add(SWinObjectiveStayAliveForTurns);
+    Items.Add(SWinObjectiveCaptureEntireMap);
     ItemIndex := LastIndex;
   end;
@@ -327 +331 @@
 procedure TFormNew.UpdateInterface;
 begin
-  APlayerRemove.Enabled := Assigned(ListViewPlayers.Selected) and (Players.Count > 2);
+  APlayerRemove.Enabled := Assigned(ListViewPlayers.Selected) and (Players.Count > MinPlayerCount);
   APlayerAdd.Enabled := Players.Count < MaxPlayerCount;
   APlayerModify.Enabled := Assigned(ListViewPlayers.Selected);
@@ -427 +431 @@
   if ListViewPlayers.Items[I].Selected then begin
     Players.Remove(ListViewPlayers.Items[I].Data);
+    if Players.Count <= MinPlayerCount then Break;
   end;
   ReloadView;
@@ -487 +492 @@
   if Players.Count <= (MaxPlayerCount - 1) then begin
     NewPlayer := TPlayer.Create;
-    NewPlayer.Id := Players.GetNewPlayerId;
+    NewPlayer.Id := Players.GetNewId;
     NewPlayer.Name := SPlayer + ' ' + IntToStr(NewPlayer.Id);
     NewPlayer.Color := PlayerColors[Players.Count];
@@ -539 +544 @@
     SpinEditTurns.Value := StayAliveForDefinedTurns;
     SpinEditSpecialCells.Value := SpecialCaptureCellCount;
-    CheckBoxEmptyCellsNeutral.Checked := EmptyCellsNeutral;
+    CheckBoxEmptyCellsNeutral.Checked := GameSystem.EmptyCellsNeutral;
   end;
 end;
@@ -582 +587 @@
     StayAliveForDefinedTurns := SpinEditTurns.Value;
     SpecialCaptureCellCount := SpinEditSpecialCells.Value;
-    EmptyCellsNeutral := CheckBoxEmptyCellsNeutral.Checked;
+    GameSystem.EmptyCellsNeutral := CheckBoxEmptyCellsNeutral.Checked;
   end;
 end;

trunk/Languages/xtactics.cs.po

@@ -9 +9 @@
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.1.1\n"
 "Language: cs\n"
 
@@ -924 +924 @@
 
 #: uformnew.sgrownone
+msgctxt "uformnew.sgrownone"
 msgid "None"
 msgstr "Nikde"
@@ -951 +952 @@
 msgstr "Zakulacený"
 
+#: uformnew.swinobjectivecaptureentiremap
+msgid "Capture entire map"
+msgstr "Obsadit celou mapu"
+
 #: uformnew.swinobjectivecaptureposition
 msgid "Capture all special cells"
@@ -962 +967 @@
 msgid "Defeat all oponents"
 msgstr "Porazit všechny nepřátele"
+
+#: uformnew.swinobjectivenone
+msgctxt "uformnew.swinobjectivenone"
+msgid "None"
+msgstr "Žádný"
 
 #: uformnew.swinobjectivestayaliveforturns
@@ -1000 +1010 @@
 
 #: ugame.sminimumplayers
-msgid "You need at least two players"
-msgstr "Potřebujete alespoň dva hráče"
+msgid "You need at least one player"
+msgstr "Potřebujete alespoň jednoho hráče"
 
 #: ugame.snewgamefile

trunk/Languages/xtactics.po

@@ -901 +901 @@
 
 #: uformnew.sgrownone
+msgctxt "uformnew.sgrownone"
 msgid "None"
 msgstr ""
@@ -928 +929 @@
 msgstr ""
 
+#: uformnew.swinobjectivecaptureentiremap
+msgid "Capture entire map"
+msgstr ""
+
 #: uformnew.swinobjectivecaptureposition
 msgid "Capture all special cells"
@@ -938 +943 @@
 #: uformnew.swinobjectivedefeatalloponents
 msgid "Defeat all oponents"
+msgstr ""
+
+#: uformnew.swinobjectivenone
+msgctxt "uformnew.swinobjectivenone"
+msgid "None"
 msgstr ""
 
@@ -977 +987 @@
 
 #: ugame.sminimumplayers
-msgid "You need at least two players"
+msgid "You need at least one player"
 msgstr ""
 

trunk/UClientAI.pas

@@ -44 +44 @@
   TotalAttackPower: Integer;
   CanAttack: Integer;
+  TargetPower: Integer;
   TargetCells: TPlayerCells;
   Cell: TPlayerCell;
@@ -81 +82 @@
 
       // Attack if target is weaker
-      if TotalPower >= (MapCell.Power + AttackDiff) then begin
+      if Assigned(MapCell.OneUnit) then TargetPower := MapCell.OneUnit.Power
+        else TargetPower := 0;
+      if TotalPower >= (TargetPower + AttackDiff) then begin
         TotalAttackPower := 0;
         for NeighborCell in Neighbors do
         if NeighborCell.MapCell.Player = ControlPlayer then begin
           // Use only necessary power
-          AttackPower := MapCell.Power - TotalAttackPower + AttackDiff;
+          AttackPower := TargetPower - TotalAttackPower + AttackDiff;
           if NeighborCell.GetAvialPower < AttackPower then
             AttackPower := NeighborCell.GetAvialPower;
@@ -141 +144 @@
       end;
       // Attack if target is weaker
-      if Game.AttackProbability(TotalPower, TargetCell.MapCell.Power) >=
+      if Game.AttackProbability(TotalPower, TargetCell.MapCell.OneUnit.Power) >=
         ComputerAggroProbability[ControlPlayer.Agressivity] then begin
         // Try to limit total attacking power to necessary minimum
-        while Game.AttackProbability(TotalPower - 1, TargetCell.MapCell.Power) >=
+        while Game.AttackProbability(TotalPower - 1, TargetCell.MapCell.OneUnit.Power) >=
           ComputerAggroProbability[ControlPlayer.Agressivity] do
           Dec(TotalPower);
@@ -306 +309 @@
     for I := 0 to Neighbors.Count - 1 do
     if (Neighbors[I].MapCell.Player <> ControlPlayer) and (Neighbors[I].MapCell.Player <> nil) then begin
-      Inc(EnemyPower, Neighbors[I].MapCell.Power);
+      Inc(EnemyPower, Neighbors[I].MapCell.OneUnit.Power);
     end;
     if EnemyPower > (GetAvialPower + GetAttackPower) then begin

trunk/UClientGUI.pas

@@ -190 +190 @@
 
     // Show cell text
-    if (Cell.Power <> 0) or (Cell.Extra = etObjectiveTarget) then begin
+    if (Cell.OneUnit.Power <> 0) or (Cell.Extra = etObjectiveTarget) then begin
       Pen.Style := psSolid;
       Font.Color := clWhite;
@@ -319 +319 @@
           if Cell.MapCell.Player = ControlPlayer then
             CellText := IntToStr(Cell.GetAvialPower)
-            else CellText := IntToStr(Cell.MapCell.Power);
+            else begin
+              if Assigned(Cell.MapCell.OneUnit) then
+                CellText := IntToStr(Cell.MapCell.OneUnit.Power)
+                else CellText := '';
+            end;
           if Assigned(SelectedCell) and (SelectedCell = Cell) then
               Brush.Color := clGreen
@@ -349 +353 @@
         if (MapCell.Terrain <> ttVoid) and View.IsCellVisible(MapCell) then begin
           Brush.Color := MapCell.GetColor;
-          PaintMapCell(Canvas, MapCell.PosPx, IntToStr(MapCell.Power), View, MapCell);
+          if Assigned(Cell.MapCell.OneUnit) then
+            CellText := IntToStr(MapCell.OneUnit.Power)
+            else CellText := '';
+          PaintMapCell(Canvas, MapCell.PosPx, CellText, View, MapCell);
         end;
       end;
@@ -514 +521 @@
           Player.Moves.Remove(SelectedCell.MovesFrom[I]);
         end;
-        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.Power, False);
+        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power, False);
         SelectedCell := nil;
       end else
@@ -522 +529 @@
         for I := SelectedCell.MovesFrom.Count - 1 downto 0 do
           Player.Moves.Remove(SelectedCell.MovesFrom[I]);
-        UnitMove := TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.Power, False);
+        UnitMove := TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power, False);
         if Assigned(UnitMove) then
           UnitMove.CountRepeat := TGame(Player.Game).Map.MaxPower;
@@ -528 +535 @@
           else SelectedCell := nil;
       end else begin
-        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.Power);
+        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power);
         SelectedCell := nil;
       end;

trunk/UCore.pas

@@ -9 +9 @@
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
   URegistry, ULastOpenedList, UTheme, Registry, Menus, UFormClient, UPlayer,
-  UGameServer, UGameClient, fgl, UServerList;
+  UGameServer, UGameClient, fgl, UServerList, UGameSystem, UUnit;
 
 type
@@ -87 +87 @@
     procedure UpdateOtherForms;
     procedure FormClientActions;
+    procedure InitGameSystems;
   public
     Game: TGame;
@@ -99 +100 @@
     LocalClients: TClients;
     ServerList: TServerList;
+    GameSystems: TGameSystems;
     procedure ReopenGameOnInit;
     procedure LoadConfig;
@@ -445 +447 @@
 procedure TCore.DataModuleCreate(Sender: TObject);
 begin
+  GameSystems := TGameSystems.Create;
+  InitGameSystems;
   Server := TServer.Create;
   LocalClients := TClients.Create;
   GameSettings := TGame.Create;
+  GameSettings.GameSystem := GameSystems.First;
   Game := TGame.Create;
   Game.OnMoveUpdated := DoMoveUpdated;
@@ -453 +458 @@
   Game.OnNewTurn := GameNewTurnExecute;
   Game.OnPlayerChange := DoPlayerChange;
+  Game.GameSystem := GameSystems.First;
   Server.Game := Game;
   LocalClients.Game := Game;
@@ -481 +487 @@
   FreeAndNil(Game);
   FreeAndNil(GameSettings);
+  FreeAndNil(GameSystems);
 end;
 
@@ -486 +493 @@
 begin
   LastOpenedList1.LoadToMenuItem(FormMain.MenuItemLoadRecent, LoadRecentExecute);
+end;
+
+procedure TCore.InitGameSystems;
+begin
+  with GameSystems.AddNew('HexWars') do begin
+    MaxPlayerCount := 3;
+    with UnitKinds.AddNew('Unit') do begin
+      Moves := 1;
+      Stack := 99;
+    end;
+  end;
+
+  with GameSystems.AddNew('Civilization') do begin
+    MaxPlayerCount := 3;
+    with UnitKinds.AddNew('Scout') do begin
+      Moves := 1;
+      Stack := 1;
+    end;
+    with UnitKinds.AddNew('Settler') do begin
+      Moves := 1;
+      Stack := 1;
+    end;
+  end;
+
+  with GameSystems.AddNew('Dune 2') do begin
+    MaxPlayerCount := 3;
+    with UnitKinds.AddNew('Light Infantry') do begin
+      Moves := 1;
+    end;
+    with UnitKinds.AddNew('Heavy Troopers') do begin
+      Moves := 1;
+    end;
+    with UnitKinds.AddNew('Trike') do begin
+      Moves := 1;
+    end;
+    with UnitKinds.AddNew('Quad') do begin
+      Moves := 1;
+    end;
+  end;
+
+  with GameSystems.AddNew('Battle Isle 2') do begin
+    MaxPlayerCount := 8;
+    with UnitKinds.AddNew('Demon 132') do begin
+      Moves := 4;
+      Stack := 10;
+    end;
+    with UnitKinds.AddNew('Troll 142') do begin
+      Moves := 3;
+      Stack := 10;
+    end;
+    with UnitKinds.AddNew('Ranger 132') do begin
+      Moves := 10;
+      Stack := 10;
+    end;
+    with UnitKinds.AddNew('Buggy') do begin
+      Moves := 10;
+      Stack := 10;
+    end;
+  end;
 end;
 

trunk/UGame.pas

@@ -8 +8 @@
   Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite, Forms,
   DOM, Math, LazFileUtils, UXMLUtils, Dialogs, LCLType, LCLIntf, fgl,
-  UGeometry, UPlayer, UMap, UMapType;
+  UGeometry, UPlayer, UMap, UMapType, UUnit, UGameSystem;
 
 const
   DefaultPlayerStartUnits = 5;
+  MinPlayerCount = 1;
   MaxPlayerCount = 8;
 
@@ -28 +29 @@
   TGrowCells = (gcNone, gcPlayerCities, gcPlayerAll);
   TMapType = (mtNone, mtHexagon, mtSquare, mtTriangle, mtRandom, mtIsometric);
-  TWinObjective = (woDefeatAllOponents, woDefeatAllOponentsCities,
-    woSpecialCaptureCell, woStayAliveForDefinedTurns);
+  TWinObjective = (woNone, woDefeatAllOponents, woDefeatAllOponentsCities,
+    woSpecialCaptureCell, woStayAliveForDefinedTurns, woCaptureEntireMap);
 
   { TGame }
@@ -35 +36 @@
   TGame = class
   private
+    FGameSystem: TGameSystem;
     FMapType: TMapType;
     FOnChange: TNotifyEvent;
@@ -46 +48 @@
     ProbabilityMatrix: array of array of Single;
     procedure RecordTurnStats;
+    procedure SetGameSystem(AValue: TGameSystem);
     procedure SetMapType(AValue: TMapType);
     procedure SetRunning(AValue: Boolean);
@@ -57 +60 @@
     DevelMode: Boolean;
     Players: TPlayers;
+    Units: TUnits;
     Map: TMap;
     MapImageFileName: string;
@@ -77 +81 @@
     BridgeEnabled: Boolean;
     MaxPower: Integer;
-    EmptyCellsNeutral: Boolean;
     procedure PostConfig;
     procedure Assign(Source: TGame);
@@ -95 +98 @@
     property Running: Boolean read FRunning write SetRunning;
     property MapType: TMapType read FMapType write SetMapType;
+    property GameSystem: TGameSystem read FGameSystem write SetGameSystem;
   published
     property OnMoveUpdated: TMoveUpdatedEvent read FOnMoveUpdated write FOnMoveUpdated;
@@ -123 +127 @@
 
 resourcestring
-  SMinimumPlayers = 'You need at least two players';
+  SMinimumPlayers = 'You need at least one player';
   SHuman = 'Human';
   SComputer = 'Computer';
@@ -263 +267 @@
   if FRunning = AValue then Exit;
   if AValue then begin
-    if Players.Count < 2 then raise Exception.Create(SMinimumPlayers);
+    if Players.Count < 1 then raise Exception.Create(SMinimumPlayers);
     FRunning := AValue;
   end else begin
@@ -284 +288 @@
           else Terrain := ttNormal;
       end;
-    Power := Random(MaxNeutralUnits + 1);
+    if not Assigned(OneUnit) then
+      OneUnit := Units.AddNew(GameSystem.UnitKinds[0], Random(MaxNeutralUnits + 1));
     Player := nil;
   end;
@@ -428 +433 @@
   BridgeEnabled := Source.BridgeEnabled;
   MaxPower := Source.MaxPower;
-  EmptyCellsNeutral := Source.EmptyCellsNeutral;
+  GameSystem := Source.GameSystem;
 end;
 
@@ -452 +457 @@
     SetValue(DOMString(Path + '/StayAliveForDefinedTurns'), StayAliveForDefinedTurns);
     SetValue(DOMString(Path + '/SpecialCaptureCellCount'), SpecialCaptureCellCount);
-    SetValue(DOMString(Path + '/EmptyCellsNeutral'), EmptyCellsNeutral);
     Players.SaveConfig(Config, Path + '/Players');
   end;
@@ -488 +492 @@
     StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), 20);
     SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), 1);
-    EmptyCellsNeutral := GetValue(DOMString(Path + '/EmptyCellsNeutral'), False);
     Players.LoadConfig(Config, Path + '/Players');
   end;
@@ -524 +527 @@
       WinObjective := TWinObjective(ReadInteger(RootNode, 'WinObjective', Integer(woDefeatAllOponents)));
       StayAliveForDefinedTurns := ReadInteger(RootNode, 'StayAliveForDefinedTurns', 10);
-      EmptyCellsNeutral := ReadBoolean(RootNode, 'EmptyCellsNeutral', False);
+
+      NewNode := FindNode('GameSystem');
+      if Assigned(NewNode) then
+        GameSystem.LoadFromNode(NewNode);
 
       NewNode := FindNode('Map');
@@ -536 +542 @@
         else CurrentPlayer := nil;
 
+      NewNode := FindNode('Units');
+      if Assigned(NewNode) then
+        Units.LoadFromNode(NewNode);
+
       Map.Cells.FixRefId;
+      Units.FixRefId;
 
       for I := 0 to Players.Count - 1 do begin
@@ -578 +589 @@
       WriteInteger(RootNode, 'WinObjective', Integer(WinObjective));
       WriteInteger(RootNode, 'StayAliveForDefinedTurns', StayAliveForDefinedTurns);
-      WriteBoolean(RootNode, 'EmptyCellsNeutral', EmptyCellsNeutral);
       WriteBoolean(RootNode, 'Running', Running);
+
+      NewNode := OwnerDocument.CreateElement('GameSystem');
+      AppendChild(NewNode);
+      GameSystem.SaveToNode(NewNode);
 
       NewNode := OwnerDocument.CreateElement('Map');
@@ -588 +602 @@
       AppendChild(NewNode);
       Players.SaveToNode(NewNode);
+
+      NewNode := OwnerDocument.CreateElement('Units');
+      AppendChild(NewNode);
+      Units.SaveToNode(NewNode);
     end;
     if ExtractFileDir(FileName) <> '' then
@@ -633 +651 @@
     TurnStats.Add(NewStat);
   end;
+end;
+
+procedure TGame.SetGameSystem(AValue: TGameSystem);
+begin
+  if FGameSystem = AValue then Exit;
+  FGameSystem := AValue;
 end;
 
@@ -687 +711 @@
   R: Boolean;
   I: Integer;
+  PlayersCount: Integer;
 begin
   Winner := nil;
@@ -724 +749 @@
     if TurnCounter > StayAliveForDefinedTurns then
       EndGame(nil);
+  end else
+  if WinObjective = woCaptureEntireMap then begin
+    Player := nil;
+    for I := 0 to Map.Cells.Count - 1 do
+    if TCell(Map.Cells[I]).Terrain <> ttVoid then begin
+      if (TCell(Map.Cells[I]).Player <> nil) then begin
+        if Player = nil then begin
+          // First player found
+          Player := TPlayer(TCell(Map.Cells[I]).Player);
+        end else
+        if Player <> TCell(Map.Cells[I]).Player then begin
+          // Multiple players still alive
+          Player := nil;
+          Break;
+        end;
+      end else begin
+        // Neutral cell
+        Player := nil;
+        Break;
+      end;
+    end;
+    if Player <> nil then
+      EndGame(Player);
   end;
 end;
@@ -729 +777 @@
 constructor TGame.Create;
 begin
+  Units := TUnits.Create;
+  Units.Game := Self;
   Map := TMap.Create;
+  Map.Game := Self;
   Players := TPlayers.Create;
   Players.Game := Self;
@@ -742 +793 @@
   MaxNeutralUnits := Min(4, MaxPower);
 
-  Map.Game := Self;
   Map.Size := TPoint.Create(3, 3);
 end;
@@ -750 +800 @@
   FreeAndNil(Players);
   FreeAndNil(Map);
+  FreeAndNil(Units);
   inherited Destroy;
 end;
@@ -784 +835 @@
   end;
 
-  for Player in Players do Player.StartCell := nil;
+  for Player in Players do begin
+    Player.Reset;
+    Player.StartCell := nil;
+  end;
   I := 0;
   for Player in Players do
@@ -797 +851 @@
         StartCell.Terrain := ttCity;
         StartCell.Player := Player;
-        StartCell.Power := Player.StartUnits;
+        if not Assigned(StartCell.OneUnit) then
+          StartCell.OneUnit := Units.AddNew(GameSystem.UnitKinds[0], Player.StartUnits);
+        StartCell.OneUnit.Power := Player.StartUnits;
+        StartCell.OneUnit.Kind := GameSystem.UnitKinds[0];
       end;
     end;

trunk/UMap.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Graphics, ExtCtrls, UGeometry, DOM, fgl,
-  UXMLUtils;
+  UXMLUtils, UUnit;
 
 const
@@ -30 +30 @@
     FMap: TMap;
     FPower: Integer;
+    FUnit: TUnit;
+    function GetPower: Integer;
     procedure SetArea(AValue: TMapArea);
     procedure SetId(AValue: Integer);
     procedure SetPower(AValue: Integer);
+    procedure SetUnit(AValue: TUnit);
   public
     PosPx: TPoint;
     Polygon: TPolygon;
     Terrain: TTerrainType;
-    PlayerId: Integer;
+    PlayerId: Integer; // Temporary value
     Player: TObject; // TPlayer;
     NeighborsId: array of Integer;
@@ -44 +47 @@
     Weight: Integer; // Temporary value
     Angle: Double; // Temporary value
-    PlayerCell: Pointer; // Temporary value
+    PlayerCell: TObject; // Temporary value
     Links: TCellLinks;
     Extra: TExtraType;
-    property Id: Integer read FId write SetId;
+    OneUnitId: Integer; // Temporary value
     procedure ConnectTo(Cell: TCell);
     procedure DisconnectFrom(Cell: TCell);
@@ -60 +63 @@
     constructor Create;
     destructor Destroy; override;
-    property Power: Integer read FPower write SetPower;
+    property Id: Integer read FId write SetId;
     property Map: TMap read FMap write FMap;
     property Area: TMapArea read FArea write SetArea;
+    property OneUnit: TUnit read FUnit write SetUnit;
+    //property Power: Integer read GetPower;
   end;
 
@@ -612 +617 @@
     with TPlayer(Player) do begin
       Inc(TotalCells);
-      Inc(TotalUnits, Power);
+      if Assigned(OneUnit) then
+        Inc(TotalUnits, OneUnit.Power);
       if Terrain = ttCity then
         Inc(TotalCities);
@@ -656 +662 @@
   for C := 0 to (Cells.Count div 2) - 1 do begin
     Cells[C].Terrain := Cells[Cells.Count - 1 - C].Terrain;
-    Cells[C].Power := Cells[Cells.Count - 1 - C].Power;
+    Cells[C].OneUnit.Power := Cells[Cells.Count - 1 - C].OneUnit.Power;
 
     for I := Cells[C].Links.Count - 1 downto 0 do begin
@@ -908 +914 @@
 end;
 
+procedure TCell.SetUnit(AValue: TUnit);
+var
+  OldValue: TUnit;
+begin
+  if FUnit = AValue then Exit;
+  OldValue := FUnit;
+  FUnit := nil;
+  if Assigned(OldValue) then OldValue.MapCell := nil;
+  FUnit := AValue;
+  if Assigned(FUnit) then FUnit.MapCell := Self;
+end;
+
 procedure TCell.ConnectTo(Cell: TCell);
 begin
@@ -950 +968 @@
 end;
 
+function TCell.GetPower: Integer;
+begin
+  if Assigned(OneUnit) then Result := OneUnit.Power
+    else Result := 0;
+end;
+
 procedure TCell.SetId(AValue: Integer);
 begin
@@ -973 +997 @@
 begin
   Player := TGame(Map.Game).Players.FindById(PlayerId);
+  OneUnit := TGame(Map.Game).Units.FindById(OneUnitId);
 
   Neighbors.Count := Length(NeighborsId);
@@ -993 +1018 @@
 begin
   Id := ReadInteger(Node, 'Id', 0);
-  Power := ReadInteger(Node, 'Power', 0);
+  OneUnitId := ReadInteger(Node, 'Unit', 0);
   Terrain := TTerrainType(ReadInteger(Node, 'Terrain', Integer(ttVoid)));
   Extra := TExtraType(ReadInteger(Node, 'Extra', Integer(etNone)));
@@ -1029 +1054 @@
 begin
   WriteInteger(Node, 'Id', Id);
-  WriteInteger(Node, 'Power', Power);
+  if Assigned(OneUnit) then
+    WriteInteger(Node, 'Unit', OneUnit.Id)
+    else WriteInteger(Node, 'Unit', 0);
   WriteInteger(Node, 'Terrain', Integer(Terrain));
   WriteInteger(Node, 'Extra', Integer(Extra));
@@ -1090 +1117 @@
   I: Integer;
 begin
+  OneUnit := nil;
   for I := Links.Count - 1 downto 0 do
     FMap.CellLinks.Remove(Links[I]);

trunk/UPlayer.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, UMap, DOM, fgl, XMLConf,
-  UXMLUtils, Math, UGeometry;
+  Classes, SysUtils, Graphics, UMap, DOM, fgl, XMLConf, UXMLUtils, Math,
+  UGeometry, UUnit;
 
 type
@@ -96 +96 @@
     FMode: TPlayerMode;
     FOnMove: TMoveEvent;
+    procedure MoveUnit(UnitMove: TUnitMove);
     procedure SetGame(AValue: TObject); // TGame
     procedure Attack(var AttackPower, DefendPower: Integer);
@@ -118 +119 @@
     TurnStats: TGameTurnStats;
     Moves: TUnitMoves;
+    Units: TUnits;
     procedure ReduceMovesPower;
     procedure RemoveInvalidMoves;
@@ -148 +150 @@
   public
     Game: TObject; //TGame;
-    NewPlayerId: Integer;
+    NewId: Integer;
     function FindById(Id: Integer): TPlayer;
     procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
-    function GetNewPlayerId: Integer;
+    function GetNewId: Integer;
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -259 +261 @@
   UnitMove: TUnitMove;
 begin
-  Result := MapCell.Power;
+  if Assigned(MapCell.OneUnit) then Result := MapCell.OneUnit.Power
+    else Result := 0;
   for UnitMove in MovesFrom do
     Result := Result - UnitMove.CountOnce;
@@ -433 +436 @@
   with TPlayerCell(Cells[I]) do begin
     for J := 0 to MapCell.Neighbors.Count - 1 do
-      ConnectTo(TCell(MapCell.Neighbors[J]).PlayerCell);
+      ConnectTo(TPlayerCell(TCell(MapCell.Neighbors[J]).PlayerCell));
   end;
 end;
@@ -511 +514 @@
   NewPlayer.Color := Color;
   NewPlayer.Mode := Mode;
-  NewPlayer.Id := GetNewPlayerId;
+  NewPlayer.Id := GetNewId;
   if Mode = pmComputer then
     NewPlayer.Agressivity := caMedium;
@@ -517 +520 @@
 end;
 
-function TPlayers.GetNewPlayerId: Integer;
-begin
-  Result := NewPlayerId;
-  Inc(NewPlayerId);
+function TPlayers.GetNewId: Integer;
+begin
+  Result := NewId;
+  Inc(NewId);
 end;
 
@@ -554 +557 @@
 begin
   inherited;
-  NewPlayerId := 1;
+  NewId := 1;
 end;
 
@@ -579 +582 @@
     Items[I].Game := Game;
   end;
-  NewPlayerId := Source.NewPlayerId;
+  NewId := Source.NewId;
 end;
 
@@ -589 +592 @@
   with Config do begin
     NewCount := GetValue(DOMString(Path + '/Count'), -1);
-    NewPlayerId := 1;
-    if NewCount >= 2 then begin
+    NewId := 1;
+    if NewCount >= MinPlayerCount then begin
       Self.Clear;
       Count := NewCount;
       for I := 0 to Count - 1 do begin
         Items[I] := TPlayer.Create;
-        Items[I].Id := GetNewPlayerId;
+        Items[I].Id := GetNewId;
         Items[I].Game := Game;
         Items[I].LoadConfig(Config, Path + '/Player' + IntToStr(I));
@@ -683 +686 @@
 
 procedure TUnitMove.SetCellFrom(AValue: TPlayerCell);
+var
+  OldValue: TPlayerCell;
 begin
   if FCellFrom = AValue then Exit;
-  if Assigned(AValue) and not Assigned(FCellFrom) then begin
-    if AValue.MovesFrom.IndexOf(Self) = -1 then
-      AValue.MovesFrom.Add(Self)
+  OldValue := FCellFrom;
+  FCellFrom := nil;
+  if Assigned(OldValue) then begin
+    if OldValue.MovesFrom.IndexOf(Self) <> -1 then
+      OldValue.MovesFrom.Remove(Self)
+      else raise Exception.Create('Unit move not found');
+  end;
+  FCellFrom := AValue;
+  if Assigned(FCellFrom) then begin
+    if FCellFrom.MovesFrom.IndexOf(Self) = -1 then
+      FCellFrom.MovesFrom.Add(Self)
       else raise Exception.Create('Unit move already exists');
   end else
-  if not Assigned(AValue) and Assigned(FCellFrom) then begin
-    if FCellFrom.MovesFrom.IndexOf(Self) <> -1 then
-      FCellFrom.MovesFrom.Remove(Self)
+end;
+
+procedure TUnitMove.SetCellTo(AValue: TPlayerCell);
+var
+  OldValue: TPlayerCell;
+begin
+  if FCellTo = AValue then Exit;
+  OldValue := FCellTo;
+  FCellTo := nil;
+  if Assigned(OldValue) then begin
+    if OldValue.MovesTo.IndexOf(Self) <> -1 then
+      OldValue.MovesTo.Remove(Self)
       else raise Exception.Create('Unit move not found');
   end;
-  FCellFrom := AValue;
-end;
-
-procedure TUnitMove.SetCellTo(AValue: TPlayerCell);
-begin
-  if FCellTo = AValue then Exit;
-  if Assigned(AValue) and not Assigned(FCellTo) then begin
-    AValue.MovesTo.Add(Self);
+  FCellTo := AValue;
+  if Assigned(FCellTo) then begin
+    if FCellTo.MovesTo.IndexOf(Self) = -1 then
+      FCellTo.MovesTo.Add(Self)
+      else raise Exception.Create('Unit move already exists');
   end else
-  if not Assigned(AValue) and Assigned(FCellTo) then begin
-    FCellTo.MovesTo.Remove(Self);
-  end;
-  FCellTo := AValue;
 end;
 
@@ -829 +844 @@
 constructor TPlayer.Create;
 begin
+  Units := TUnits.Create(False);
   Moves := TUnitMoves.Create;
   Moves.Player := Self;
@@ -844 +860 @@
   FreeAndNil(PlayerMap);
   FreeAndNil(Moves);
+  FreeAndNil(Units);
   inherited Destroy;
 end;
@@ -937 +954 @@
 
 function CellCompare(const Item1, Item2: TPlayerCell): Integer;
-begin
-  if Item1.MapCell.Power > Item2.MapCell.Power then Result := 1
-  else if Item1.MapCell.Power < Item2.MapCell.Power then Result := -1
+var
+  Stack1, Stack2: Integer;
+begin
+  if Assigned(Item1.MapCell.OneUnit) then Stack1 := Item1.MapCell.OneUnit.Power
+    else Stack1 := 0;
+  if Assigned(Item2.MapCell.OneUnit) then Stack2 := Item2.MapCell.OneUnit.Power
+    else Stack2 := 0;
+  if Stack1 > Stack1 then Result := 1
+  else if Stack1 < Stack2 then Result := -1
   else Result := 0;
 end;
 
 function CellCompareDescending(const Item1, Item2: TPlayerCell): Integer;
-begin
-  if Item1.MapCell.Power > Item2.MapCell.Power then Result := -1
-  else if Item1.MapCell.Power < Item2.MapCell.Power then Result := 1
+var
+  Stack1, Stack2: Integer;
+begin
+  if Assigned(Item1.MapCell.OneUnit) then Stack1 := Item1.MapCell.OneUnit.Power
+    else Stack1 := 0;
+  if Assigned(Item2.MapCell.OneUnit) then Stack2 := Item2.MapCell.OneUnit.Power
+    else Stack2 := 0;
+  if Stack1 > Stack2 then Result := -1
+  else if Stack1 < Stack2 then Result := 1
   else Result := 0;
 end;
 
-procedure TPlayer.MoveAll;
+procedure TPlayer.MoveUnit(UnitMove: TUnitMove);
 var
   AttackerPower: Integer;
   DefenderPower: Integer;
   UnitCount: Integer;
+begin
+  with UnitMove do begin
+    UnitCount := CountOnce;
+    if CountOnce > CellFrom.MapCell.OneUnit.Power then
+      UnitCount := CellFrom.MapCell.OneUnit.Power;
+    CountOnce := 0;
+    if not Assigned(CellTo.MapCell.OneUnit) then begin
+      CellTo.MapCell.OneUnit := TGame(Game).Units.AddNew(CellFrom.MapCell.OneUnit.Kind, 0);
+      CellTo.MapCell.Player := Self;
+    end;
+
+    if CellTo.MapCell.OneUnit.Player = Self then begin
+      // Inner move
+      CellTo.MapCell.OneUnit.Power := CellTo.MapCell.OneUnit.Power + UnitCount;
+    end else begin
+      AttackerPower := UnitCount;
+      if Assigned(CellTo.MapCell.OneUnit) then
+        DefenderPower := CellTo.MapCell.OneUnit.Power
+        else DefenderPower := 0;
+      Attack(AttackerPower, DefenderPower);
+      if DefenderPower = 0 then begin
+        // Attacker wins with possible loses
+        ClearMovesFromCell(CellTo);
+        CellTo.MapCell.Player := Self;
+        CellTo.MapCell.OneUnit.Player := Self;
+        CellTo.MapCell.OneUnit.Power := AttackerPower;
+      end else
+      if AttackerPower = 0 then begin
+        // Defender wins with possible loses
+        CellTo.MapCell.OneUnit.Power := DefenderPower;
+      end else
+        raise Exception.Create(SUnfinishedBattle);
+    end;
+    CellFrom.MapCell.OneUnit.Power := CellFrom.MapCell.OneUnit.Power - UnitCount;
+  end;
+end;
+
+procedure TPlayer.MoveAll;
+var
   UnitMove: TUnitMove;
 begin
   for UnitMove in Moves do
-  with UnitMove do begin
+  with UnitMove do
   if CountOnce > 0 then begin
     if CellFrom.MapCell.Player = Self then begin
-      UnitCount := CountOnce;
-      if CountOnce > CellFrom.MapCell.Power then
-        UnitCount := CellFrom.MapCell.Power;
-      CountOnce := 0;
-      if CellTo.MapCell.Player = Self then begin
-        // Inner move
-        CellTo.MapCell.Power := CellTo.MapCell.Power + UnitCount;
-      end else begin
-        AttackerPower := UnitCount;
-        DefenderPower := CellTo.MapCell.Power;
-        Attack(AttackerPower, DefenderPower);
-        if DefenderPower = 0 then begin
-          // Attacker wins with possible loses
-          ClearMovesFromCell(CellTo);
-          CellTo.MapCell.Player := Self;
-          CellTo.MapCell.Power := AttackerPower;
-        end else
-        if AttackerPower = 0 then begin
-          // Defender wins with possible loses
-          CellTo.MapCell.Power := DefenderPower;
-        end else
-          raise Exception.Create(SUnfinishedBattle);
-      end;
-      CellFrom.MapCell.Power := CellFrom.MapCell.Power - UnitCount;
-    end;
+      MoveUnit(UnitMove);
     end;
   end;
@@ -1020 +1064 @@
 var
   I: Integer;
-begin
-  for I := Cell.MovesFrom.Count - 1 downto 0 do
-    Cell.MovesFrom.Delete(I);
+  OtherPlayerCell: TPlayerCell;
+begin
+  if Assigned(Cell.MapCell.Player) then
+  with TPlayer(Cell.MapCell.Player) do begin
+    OtherPlayerCell := PlayerMap.Cells.SearchCell(Cell.MapCell);
+    if Assigned(OtherPlayerCell) then begin
+    for I := OtherPlayerCell.MovesFrom.Count - 1 downto 0 do
+      Moves.Remove(OtherPlayerCell.MovesFrom[I]);
+    end;
+  end;
 end;
 
@@ -1082 +1133 @@
 var
   Move: TUnitMove;
+  AvailPower: Integer;
 begin
   for Move in Moves do
   with Move do begin
-    if CellFrom.MapCell.Player = Self then
-      if CountRepeat <= CellFrom.GetAvialPower then
+    if CellFrom.MapCell.Player = Self then begin
+      AvailPower := CellFrom.GetAvialPower + Move.CountOnce;
+      if CountRepeat <= AvailPower then
         CountOnce := CountRepeat
-        else CountOnce := CellFrom.GetAvialPower;
+        else CountOnce := AvailPower;
+    end;
   end;
   RemoveEmptyUnitMoves;
@@ -1097 +1151 @@
   I: Integer;
 begin
-  if TGame(Game).EmptyCellsNeutral then
+  if TGame(Game).GameSystem.EmptyCellsNeutral then
   for I := 0 to PlayerMap.Cells.Count - 1 do
   with TPlayerCell(PlayerMap.Cells[I]) do begin
-    if MapCell.Power = 0 then MapCell.Player := nil;
+    if MapCell.OneUnit.Power = 0 then MapCell.Player := nil;
   end;
 end;
@@ -1108 +1162 @@
   I: Integer;
 begin
-  // Remove empty moves
   for I := Moves.Count - 1 downto 0 do
   if (TUnitMove(Moves[I]).CellFrom.MapCell.Player = Self) and
@@ -1168 +1221 @@
   with TGame(Game).Map do
   for I := 0 to Cells.Count - 1 do
-  with Cells[I] do begin
+  with TCell(Cells[I]) do begin
     if (Player = Self) and ((TGame(Game).GrowCells = gcPlayerAll) or
     ((TGame(Game).GrowCells = gcPlayerCities) and (Terrain = ttCity))) then begin
-      if Power < MaxPower then begin
+      if OneUnit.Power < MaxPower then begin
         // Increase units count
         Addition := 0;
@@ -1178 +1231 @@
         end else
         if TGame(Game).GrowAmount = gaBySquareRoot then begin
-          Addition := Trunc(Sqrt(Power));
+          Addition := Trunc(Sqrt(OneUnit.Power));
           if Addition = 0 then Addition := 1;
         end;
-        Power := Min(Power + Addition, MaxPower);
+        OneUnit.Power := Min(OneUnit.Power + Addition, MaxPower);
       end else
-      if Power > MaxPower then begin
+      if OneUnit.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);
+        Dies := 2 * Trunc(Sqrt(OneUnit.Power - MaxPower));
+        OneUnit.Power := Max(OneUnit.Power - Dies, 0);
       end;
     end;

trunk/xtactics.lpi

@@ -109 +109 @@
       </Item7>
     </RequiredPackages>
-    <Units Count="33">
+    <Units Count="36">
       <Unit0>
         <Filename Value="xtactics.lpr"/>
@@ -287 +287 @@
         <IsPartOfProject Value="True"/>
       </Unit32>
+      <Unit33>
+        <Filename Value="UUnit.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit33>
+      <Unit34>
+        <Filename Value="UGameSystem.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit34>
+      <Unit35>
+        <Filename Value="UBuilding.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit35>
     </Units>
   </ProjectOptions>