Changeset 401

Timestamp:

Jan 6, 2025, 11:12:12 AM (2 days ago)

Author:

chronos

Message:

Merged revision(s) 396-400 from trunk:

• Fixed: Charts form chart was not drawn on the initial show.
• Fixed: Run Randomize only once at startup.
• Fixed: Store current state of RandSeed to game save.
• Fixed: Load/store RandSeed as its Cardinal type instead of Integer.
• Modified: Maximum number of player set to 12.
• Fixed: Standard yellow color is too bright and not readable with white text. Used darker yellow instead.
• Fixed: Integrity checks for id references loaded from game file.
• Fixed: Wrong players and units id recalculation during game save causing bad references.
• Modified: Set new created players as computer.
• Fixed: Scale charts line width.
• Fixed: Item form made bigger to avoid showing scrollbars.
• Fixed: Item form string control made shorter.

Files:

• bin/win/Install-xTactics-1.4.0.exe (modified) ( previous)
• tags/1.4.0 (modified) (1 prop)
• tags/1.4.0/Core.pas (modified) (1 diff)
• tags/1.4.0/Forms/FormCharts.pas (modified) (2 diffs)
• tags/1.4.0/Forms/FormNew.pas (modified) (2 diffs)
• tags/1.4.0/Game.pas (modified) (7 diffs)
• tags/1.4.0/Install/flatpak/net.zdechov.app.xTactics.yml (modified) (1 diff)
• tags/1.4.0/Map.pas (modified) (1 diff)
• tags/1.4.0/Packages/Common/Forms/FormItem.lfm (modified) (4 diffs)
• tags/1.4.0/Packages/Common/Forms/FormItem.pas (modified) (1 diff)
• tags/1.4.0/Packages/Common/ItemList.pas (modified) (3 diffs)
• tags/1.4.0/Player.pas (modified) (2 diffs)
• tags/1.4.0/Release notes.txt (modified) (4 diffs)
• tags/1.4.0/Units.pas (modified) (2 diffs)
• trunk/Forms/FormCharts.lfm (modified) (1 diff)
• trunk/Install/flatpak/net.zdechov.app.xTactics.yml (modified) (1 diff)
• trunk/Languages/xtactics.cs.po (modified) (1 diff)
• trunk/Release notes.txt (modified) (4 diffs)

tags/1.4.0/Core.pas

@@ -532 +532 @@
 {$ENDIF}
 begin
+  Randomize;
+
   BaseDir := ExcludeTrailingPathDelimiter(ExtractFilePath(ParamStr(0)));
   GameSystemsDir := CombinePaths(BaseDir, GameSystemsDirName);

tags/1.4.0/Forms/FormCharts.pas

@@ -55 +55 @@
 procedure TFormCharts.FormShow(Sender: TObject);
 begin
-  Redraw;
   Translate;
   if (ComboBox1.ItemIndex = -1) and (ComboBox1.Items.Count > 0) then
     ComboBox1.ItemIndex := 0;
   Chart1.BackColor := ThemeManager.ActualTheme.ColorWindow;
+  Redraw;
 end;
 
@@ -73 +73 @@
     NewSeries := TLineSeries.Create(nil);
     NewSeries.LinePen.Color := Color;
+    NewSeries.LinePen.Width := Scale96ToScreen(1);
     for X := 0 to TurnStats.Count - 1 do begin
       if ComboBox1.ItemIndex = 0 then NewSeries.AddXY(X, TurnStats[X].OccupiedCells)

tags/1.4.0/Forms/FormNew.pas

@@ -498 +498 @@
 procedure TFormNew.FormShow(Sender: TObject);
 begin
-  Randomize;
   NewRandSeed := RandSeed;
   ReloadView;
@@ -659 +658 @@
 procedure TFormNew.ButtonRandomizeClick(Sender: TObject);
 begin
-  Randomize;
   NewRandSeed := RandSeed;
   MapPreviewRedraw;

tags/1.4.0/Game.pas

@@ -11 +11 @@
   DefaultPlayerStartUnits = 5;
   MinPlayerCount = 1;
-  MaxPlayerCount = 8;
+  MaxPlayerCount = 12;
   GameFileExt = '.xtg';
 
@@ -529 +529 @@
 begin
   with Config do begin
