Changeset 265 for trunk/UClientGUI.pas

Timestamp:

Jan 15, 2019, 1:03:40 AM (6 years ago)

Author:

chronos

Message:

• Modified: Cell power is now internally represented as unit power (TUnit class).
• Modified: Allow to have only one player in the game.
• Added: New win objective None to just play freely without any win objective.
• Added: New win objective to capture entire map.
• Added: TGameSystem class to represent various game play systems of other existing games.
• Fixed: Clear correctly defender player from unit moves if his cell is captured.
• Fixed: Do not allow to remove too many players to have at least minimum players.

File:

• trunk/UClientGUI.pas (modified) (6 diffs)

trunk/UClientGUI.pas

@@ -190 +190 @@
 
     // Show cell text
-    if (Cell.Power <> 0) or (Cell.Extra = etObjectiveTarget) then begin
+    if (Cell.OneUnit.Power <> 0) or (Cell.Extra = etObjectiveTarget) then begin
       Pen.Style := psSolid;
       Font.Color := clWhite;
@@ -319 +319 @@
           if Cell.MapCell.Player = ControlPlayer then
             CellText := IntToStr(Cell.GetAvialPower)
-            else CellText := IntToStr(Cell.MapCell.Power);
+            else begin
+              if Assigned(Cell.MapCell.OneUnit) then
+                CellText := IntToStr(Cell.MapCell.OneUnit.Power)
+                else CellText := '';
+            end;
           if Assigned(SelectedCell) and (SelectedCell = Cell) then
               Brush.Color := clGreen
@@ -349 +353 @@
         if (MapCell.Terrain <> ttVoid) and View.IsCellVisible(MapCell) then begin
           Brush.Color := MapCell.GetColor;
-          PaintMapCell(Canvas, MapCell.PosPx, IntToStr(MapCell.Power), View, MapCell);
+          if Assigned(Cell.MapCell.OneUnit) then
+            CellText := IntToStr(MapCell.OneUnit.Power)
+            else CellText := '';
+          PaintMapCell(Canvas, MapCell.PosPx, CellText, View, MapCell);
         end;
       end;
@@ -514 +521 @@
           Player.Moves.Remove(SelectedCell.MovesFrom[I]);
         end;
-        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.Power, False);
+        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power, False);
         SelectedCell := nil;
       end else
@@ -522 +529 @@
         for I := SelectedCell.MovesFrom.Count - 1 downto 0 do
           Player.Moves.Remove(SelectedCell.MovesFrom[I]);
-        UnitMove := TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.Power, False);
+        UnitMove := TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power, False);
         if Assigned(UnitMove) then
           UnitMove.CountRepeat := TGame(Player.Game).Map.MaxPower;
@@ -528 +535 @@
           else SelectedCell := nil;
       end else begin
-        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.Power);
+        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power);
         SelectedCell := nil;
       end;