Changeset 202 for trunk

Timestamp:

May 17, 2018, 5:41:47 PM (7 years ago)

Author:

chronos

Message:

• Modified: AI player related code moved to UClientAI unit. It is now extension of TClient class to simulate regular human client.
• Modified: More work on client-server architecture.

Location:

trunk

Files:

• Forms/UFormClient.lfm (modified) (3 diffs)
• Forms/UFormClient.pas (modified) (5 diffs)
• Languages/xtactics.cs.po (modified) (1 diff)
• Languages/xtactics.po (modified) (1 diff)
• Packages/CoolStreaming/UVarBlockSerializer.pas (modified) (1 diff)
• UClientAI.pas (added)
• UCore.pas (modified) (14 diffs)
• UGame.pas (modified) (13 diffs)
• UGameClient.pas (modified) (7 diffs)
• UGameConnection.pas (added)
• UGameProtocol.pas (modified) (10 diffs)
• UGameServer.pas (modified) (9 diffs)
• xtactics.lpi (modified) (3 diffs)
• xtactics.lpr (modified) (2 diffs)

trunk/Forms/UFormClient.lfm

@@ -13 +13 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '1.8.2.0'
   WindowState = wsMaximized
   object StatusBar1: TStatusBar
@@ -48 +48 @@
       Left = 1
       Top = 2
-      Action = Core.AGameEndTurn
+      Action = AGameEndTurn
     end
     object ToolButton6: TToolButton
@@ -128 +128 @@
       OnExecute = AStatusBarVisibleExecute
     end
+    object AGameEndTurn: TAction
+      Caption = 'End turn'
+      ImageIndex = 0
+      OnExecute = AGameEndTurnExecute
+    end
   end
   object PopupMenuToolbar: TPopupMenu

trunk/Forms/UFormClient.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM,
-  UGeometry, UGameClient;
+  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM, UCommPin,
+  UGeometry, UGameClient, UGameProtocol;
 
 const
@@ -19 +19 @@
 
   TFormClient = class(TForm)
+    AGameEndTurn: TAction;
     AStatusBarVisible: TAction;
     AToolBarVisible: TAction;
@@ -37 +38 @@
     ToolButton8: TToolButton;
     ToolButton9: TToolButton;
+    procedure AGameEndTurnExecute(Sender: TObject);
     procedure AStatusBarVisibleExecute(Sender: TObject);
     procedure AToolBarBigIconsExecute(Sender: TObject);
@@ -196 +198 @@
     Caption := NewCaption;
     Drawing := False;
+    AGameEndTurn.Enabled := Core.Game.Running;
   end;
 end;
@@ -299 +302 @@
   AStatusBarVisible.Checked := not AStatusBarVisible.Checked;
   ReloadView;
+end;
+
+procedure TFormClient.AGameEndTurnExecute(Sender: TObject);
+var
+  P: TGameProtocolClient;
+  P2: TCommPin;
+begin
+  P := Client.Protocol;
+  P2 := P.Pin;
+  Client.Protocol.TurnEnd;
 end;
 

trunk/Languages/xtactics.cs.po

@@ -151 +151 @@
 msgid "Chat:"
 msgstr "Pokec:"
+
+#: tformclient.agameendturn.caption
+#, fuzzy
+msgctxt "tformclient.agameendturn.caption"
+msgid "End turn"
+msgstr "Ukončit tah"
 
 #: tformclient.astatusbarvisible.caption

trunk/Languages/xtactics.po

@@ -140 +140 @@
 #: tformchat.label1.caption
 msgid "Chat:"
+msgstr ""
+
+#: tformclient.agameendturn.caption
+msgctxt "tformclient.agameendturn.caption"
+msgid "End turn"
 msgstr ""
 

trunk/Packages/CoolStreaming/UVarBlockSerializer.pas

@@ -191 +191 @@
   // Get bit length
   Length := SizeOf(QWord) * BitAlignment;
-  while (((Value shr Length) and 1) = 0) and (Length > 0) do
+  while ((Value and (QWord(1) shl (Length - 1))) = 0) and (Length > 0) do
     Dec(Length);
   Inc(Length);

trunk/UCore.pas

@@ -9 +9 @@
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
   URegistry, ULastOpenedList, Registry, Menus, UGeometry, UFormClient,
-  UGameServer, UGameClient, fgl, UServerList;
+  UGameServer, UGameClient, fgl, UServerList, UGameProtocol;
 
 type
@@ -65 +65 @@
     GameLoaded: Boolean;
     procedure LoadRecentExecute(Sender: TObject);
-    procedure ProcessComputerTurns;
     procedure StartNewGame;
     procedure DoPlayerChange(Sender: TObject);