-    SetValue(DOMString(Path + '/RandSeed'), Integer(StoredRandSeed));
+    SetValue(DOMString(Path + '/RandSeed'), DOMString(IntToStr(StoredRandSeed)));
     SetValue(DOMString(Path + '/GridType'), Integer(MapType));
     SetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName));
@@ -558 +558 @@
 var
   Value: Integer;
+  ValueInt64: Int64;
 begin
   with Config do begin
-    StoredRandSeed := GetValue(DOMString(Path + '/RandSeed'), 0);
-    MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagonVertical)));
-    Map.Size := TPoint.Create(GetValue(DOMString(Path + '/MapSizeX'), 10),
-      GetValue(DOMString(Path + '/MapSizeY'), 10));
+    if TryStrToInt64(string(GetValue(DOMString(Path + '/RandSeed'), DOMString(IntToStr(StoredRandSeed)))), ValueInt64) then
+      StoredRandSeed := ValueInt64;
+    MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(MapType)));
+    Map.Size := TPoint.Create(GetValue(DOMString(Path + '/MapSizeX'), Map.Size.X),
+      GetValue(DOMString(Path + '/MapSizeY'), Map.Size.Y));
     MapImageFileName := string(GetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName)));
-    SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), False);
-    CyclicMap := GetValue(DOMString(Path + '/CyclicMap'), False);
-    FogOfWar := GetValue(DOMString(Path + '/FogOfWar'), False);
-    VoidEnabled := GetValue(DOMString(Path + '/VoidEnabled'), True);
-    VoidPercentage := GetValue(DOMString(Path + '/VoidPercentage'), 20);
-    Value := GetValue(DOMString(Path + '/MapShape'), 0);
+    SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), SymetricMap);
+    CyclicMap := GetValue(DOMString(Path + '/CyclicMap'), CyclicMap);
+    FogOfWar := GetValue(DOMString(Path + '/FogOfWar'), FogOfWar);
+    VoidEnabled := GetValue(DOMString(Path + '/VoidEnabled'), VoidEnabled);
+    VoidPercentage := GetValue(DOMString(Path + '/VoidPercentage'), VoidPercentage);
+    Value := GetValue(DOMString(Path + '/MapShape'), Integer(Map.Shape));
     if (Value >= Integer(Low(TMapShape))) and (Value <= Integer(High(TMapShape))) then
       Map.Shape := TMapShape(Value) else Map.Shape := Low(TMapShape);
-    CityEnabled := GetValue(DOMString(Path + '/CityEnabled'), False);
-    CityPercentage := GetValue(DOMString(Path + '/CityPercentage'), 10);
-    BridgeEnabled := GetValue(DOMString(Path + '/BridgeEnabled'), True);
-    Value := GetValue(DOMString(Path + '/GrowAmount'), Integer(gaBySquareRoot));
+    CityEnabled := GetValue(DOMString(Path + '/CityEnabled'), CityEnabled);
+    CityPercentage := GetValue(DOMString(Path + '/CityPercentage'), CityPercentage);
+    BridgeEnabled := GetValue(DOMString(Path + '/BridgeEnabled'), BridgeEnabled);
+    Value := GetValue(DOMString(Path + '/GrowAmount'), Integer(GrowAmount));
     if (Value >= Integer(Low(TGrowAmount))) and (Value <= Integer(High(TGrowAmount))) then
       GrowAmount := TGrowAmount(Value) else GrowAmount := Low(TGrowAmount);
-    Value := GetValue(DOMString(Path + '/GrowCells'), Integer(gcPlayerAll));
+    Value := GetValue(DOMString(Path + '/GrowCells'), Integer(GrowCells));
     if (Value >= Integer(Low(TGrowCells))) and (Value <= Integer(High(TGrowCells))) then
       GrowCells := TGrowCells(Value) else GrowCells := Low(TGrowCells);
-    Value := GetValue(DOMString(Path + '/WinObjective'), Integer(woDefeatAllOponents));
+    Value := GetValue(DOMString(Path + '/WinObjective'), Integer(WinObjective));
     if (Value >= Integer(Low(TWinObjective))) and (Value <= Integer(High(TWinObjective))) then
       WinObjective := TWinObjective(Value) else WinObjective := Low(TWinObjective);
