Changeset 291 for trunk/UUnit.pas

Timestamp:

Mar 26, 2019, 1:16:27 PM (6 years ago)

Author:

chronos

Message:

• Modified: UnitKind list and items converted to general item list.

File:

• trunk/UUnit.pas (modified) (6 diffs)

trunk/UUnit.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, fgl, UGeometry, DOM, UXMLUtils;
+  Classes, SysUtils, fgl, UGeometry, DOM, UXMLUtils, UItemList;
 
 type
@@ -12 +12 @@
   { TUnitKind }
 
-  TUnitKind = class
-    Id: Integer;
-    Name: string;
+  TUnitKind = class(TItem)
     PowerAttack: Integer;
     PowerDefense: Integer;
@@ -21 +19 @@
     Power: Integer;
     ViewRange: Integer;
-    procedure Assign(Source: TUnitKind);
-    procedure LoadFromNode(Node: TDOMNode);
-    procedure SaveToNode(Node: TDOMNode);
+    class function GetFields: TItemFields; override;
+    procedure GetValue(Index: Integer; out Value); override;
+    procedure SetValue(Index: Integer; var Value); override;
+    class function GetClassSysName: string; override;
+    class function GetClassName: string; override;
   end;
 
   { TUnitKinds }
 
-  TUnitKinds = class(TFPGObjectList<TUnitKind>)
-    NewId: Integer;
-    function FindById(Id: Integer): TUnitKind;
-    function GetNewId: Integer;
-    function AddNew(Name: string): TUnitKind;
-    procedure LoadFromNode(Node: TDOMNode);
-    procedure SaveToNode(Node: TDOMNode);
+  TUnitKinds = class(TItemList)
     constructor Create(FreeObjects: Boolean = True);
-    procedure Assign(Source: TUnitKinds);
+    class function GetItemClass: TItemClass; override;
   end;
 
@@ -89 +83 @@
   UPlayer, UMap, UGame;
 
+resourcestring
+  SStack = 'Stack';
+  SCost = 'Cost';
+  SMoves = 'Moves';
+  SPowerAttack =  'Attack power';
+  SPowerDefense = 'Defense power';
+  SViewRange = 'View range';
+  SUnitKind = 'Unit kind';
+
+
 { TUnitKind }
 
-procedure TUnitKind.Assign(Source: TUnitKind);
-begin
-  Id := Source.Id;
-  Name := Source.Name;
-  PowerAttack := Source.PowerAttack;
-  PowerDefense := Source.PowerDefense;
-  Moves := Source.Moves;
-  Cost := Source.Cost;
-  Power := Source.Power;
-  ViewRange := Source.ViewRange;
-end;
-
-procedure TUnitKind.LoadFromNode(Node: TDOMNode);
-begin
-  Id := ReadInteger(Node, 'Id', 0);
-  Name := ReadString(Node, 'Name', '');
-  Power := ReadInteger(Node, 'Stack', 0);
-  Cost := ReadInteger(Node, 'Cost', 0);
-  Moves := ReadInteger(Node, 'Moves', 0);
-  PowerAttack := ReadInteger(Node, 'PowerAttack', 0);
-  PowerDefense := ReadInteger(Node, 'PowerDefense', 0);
-  ViewRange := ReadInteger(Node, 'ViewRange', 0);
-end;
-
-procedure TUnitKind.SaveToNode(Node: TDOMNode);
-begin
-  WriteInteger(Node, 'Id', Id);
-  WriteString(Node, 'Name', Name);
-  WriteInteger(Node, 'Stack', Power);
-  WriteInteger(Node, 'Cost', Cost);
-  WriteInteger(Node, 'Moves', Moves);
-  WriteInteger(Node, 'PowerAttack', PowerAttack);
-  WriteInteger(Node, 'PowerDefense', PowerDefense);
-  WriteInteger(Node, 'ViewRange', ViewRange);
+class function TUnitKind.GetFields: TItemFields;
+begin
+  Result := inherited;
+  Result.AddField(2, 'Stack', SStack, dtInteger);
+  Result.AddField(3, 'Cost', SCost, dtInteger);
+  Result.AddField(4, 'Moves', SMoves, dtInteger);
+  Result.AddField(5, 'PowerAttack', SPowerAttack, dtInteger);
+  Result.AddField(6, 'PowerDefense', SPowerDefense, dtInteger);
+  Result.AddField(7, 'ViewRange', SViewRange, dtInteger);
+end;
+
+procedure TUnitKind.GetValue(Index: Integer; out Value);
+begin
+  if Index = 1 then string(Value) := Name
+  else if Index = 2 then Integer(Value) := Power
+  else if Index = 3 then Integer(Value) := Cost
+  else if Index = 4 then Integer(Value) := Moves
+  else if Index = 5 then Integer(Value) := PowerAttack
+  else if Index = 6 then Integer(Value) := PowerDefense
+  else if Index = 7 then Integer(Value) := ViewRange
+  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+end;
+
+procedure TUnitKind.SetValue(Index: Integer; var Value);
+begin
+  if Index = 1 then Name := string(Value)
+  else if Index = 2 then Power := Integer(Value)
+  else if Index = 3 then Cost := Integer(Value)
+  else if Index = 4 then Moves := Integer(Value)
+  else if Index = 5 then PowerAttack := Integer(Value)
+  else if Index = 6 then PowerDefense := Integer(Value)
+  else if Index = 7 then ViewRange := Integer(Value)
+  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+end;
+
+class function TUnitKind.GetClassSysName: string;
+begin
+  Result := 'UnitKind';
+end;
+
+class function TUnitKind.GetClassName: string;
+begin
+  Result := SUnitKind;
 end;
 
@@ -243 +256 @@
 begin
   Player := TGame(Game).Players.FindById(PlayerId);
-  Kind := TGame(Game).GameSystem.UnitKinds.FindById(KindId);
+  Kind := TUnitKind(TGame(Game).GameSystem.UnitKinds.FindById(KindId));
 end;
 
@@ -296 +309 @@
 { TUnitKinds }
 
-function TUnitKinds.FindById(Id: Integer): TUnitKind;
-var
-  I: Integer;
-begin
-  I := 0;
-  while (I < Count) and (Items[I].Id <> Id) do Inc(I);
-  if I < Count then Result := Items[I]
-    else Result := nil;
-end;
-
-function TUnitKinds.GetNewId: Integer;
-begin
-  Result := NewId;
-  Inc(NewId);
-end;
-
-function TUnitKinds.AddNew(Name: string): TUnitKind;
-begin
-  Result := TUnitKind.Create;
-  Result.Name := Name;
-  Result.Id := GetNewId;
-  Add(Result);
-end;
-
-procedure TUnitKinds.LoadFromNode(Node: TDOMNode);
-var
-  Node2: TDOMNode;
-  NewItem: TUnitKind;
-begin
-  Count := 0;
-  Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = 'UnitKind') do begin
-    NewItem := TUnitKind.Create;
-    NewItem.LoadFromNode(Node2);
-    Add(NewItem);
-    Node2 := Node2.NextSibling;
-  end;
-end;
-
-procedure TUnitKinds.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('UnitKind');
-    Node.AppendChild(NewNode2);
-    SaveToNode(NewNode2);
-  end;
-end;
-
 constructor TUnitKinds.Create(FreeObjects: Boolean);
 begin
   inherited;
-  NewId := 1;
-end;
-
-procedure TUnitKinds.Assign(Source: TUnitKinds);
-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;
+
+class function TUnitKinds.GetItemClass: TItemClass;
+begin
+  Result := TUnitKind;
 end;