Changeset 72 for trunk/UCore.pas

Timestamp:

Sep 28, 2014, 9:21:26 PM (10 years ago)

Author:

chronos

Message:

• Fixed: Unit move win probability was bad calculated if already existed move was modified.
• Added: Easier close of unit move dialog by Escape or Enter key.

File:

• trunk/UCore.pas (modified) (2 diffs)

trunk/UCore.pas

@@ -81 +81 @@
 procedure TCore.DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
   CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
+var
+  I: Integer;
 begin
   if Update then FormMove.SpinEditOnce.MaxValue := CellFrom.GetAvialPower + CountOnce
@@ -92 +94 @@
   FormMove.TrackBarRepeat.Position := FormMove.SpinEditRepeat.Value;
   FormMove.DefendCount := CellTo.Power;
-  FormMove.AttackCount := CellTo.GetAttackPower;
+  // Attack count from other surrounding cells without current move if already exists
+  FormMove.AttackCount := 0;
+  for I := 0 to CellTo.MovesTo.Count - 1 do
+  if TUnitMove(CellTo.MovesTo[I]).CellFrom <> CellFrom then
+    FormMove.AttackCount := FormMove.AttackCount + TUnitMove(CellTo.MovesTo[I]).CountOnce;
   FormMove.ShowWinProbability := CellTo.Player <> CellFrom.Player;
+
   if FormMove.ShowModal = mrOk then begin
     CountOnce := FormMove.SpinEditOnce.Value;