-    StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), 20);
-    SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), 1);
-    MaxNeutralUnits := GetValue(DOMString(Path + '/MaxNeutralUnits'), 5);
-    MaxPower := GetValue(DOMString(Path + '/MaxPower'), 99);
+    StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), StayAliveForDefinedTurns);
+    SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), SpecialCaptureCellCount);
+    MaxNeutralUnits := GetValue(DOMString(Path + '/MaxNeutralUnits'), MaxNeutralUnits);
+    MaxPower := GetValue(DOMString(Path + '/MaxPower'), MaxPower);
     Players.LoadConfig(Config, Path + '/Players');
   end;
@@ -608 +610 @@
     RootNode := Doc.DocumentElement;
     with RootNode do begin
-      StoredRandSeed := ReadInteger(RootNode, 'RandSeed', 0);
+      StoredRandSeed := ReadInt64(RootNode, 'RandSeed', 0);
       MapType := TMapType(ReadInteger(RootNode, 'MapType', Integer(mtNone)));
       SymetricMap := ReadBoolean(RootNode, 'SymetricMap', False);
@@ -672 +674 @@
     AppendChild(RootNode);
     with RootNode do begin
-      WriteInteger(RootNode, 'RandSeed', Integer(StoredRandSeed));
+      StoredRandSeed := RandSeed;
+      WriteInt64(RootNode, 'RandSeed', StoredRandSeed);
       WriteInteger(RootNode, 'MapType', Integer(MapType));
       WriteBoolean(RootNode, 'SymetricMap', SymetricMap);
@@ -691 +694 @@
       WriteBoolean(RootNode, 'Running', Running);
       WriteInteger(RootNode, 'CurrentPlayer', CurrentPlayer.Id);
+
+      Units.RecalculateItemsId;
+      Players.RecalculateItemsId;
 
       NewNode := OwnerDocument.CreateElement('GameSystem');
@@ -910 +916 @@
 
   GeneratePlayers := True;
+  StoredRandSeed := RandSeed;
   MapImageFileName := '';
-  Randomize;
-  StoredRandSeed := RandSeed;
-  InitDefaultPlayers;
-
+  MapType := mtHexagonVertical;
+  Map.Size := TPoint.Create(10, 10);
+
+  CityPercentage := 20;
   VoidEnabled := True;
   VoidPercentage := 20;
   MaxPower := DefaultMaxPower;
   MaxNeutralUnits := Min(4, MaxPower);
-
-  Map.Size := TPoint.Create(3, 3);
+  BridgeEnabled := True;
+  MaxNeutralUnits := 5;
+  MaxPower := 99;
+  SpecialCaptureCellCount := 1;
+  StayAliveForDefinedTurns := 20;
+  WinObjective := woDefeatAllOponents;
+  GrowCells := gcPlayerAll;
+  GrowAmount := gaBySquareRoot;
+
+  InitDefaultPlayers;
 end;
 

tags/1.4.0/Install/flatpak/net.zdechov.app.xTactics.yml

@@ -27 +27 @@
       - type: svn
         url: https://svn.zdechov.net/xtactics/tags/1.4.0
-        revision: r395
+        revision: r401
     buildsystem: simple
     build-commands:

tags/1.4.0/Map.pas

@@ -1058 +1058 @@
   Cell: TCell;
 begin
-  Player := TGame(Map.Game).Players.FindById(PlayerId);
-  OneUnit := TGame(Map.Game).Units.FindById(OneUnitId);
+  if PlayerId <> 0 then begin
+    Player := TGame(Map.Game).Players.FindById(PlayerId);
+    if not Assigned(Player) then
+      raise Exception.Create('Referenced player id ' + IntToStr(PlayerId) + ' not found.');
+  end else Player := nil;
+
+  if OneUnitId <> 0 then begin
+    OneUnit := TGame(Map.Game).Units.FindById(OneUnitId);
+    if not Assigned(OneUnit) then
+      raise Exception.Create('Referenced unit id ' + IntToStr(OneUnitId) + ' not found.');
+  end else OneUnit := nil;
 
   Neighbors.Count := Length(NeighborsId);

tags/1.4.0/Packages/Common/Forms/FormItem.lfm

@@ -1 +1 @@
 object FormItem: TFormItem
-  Left = 1040
-  Height = 397
-  Top = 540
-  Width = 469
+  Left = 441
+  Height = 446
+  Top = 395
+  Width = 577
   Caption = 'Item'