@@ -91 +90 @@
     ReopenLastFile: Boolean;
     FormClients: TFPGObjectList<TFormClient>;
-    Clients: TClients;
+    LocalClients: TClients;
     ServerList: TServerList;
     procedure Spectate(Player: TPlayer);
@@ -109 +108 @@
 
 uses
-  UFormMain, UFormNew, UFormSettings, UFormAbout,
+  UFormMain, UFormNew, UFormSettings, UFormAbout, UClientAI,
   UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats;
 
@@ -240 +239 @@
 begin
   FirstHuman := Game.Players.GetFirstHuman;
-  if Assigned(FirstHuman) then FormClient.Client := Clients.SearchPlayer(FirstHuman)
-    else FormClient.Client := TClient(Clients.First);
+  if Assigned(FirstHuman) then FormClient.Client := LocalClients.SearchPlayer(FirstHuman)
+    else FormClient.Client := TClient(LocalClients.First);
 end;
 
@@ -275 +274 @@
 end;
 
-procedure TCore.ProcessComputerTurns;
-begin
-  while Game.Running and (Game.CurrentPlayer.Mode <> pmHuman) do begin
-    if Game.CurrentPlayer.Mode = pmComputer then begin
-      Game.CurrentPlayer.Computer.Process;
-      RedrawClients;
-      Delay(Trunc((100 - AnimationSpeed) / 100 * 2000));
-    end;
-    Game.NextTurn;
-    RedrawClients;
-    Application.ProcessMessages;
-    Sleep(1);
-  end;
-end;
-
 procedure TCore.AGameEndTurnExecute(Sender: TObject);
 begin
-  Game.NextTurn;
+  Game.NextPlayer;
   RedrawClients;
-  ProcessComputerTurns;
   UpdateActions;
 end;
@@ -399 +382 @@
 begin
   Server := TServer.Create;
-  Clients := TClients.Create;
+  LocalClients := TClients.Create;
   GameSettings := TGame.Create;
   Game := TGame.Create;
@@ -407 +390 @@
   Game.OnPlayerChange := DoPlayerChange;
   Server.Game := Game;
-  Clients.Game := Game;
+  LocalClients.Game := Game;
   StoredDimension := TControlDimension.Create;
   XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
@@ -424 +407 @@
   FreeAndNil(StoredDimension);
   FreeAndNil(Server);
-  FreeAndNil(Clients);
+  FreeAndNil(LocalClients);
   FreeAndNil(Game);
   FreeAndNil(GameSettings);
@@ -448 +431 @@
   Game.LoadFromFile(FileName);
   Server.InitClients;
-
-  // Create local clients for human players
+  Server.Active := True;
+
+  // Create local LocalClients for human players
   for Player in Game.Players do
   with Player do
   if Mode = pmHuman then begin
-    NewClient := Clients.New(Name);
+    NewClient := LocalClients.New(Name);
     NewClient.ControlPlayer := Player;
     NewClient.View.Clear;
     NewClient.View.Zoom := 1;
+    NewClient.LocalServer := Server;
+    NewClient.ConnectType := ctLocal;
+    NewClient.Active := True;
     if Assigned(NewClient.ControlPlayer.StartCell) then
       NewClient.View.CenterPlayerCity(NewClient.ControlPlayer)
       else NewClient.View.CenterMap;
+  end else
+  if Mode = pmComputer then begin
+    NewClient := TComputer.Create;
+    NewClient.Game := Game;
+    NewClient.Name := Name;
+    LocalClients.Add(NewClient);
+    NewClient.ControlPlayer := Player;
+    NewClient.LocalServer := Server;
+    NewClient.ConnectType := ctLocal;
+    NewClient.Active := True;
   end;
 
@@ -493 +490 @@
 begin
   Form := TFormClient.Create(nil);
-  Form.Client := Clients.New(SSpectator);
+  Form.Client := LocalClients.New(SSpectator);
   //Form.Client.Form := Form;
   //Form.Client.ControlPlayer := Player;
@@ -505 +502 @@
   NewClient: TClient;
   Player: TPlayer;
+  ServerClient: TServerClient;
 begin
   Game.New;
   Server.InitClients;
-
-  // Create local clients for human players
+  Server.Active := True;
+
+  // Create local LocalClients for human players
   for Player in Game.Players do
   with Player do
   if Mode = pmHuman then begin
-    NewClient := Clients.New(Name);
+    NewClient := LocalClients.New(Name);
     NewClient.ControlPlayer := Player;
     NewClient.View.Clear;
     NewClient.View.Zoom := 1;
