Changeset 289 for trunk

Timestamp:

Mar 24, 2019, 11:15:07 PM (6 years ago)

Author:

chronos

Message:

• Added: Allow to add building kinds to game system.

Location:

trunk

Files:

• Forms/UFormBuildingKind.lfm (added)
• Forms/UFormBuildingKind.pas (added)
• Forms/UFormBuildingKinds.lfm (added)
• Forms/UFormBuildingKinds.pas (added)
• Forms/UFormGameSystem.lfm (modified) (3 diffs)
• Forms/UFormGameSystem.pas (modified) (8 diffs)
• Languages/xtactics.cs.po (modified) (5 diffs)
• Languages/xtactics.po (modified) (4 diffs)
• UBuilding.pas (modified) (4 diffs)
• UGameSystem.pas (modified) (8 diffs)
• xtactics.lpi (modified) (2 diffs)

trunk/Forms/UFormGameSystem.lfm

@@ -12 +12 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.8.4.0'
+  LCLVersion = '2.0.0.4'
   object ButtonSave: TButton
     Left = 160
@@ -58 +58 @@
     Top = 16
     Width = 744
-    ActivePage = TabSheetNations
+    ActivePage = TabSheetBuildings
     Anchors = [akTop, akLeft, akRight, akBottom]
-    TabIndex = 2
+    TabIndex = 3
     TabOrder = 4
     object TabSheetGeneral: TTabSheet
@@ -97 +97 @@
       Caption = 'Nations'
     end
+    object TabSheetBuildings: TTabSheet
+      Caption = 'Buildings'
+    end
   end
   object OpenDialog1: TOpenDialog

trunk/Forms/UFormGameSystem.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, UGameSystem, UFormUnitKinds, UFormNations;
+  ComCtrls, UGameSystem, UFormUnitKinds, UFormNations, UFormBuildingKinds;
 
 type
@@ -24 +24 @@
     PageControl1: TPageControl;
     SaveDialog1: TSaveDialog;
+    TabSheetBuildings: TTabSheet;
     TabSheetNations: TTabSheet;
     TabSheetGeneral: TTabSheet;
@@ -37 +38 @@
     FormUnitKinds: TFormUnitKinds;
     FormNations: TFormNations;
+    FormBuildingKinds: TFormBuildingKinds;
     procedure SetGameSystem(AValue: TGameSystem);
   public
@@ -100 +102 @@
   FormNations.Align := alClient;
   FormNations.Visible := True;
+  FormBuildingKinds := TFormBuildingKinds.Create(nil);
+  FormBuildingKinds.ManualDock(TabSheetBuildings, nil, alClient);
+  FormBuildingKinds.Align := alClient;
+  FormBuildingKinds.Visible := True;
 end;
 
@@ -107 +113 @@
   FreeAndNil(FormNations);
   FreeAndNil(FormUnitKinds);
+  FreeAndNil(FormBuildingKinds);
 end;
 
@@ -120 +127 @@
     FormUnitKinds.UnitKinds := nil;
     FormNations.Nations := nil;
+    FormBuildingKinds.BuildingKinds := nil;
   end;
   FGameSystem := AValue;
@@ -125 +133 @@
     FormUnitKinds.UnitKinds := GameSystem.UnitKinds;
     FormNations.Nations := GameSystem.Nations;
+    FormBuildingKinds.BuildingKinds := GameSystem.BuildingKinds;
   end;
 end;
@@ -138 +147 @@
   FormUnitKinds.UpdateList;
   FormUnitKinds.UpdateInterface;
+  FormBuildingKinds.UpdateList;
+  FormBuildingKinds.UpdateInterface;
   Caption := ExtractFileName(Self.GameSystem.FileName) + ' - ' + SGameSystem;
 end;

trunk/Languages/xtactics.cs.po

@@ -113 +113 @@
 msgstr "Přepnout Skrytou mapu"
 
