Changeset 337 for trunk

Timestamp:

Sep 8, 2024, 10:29:37 PM (3 months ago)

Author:

chronos

Message:

• Added: Game systems action in Tools menu.
• Modified: TurnStats moved to separate unit.

Location:

trunk

Files:

• ClientAI.pas (modified) (1 diff)
• Core.lfm (modified) (1 diff)
• Core.lrj (modified) (1 diff)
• Core.pas (modified) (4 diffs)
• Forms/FormMain.lfm (modified) (1 diff)
• Forms/FormMain.pas (modified) (2 diffs)
• Game.pas (modified) (1 diff)
• Languages/xtactics.cs.po (modified) (2 diffs)
• Languages/xtactics.pot (modified) (2 diffs)
• MapType.pas (modified) (1 diff)
• Player.pas (modified) (3 diffs)
• TurnStats.pas (added)
• xtactics.lpi (modified) (2 diffs)
• xtactics.lpr (modified) (1 diff)

trunk/ClientAI.pas

@@ -340 +340 @@
 end;
 
-
 end.
 

trunk/Core.lfm

@@ -126 +126 @@
       Caption = 'Tests'
       OnExecute = ATestsExecute
+    end
+    object AGameSystems: TAction
+      Category = 'Tools'
+      Caption = 'Game systems'
+      OnExecute = AGameSystemsExecute
     end
   end

trunk/Core.lrj

@@ -23 +23 @@
 {"hash":108810549,"name":"tcore.afullscreen.caption","sourcebytes":[70,117,108,108,32,115,99,114,101,101,110,32,109,111,100,101],"value":"Full screen mode"},
 {"hash":5950131,"name":"tcore.atests.caption","sourcebytes":[84,101,115,116,115],"value":"Tests"},
+{"hash":265461043,"name":"tcore.agamesystems.caption","sourcebytes":[71,97,109,101,32,115,121,115,116,101,109,115],"value":"Game systems"},
 {"hash":160200403,"name":"tcore.savedialog1.title","sourcebytes":[83,97,118,101,32,97,115],"value":"Save as"},
 {"hash":131198430,"name":"tcore.applicationinfo.description","sourcebytes":[65,32,116,117,114,110,45,98,97,115,101,100,32,115,116,114,97,116,101,103,121,32,103,97,109,101,32,105,110,115,112,105,114,101,100,32,98,121,32,99,108,97,115,115,105,99,32,82,105,115,107,32,98,111,97,114,100,32,103,97,109,101,46,32,84,104,101,32,103,97,109,101,32,105,115,32,104,105,103,104,108,121,32,99,111,110,102,105,103,117,114,97,98,108,101,32,116,111,32,97,108,108,111,119,32,116,111,32,97,100,106,117,115,116,32,98,97,116,116,108,101,32,102,105,101,108,100,32,97,110,100,32,103,97,109,101,32,114,117,108,101,115,46],"value":"A turn-based strategy game inspired by classic Risk board game. The game is highly configurable to allow to adjust battle field and game rules."}

trunk/Core.pas

@@ -16 +16 @@
   TCore = class(TDataModule)
     AAbout: TAction;
+    AGameSystems: TAction;
     ATests: TAction;
     AFullscreen: TAction;
@@ -54 +55 @@
     procedure AGameSaveAsExecute(Sender: TObject);
     procedure AGameSaveExecute(Sender: TObject);
+    procedure AGameSystemsExecute(Sender: TObject);
     procedure AHelpExecute(Sender: TObject);
     procedure ANewSpectatorClientExecute(Sender: TObject);
@@ -130 +132 @@
 uses
   FormNew, FormSettings, ClientAI, FormKeyShortcuts, Common, FormEx, FormTests,
-  FormHelp, FormUnitMoves, FormPlayersStats, ClientGUI, FormAbout, Tests;
+  FormHelp, FormUnitMoves, FormPlayersStats, ClientGUI, FormAbout, Tests,
+  FormGameSystems;
 
 const
@@ -406 +409 @@
     Game.SaveToFile(Game.FileName)
     else AGameSaveAs.Execute;
+end;
+
+procedure TCore.AGameSystemsExecute(Sender: TObject);
+var
+  FormGameSystems: TFormGameSystems;
+begin
+  FormGameSystems := TFormGameSystems.Create(nil);
+  try
+    FormGameSystems.GameSystems := GameSystems;
+    FormGameSystems.ShowModal;
+  finally
+    FreeAndNil(FormGameSystems);
+  end;
 end;
 

trunk/Forms/FormMain.lfm

@@ -178 +178 @@
         Action = Core.ASettings
       end
+      object MenuItem37: TMenuItem
+        Action = Core.AGameSystems
+      end
+      object Separator1: TMenuItem
+        Caption = '-'
+      end
       object MenuItem24: TMenuItem
         Action = Core.AShowCharts

trunk/Forms/FormMain.pas

@@ -52 +52 @@
     MenuItem35: TMenuItem;
     MenuItem36: TMenuItem;
+    MenuItem37: TMenuItem;
     MenuItemDebug: TMenuItem;
     MenuItem31: TMenuItem;
@@ -64 +65 @@
     PanelMain: TPanel;
     PopupMenuToolbar: TPopupMenu;