-  ClientHeight = 397
-  ClientWidth = 469
+  ClientHeight = 446
+  ClientWidth = 577
   DesignTimePPI = 144
   OnCreate = FormCreate
@@ -12 +12 @@
   LCLVersion = '3.6.0.0'
   object ButtonOk: TButton
-    Left = 224
+    Left = 332
     Height = 38
-    Top = 353
+    Top = 402
     Width = 113
     Anchors = [akRight, akBottom]
@@ -24 +24 @@
   end
   object ButtonCancel: TButton
-    Left = 348
+    Left = 456
     Height = 38
-    Top = 353
+    Top = 402
     Width = 113
     Anchors = [akRight, akBottom]
@@ -36 +36 @@
   object ScrollBox1: TScrollBox
     Left = 8
-    Height = 334
+    Height = 383
     Top = 8
-    Width = 453
+    Width = 561
     HorzScrollBar.Page = 1
     VertScrollBar.Page = 1

tags/1.4.0/Packages/Common/Forms/FormItem.pas

@@ -176 +176 @@
     if DataType = dtString then begin
       NewControl := TEdit.Create(nil);
-      NewControl.Width := Scale96ToScreen(300);
+      NewControl.Width := Scale96ToScreen(200);
     end else
     if DataType = dtColor then begin

tags/1.4.0/Packages/Common/ItemList.pas

@@ -133 +133 @@
     FBaseItemList: TBaseItemList;
     procedure RecalculateNewId(Reset: Boolean);
-    procedure RecalculateItemsId;
     function BaseGetItem(Index: SizeInt): TItem;
     procedure BaseSetItem(Index: SizeInt; AValue: TItem);
@@ -145 +144 @@
   public
     NewId: Integer;
+    procedure RecalculateItemsId;
     function CreateItem(Name: string = ''): T; virtual;
     function IncrementName(Name: string): string;
@@ -265 +265 @@
   NewNode2: TDOMNode;
 begin
-  RecalculateItemsId;
   for I := 0 to Count - 1 do
   with TItem(Items[I]) do begin

tags/1.4.0/Player.pas

@@ -209 +209 @@
 
 const
