Changeset 208

Timestamp:

May 22, 2018, 10:10:54 AM (6 years ago)

Author:

chronos

Message:

• Added: Show number of captured win objective cells in players stats and graphs.

Location:

trunk

Files:

• Forms/UFormCharts.lfm (modified) (3 diffs)
• Forms/UFormCharts.pas (modified) (3 diffs)
• Forms/UFormPlayersStats.lfm (modified) (2 diffs)
• Forms/UFormPlayersStats.pas (modified) (2 diffs)
• Languages/xtactics.cs.po (modified) (2 diffs)
• Languages/xtactics.po (modified) (2 diffs)
• UGame.pas (modified) (8 diffs)

trunk/Forms/UFormCharts.lfm

@@ -7 +7 @@
   ClientHeight = 709
   ClientWidth = 944
+  DesignTimePPI = 120
   OnClose = FormClose
   OnShow = FormShow
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '1.8.2.0'
   object Chart1: TChart
     Left = 8
@@ -17 +18 @@
     AxisList = <    
       item
+        Marks.LabelBrush.Style = bsClear
         Minors = <>
         Title.LabelFont.Orientation = 900
+        Title.LabelBrush.Style = bsClear
       end    
       item
         Alignment = calBottom
+        Marks.LabelBrush.Style = bsClear
         Minors = <>
+        Title.LabelBrush.Style = bsClear
       end>
     Foot.Brush.Color = clBtnFace
@@ -35 +40 @@
   object ComboBox1: TComboBox
     Left = 24
-    Height = 36
+    Height = 28
     Top = 8
     Width = 392
-    ItemHeight = 0
+    ItemHeight = 20
     ItemIndex = 0
     Items.Strings = (

trunk/Forms/UFormCharts.pas

@@ -41 +41 @@
   SDiscoveredCells = 'Discovered cells';
   SCitiesCount = 'Cities count';
+  SWinObjectiveCells = 'Win objective cells';
 
 
@@ -79 +80 @@
       else if ComboBox1.ItemIndex = 1 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).Units)
       else if ComboBox1.ItemIndex = 2 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).DiscoveredCells)
-      else if ComboBox1.ItemIndex = 3 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).Cities);
+      else if ComboBox1.ItemIndex = 3 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).Cities)
+      else if ComboBox1.ItemIndex = 4 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).WinObjectiveCells);
     end;
     Chart1.AddSeries(NewSeries);
@@ -97 +99 @@
     Items.Add(SDiscoveredCells);
     Items.Add(SCitiesCount);
+    Items.Add(SWinObjectiveCells);
     ItemIndex := LastIndex;
   end;

trunk/Forms/UFormPlayersStats.lfm

@@ -3 +3 @@
   Height = 300
   Top = 637
-  Width = 697
+  Width = 746
   Caption = 'Players stats'
   ClientHeight = 300
-  ClientWidth = 697
+  ClientWidth = 746
+  DesignTimePPI = 120
   OnClose = FormClose
   OnShow = FormShow
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '1.8.2.0'
   object ListView1: TListView
     Left = 4
     Height = 292
     Top = 4
-    Width = 689
+    Width = 738
     Align = alClient
     BorderSpacing.Around = 4
@@ -40 +41 @@
       item
         Caption = 'Units'
-        Width = 169
+        Width = 100
+      end    
+      item
+        Caption = 'Win objective cells'
+        Width = 100
       end>
     OwnerData = True

trunk/Forms/UFormPlayersStats.pas

@@ -57 +57 @@
     Item.SubItems.Add(IntToStr(TotalCities));
     Item.SubItems.Add(IntToStr(TotalUnits));
+    Item.SubItems.Add(IntToStr(TotalWinObjectiveCells));
   end;
 end;
@@ -73 +74 @@
       4: Result := CompareInteger(TPlayer(Item1).TotalCities, TPlayer(Item2).TotalCities);
       5: Result := CompareInteger(TPlayer(Item1).TotalUnits, TPlayer(Item2).TotalUnits);