+    NewClient.LocalServer := Server;
+    NewClient.ConnectType := ctLocal;
+    NewClient.Active := True;
     if Assigned(NewClient.ControlPlayer.StartCell) then
       NewClient.View.CenterPlayerCity(NewClient.ControlPlayer)
       else NewClient.View.CenterMap;
+  end else
+  if Mode = pmComputer then begin
+    NewClient := TComputer.Create;
+    NewClient.Game := Game;
+    NewClient.Name := Name;
+    LocalClients.Add(NewClient);
+    NewClient.ControlPlayer := Player;
+    NewClient.LocalServer := Server;
+    NewClient.ConnectType := ctLocal;
+    NewClient.Active := True;
   end;
 
@@ -528 +540 @@
   RedrawClients;
   UpdateOtherForms;
-  ProcessComputerTurns;
   UpdateActions;
+  ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
+  if Assigned(ServerClient) then ServerClient.TurnStart
+    else raise Exception.Create('Server client for current player not found.');
 end;
 
@@ -535 +549 @@
 var
   PlayerClient: TClient;
+  ServerClient: TServerClient;
 begin
   if Assigned(Game.CurrentPlayer) then begin
-    PlayerClient := Clients.SearchPlayer(Game.CurrentPlayer);
+    PlayerClient := LocalClients.SearchPlayer(Game.CurrentPlayer);
     if Assigned(PlayerClient) then FormClient.Client := PlayerClient;
+
+    ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
+    if Assigned(ServerClient) then ServerClient.TurnStart;
   end;
   UpdateOtherForms;

trunk/UGame.pas

@@ -290 +290 @@
   TPlayerMode = (pmHuman, pmComputer);
   TComputerAgressivity = (caLow, caMedium, caHigh);
-  TComputer = class;
   TUnitMove = class;
 
@@ -310 +309 @@
     procedure CheckCounterMove(Move: TUnitMove);
     procedure SetMode(AValue: TPlayerMode);
-    function SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
     procedure UpdateRepeatMoves;
     procedure RemoveEmptyUnitMoves;
@@ -328 +326 @@
     TurnStats: TGameTurnStats;
     Moves: TUnitMoves;
-    Computer: TComputer;
+    function SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
     procedure Reset;
     function IsAlive: Boolean;
@@ -343 +341 @@
     property Mode: TPlayerMode read FMode write SetMode;
     property OnMove: TMoveEvent read FOnMove write FOnMove;
-  end;
-
-    { TComputer }
-
-  TComputer = class
-    Game: TGame;
-    //Targets: TFPGObjectList<TPlayer>;
-    CellProcessDirection: Boolean;
-    Player: TPlayer;
-    procedure AttackNeutral;
-    procedure AttackPlayers;
-    procedure InnerMoves;
-    procedure IncreaseMoves;
-    procedure Process;
-    procedure FallBack;
-    function AttackersCount(Cell: TCell): Integer;
   end;
 
@@ -474 +456 @@
     procedure SaveToFile(FileName: string);
     procedure ComputePlayerStats;
-    procedure NextTurn;
+    procedure NextPlayer;
     procedure CheckWinObjective;
     constructor Create;
@@ -502 +484 @@
 
 procedure InitStrings;
+function CellCompare(const Item1, Item2: TCell): Integer;
+function CellCompareDescending(const Item1, Item2: TCell): Integer;
 
 resourcestring
@@ -2096 +2080 @@
   FGame := AValue;
   Moves.Game := AValue;
-  Computer.Game := AValue;
 end;
 
@@ -2187 +2170 @@
   PlayerMap.Player := Self;
   TurnStats := TGameTurnStats.Create;
-  Computer := TComputer.Create;
-  Computer.Player := Self;
 end;
 
@@ -2194 +2175 @@
 begin
   //Client := nil;
-  FreeAndNil(Computer);
   FreeAndNil(TurnStats);
   FreeAndNil(PlayerMap);
@@ -2214 +2194 @@
   Agressivity := Source.Agressivity;
   Defensive := Source.Defensive;
-  Computer.Game := Source.Computer.Game;
-  Computer.CellProcessDirection := Source.Computer.CellProcessDirection;
 end;
 
@@ -2301 +2279 @@
   else if Item1.Power < Item2.Power then Result := 1
   else Result := 0;
