Changeset 82 for trunk

Timestamp:

Nov 5, 2014, 9:51:30 AM (10 years ago)

Author:

chronos

Message:

• Added: New game option "Fog of war" which cause map to be covered to black and only explored cells will be visible.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (5 diffs)
• Forms/UFormNew.lfm (modified) (2 diffs)
• Forms/UFormNew.lrt (modified) (1 diff)
• Forms/UFormNew.pas (modified) (3 diffs)
• Languages/xtactics.cs.po (modified) (1 diff)
• Languages/xtactics.po (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• UGame.pas (modified) (18 diffs)

trunk/Forms/UFormMain.pas

@@ -128 +128 @@
 begin
   DrawStart := Now;
-  if Assigned(Core.Game.CurrentPlayer) then
-  with Core.Game.CurrentPlayer do begin
+  if Assigned(Core.Player) then
+  with Core.Player do begin
     View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
     if csOpaque in PaintBox1.ControlStyle then begin
@@ -151 +151 @@
 procedure TFormMain.PaintBox1Resize(Sender: TObject);
 begin
-  if Assigned(Core.Game.CurrentPlayer) then
-  with Core.Game.CurrentPlayer do
+  if Assigned(Core.Player) then
+  with Core.Player do
     View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
   Redraw;
@@ -240 +240 @@
   MapRect: TRect;
 begin
-  with Core.Game, CurrentPlayer, View do begin
+  with Core, Game, Player, View do begin
     MapRect := Map.GetPixelRect;
     Factor := FloatPoint((DestRect.Right - DestRect.Left) / (MapRect.Right - MapRect.Left),
@@ -271 +271 @@
 procedure TFormMain.AZoomInExecute(Sender: TObject);
 begin
-  with Core.Game.CurrentPlayer do begin
+  with Core.Player do begin
     View.Zoom := View.Zoom * ZoomFactor;
   end;
@@ -281 +281 @@
   D: TPoint;
 begin
-  with Core.Game.CurrentPlayer do begin
+  with Core.Player do begin
     //D := Point(Trunc(MousePos.X - View.Left / ViewZoom),
     //  Trunc(MousePos.Y - View.Top / ViewZoom));

trunk/Forms/UFormNew.lfm

@@ -45 +45 @@
     Top = 5
     Width = 745
-    ActivePage = TabSheet1
+    ActivePage = TabSheet3
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
-    TabIndex = 0
+    TabIndex = 2
     TabOrder = 3
     object TabSheet1: TTabSheet
@@ -407 +407 @@
         TabOrder = 2
       end
+      object CheckBoxFogOfWar: TCheckBox
+        Left = 336
+        Height = 27
+        Top = 24
+        Width = 120
+        Caption = 'Fog of war'
+        TabOrder = 3
+      end
     end
   end

trunk/Forms/UFormNew.lrt

@@ -25 +25 @@
 TFORMNEW.LABEL6.CAPTION=Win objective:
 TFORMNEW.RADIOGROUPGROWAMOUNT.CAPTION=Per turn grow amount
+TFORMNEW.CHECKBOXFOGOFWAR.CAPTION=Fog of war
 TFORMNEW.APLAYERMODIFY.CAPTION=Modify player
 TFORMNEW.APLAYERADD.CAPTION=Add

trunk/Forms/UFormNew.pas

@@ -24 +24 @@
     ButtonPlayerModify: TButton;
     ButtonPlayerRemove: TButton;
+    CheckBoxFogOfWar: TCheckBox;
     CheckBoxCity: TCheckBox;
     CheckBoxSymetricMap: TCheckBox;
@@ -351 +352 @@
   ComboBoxMapShape.ItemIndex := Integer(Game.Map.Shape);
   EditImageFile.Text := Game.MapImageFileName;
+  CheckBoxFogOfWar.Checked := Game.FogOfWar;
 end;
 
@@ -379 +381 @@
   Game.Map.Shape := TMapShape(ComboBoxMapShape.ItemIndex);
   Game.MapImageFileName := EditImageFile.Text;
+  Game.FogOfWar := CheckBoxFogOfWar.Checked;
 end;
 

trunk/Languages/xtactics.cs.po

@@ -236 +236 @@
 msgstr "Města"
 
+#: tformnew.checkboxfogofwar.caption
+msgid "Fog of war"
+msgstr ""
+
 #: tformnew.checkboxsymetricmap.caption
 msgid "Symetric map"

trunk/Languages/xtactics.po

@@ -224 +224 @@
 msgstr ""
 
+#: tformnew.checkboxfogofwar.caption
+msgid "Fog of war"
+msgstr ""
+
 #: tformnew.checkboxsymetricmap.caption
 msgid "Symetric map"

trunk/UCore.pas

@@ -56 +56 @@
   public
     Game: TGame;
+    Player: TPlayer;
     UseSingleView: Boolean;
     DevelMode: Boolean;
@@ -238 +239 @@
     FormNew.Save(Game);
     Game.New;
+    Player := Game.Players.GetFirstHuman;
     Game.Running := True;
     FormMain.AZoomAll.Execute;
@@ -308 +310 @@
   Game.LoadConfig(XMLConfig1, 'Game');
   Game.New;
+  Player := Game.Players.GetFirstHuman;
   Game.Running := True;
   FormMain.AZoomAll.Execute;

trunk/UGame.pas

@@ -218 +218 @@
   TPlayerMap = class
     Cells: TPlayerCells;
+    Player: TPlayer;
+    procedure Update;
     constructor Create;
     destructor Destroy; override;
+    procedure CheckVisibility;
+    procedure Paint(Canvas: TCanvas; View: TView);
   end;
 
@@ -278 +282 @@
     procedure SaveToNode(Node: TDOMNode);
     constructor Create;
+    function GetFirstHuman: TPlayer;
   end;
 
@@ -354 +359 @@
     MaxNeutralUnits: Integer;
     FileName: string;
+    FogOfWar: Boolean;
     function AttackProbability(AttackCount, DefendCount, Depth: Integer): Double;
     procedure LoadConfig(Config: TXmlConfig; Path: string);
@@ -465 +471 @@
 end;
 
+function HalfColor(Color: TColor): TColor;
+begin
+  Result :=
+    ((((Color shr 0) and $ff) shr 1) shl 0) or
+    ((((Color shr 8) and $ff) shr 1) shl 8) or
+    ((((Color shr 16) and $ff) shr 1) shl 16) or
+    ((((Color shr 24) and $ff) shr 0) shl 24);
+end;
+
 { TPlayerMap }
+
+procedure TPlayerMap.Update;
+var
+  I: Integer;
+  OldCount: Integer;
+begin
+  // Update players cells count to map cells count to be 1:1
+  OldCount := Cells.Count;
+  Cells.Count := Player.Game.Map.Cells.Count;
+  for I := OldCount to Cells.Count - 1 do
+    Cells[I] := TPlayerCell.Create;
+
+  for I := 0 to Cells.Count - 1 do
+  with TPlayerCell(Cells[I]) do begin
+    Explored := False;
+    InVisibleRange := False;
+    MapCell := TCell(Player.Game.Map.Cells[I]);
+  end;
+end;
 
 constructor TPlayerMap.Create;
@@ -476 +510 @@
   Cells.Free;
   inherited Destroy;
+end;
+
+procedure TPlayerMap.CheckVisibility;
+var
+  I: Integer;
+  C: Integer;
+  NeighCount: Integer;
+begin
+  for I := 0 to Cells.Count - 1 do
+  with TPlayerCell(Cells[I]) do begin
+    NeighCount := 0;
+    for C := 0 to MapCell.Neighbors.Count - 1 do
+      if TCell(MapCell.Neighbors[C]).Player = Player then
+        Inc(NeighCount);
+
+    InVisibleRange := (NeighCount > 0) or (TCell(MapCell).Player = Player);
+    if InVisibleRange and not Explored then Explored := True;
+  end;
+end;
+
+procedure TPlayerMap.Paint(Canvas: TCanvas; View: TView);
+var
+  I: Integer;
+  C: Integer;
+  Cell: TPlayerCell;
+  PosFrom, PosTo: TPoint;
+  Angle: Double;
+  ArrowCenter: TPoint;
+  Move: TUnitMove;
+  CellText: string;
+begin
+  with Canvas, View do
+  try
+    Lock;
+    for C := 0 to Cells.Count - 1 do begin
+      Cell := TPlayerCell(Cells[C]);
+      if (Cell.MapCell.Terrain <> ttVoid) and Cell.MapCell.IsVisible(View) then begin
+        CellText := IntToStr(Cell.MapCell.GetAvialPower);
+        if Assigned(SelectedCell) and (SelectedCell = Cell.MapCell) then
+            Brush.Color := clGreen
+          else if Assigned(SelectedCell) and Player.Game.Map.IsCellsNeighbor(SelectedCell, Cell.MapCell) then
+            Brush.Color := clPurple
+          else if Player.Game.FogOfWar then begin
+            if Cell.InVisibleRange then begin
+              if not Cell.Explored then begin
+                Brush.Color := HalfColor(Cell.MapCell.GetColor);
+                CellText := '';
+              end else Brush.Color := Cell.MapCell.GetColor
+            end else begin
+              Brush.Color := clBlack;
+              CellText := '';
+            end;
+          end else Brush.Color := Cell.MapCell.GetColor;
+        Player.Game.Map.PaintCell(Canvas, Cell.MapCell.PosPx, CellText, View, Cell.MapCell);
+      end else
+      if Game.FogOfWar and (Cell.MapCell.Terrain = ttVoid) and (not Cell.Explored) then begin
+        Brush.Color := clBlack;
+        Player.Game.Map.PaintCell(Canvas, Cell.MapCell.PosPx, '', View, Cell.MapCell);
+      end;
+    end;
+
+    // Draw arrows
+    Pen.Color := clCream;
+    for I := 0 to Game.Moves.Count - 1 do begin
+      Move := TUnitMove(Game.Moves[I]);
+      PosFrom := Player.Game.Map.CellToPos(Move.CellFrom);
+      PosTo := Player.Game.Map.CellToPos(Move.CellTo);
+      if Move.CountRepeat > 0 then Pen.Width := 2
+        else Pen.Width := 1;
+      Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
+      if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
+      ArrowCenter := View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
+        Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2)));
+      Player.Game.Map.DrawArrow(Canvas, View, ArrowCenter,
+        Angle, IntToStr(Move.CountOnce));
+    end;
+  finally
+    Unlock;
+  end;
 end;
 
