Changeset 27

Timestamp:

Mar 3, 2014, 1:24:06 AM (11 years ago)

Author:

chronos

Message:

• Modified: Computer strategy can now attack to weaker neighbour from multiple own cells.

Location:

trunk

Files:

• UFormMove.lfm (modified) (2 diffs)
• UGame.pas (modified) (6 diffs)

trunk/UFormMove.lfm

@@ -66 +66 @@
     Width = 296
     OnChange = TrackBarOnceChange
+    PageSize = 1
     Position = 0
     TickStyle = tsNone
@@ -77 +78 @@
     Width = 304
     OnChange = TrackBarRepeatChange
+    PageSize = 1
     Position = 0
     TickStyle = tsNone

trunk/UGame.pas

@@ -141 +141 @@
     FRunning: Boolean;
     procedure MoveAll(Player: TPlayer);
-    procedure SetMove(CellFrom, CellTo: TCell);
+    procedure SetMove(CellFrom, CellTo: TCell; Power: Integer);
     procedure SetRunning(AValue: Boolean);
   public
@@ -316 +316 @@
   Cells: TCellArray;
   X, Y: Integer;
-  Target: TCell;
-  MinPower: Integer;
+  TotalPower: Integer;
+  AttackPower: Integer;
+  TotalAttackPower: Integer;
   I: Integer;
 begin
@@ -323 +324 @@
   for X := 0 to Game.Map.Size.Y - 1 do
   with TCell(Game.Map.Cells[Y, X]) do begin
-    if Player = Self then begin
-      // Search not own neighbour with lowes power
+    if (Terrain <> ttVoid) and (Player <> Self) then begin
+      // Count own possible power
       Cells := Game.Map.GetCellNeighbours(Game.Map.Cells[Y, X]);
-      Target := nil;
+      TotalPower := 0;
       for I := 0 to Length(Cells) - 1 do
-      if (Cells[I].Terrain <> ttVoid) and (Cells[I].Player <> Self) then begin
-        if Target = nil then begin
-          MinPower := Cells[I].Power;
-          Target := Cells[I];
-        end else if Cells[I].Power < MinPower then begin
-          MinPower := Cells[I].Power;
-          Target := Cells[I];
+      if (Cells[I].Player = Self) then begin
+        TotalPower := TotalPower + Cells[I].GetAvialPower;
+      end;
+      // Attack if target is weaker
+      if TotalPower > Power then begin
+        TotalAttackPower := 0;
+        for I := 0 to Length(Cells) - 1 do
+        if (Cells[I].Player = Self) then begin
+          // Use only necessary power
+          AttackPower := Power - TotalAttackPower + 1;
+          if Cells[I].Power < AttackPower then
+            AttackPower := Cells[I].Power;
+          Game.SetMove(Cells[I], Game.Map.Cells[Y, X], AttackPower);
+          TotalAttackPower := TotalAttackPower + AttackPower;
         end;
       end;
-      // Attack if target is weaker
-      if Assigned(Target) and (Target.Power < Power) then
-        Game.SetMove(Game.Map.Cells[Y, X], Target);
     end;
   end;
@@ -353 +358 @@
   if Assigned(NewSelectedCell) then begin
     if Assigned(SelectedCell) and IsCellsNeighbor(NewSelectedCell, SelectedCell) then begin
-      Game.SetMove(SelectedCell, NewSelectedCell);
+      Game.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power);
       SelectedCell := nil;
     end else
@@ -433 +438 @@
 end;
 
-procedure TGame.SetMove(CellFrom, CellTo: TCell);
+procedure TGame.SetMove(CellFrom, CellTo: TCell; Power: Integer);
 var
   NewMove: TMove;
@@ -449 +454 @@
       Assigned(FOnMove) then FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, True);
   end else begin
-    CountOnce := CellFrom.Power;
+    CountOnce := Power;
     CountRepeat := 0;
     if Assigned(CurrentPlayer) and (CurrentPlayer.Mode = pmHuman) and