Changeset 65 for trunk

Timestamp:

Sep 28, 2014, 12:07:12 AM (10 years ago)

Author:

chronos

Message:

• Modified: Computer strategy as separate class TComputer.
• Modified: Computer move more units to borders.

Location:

trunk

Files:

• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (8 diffs)

trunk/UCore.pas

@@ -133 +133 @@
 
 procedure TCore.AGameEndTurnExecute(Sender: TObject);
+var
+  I: Integer;
+  Computer: TComputer;
 begin
   Game.NextTurn;
   FormMain.Redraw;
   while Game.Running and (Game.CurrentPlayer.Mode <> pmHuman) do begin
-    if Game.CurrentPlayer.Mode = pmComputer then
-      Game.CurrentPlayer.ComputerTurn;
+    if Game.CurrentPlayer.Mode = pmComputer then begin
+      Computer := TComputer.Create;
+      Computer.Game := Game;
+      Computer.Process;
+      Computer.Free;
+      FormMain.Redraw;
+      for I := 0 to 10 do begin
+        Application.ProcessMessages;
+        Sleep(100);
+      end;
+    end;
     Game.NextTurn;
     FormMain.Redraw;

trunk/UGame.pas

@@ -188 +188 @@
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
-    procedure ComputerTurn;
     procedure Paint(PaintBox: TPaintBox);
     constructor Create;
@@ -194 +193 @@
     procedure Assign(Source: TPlayer);
     property Game: TGame read FGame write SetGame;
+  end;
+
+
+  { TComputer }
+
+  TComputer = class
+    Game: TGame;
+    Targets: TObjectList;
+    procedure Process;
   end;
 
@@ -381 +389 @@
 end;
 
+{ TComputer }
+
 { TPlayers }
 
@@ -1103 +1113 @@
 end;
 
-procedure TPlayer.ComputerTurn;
+procedure TComputer.Process;
 var
   AllCells: TObjectList;
-  Cells: TCellArray;
+  Cells, Cells2: TCellArray;
   X, Y: Integer;
   TotalPower: Integer;
   AttackPower: Integer;
   TotalAttackPower: Integer;
-  I: Integer;
+  I, J: Integer;
   C: Integer;
-  CanAttack: Integer;
+  CanAttack, CanAttack2: Integer;
+const
+  AttackDiff = 2;
 begin
   AllCells := Game.Map.Cells;
   for C := 0 to AllCells.Count - 1 do
   with TCell(AllCells[C]) do begin
-    if (Terrain <> ttVoid) and (Player <> Self) then begin
+    if (Terrain <> ttVoid) and (Player <> Game.CurrentPlayer) then begin
       // Attack to not owned cell yet
       // Count own possible power
@@ -1124 +1136 @@
       TotalPower := 0;
       for I := 0 to Length(Cells) - 1 do
-      if (Cells[I].Player = Self) then begin
+      if (Cells[I].Player = Game.CurrentPlayer) then begin
         TotalPower := TotalPower + Cells[I].GetAvialPower;
       end;
       // Attack if target is weaker
-      if TotalPower >= Power then begin
+      if TotalPower >= (Power + AttackDiff) then begin
         TotalAttackPower := 0;
         for I := 0 to Length(Cells) - 1 do
-        if (Cells[I].Player = Self) then begin
+        if (Cells[I].Player = Game.CurrentPlayer) then begin
           // Use only necessary power
-          AttackPower := Power - TotalAttackPower + 1;
+          AttackPower := Power - TotalAttackPower + AttackDiff;
           if Cells[I].GetAvialPower < AttackPower then
             AttackPower := Cells[I].GetAvialPower;
@@ -1141 +1153 @@
       end;
     end else
-    if (Terrain <> ttVoid) and (Player = Self) then begin
+    if (Terrain <> ttVoid) and (Player = Game.CurrentPlayer) then begin
       // Inner moves
       // We need to move available power to borders to be available for attacks
@@ -1148 +1160 @@
       CanAttack := 0;
       for I := 0 to Length(Cells) - 1 do
-      if (Cells[I].Player <> Self) and (Cells[I].Terrain <> ttVoid) then begin
+      if (Cells[I].Player <> Game.CurrentPlayer) and (Cells[I].Terrain <> ttVoid) then begin
         Inc(CanAttack);
       end;
@@ -1155 +1167 @@
         // For simplicty just try to balance inner area cells power
         for I := 0 to Length(Cells) - 1 do
-        if (Cells[I].Player = Self) and (Cells[I].Power < TCell(AllCells[C]).GetAvialPower) then begin
+        if (Cells[I].Player = Game.CurrentPlayer) and (Cells[I].Power < TCell(AllCells[C]).GetAvialPower) then begin
           Game.SetMove(TCell(AllCells[C]), Cells[I], (TCell(AllCells[C]).GetAvialPower - Cells[I].Power) div 2);
+        end;
+      end else begin
+        // Is enemy border cell, try to absorb all units from inner neighbours
+        for I := 0 to Length(Cells) - 1 do
+        if (Cells[I].Player = Game.CurrentPlayer) and (Cells[I].GetAvialPower > 0) then begin
+          Cells2 := Game.Map.GetCellNeighbors(TCell(Cells[I]));
+          CanAttack2 := 0;
+          for J := 0 to Length(Cells2) - 1 do
+          if (Cells2[J].Player <> Game.CurrentPlayer) and (Cells2[J].Terrain <> ttVoid) then begin
+            Inc(CanAttack2);
+          end;
+          if CanAttack2 = 0 then
+            Game.SetMove(Cells[I], TCell(AllCells[C]), Cells[I].GetAvialPower);
         end;
       end;