+#: tformbuildingkind.buttoncancel.caption
+#, fuzzy
+msgctxt "tformbuildingkind.buttoncancel.caption"
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: tformbuildingkind.buttonok.caption
+#, fuzzy
+msgctxt "tformbuildingkind.buttonok.caption"
+msgid "OK"
+msgstr "OK"
+
+#: tformbuildingkind.caption
+msgid "Building kind"
+msgstr ""
+
+#: tformbuildingkind.labelname.caption
+#, fuzzy
+msgctxt "tformbuildingkind.labelname.caption"
+msgid "Name:"
+msgstr "Jméno:"
+
+#: tformbuildingkinds.aadd.caption
+#, fuzzy
+msgctxt "tformbuildingkinds.aadd.caption"
+msgid "Add"
+msgstr "Přidat"
+
+#: tformbuildingkinds.aclone.caption
+#, fuzzy
+msgctxt "tformbuildingkinds.aclone.caption"
+msgid "Clone"
+msgstr "Klonovat"
+
+#: tformbuildingkinds.amodify.caption
+#, fuzzy
+msgctxt "tformbuildingkinds.amodify.caption"
+msgid "Modify"
+msgstr "Upravit"
+
+#: tformbuildingkinds.aremove.caption
+#, fuzzy
+msgctxt "tformbuildingkinds.aremove.caption"
+msgid "Remove"
+msgstr "Odstranit"
+
+#: tformbuildingkinds.aselectall.caption
+#, fuzzy
+msgctxt "tformbuildingkinds.aselectall.caption"
+msgid "Select all"
+msgstr "Vybrat vše"
+
+#: tformbuildingkinds.caption
+msgid "Building kinds"
+msgstr ""
+
+#: tformbuildingkinds.listview1.columns[0].caption
+#, fuzzy
+msgctxt "tformbuildingkinds.listview1.columns[0].caption"
+msgid "Name"
+msgstr "Jméno"
+
 #: tformcharts.caption
 msgctxt "tformcharts.caption"
@@ -218 +280 @@
 msgid "Units can split or merge"
 msgstr "Dělení nebo slučování jednotek"
+
+#: tformgamesystem.tabsheetbuildings.caption
+msgid "Buildings"
+msgstr ""
 
 #: tformgamesystem.tabsheetgeneral.caption
@@ -950 +1016 @@
 msgstr "Jméno"
 
+#: ubuilding.sbuilding
+msgid "Building"
+msgstr ""
+
 #: uclientgui.swrongarrowangle
 msgid "Wrong arrow angle %s"
@@ -1007 +1077 @@
 msgid "Version"
 msgstr "Verze"
+
+#: uformbuildingkinds.snewbuildingkind
+msgid "New building kind"
+msgstr ""
+
+#: uformbuildingkinds.sremoveitems
+#, fuzzy
+msgctxt "uformbuildingkinds.sremoveitems"
+msgid "Remove items"
+msgstr "Odstranit položky"
+
+#: uformbuildingkinds.sremoveitemsquery
+#, fuzzy
+msgctxt "uformbuildingkinds.sremoveitemsquery"
+msgid "Do you want to remove selected items?"
+msgstr "Opravdu chcete odstranit vybrané položky?"
 
 #: uformcharts.scitiescount
@@ -1324 +1410 @@
 msgid "Unfinished battle"
 msgstr "Neukončená bitva"
+

trunk/Languages/xtactics.po

@@ -103 +103 @@
 msgstr ""
 