-end;
-
-{ TComputer }
-
-procedure TComputer.AttackNeutral;
-var
-  AllCells: TCells;
-  TotalPower: Integer;
-  AttackPower: Integer;
-  TotalAttackPower: Integer;
-  CanAttack: Integer;
-  TargetCells: TCells;
-  Cell: TCell;
-  NeighborCell: TCell;
-const
-  AttackDiff = 1;
-begin
-  AllCells := Game.Map.Cells;
-  TargetCells := TCells.Create;
-  TargetCells.FreeObjects := False;
-
-  // Get list of all attack target cells
-  for Cell in AllCells do
-  with Cell do begin
-    if (Terrain <> ttVoid) and (Player = nil) then begin
-      CanAttack := 0;
-      for NeighborCell in Neighbors do
-      if NeighborCell.Player = Game.CurrentPlayer then begin
-        Inc(CanAttack);
-      end;
-      if CanAttack > 0 then TargetCells.Add(Cell);
-    end;
-  end;
-
-  // Sort ascending to attack cells with lower power first
-  // Low power cells are better for expanding our teritorry
-  TargetCells.Sort(CellCompare);
-
-  for Cell in TargetCells do
-  with Cell do begin
-      // Attack to not owned cell yet
-      // Count own possible power
-      TotalPower := 0;
-      for NeighborCell in Neighbors do
-      if NeighborCell.Player = Game.CurrentPlayer then
-        TotalPower := TotalPower + NeighborCell.GetAvialPower;
-
-      // Attack if target is weaker
-      if TotalPower >= (Power + AttackDiff) then begin
-        TotalAttackPower := 0;
-        for NeighborCell in Neighbors do
-        if NeighborCell.Player = Game.CurrentPlayer then begin
-          // Use only necessary power
-          AttackPower := Power - TotalAttackPower + AttackDiff;
-          if NeighborCell.GetAvialPower < AttackPower then
-            AttackPower := NeighborCell.GetAvialPower;
-          Self.Player.SetMove(NeighborCell, Cell, AttackPower, False);
-          TotalAttackPower := TotalAttackPower + AttackPower;
-        end;
-      end;
-  end;
-
-  FreeAndNil(TargetCells);
-end;
-
-procedure TComputer.AttackPlayers;
-var
-  AllCells: TCells;
-  TotalPower: Integer;
-  AttackPower: Integer;
-  TotalAttackPower: Integer;
-  CanAttack: Integer;
-  TargetCells: TCells;
-  TargetCell: TCell;
-  NeighborCell: TCell;
-begin
-  if Player.Defensive then Exit;
-
-  AllCells := Game.Map.Cells;
-  TargetCells := TCells.Create;
-  TargetCells.FreeObjects := False;
-
-  // Get list of all attack target cells
-  for TargetCell in AllCells do begin
-    if (TargetCell.Terrain <> ttVoid) and (TargetCell.Player <> Player) and
-      (TargetCell.Player <> nil) then begin
-      CanAttack := 0;
-      for NeighborCell in TargetCell.Neighbors do
-      if NeighborCell.Player = Player then begin
-        Inc(CanAttack);
-      end;
-      if CanAttack > 0 then TargetCells.Add(TargetCell);
-    end;
-  end;
-
-  // Sort descending to attack cells with higher power first
-  // Higher power enemy cells can grow faster and is more dangerous
-  TargetCells.Sort(CellCompareDescending);
-
-  for TargetCell in TargetCells do begin
-      // Attack to not owned cell yet
-      // Count own possible power
-      TotalPower := 0;
-      for NeighborCell in TargetCell.Neighbors do
-      if NeighborCell.Player = Player then begin
-        TotalPower := TotalPower + NeighborCell.GetAvialPower;
-      end;
-      // Attack if target is weaker
-      if Game.AttackProbability(TotalPower, TargetCell.Power) >=
-        ComputerAggroProbability[Player.Agressivity] then begin
-        // Try to limit total attacking power to necessary minimum
-        while Game.AttackProbability(TotalPower - 1, TargetCell.Power) >=
-          ComputerAggroProbability[Player.Agressivity] do
-          Dec(TotalPower);
-
-        // Collect required attack units from our cells
-        TotalAttackPower := 0;
-        for NeighborCell in TargetCell.Neighbors do
-        if NeighborCell.Player = Player then begin
-          // Use only necessary power
-          AttackPower := TotalPower - TotalAttackPower;
-          if NeighborCell.GetAvialPower < AttackPower then
-            AttackPower := NeighborCell.GetAvialPower;
-          Self.Player.SetMove(NeighborCell, TargetCell, AttackPower, False);
-          TotalAttackPower := TotalAttackPower + AttackPower;
-          if TotalAttackPower >= TotalPower then Break;
-        end;
-      end;
-  end;
-
-  FreeAndNil(TargetCells);
-end;
-
-procedure TComputer.InnerMoves;
-var
-  AllCells: TCells;
-  I, J: Integer;
-  C: Integer;
-  CanAttack: Integer;
-  TargetCells: TCells;
-  NewTargetCells: TCells;
-  Cells2: TCells;
-  MovedPower: Integer;
-begin
-  // We need to move available power to borders to be available for attacks
-  // or defense
-  AllCells := Game.Map.Cells;
-  TargetCells := TCells.Create;
-  TargetCells.FreeObjects := False;
-  NewTargetCells := TCells.Create;
-  NewTargetCells.FreeObjects := False;
-
-  // Get list of all enemy border cells
-  for C := 0 to AllCells.Count - 1 do
-  with AllCells[C] do begin
-    if (Player <> Game.CurrentPlayer) and (Player <> nil) and (Terrain <> ttVoid) then begin
-      CanAttack := 0;
-      for I := 0 to Neighbors.Count - 1 do
-      if ((Neighbors[I].Player = Game.CurrentPlayer) or
-      (Neighbors[I].Player = nil)) and (Neighbors[I].Terrain <> ttVoid) then begin
-        Inc(CanAttack);
-      end;
-      if CanAttack > 0 then TargetCells.Add(AllCells[C]);
-    end;
-  end;
-
-  if CellProcessDirection then begin
-    // Reverse array
-    for I := 0 to (TargetCells.Count div 2) - 1 do
-      TargetCells.Exchange(I, TargetCells.Count - 1 - I);
-  end;
-
-  Game.Map.Cells.ClearMark;
-
-  while TargetCells.Count > 0 do begin
-    // Set mark for selected border cells
-    for C := 0 to TargetCells.Count - 1 do
-      TargetCells[C].Mark := True;
-
-    // Move all power from unmarked cells and mark them
-    NewTargetCells.Count := 0;
-    for C := 0 to TargetCells.Count - 1 do
-    with TargetCells[C] do begin
-      for I := 0 to Neighbors.Count - 1 do begin
-        if (Neighbors[I].Terrain <> ttVoid) and (not Neighbors[I].Mark) then begin
-          if (TargetCells[C].Player = Game.CurrentPlayer) and
-          (Neighbors[I].Player = Game.CurrentPlayer) then begin
-            // Do not take units from front line
-            Cells2 := Neighbors[I].Neighbors;
-            CanAttack := 0;
-            for J := 0 to Cells2.Count - 1 do
-            if ((Cells2[J].Player <> Game.CurrentPlayer) or (Cells2[J].Player = nil))
-            and (Cells2[J].Terrain <> ttVoid) then begin
-              Inc(CanAttack);
-            end;
-            if CanAttack = 0 then begin
-              MovedPower := Neighbors[I].GetAvialPower;
-              if (TargetCells[C].GetAvialPower + TargetCells[C].GetAttackPower + MovedPower) > Game.Map.MaxPower then
-                MovedPower := Game.Map.MaxPower - TargetCells[C].GetAvialPower - TargetCells[C].GetAttackPower;
-              Player.SetMove(Neighbors[I], TargetCells[C], MovedPower, False);
-            end;
-          end;
-          Neighbors[I].Mark := True;
-          NewTargetCells.Add(Neighbors[I]);
-        end;
-      end;
-    end;
-
-    // Use source cells NewTargetCells as new TargetCells
-    FreeAndNil(TargetCells);
-    TargetCells := NewTargetCells;
-    NewTargetCells := TCells.Create;
-    NewTargetCells.FreeObjects := False;
-  end;
-
-  FreeAndNil(TargetCells);
-  FreeAndNil(NewTargetCells);
-end;
-
-procedure TComputer.IncreaseMoves;
-var
-  Move: TUnitMove;
-  AvailPower: Integer;
-begin
-  // If available power remains then use all for existed unit moves
-  for Move in Player.Moves do
-  with Move do begin
-    if CellFrom.GetAvialPower > 0 then begin
-      AvailPower := CellFrom.GetAvialPower;
-      CountOnce := CountOnce + Min(AvailPower div CellFrom.MovesFrom.Count, AvailPower);
-    end;
-  end;
-end;
-
-procedure TComputer.Process;
-begin
-  AttackPlayers;
-  AttackNeutral;
-  InnerMoves;
-  IncreaseMoves;
-  //FallBack;
-  CellProcessDirection := not CellProcessDirection;
-end;
-
-procedure TComputer.FallBack;
-var
-  C: Integer;
-  I: Integer;
-  AllCells: TCells;
-  BorderCells: TCells;
-  EnemyPower: Integer;
-begin
-  BorderCells := TCells.Create;
-  BorderCells.FreeObjects := False;
-  AllCells := Game.Map.Cells;
-
-  // Get list of border cells
-  for C := 0 to AllCells.Count - 1 do
-  with AllCells[C] do begin
-    if (Terrain <> ttVoid) and (Player = Game.CurrentPlayer)  then begin
-      if AttackersCount(AllCells[C]) > 0 then
-        BorderCells.Add(AllCells[C]);
-    end;
-  end;
-
-  // Move all units back to inner area from weak border cells
-  for C := 0 to BorderCells.Count - 1 do
-  with BorderCells[C] do begin
-    // Calculate enemy power
-    // TODO: Do not sum different enemy power to one value
-    EnemyPower := 0;
-    for I := 0 to Neighbors.Count - 1 do
-    if (Neighbors[I].Player <> Game.CurrentPlayer) and (Neighbors[I].Player <> nil) then begin
-      Inc(EnemyPower, Neighbors[I].Power);
-    end;
-    if EnemyPower > (GetAvialPower + GetAttackPower) then begin
-      // Fallback
-      for I := MovesTo.Count - 1 downto 0 do
-        Player.Moves.Remove(MovesTo[I]);
-      for I := 0 to Neighbors.Count - 1 do
-      if (Neighbors[I].Player = Player) and (AttackersCount(Neighbors[I]) = 0) then begin
-        Player.SetMove(BorderCells[C], Neighbors[I], GetAvialPower, False);
-        Break;
-      end;
-    end;
-  end;
-
-  FreeAndNil(BorderCells);
-end;
-
-function TComputer.AttackersCount(Cell: TCell): Integer;
-var
-  I: Integer;
-begin
-  Result := 0;
-  for I := 0 to Cell.Neighbors.Count - 1 do
-  if (Cell.Neighbors[I].Player <> Game.CurrentPlayer) and
-    (Cell.Neighbors[I].Player <> nil) then begin
-      Inc(Result);
-  end;
 end;
 
