Changeset 69 for trunk

Timestamp:

Sep 28, 2014, 5:42:51 PM (10 years ago)

Author:

chronos

Message:

 

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (5 diffs)
• Forms/UFormMain.pas (modified) (1 diff)
• UGame.pas (modified) (6 diffs)

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 600
+  ClientHeight = 595
   ClientWidth = 775
   Menu = MainMenu1
@@ -13 +13 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.0.10.0'
+  LCLVersion = '1.3'
   WindowState = wsMaximized
   object PaintBox1: TPaintBox
     Left = 40
-    Height = 579
+    Height = 569
     Top = 0
     Width = 735
@@ -32 +32 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 21
-    Top = 579
+    Height = 26
+    Top = 569
     Width = 775
     Panels = <    
@@ -49 +49 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 579
+    Height = 569
     Top = 0
     Width = 40
@@ -87 +87 @@
     object ToolButton6: TToolButton
       Left = 1
-      Top = 194
+      Top = 172
       Action = AZoomIn
     end
     object ToolButton7: TToolButton
       Left = 1
-      Top = 226
+      Top = 204
       Action = AZoomOut
     end
     object ToolButton8: TToolButton
       Left = 1
-      Top = 258
+      Top = 236
       Action = AZoomAll
     end

trunk/Forms/UFormMain.pas

@@ -343 +343 @@
 procedure TFormMain.PaintBox1MouseUp(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);
-begin
-  if (Abs(StartMousePoint.X - X) < 5) and (Abs(StartMousePoint.Y - Y) < 5) then begin
+const
+  MouseMinDiff = 10;
+begin
+  if (Abs(StartMousePoint.X - X) < MouseMinDiff) and (Abs(StartMousePoint.Y - Y) < MouseMinDiff) then begin
     if Core.Game.Running and (Core.Game.CurrentPlayer.Mode = pmHuman) then begin
       Core.Game.CurrentPlayer.View.SelectCell(Point(X, Y), Core.Game.CurrentPlayer);

trunk/UGame.pas

@@ -1148 +1148 @@
   S: string;
 const
-  AttackDiff = 2;
+  AttackDiff = 1;
 begin
   AllCells := Game.Map.Cells;
@@ -1283 +1283 @@
   NewTargetCells.OwnsObjects := False;
 
-  // Get list of all our cells which can attack
+  // Get list of all enemy border cells
   for C := 0 to AllCells.Count - 1 do
   with TCell(AllCells[C]) do begin
-    if (Player = Game.CurrentPlayer) then begin
+    if (Player <> Game.CurrentPlayer) and (Player <> nil) and (Terrain <> ttVoid) 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) and (Cells[I].Terrain <> ttVoid) then begin
+      if ((Cells[I].Player = Game.CurrentPlayer) or (Cells[I].Player = nil)) and (Cells[I].Terrain <> ttVoid) then begin
         Inc(CanAttack);
       end;
@@ -1310 +1310 @@
     for C := 0 to TargetCells.Count - 1 do
     with TCell(TargetCells[C]) do begin
-      //
       Cells := Game.Map.GetCellNeighbors(TCell(TargetCells[C]));
-      for I := 0 to Length(Cells) - 1 do
-      if (Cells[I].Player = Game.CurrentPlayer) and (Cells[I].Terrain <> ttVoid)
-      and (not Cells[I].Mark) then begin
-        Game.SetMove(Cells[I], TCell(TargetCells[C]), Cells[I].GetAvialPower);
-        TCell(TargetCells[C]).Mark := True;
-        NewTargetCells.Add(Cells[I]);
+      for I := 0 to Length(Cells) - 1 do begin
+        if (Cells[I].Terrain <> ttVoid) and (not Cells[I].Mark) then begin
+          if (TCell(TargetCells[C]).Player = Game.CurrentPlayer) and
+          (Cells[I].Player = Game.CurrentPlayer) then begin
+            // Do not take units from front line
+            Cells2 := Game.Map.GetCellNeighbors(TCell(Cells[I]));
+            CanAttack := 0;
+            for J := 0 to Length(Cells2) - 1 do
+            if ((Cells2[J].Player <> Game.CurrentPlayer) or (Cells2[J].Player = nil))
+            and (Cells2[J].Terrain <> ttVoid) then begin
+              Inc(CanAttack);
+            end;
+            if CanAttack = 0 then
+              Game.SetMove(Cells[I], TCell(TargetCells[C]), Cells[I].GetAvialPower);
+          end;
+          TCell(TargetCells[C]).Mark := True;
+          NewTargetCells.Add(Cells[I]);
+        end;
       end;
     end;
@@ -1695 +1706 @@
     VoidEnabled := GetValue(Path + '/VoidEnabled', True);
     VoidPercentage := GetValue(Path + '/VoidPercentage', 20);
-    Map.Size := Point(GetValue(Path + '/MapSizeX', 15),
-      GetValue(Path + '/MapSizeY', 15));
-    CityEnabled := GetValue(Path + '/CityEnabled', True);
+    Map.Size := Point(GetValue(Path + '/MapSizeX', 10),
+      GetValue(Path + '/MapSizeY', 10));
+    CityEnabled := GetValue(Path + '/CityEnabled', False);
     CityPercentage := GetValue(Path + '/CityPercentage', 10);
     GrowAmount := TGrowAmount(GetValue(Path + '/GrowAmount', Integer(gaBySquareRoot)));
@@ -1839 +1850 @@
   MoveAll(CurrentPlayer);
   Map.Grow(CurrentPlayer);
+  UpdateRepeatMoves(CurrentPlayer);
   ComputePlayerStats;
   PrevPlayer := CurrentPlayer;
@@ -1847 +1859 @@
   if Players.IndexOf(CurrentPlayer) < Players.IndexOf(PrevPlayer) then Inc(TurnCounter);
   CheckWinObjective;
-  UpdateRepeatMoves(CurrentPlayer);
   // For computers take view from previous human
   if CurrentPlayer.Mode = pmComputer then CurrentPlayer.View.Assign(PrevPlayer.View);