@@ -607 +720 @@
   inherited Create;
   NewPlayerId := 1;
+end;
+
+function TPlayers.GetFirstHuman: TPlayer;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TPlayer(Items[I]).Mode <> pmHuman) do Inc(I);
+  if I < Count then Result := TPlayer(Items[I])
+    else Result := nil;
 end;
 
@@ -1720 +1843 @@
 procedure TPlayer.Paint(Canvas: TCanvas);
 begin
-  Game.Map.Paint(Canvas, View);
+  PlayerMap.Paint(Canvas, View);
 end;
 
@@ -1729 +1852 @@
   StartCell := nil;
   PlayerMap := TPlayerMap.Create;
+  PlayerMap.Player := Self;
 end;
 
@@ -2023 +2147 @@
     SetValue(Path + '/MapImage', MapImageFileName);
     SetValue(Path + '/SymetricMap', SymetricMap);
+    SetValue(Path + '/FogOfWar', FogOfWar);
     SetValue(Path + '/VoidEnabled', VoidEnabled);
     SetValue(Path + '/VoidPercentage', VoidPercentage);
@@ -2044 +2169 @@
     MapImageFileName := GetValue(Path + '/MapImage', MapImageFileName);
     SymetricMap := GetValue(Path + '/SymetricMap', False);
