Changeset 66 for trunk

Timestamp:

Sep 28, 2014, 11:51:26 AM (10 years ago)

Author:

chronos

Message:

• Modified: Computer strategy divided to Attack and InnerMoves.
• Modified: Computer attack lower power cells first.

Location:

trunk

Files:

• UGame.pas (modified) (6 diffs)
• xtactics.lpi (modified) (9 diffs)

trunk/UGame.pas

@@ -59 +59 @@
 
   TCellArray = array of TCell;
+  TCells = class(TObjectList)
+
+  end;
 
   { TView }
@@ -201 +204 @@
     Game: TGame;
     Targets: TObjectList;
+    procedure Attack;
+    procedure InnerMoves;
     procedure Process;
   end;
@@ -1113 +1118 @@
 end;
 
-procedure TComputer.Process;
+function CellCompare(Item1, Item2: Pointer): Integer;
+begin
+  if TCell(Item1).Power > TCell(Item2).Power then Result := 1
+  else if TCell(Item1).Power < TCell(Item2).Power then Result := -1
+  else Result := 0;
+end;
+
+procedure TComputer.Attack;
 var
   AllCells: TObjectList;
   Cells, Cells2: TCellArray;
-  X, Y: Integer;
   TotalPower: Integer;
   AttackPower: Integer;
@@ -1124 +1135 @@
   C: Integer;
   CanAttack, CanAttack2: Integer;
+  TargetCells: TCells;
+  S: string;
 const
   AttackDiff = 2;
 begin
   AllCells := Game.Map.Cells;
+  TargetCells := TCells.Create;
+  TargetCells.OwnsObjects := False;
+
+  // Get list of all attack target cells
   for C := 0 to AllCells.Count - 1 do
   with TCell(AllCells[C]) do begin
     if (Terrain <> ttVoid) and (Player <> Game.CurrentPlayer) then begin
+      Cells := Game.Map.GetCellNeighbors(TCell(AllCells[C]));
+      CanAttack := 0;
+      for I := 0 to Length(Cells) - 1 do
+      if (Cells[I].Player = Game.CurrentPlayer) then begin
+        Inc(CanAttack);
+      end;
+      if CanAttack > 0 then TargetCells.Add(AllCells[C]);
+    end;
+  end;
+
+  // Sort ascending to attack cells with lower power first
+  TargetCells.Sort(CellCompare);
+
+  for C := 0 to TargetCells.Count - 1 do
+  with TCell(TargetCells[C]) do begin
       // Attack to not owned cell yet
       // Count own possible power
-      Cells := Game.Map.GetCellNeighbors(TCell(AllCells[C]));
+      Cells := Game.Map.GetCellNeighbors(TCell(TargetCells[C]));
       TotalPower := 0;
       for I := 0 to Length(Cells) - 1 do
@@ -1148 +1180 @@
           if Cells[I].GetAvialPower < AttackPower then
             AttackPower := Cells[I].GetAvialPower;
-          Game.SetMove(Cells[I], TCell(AllCells[C]), AttackPower);
+          Game.SetMove(Cells[I], TCell(TargetCells[C]), AttackPower);
           TotalAttackPower := TotalAttackPower + AttackPower;
         end;
       end;
-    end else
-    if (Terrain <> ttVoid) and (Player = Game.CurrentPlayer) then begin
+  end;
+
+  TargetCells.Free;
+end;
+
+procedure TComputer.InnerMoves;
+var
+  AllCells: TObjectList;
+  Cells, Cells2: TCellArray;
+  I, J: Integer;
+  C: Integer;
+  CanAttack, CanAttack2: Integer;
+begin
+  AllCells := Game.Map.Cells;
+  for C := 0 to AllCells.Count - 1 do
+  with TCell(AllCells[C]) do 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
@@ -1188 +1235 @@
 end;
 
+procedure TComputer.Process;
+begin
+  Attack;
+  InnerMoves;
+end;
+
 procedure TView.SelectCell(Pos: TPoint; Player: TPlayer);
 var

trunk/xtactics.lpi

@@ -1 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
@@ -56 +56 @@
             </Options>
           </Linking>
-          <Other>
-            <CompilerPath Value="$(CompPath)"/>
-          </Other>
         </CompilerOptions>
       </Item2>
@@ -68 +65 @@
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
@@ -115 +111 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormPlayer"/>
       </Unit3>
       <Unit4>
@@ -123 +118 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormSettings"/>
       </Unit4>
       <Unit5>
@@ -139 +133 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormMove"/>
       </Unit6>
       <Unit7>
@@ -147 +140 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormNew"/>
       </Unit7>
       <Unit8>
@@ -155 +147 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormAbout"/>
       </Unit8>
     </Units>
@@ -199 +190 @@
     <Other>
       <CustomOptions Value="-dDEBUG"/>
-      <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>