-  PlayerColors: array[0..11] of TColor = (clBlue, clRed, clGreen, clYellow,
+  clDarkYellow = $00C0C0;
+  PlayerColors: array[0..11] of TColor = (clBlue, clRed, clGreen, clDarkYellow,
     clFuchsia, clAqua, clOlive, clMaroon, clNavy, clPurple, clTeal, clGray);
 
@@ -557 +558 @@
   Result := inherited;
   Result.Game := Game;
+  Result.Mode := pmComputer;
+  Result.Agressivity := caMedium;
   Result.Color := GetUnusedColor;
 end;

tags/1.4.0/Release notes.txt

@@ -2 +2 @@
 ==========================
 
-* Added: Application icon with 256x256 resolution.
+* Added: Added vector logo and generated raster logo with resolution 256x256.
 * Added: Close button on more forms for better touch screen devices support.
 * Added: Game systems action in Tools menu.
@@ -25 +25 @@
 * Modified: Do not paint new game preview bellow form height.
 * Modified: Automatically save running game on application exit and reopen it on next start.
-* Modified: Automatic map zoom on new game.
 * Modified: Show icons in shortcuts window.
 * Modified: Improved dark theme support on Windows.
@@ -31 +30 @@
 * Modified: Allow to set nation in player settings.
 * Modified: Allow to have only one player in the game.
+* Modified: Set new created players as computer.
+* Modified: Maximum number of player set to 12.
+* Modified: Do not zoom all on new game start and game load from file.
+* Modified: Allow to resize new game, settings and game system forms to be smaller with scroll box area.
+* Modified: Use new higher resolution application image in about dialog.
 * Fixed: Initialization of preset World image map.
 * Fixed: Map image was not always loaded and applied.
@@ -52 +56 @@
 * Fixed: Selection of unit moves.
 * Fixed: Full screen mode under Windows and Linux.
+* Fixed: Scale charts line width.
+* Fixed: Item form made bigger to avoid showing scrollbars.
+* Fixed: Item form string control made shorter.
+* Fixed: Wrong players and units id recalculation during game save causing bad references.
+* Fixed: Integrity checks for id references loaded from game file.
+* Fixed: Run Randomize only once at startup.
+* Fixed: Store current state of RandSeed to game save.
+* Fixed: Load/store RandSeed as its Cardinal type instead of Integer.
+* Fixed: Charts form chart was not drawn on the initial show.
+* Fixed: Themed background in New game form rules win conditions.
+* Fixed: Apply theme to chart background.
+* Fixed: Add new players with different colors.
 
 Version 1.3.0 (2018-09-22)

tags/1.4.0/Units.pas

@@ -114 +114 @@
   NewNode2: TDOMNode;
 begin
-  RecalculateItemsId;
   for I := 0 to Count - 1 do
   with Items[I] do begin
@@ -188 +187 @@
 procedure TUnit.FixRefId;
 begin
-  Player := TGame(Game).Players.FindById(PlayerId);
-  Kind := TGame(Game).GameSystem.UnitKinds.FindById(KindId);
+  if PlayerId <> 0 then begin
+    Player := TGame(Game).Players.FindById(PlayerId);
+    if not Assigned(Player) then
+      raise Exception.Create('Referenced player id ' + IntToStr(PlayerId) + ' not found.');
+  end else Player := nil;
+
+  if KindId <> 0 then begin
+    Kind := TGame(Game).GameSystem.UnitKinds.FindById(KindId);
+    if not Assigned(Kind) then
+      raise Exception.Create('Referenced unit kind id ' + IntToStr(KindId) + ' not found.');
+  end else Kind := nil;
 end;
 

trunk/Forms/FormCharts.lfm

@@ -41 +41 @@
   object ComboBox1: TComboBox
     Left = 29
-    Height = 38
+    Height = 33
     Top = 10
     Width = 470
-    ItemHeight = 0
+    ItemHeight = 25
     ItemIndex = 0
     Items.Strings = (

trunk/Install/flatpak/net.zdechov.app.xTactics.yml

@@ -27 +27 @@
       - type: svn
         url: https://svn.zdechov.net/xtactics/trunk
-        revision: r395
+        revision: r401
     buildsystem: simple
     build-commands:

trunk/Languages/xtactics.cs.po

@@ -1257 +1257 @@
 msgid "View range"
 msgstr "Dohled"
+

trunk/Release notes.txt

@@ -2 +2 @@
 ==========================
 
-* Added: Application icon with 256x256 resolution.
+* Added: Added vector logo and generated raster logo with resolution 256x256.
 * Added: Close button on more forms for better touch screen devices support.
 * Added: Game systems action in Tools menu.
@@ -25 +25 @@
 * Modified: Do not paint new game preview bellow form height.
 * Modified: Automatically save running game on application exit and reopen it on next start.
-* Modified: Automatic map zoom on new game.
 * Modified: Show icons in shortcuts window.
 * Modified: Improved dark theme support on Windows.
@@ -31 +30 @@
 * Modified: Allow to set nation in player settings.
 * Modified: Allow to have only one player in the game.
+* Modified: Set new created players as computer.
+* Modified: Maximum number of player set to 12.
+* Modified: Do not zoom all on new game start and game load from file.
+* Modified: Allow to resize new game, settings and game system forms to be smaller with scroll box area.
+* Modified: Use new higher resolution application image in about dialog.
 * Fixed: Initialization of preset World image map.
 * Fixed: Map image was not always loaded and applied.
@@ -52 +56 @@
 * Fixed: Selection of unit moves.
 * Fixed: Full screen mode under Windows and Linux.
+* Fixed: Scale charts line width.
+* Fixed: Item form made bigger to avoid showing scrollbars.
+* Fixed: Item form string control made shorter.
+* Fixed: Wrong players and units id recalculation during game save causing bad references.
+* Fixed: Integrity checks for id references loaded from game file.
+* Fixed: Run Randomize only once at startup.
+* Fixed: Store current state of RandSeed to game save.
+* Fixed: Load/store RandSeed as its Cardinal type instead of Integer.
+* Fixed: Charts form chart was not drawn on the initial show.
+* Fixed: Themed background in New game form rules win conditions.
+* Fixed: Apply theme to chart background.
+* Fixed: Add new players with different colors.
 
 Version 1.3.0 (2018-09-22)