+    Separator1: TMenuItem;
     Timer1: TTimer;
     ToolBar1: TToolBar;

trunk/Game.pas

@@ -126 +126 @@
 implementation
 
+uses
+  TurnStats;
+
 resourcestring
   SMinimumPlayers = 'You need at least one player';

trunk/Languages/xtactics.cs.po

@@ -563 +563 @@
 msgstr "Uložit jako..."
 
+#: tcore.agamesystems.caption
+msgctxt "tcore.agamesystems.caption"
+msgid "Game systems"
+msgstr "Herní systémy"
+
 #: tcore.ahelp.caption
 msgctxt "tcore.ahelp.caption"
@@ -767 +772 @@
 
 #: tformgamesystems.caption
+msgctxt "tformgamesystems.caption"
 msgid "Game systems"
 msgstr "Herní systémy"

trunk/Languages/xtactics.pot

@@ -541 +541 @@
 msgstr ""
 
+#: tcore.agamesystems.caption
+msgctxt "tcore.agamesystems.caption"
+msgid "Game systems"
+msgstr ""
+
 #: tcore.ahelp.caption
 msgctxt "tcore.ahelp.caption"
@@ -743 +748 @@
 
 #: tformgamesystems.caption
+msgctxt "tformgamesystems.caption"
 msgid "Game systems"
 msgstr ""

trunk/MapType.pas

@@ -771 +771 @@
 end;
 
-
 end.
 

trunk/Player.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Graphics, Map, DOM, Generics.Collections, Generics.Defaults,
-  XMLConf, XML, Math, Geometry, &Unit, Nation, ItemList;
+  XMLConf, XML, Math, Geometry, &Unit, Nation, ItemList, TurnStats;
 
 type
@@ -67 +67 @@
     Update: Boolean; var Confirm: Boolean) of object;
   TMoveUpdatedEvent = procedure(UnitMove: TUnitMove) of object;
-
-  { TGameTurnStat }
-
-  TGameTurnStat = class
-    OccupiedCells: Integer;
-    Units: Integer;
-    DiscoveredCells: Integer;
-    Cities: Integer;
-    WinObjectiveCells: Integer;
-    procedure LoadFromNode(Node: TDOMNode);
-    procedure SaveToNode(Node: TDOMNode);
-  end;
-
-  { TGameTurnStats }
-
-  TGameTurnStats = class(TObjectList<TGameTurnStat>)
-    procedure LoadFromNode(Node: TDOMNode);
-    procedure SaveToNode(Node: TDOMNode);
-  end;
 
   { TPlayer }
@@ -1320 +1301 @@
 end;
 
-{ TGameTurnStat }
-
-procedure TGameTurnStat.LoadFromNode(Node: TDOMNode);
-begin
-  OccupiedCells := ReadInteger(Node, 'OccupiedCells', 0);
-  Units := ReadInteger(Node, 'Units', 0);
-  DiscoveredCells := ReadInteger(Node, 'DiscoveredCells', 0);
-  Cities := ReadInteger(Node, 'Cities', 0);
-  WinObjectiveCells := ReadInteger(Node, 'WinObjectiveCells', 0);
-end;
-
-procedure TGameTurnStat.SaveToNode(Node: TDOMNode);
-begin
-  WriteInteger(Node, 'OccupiedCells', OccupiedCells);
-  WriteInteger(Node, 'Units', Units);
-  WriteInteger(Node, 'DiscoveredCells', DiscoveredCells);
-  WriteInteger(Node, 'Cities', Cities);
-  WriteInteger(Node, 'WinObjectiveCells', WinObjectiveCells);
-end;
-
-{ TGameTurnStats }
-
-procedure TGameTurnStats.LoadFromNode(Node: TDOMNode);
-var
-  Node2: TDOMNode;
-  NewTurnStat: TGameTurnStat;
-begin
-  Count := 0;
-  Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = 'TurnStat') do begin
-    NewTurnStat := TGameTurnStat.Create;
-    NewTurnStat.LoadFromNode(Node2);
-    Add(NewTurnStat);
-    Node2 := Node2.NextSibling;
-  end;
-end;
-
-procedure TGameTurnStats.SaveToNode(Node: TDOMNode);
-var
-  I: Integer;
-  NewNode: TDOMNode;
-begin
-  for I := 0 to Count - 1 do begin;
-    NewNode := Node.OwnerDocument.CreateElement('TurnStat');
-    Node.AppendChild(NewNode);
-    Items[I].SaveToNode(NewNode);
-  end;
-end;
-
 end.
 

trunk/xtactics.lpi

@@ -110 +110 @@
       </Item6>
     </RequiredPackages>
-    <Units Count="40">
+    <Units Count="41">
       <Unit0>
         <Filename Value="xtactics.lpr"/>
@@ -320 +320 @@
         <IsPartOfProject Value="True"/>
       </Unit39>
+      <Unit40>
+        <Filename Value="TurnStats.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit40>
     </Units>
   </ProjectOptions>

trunk/xtactics.lpr

@@ -8 +8 @@
   Forms, tachartlazaruspkg, Game, Core, Common, TemplateGenerics
   { you can add units after this },
-  SysUtils, FormMain, CoolStreaming, Tests;
+  SysUtils, FormMain, CoolStreaming, Tests, TurnStats;
 
 {$R *.res}