@@ -3457 +3135 @@
 end;
 
-procedure TGame.NextTurn;
+procedure TGame.NextPlayer;
 var
   PrevPlayer: TPlayer;
 begin
-  //TODO CurrentPlayer.View.SelectedCell := nil;
+  // Finalize current player
   CurrentPlayer.MoveAll;
   Map.Grow(CurrentPlayer);
   CurrentPlayer.UpdateRepeatMoves;
   ComputePlayerStats;
+
+  // Select new player
   PrevPlayer := CurrentPlayer;
   // Skip dead players
@@ -3482 +3162 @@
   CurrentPlayer.PlayerMap.CheckVisibility;
   CurrentPlayer.ReduceMovesPower;
-  // For computers take view from previous human
-  //if CurrentPlayer.Mode = pmComputer then CurrentPlayer.View.Assign(PrevPlayer.View);
   if Assigned(FOnChange) then
     FOnChange(Self);

trunk/UGameClient.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UGame, Forms, fgl, UGameProtocol;
+  Classes, SysUtils, UGame, Forms, fgl, UGameProtocol, UGameServer;
 
 type
+  TClientConnectType = (ctLocal, ctNetwork);
+
   { TClient }
 
   TClient = class
   private
+    FActive: Boolean;
     FForm: TForm;
     FGame: TGame;