+    FogOfWar := GetValue(Path + '/FogOfWar', False);
     VoidEnabled := GetValue(Path + '/VoidEnabled', True);
     VoidPercentage := GetValue(Path + '/VoidPercentage', 20);
@@ -2073 +2199 @@
     with RootNode do begin
       SymetricMap := ReadBoolean(RootNode, 'SymetricMap', False);
+      FogOfWar := ReadBoolean(RootNode, 'FogOfWar', False);
       VoidEnabled := ReadBoolean(RootNode, 'VoidEnabled', False);
       VoidPercentage := ReadInteger(RootNode, 'VoidPercentage', 0);
@@ -2120 +2247 @@
     with RootNode do begin
       WriteBoolean(RootNode, 'SymetricMap', SymetricMap);
+      WriteBoolean(RootNode, 'FogOfWar', FogOfWar);
       WriteBoolean(RootNode, 'VoidEnabled', VoidEnabled);
       WriteInteger(RootNode, 'VoidPercentage', VoidPercentage);
@@ -2194 +2322 @@
   Map.Grow(CurrentPlayer);
   UpdateRepeatMoves(CurrentPlayer);
+  CurrentPlayer.PlayerMap.CheckVisibility;
   ComputePlayerStats;
   PrevPlayer := CurrentPlayer;
@@ -2207 +2336 @@
   CheckWinObjective;
   // For computers take view from previous human
-  if CurrentPlayer.Mode = pmComputer then CurrentPlayer.View.Assign(PrevPlayer.View);
+  //if CurrentPlayer.Mode = pmComputer then CurrentPlayer.View.Assign(PrevPlayer.View);
 end;
 
@@ -2274 +2403 @@
 var
   I: Integer;
-  StartCell: TCell;
   Counter: Integer;
   AllCells: TCellArray;
@@ -2301 +2429 @@
 
   if SymetricMap then begin
-    for C := 0 to Map.Cells.Count div 2 - 1 do begin
+    for C := 0 to (Map.Cells.Count div 2) - 1 do begin
       TCell(Map.Cells[C]).Terrain :=
         TCell(Map.Cells[Map.Cells.Count - 1 - C]).Terrain;
@@ -2311 +2439 @@
   for I := 0 to Players.Count - 1 do
   with TPlayer(Players[I]) do begin
+    PlayerMap.Update;
     View.Clear;
     if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
@@ -2332 +2461 @@
     View.Zoom := 1;
     View.CenterMap;
+    PlayerMap.CheckVisibility;
   end;
   if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])