Changeset 222 for trunk/UClientAI.pas

Timestamp:

Jul 13, 2018, 11:13:12 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Computer was affecting player cells by its cell moves.
• Added: Additional consistency checks.

File:

• trunk/UClientAI.pas (modified) (9 diffs)

trunk/UClientAI.pas

@@ -60 +60 @@
       CanAttack := 0;
       for NeighborCell in Neighbors do
-      if NeighborCell.Player = Game.CurrentPlayer then begin
+      if NeighborCell.Player = ControlPlayer then begin
         Inc(CanAttack);
       end;
@@ -77 +77 @@
       TotalPower := 0;
       for NeighborCell in Neighbors do
-      if NeighborCell.Player = Game.CurrentPlayer then
+      if NeighborCell.Player = ControlPlayer then
         TotalPower := TotalPower + NeighborCell.GetAvialPower;
 
@@ -84 +84 @@
         TotalAttackPower := 0;
         for NeighborCell in Neighbors do
-        if NeighborCell.Player = Game.CurrentPlayer then begin
+        if NeighborCell.Player = ControlPlayer then begin
           // Use only necessary power
           AttackPower := Power - TotalAttackPower + AttackDiff;
@@ -109 +109 @@
   NeighborCell: TCell;
 begin
-  if ControlPlayer.Defensive then Exit;
+if ControlPlayer.Defensive then Exit;
 
   AllCells := Game.Map.Cells;
@@ -188 +188 @@
   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
+    if (Player <> ControlPlayer) 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
+      if ((Neighbors[I].Player = ControlPlayer) or
       (Neighbors[I].Player = nil)) and (Neighbors[I].Terrain <> ttVoid) then begin
         Inc(CanAttack);
@@ -218 +218 @@
       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
+          if (TargetCells[C].Player = ControlPlayer) and
+          (Neighbors[I].Player = ControlPlayer) 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))
+            if ((Cells2[J].Player <> ControlPlayer) or (Cells2[J].Player = nil))
             and (Cells2[J].Terrain <> ttVoid) then begin
               Inc(CanAttack);
@@ -292 +292 @@
   for C := 0 to AllCells.Count - 1 do
   with AllCells[C] do begin
-    if (Terrain <> ttVoid) and (Player = Game.CurrentPlayer)  then begin
+    if (Terrain <> ttVoid) and (Player = ControlPlayer)  then begin
       if AttackersCount(AllCells[C]) > 0 then
         BorderCells.Add(AllCells[C]);
@@ -305 +305 @@
     EnemyPower := 0;
     for I := 0 to Neighbors.Count - 1 do
-    if (Neighbors[I].Player <> Game.CurrentPlayer) and (Neighbors[I].Player <> nil) then begin
+    if (Neighbors[I].Player <> ControlPlayer) and (Neighbors[I].Player <> nil) then begin
       Inc(EnemyPower, Neighbors[I].Power);
     end;
@@ -329 +329 @@
   Result := 0;
   for I := 0 to Cell.Neighbors.Count - 1 do
-  if (Cell.Neighbors[I].Player <> Game.CurrentPlayer) and
+  if (Cell.Neighbors[I].Player <> ControlPlayer) and
     (Cell.Neighbors[I].Player <> nil) then begin
       Inc(Result);