+#: tformbuildingkind.buttoncancel.caption
+msgctxt "tformbuildingkind.buttoncancel.caption"
+msgid "Cancel"
+msgstr ""
+
+#: tformbuildingkind.buttonok.caption
+msgctxt "tformbuildingkind.buttonok.caption"
+msgid "OK"
+msgstr ""
+
+#: tformbuildingkind.caption
+msgid "Building kind"
+msgstr ""
+
+#: tformbuildingkind.labelname.caption
+msgctxt "tformbuildingkind.labelname.caption"
+msgid "Name:"
+msgstr ""
+
+#: tformbuildingkinds.aadd.caption
+msgctxt "tformbuildingkinds.aadd.caption"
+msgid "Add"
+msgstr ""
+
+#: tformbuildingkinds.aclone.caption
+msgctxt "tformbuildingkinds.aclone.caption"
+msgid "Clone"
+msgstr ""
+
+#: tformbuildingkinds.amodify.caption
+msgctxt "tformbuildingkinds.amodify.caption"
+msgid "Modify"
+msgstr ""
+
+#: tformbuildingkinds.aremove.caption
+msgctxt "tformbuildingkinds.aremove.caption"
+msgid "Remove"
+msgstr ""
+
+#: tformbuildingkinds.aselectall.caption
+msgctxt "tformbuildingkinds.aselectall.caption"
+msgid "Select all"
+msgstr ""
+
+#: tformbuildingkinds.caption
+msgid "Building kinds"
+msgstr ""
+
+#: tformbuildingkinds.listview1.columns[0].caption
+msgctxt "tformbuildingkinds.listview1.columns[0].caption"
+msgid "Name"
+msgstr ""
+
 #: tformcharts.caption
 msgctxt "tformcharts.caption"
@@ -209 +262 @@
 msgstr ""
 
+#: tformgamesystem.tabsheetbuildings.caption
+msgid "Buildings"
+msgstr ""
+
 #: tformgamesystem.tabsheetgeneral.caption
 msgctxt "tformgamesystem.tabsheetgeneral.caption"
@@ -936 +993 @@
 msgstr ""
 
+#: ubuilding.sbuilding
+msgid "Building"
+msgstr ""
+
 #: uclientgui.swrongarrowangle
 msgid "Wrong arrow angle %s"
@@ -992 +1053 @@
 #: uformabout.sversion
 msgid "Version"
+msgstr ""
+
+#: uformbuildingkinds.snewbuildingkind
+msgid "New building kind"
+msgstr ""
+
+#: uformbuildingkinds.sremoveitems
+msgctxt "uformbuildingkinds.sremoveitems"
+msgid "Remove items"
+msgstr ""
+
+#: uformbuildingkinds.sremoveitemsquery
+msgctxt "uformbuildingkinds.sremoveitemsquery"
+msgid "Do you want to remove selected items?"
 msgstr ""
 

trunk/UBuilding.pas

@@ -9 +9 @@
 
 type
+
+  { TBuildingKind }
+
   TBuildingKind = class
     Id: Integer;
     Name: string;
     Cost: Integer;
+    procedure Assign(Source: TBuildingKind);
+    procedure LoadFromNode(Node: TDOMNode);
+    procedure SaveToNode(Node: TDOMNode);
   end;
 
@@ -19 +25 @@
   TBuildingKinds = class(TFPGObjectList<TBuildingKind>)
     function AddNew(Name: string): TBuildingKind;
+    procedure LoadFromNode(Node: TDOMNode);
+    procedure SaveToNode(Node: TDOMNode);
+    procedure Assign(Source: TBuildingKinds);
   end;
 
@@ -25 +34 @@
   end;
 
+resourcestring
+  SBuilding = 'Building';
+
 
 implementation
+
+{ TBuildingKind }
+
+procedure TBuildingKind.Assign(Source: TBuildingKind);
+begin
+  Name := Source.Name;
+  Cost := Source.Cost;
+end;
+
+procedure TBuildingKind.LoadFromNode(Node: TDOMNode);
+begin
+  Id := ReadInteger(Node, 'Id', 0);
+  Name := ReadString(Node, 'Name', '');
+  Cost := ReadInteger(Node, 'Cost', 0);
+end;
+
+procedure TBuildingKind.SaveToNode(Node: TDOMNode);
+begin
+  WriteInteger(Node, 'Id', Id);
+  WriteString(Node, 'Name', Name);
+  WriteInteger(Node, 'Cost', Cost);
+end;
 
 { TBuildingKinds }