@@ -19 +22 @@
     FOnReceive: TCommandEvent;
     FOnMove: TMoveEvent;
+    procedure SetActive(AValue: Boolean);
     procedure SetControlPlayer(AValue: TPlayer);
     procedure SetForm(AValue: TForm);
@@ -24 +28 @@
     procedure PlayerMove(CellFrom, CellTo: TCell; var CountOnce, CountRepeat: Integer;
       Update: Boolean; var Confirm: Boolean);
-    procedure ReceiveCmd(Command: TCommand; DataOut, DataIn: TStream);
+  protected
+    procedure ReceiveCmd(Command: TCommand; DataOut, DataIn: TStream); virtual;
+    procedure DoTurnStart(Sender: TObject); virtual;
   public
     Name: string;
     View: TView;
+    LocalServer: TServer;
+    RemoteAddress: string;
+    RemotePort: Word;
+    ConnectType: TClientConnectType;
     Protocol: TGameProtocolClient;
     procedure DoChange;
@@ -38 +48 @@
     property OnReceive: TCommandEvent read FOnReceive write FOnReceive;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
+    property Active: Boolean read FActive write SetActive;
   end;
 
@@ -107 +118 @@
 end;
 
+procedure TClient.DoTurnStart(Sender: TObject);
+begin
+
+end;
+
 procedure TClient.SetControlPlayer(AValue: TPlayer);
 begin
@@ -115 +131 @@
   if Assigned(FControlPlayer) then begin
      FControlPlayer.OnMove := PlayerMove;