+      6: Result := CompareInteger(TPlayer(Item1).TotalWinObjectiveCells, TPlayer(Item2).TotalWinObjectiveCells);
     end;
     if ListViewSort1.Order = soDown then Result := -Result;

trunk/Languages/xtactics.cs.po

@@ -619 +619 @@
 msgstr "Jednotky"
 
+#: tformplayersstats.listview1.columns[6].caption
+msgctxt "tformplayersstats.listview1.columns[6].caption"
+msgid "Win objective cells"
+msgstr "Buňky cíle vítězství"
+
 #: tformserver.buttoncancel.caption
 msgctxt "tformserver.buttoncancel.caption"
@@ -794 +799 @@
 msgid "Occupied cells"
 msgstr "Obsazené buňky"
+
+#: uformcharts.swinobjectivecells
+msgctxt "uformcharts.swinobjectivecells"
+msgid "Win objective cells"
+msgstr "Buňky cíle vítězství"
 
 #: uformclient.sturn

trunk/Languages/xtactics.po

@@ -604 +604 @@
 msgstr ""
 
+#: tformplayersstats.listview1.columns[6].caption
+msgctxt "tformplayersstats.listview1.columns[6].caption"
+msgid "Win objective cells"
+msgstr ""
+
 #: tformserver.buttoncancel.caption
 msgctxt "tformserver.buttoncancel.caption"
@@ -778 +783 @@
 msgctxt "uformcharts.soccupiedcells"
 msgid "Occupied cells"
+msgstr ""
+
+#: uformcharts.swinobjectivecells
+msgctxt "uformcharts.swinobjectivecells"
+msgid "Win objective cells"
 msgstr ""
 

trunk/UGame.pas

@@ -278 +278 @@
     DiscoveredCells: Integer;
     Cities: Integer;
+    WinObjectiveCells: Integer;
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -320 +321 @@
     TotalCities: Integer;
     TotalDiscovered: Integer;
+    TotalWinObjectiveCells: Integer;
     StartUnits: Integer;
     StartCell: TCell;
@@ -541 +543 @@
   DiscoveredCells := ReadInteger(Node, 'DiscoveredCells', 0);
   Cities := ReadInteger(Node, 'Cities', 0);
+  WinObjectiveCells := ReadInteger(Node, 'WinObjectiveCells', 0);
 end;
 
@@ -549 +552 @@
   WriteInteger(Node, 'DiscoveredCells', DiscoveredCells);
   WriteInteger(Node, 'Cities', Cities);
+  WriteInteger(Node, 'WinObjectiveCells', WinObjectiveCells);
 end;
 
@@ -1556 +1560 @@
   with Cell do begin
     if Assigned(Player) then begin
-      Player.TotalCells := Player.TotalCells + 1;
-      Player.TotalUnits := Player.TotalUnits + Power;
+      Inc(Player.TotalCells);
+      Inc(Player.TotalUnits, Power);
       if Terrain = ttCity then
-        Player.TotalCities := Player.TotalCities + 1;
+        Inc(Player.TotalCities);
+      if Extra = etObjectiveTarget then
+        Inc(Player.TotalWinObjectiveCells);
     end;
   end;
@@ -2505 +2511 @@
   TotalCities := 0;
   TotalDiscovered := 0;
+  TotalWinObjectiveCells := 0;
   TurnStats.Clear;
   StartCell := nil;
@@ -3118 +3125 @@
     TotalCells := 0;
     TotalCities := 0;
-
+    TotalWinObjectiveCells := 0;
     TotalDiscovered := 0;
     for J := 0 to PlayerMap.Cells.Count - 1 do
@@ -3141 +3148 @@
     NewStat.Units := TotalUnits;
     NewStat.Cities := TotalCities;
+    NewStat.WinObjectiveCells := TotalWinObjectiveCells;
     TurnStats.Add(NewStat);
   end;