Changeset 274 for trunk/UPlayer.pas

Timestamp:

Feb 3, 2019, 8:32:20 PM (6 years ago)

Author:

chronos

Message:

• Added: Keep information about available unit moves during turn.
• Added: Allow to move units instantly during turn.
• Added: Game system parameter to play without possibility to merge/split units.

File:

• trunk/UPlayer.pas (modified) (17 diffs)

trunk/UPlayer.pas

@@ -28 +28 @@
     procedure DisconnectFrom(Cell: TPlayerCell);
     function GetAvialPower: Integer;
+    function GetAvialPowerForMove: Integer;
     function GetAttackPower: Integer;
     procedure LoadFromNode(Node: TDOMNode);
@@ -102 +103 @@
     procedure CheckCounterMove(Move: TUnitMove);
     procedure SetMode(AValue: TPlayerMode);
-    procedure RemoveEmptyUnitMoves;
   public
     Id: Integer;
@@ -120 +120 @@
     Moves: TUnitMoves;
     Units: TUnits;
+    function IsAllowedMoveTarget(CellFrom, CellTo: TPlayerCell): Boolean;
     procedure ReduceMovesPower;
     procedure RemoveInvalidMoves;
     procedure RemoveEmptyUnits;
+    procedure InitUnitMoves;
     procedure UpdateRepeatMoves;
     procedure UpdateEmptyCellsNeutral;
@@ -205 +207 @@
 
 uses
-  UGame;
+  UGame, UGameSystem;
 
 resourcestring
@@ -262 +264 @@
   UnitMove: TUnitMove;
 begin
-  if Assigned(MapCell.OneUnit) then Result := MapCell.OneUnit.Power
-    else Result := 0;
+  Result := 0;
+  if Assigned(MapCell.OneUnit) then
+    Result := MapCell.OneUnit.Power;
+  for UnitMove in MovesFrom do
+    Result := Result - UnitMove.CountOnce;
+end;
+
+function TPlayerCell.GetAvialPowerForMove: Integer;
+var
+  UnitMove: TUnitMove;
+begin
+  Result := 0;
+  if Assigned(MapCell.OneUnit) then
+    if MapCell.OneUnit.Moves > 0 then Result := MapCell.OneUnit.Power;
   for UnitMove in MovesFrom do
     Result := Result - UnitMove.CountOnce;
@@ -999 +1013 @@
       // Inner move
       CellTo.MapCell.OneUnit.Power := CellTo.MapCell.OneUnit.Power + UnitCount;
+      Dec(CellTo.MapCell.OneUnit.Moves);
     end else begin
       AttackerPower := UnitCount;
@@ -1015 +1030 @@
         // Defender wins with possible loses
         CellTo.MapCell.OneUnit.Power := DefenderPower;
+        CellTo.MapCell.OneUnit.Moves := CellFrom.MapCell.OneUnit.Moves - 1;
       end else
         raise Exception.Create(SUnfinishedBattle);
@@ -1020 +1036 @@
     CellFrom.MapCell.OneUnit.Power := CellFrom.MapCell.OneUnit.Power - UnitCount;
   end;
+
+  // Clean from cell from empty units
+  if UnitMove.CellFrom.MapCell.OneUnit.Power = 0 then begin
+    Units.Remove(UnitMove.CellFrom.MapCell.OneUnit);
+    UnitMove.CellFrom.MapCell.OneUnit := nil;
+  end;
+
+  // Remove empty move
+  if (UnitMove.CellFrom.MapCell.Player = Self) and
+    (UnitMove.CountOnce = 0) and (UnitMove.CountRepeat = 0) then
+    Moves.Remove(UnitMove);
 end;
 
 procedure TPlayer.MoveAll;
 var
-  UnitMove: TUnitMove;
-begin
-  for UnitMove in Moves do
-  with UnitMove do
+  I: Integer;
+begin
+  for I := Moves.Count - 1 downto 0 do
+  with Moves[I] do
   if CountOnce > 0 then begin
     if CellFrom.MapCell.Player = Self then begin
-      MoveUnit(UnitMove);
-    end;
-  end;
-
-  RemoveEmptyUnitMoves;
+      MoveUnit(Moves[I]);
+    end;
+  end;
 end;
 
@@ -1077 +1102 @@
 end;
 
+procedure TPlayer.InitUnitMoves;
+var
+  I: Integer;
+begin
+  for I := 0 to Units.Count - 1 do
+    TUnit(Units[I]).Moves := TUnit(Units[I]).Kind.Moves;
+end;
+
 procedure TPlayer.ClearMovesFromCell(Cell: TPlayerCell);
 var
@@ -1105 +1138 @@
 
   if Assigned(Result) then begin
+    // Update existing move
     CountOnce := Result.CountOnce;
     CountRepeat := Result.CountRepeat;
@@ -1111 +1145 @@
         FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, True, Confirm);
   end else begin
+    // Create new move
     CountOnce := Power;
     CountRepeat := 0;
@@ -1139 +1174 @@
         Result := NewMove;
         CheckCounterMove(NewMove);
+        if TGame(Game).GameSystem.UnitsMoveImmediately then begin
+          MoveUnit(NewMove);
+        end;
       end;
     end;
@@ -1160 +1198 @@
     end;
   end;
-  RemoveEmptyUnitMoves;
 end;
 
@@ -1173 +1210 @@
       MapCell.Player := nil;
   end;
-end;
-
-procedure TPlayer.RemoveEmptyUnitMoves;
-var
-  I: Integer;
-begin
-  for I := Moves.Count - 1 downto 0 do
-  if (TUnitMove(Moves[I]).CellFrom.MapCell.Player = Self) and
-    (TUnitMove(Moves[I]).CountOnce = 0) and (TUnitMove(Moves[I]).CountRepeat = 0) then
-    Moves.Delete(I);
 end;
 
@@ -1230 +1257 @@
 end;
 
+function TPlayer.IsAllowedMoveTarget(CellFrom, CellTo: TPlayerCell): Boolean;
+var
+  CellToHasOwnUnit: Boolean;
+  UnitHasMoveEnergy: Boolean;
+begin
+  CellToHasOwnUnit := Assigned(CellTo.MapCell.OneUnit) and
+    (CellTo.MapCell.OneUnit.Player = Self) and (CellTo.MapCell.OneUnit.Power > 0);
+  UnitHasMoveEnergy := Assigned(CellFrom.MapCell.OneUnit) and
+    (CellFrom.MapCell.OneUnit.Moves > 0);
+  Result := UnitHasMoveEnergy and
+  TGame(Game).Map.IsCellsNeighbor(CellFrom.MapCell, CellTo.MapCell)
+    and (TGame(Game).GameSystem.UnitsSplitMerge or
+    (not TGame(Game).GameSystem.UnitsSplitMerge and not CellToHasOwnUnit));
+end;
+
 procedure TPlayer.Grow;
 var
@@ -1235 +1277 @@
   Addition: Integer;
   Dies: Integer;
+  NewUnit: TUnit;
 begin
   with TGame(Game).Map do
@@ -1241 +1284 @@
     if (Player = Self) and ((TGame(Game).GrowCells = gcPlayerAll) or
     ((TGame(Game).GrowCells = gcPlayerCities) and (Terrain = ttCity))) then begin
+      if not Assigned(OneUnit) then begin
+        NewUnit := TGame(Game).Units.AddNew(TGame(Game).GameSystem.UnitKinds.First, 0);
+        NewUnit.Player := Self;
+        NewUnit.MapCell := TCell(Cells[I]);
+        Units.Add(NewUnit);
+      end;
       if OneUnit.Power < MaxPower then begin
         // Increase units count