+  end;
+end;
+
+procedure TClient.SetActive(AValue: Boolean);
+var
+  ServerClient: TServerClient;
+begin
+  if FActive = AValue then Exit;
+  FActive := AValue;
+  if FActive then begin
+    case ConnectType of
+      ctLocal: if LocalServer.Active then begin
+        ServerClient := LocalServer.GetNewServerClient;
+        ServerClient.Player := ControlPlayer;
+        ServerClient.Protocol.Pin.Connect(Protocol.Pin);
+      end else raise Exception.Create('Local server is not active');
+      //ctNetwork: ;
+    end;
+  end else begin
+    Protocol.Pin.Disconnect;
   end;
 end;
@@ -129 +165 @@
   View := TView.Create;
   Protocol := TGameProtocolClient.Create;
+  Protocol.OnTurnStart := DoTurnStart;
 end;
 

trunk/UGameProtocol.pas

@@ -22 +22 @@
     FOnGameEnd: TNotifyEvent;
     FOnGameStart: TNotifyEvent;
+    FOnTurnStart: TNotifyEvent;
     procedure Receive(Sender: TCommPin; Stream: TListByte);
+    procedure SendCmd(Command: TCommand);
   public
     Pin: TCommPin;
+    procedure TurnEnd;
     procedure SendMessage(Text: string);
     constructor Create;
@@ -32 +35 @@
     property OnGameEnd: TNotifyEvent read FOnGameEnd
       write FOnGameEnd;
+    property OnTurnStart: TNotifyEvent read FOnTurnStart
+      write FOnTurnStart;
   end;
 
@@ -41 +46 @@
   private
     FOnSendMessage: TSendMessageEvent;
+    FOnTurnEnd: TNotifyEvent;
     procedure Receive(Sender: TCommPin; Stream: TListByte);
+    procedure SendCmd(Command: TCommand);
   public
     Pin: TCommPin;
@@ -48 +55 @@
     procedure GameStart;
     procedure GameEnd;
+    procedure TurnStart;
     property OnSendMessage: TSendMessageEvent read FOnSendMessage
       write FOnSendMessage;
+    property OnTurnEnd: TNotifyEvent read FOnTurnEnd
+      write FOnTurnEnd;
   end;
 
@@ -69 +79 @@
     if Command = Integer(cmdTextMessage) then begin
       if Assigned(FOnSendMessage) then FOnSendMessage(Data.ReadVarString);
+    end else
+    if Command = Integer(cmdTurnEnd) then begin
+      if Assigned(FOnTurnEnd) then FOnTurnEnd(Self);
     end;
   finally
@@ -75 +88 @@
 end;
 
-constructor TGameProtocolServer.Create;
-begin
-  Pin := TCommPin.Create;
-  Pin.OnReceive := Receive;
-end;
-
-destructor TGameProtocolServer.Destroy;
-begin
-  Pin.Free;
-  inherited Destroy;
-end;
-
-procedure TGameProtocolServer.GameStart;
+procedure TGameProtocolServer.SendCmd(Command: TCommand);
 var
   Data: TVarBlockSerializer;
@@ -95 +96 @@
   Data2 := TListByte.Create;
   try
-    Data.WriteVarUInt(Integer(cmdGameStart));
+    Data.WriteVarUInt(Integer(Command));
     Data.Stream.Position := 0;
     Data.ReadVarList(Data2);
@@ -105 +106 @@
 end;
 
+constructor TGameProtocolServer.Create;
+begin
+  Pin := TCommPin.Create;
+  Pin.OnReceive := Receive;
+end;
+
+destructor TGameProtocolServer.Destroy;
+begin
+  Pin.Free;
+  inherited Destroy;
+end;
+
+procedure TGameProtocolServer.GameStart;
+begin
+  SendCmd(cmdGameStart);
+end;
+
 procedure TGameProtocolServer.GameEnd;
-var
-  Data: TVarBlockSerializer;
-  Data2: TListByte;
-begin
-  Data := TVarBlockSerializer.Create;
-  Data2 := TListByte.Create;
-  try
-    Data.WriteVarUInt(Integer(cmdGameEnd));
-    Data.Stream.Position := 0;
-    Data.ReadVarList(Data2);
-    Pin.Send(Data2);
-  finally
-    Data2.Free;
-    Data.Free;
-  end;
+begin
+  SendCmd(cmdGameEnd);
+end;
+
+procedure TGameProtocolServer.TurnStart;
+begin
+  SendCmd(cmdTurnStart);
 end;
 
@@ -131 +141 @@
 begin
   Data := TVarBlockSerializer.Create;
-  Data.ReadVarList(Stream);
+  Data.WriteVarList(Stream);
   Data.Stream.Position := 0;
   Command := Data.ReadVarSInt;
@@ -140 +150 @@
     if Command = Integer(cmdGameEnd) then begin
       if Assigned(FOnGameEnd) then FOnGameEnd(Self);