@@ -37 +71 @@
 end;
 
+procedure TBuildingKinds.LoadFromNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  NewItem: TBuildingKind;
+begin
+  Count := 0;
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = 'BuildingKind') do begin
+    NewItem := TBuildingKind.Create;
+    NewItem.LoadFromNode(Node2);
+    Add(NewItem);
+    Node2 := Node2.NextSibling;
+  end;
+end;
+
+procedure TBuildingKinds.SaveToNode(Node: TDOMNode);
+var
+  I: Integer;
+  NewNode2: TDOMNode;
+begin
+  for I := 0 to Count - 1 do
+  with Items[I] do begin
+    NewNode2 := Node.OwnerDocument.CreateElement('BuildingKind');
+    Node.AppendChild(NewNode2);
+    SaveToNode(NewNode2);
+  end;
+end;
+
+procedure TBuildingKinds.Assign(Source: TBuildingKinds);
+var
+  I: Integer;
+begin
+  while Count > Source.Count do Delete(Count - 1);
+  while Count < Source.Count do AddNew('');
+  for I := 0 to Count - 1 do
+    Items[I].Assign(Source.Items[I]);
+end;
+
 end.
 

trunk/UGameSystem.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, fgl, UUnit, DOM, XMLRead, XMLWrite, UXMLUtils, XMLConf,
-  FileUtil, UMapType, UNation;
+  FileUtil, UMapType, UNation, UBuilding;
 
 type
@@ -23 +23 @@
     PreferedMapType: TMapType;
     Nations: TNations;
+    BuildingKinds: TBuildingKinds;
     constructor Create;
     destructor Destroy; override;
@@ -79 +80 @@
 begin
   UnitKinds := TUnitKinds.Create;
+  BuildingKinds := TBuildingKinds.Create;
   Nations := TNations.Create;
 end;
@@ -85 +87 @@
 begin
   Nations.Free;
+  BuildingKinds.Free;
   UnitKinds.Free;
   inherited Destroy;
@@ -92 +95 @@
 begin
   UnitKinds.Clear;
+  BuildingKinds.Clear;
   Nations.Clear;
 end;
@@ -109 +113 @@
   PreferedMapType := Source.PreferedMapType;
   UnitKinds.Assign(Source.UnitKinds);
+  BuildingKinds.Assign(Source.BuildingKinds);
   Nations.Assign(Source.Nations);
 end;
@@ -124 +129 @@
   if Assigned(NewNode) then
     UnitKinds.LoadFromNode(NewNode);
+  NewNode := Node.FindNode('BuildingKinds');
+  if Assigned(NewNode) then
+    BuildingKinds.LoadFromNode(NewNode);
   NewNode := Node.FindNode('Nations');
   if Assigned(NewNode) then
@@ -141 +149 @@
   Node.AppendChild(NewNode);
   UnitKinds.SaveToNode(NewNode);
+  NewNode := Node.OwnerDocument.CreateElement('BuildingKinds');
+  Node.AppendChild(NewNode);
+  BuildingKinds.SaveToNode(NewNode);
   NewNode := Node.OwnerDocument.CreateElement('Nations');
   Node.AppendChild(NewNode);

trunk/xtactics.lpi

@@ -110 +110 @@
       </Item7>
     </RequiredPackages>
-    <Units Count="46">
+    <Units Count="48">
       <Unit0>
         <Filename Value="xtactics.lpr"/>
@@ -361 +361 @@
         <ResourceBaseClass Value="Form"/>
       </Unit45>
+      <Unit46>
+        <Filename Value="Forms/UFormBuildingKind.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormBuildingKind"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+      </Unit46>
+      <Unit47>
+        <Filename Value="Forms/UFormBuildingKinds.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormBuildingKinds"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+      </Unit47>
     </Units>
   </ProjectOptions>