+    end else
+    if Command = Integer(cmdTurnStart) then begin
+      if Assigned(FOnTurnStart) then FOnTurnStart(Self);
     end;
   finally
     Data.Free;
   end;
+end;
+
+procedure TGameProtocolClient.SendCmd(Command: TCommand);
+var
+  Data: TVarBlockSerializer;
+  Data2: TListByte;
+begin
+  Data := TVarBlockSerializer.Create;
+  Data2 := TListByte.Create;
+  try
+    Data.WriteVarUInt(Integer(Command));
+    Data.Stream.Position := 0;
+    Data.ReadVarList(Data2);
+    Pin.Send(Data2);
+  finally
+    Data2.Free;
+    Data.Free;
+  end;
+end;
+
+procedure TGameProtocolClient.TurnEnd;
+begin
+  SendCmd(cmdTurnEnd);
 end;
 

trunk/UGameServer.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UGame, DOM, XMLConf, fgl,
-  UGameProtocol;
+  Classes, SysUtils, UGame, DOM, XMLConf, fgl, UGameProtocol;
 
 type
@@ -18 +17 @@
     FOnReceiveCmd: TCommandEvent;
     procedure ReceiveCmd(Command: TCommand; DataOut, DataIn: TStream);
+    procedure DoTurnEnd(Sender: TObject);
   public
     Game: TGame;
     Protocol: TGameProtocolServer;
+    Player: TPlayer;
     procedure DoChange;
     procedure SendCmd(Command: TCommand; DataOut, DataIn: TStream);
+    procedure TurnStart;
     property OnReceiveCmd: TCommandEvent read FOnReceiveCmd write
       FOnReceiveCmd;
@@ -29 +31 @@
   end;
 
+  { TServerClients }
+
   TServerClients = class(TFPGObjectList<TServerClient>)
     Game: TGame;
+    function SearchByPlayer(Player: TPlayer): TServerClient;
   end;
 
@@ -51 +56 @@
     RemoteNetworkAddress: string;
     RemoteNetworkPort: Word;
+    function GetNewServerClient: TServerClient;
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
@@ -67 +73 @@
 implementation
 
+{ TServerClients }
+
+function TServerClients.SearchByPlayer(Player: TPlayer): TServerClient;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (Items[I].Player <> Player) do Inc(I);
+  if I < Count then Result := Items[I]
+    else Result := nil;
+end;
+
 { TServerClient }
 
@@ -79 +97 @@
 end;
 
+procedure TServerClient.TurnStart;
+begin
+  Protocol.TurnStart;
+end;
+
 constructor TServerClient.Create;
 begin
   Protocol := TGameProtocolServer.Create;
+  Protocol.OnTurnEnd := DoTurnEnd;
 end;
 
@@ -94 +118 @@
   if Assigned(FOnReceiveCmd) then
     FOnReceiveCmd(Command, DataOut, DataIn);
+end;
+
+procedure TServerClient.DoTurnEnd(Sender: TObject);
+begin
+  if Game.Running then Game.NextPlayer;
 end;
 
@@ -153 +182 @@
 end;
 
-procedure TServer.DoChange;
+procedure TServer.DoChange(Sender: TObject);
 var
   Client: TServerClient;
@@ -169 +198 @@
     //TODO View.Clear;
   end;
+end;
+
+function TServer.GetNewServerClient: TServerClient;
+begin
+  Result := TServerClient.Create;
+  Clients.Add(Result);
 end;
 

trunk/xtactics.lpi

@@ -104 +104 @@
       </Item7>
     </RequiredPackages>
-    <Units Count="25">
+    <Units Count="27">
       <Unit0>
         <Filename Value="xtactics.lpr"/>
@@ -247 +247 @@
         <ResourceBaseClass Value="Form"/>
       </Unit24>
+      <Unit25>
+        <Filename Value="UClientAI.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit25>
+      <Unit26>
+        <Filename Value="UGameConnection.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit26>
     </Units>
   </ProjectOptions>
@@ -280 +288 @@
       <Debugging>
         <UseHeaptrc Value="True"/>
-        <UseExternalDbgSyms Value="True"/>
       </Debugging>
       <Options>

trunk/xtactics.lpr

@@ -11 +11 @@
   CoolTranslator, TemplateGenerics
   { you can add units after this },
-  SysUtils, UFormMain, CoolStreaming, UFormServer;
+  SysUtils, UFormMain, CoolStreaming, UFormServer, UClientAI, UGameConnection;
 
 {$R *.res}
@@ -32 +32 @@
   Application.CreateForm(TCore, Core);
   Application.CreateForm(TFormMain, FormMain);
-  Application.CreateForm(TFormServer, FormServer);
   Application.Run;
 end.