Changeset 298 for trunk/UPlayer.pas

Timestamp:

Jul 10, 2019, 5:35:15 PM (5 years ago)

Author:

chronos

Message:

• Added: New item list type reference. Used in players for reference to selected nation.
• Modified: New game players selection migrated to dynamic item/list forms.

File:

• trunk/UPlayer.pas (modified) (16 diffs)

trunk/UPlayer.pas

@@ -122 +122 @@
     procedure GetValue(Index: Integer; out Value); override;
     procedure SetValue(Index: Integer; var Value); override;
+    function GetReferenceList(Index: Integer): TItemList; override;
     class function GetClassSysName: string; override;
+    class function GetClassName: string; override;
     function IsAllowedMoveTarget(CellFrom, CellTo: TPlayerCell): Boolean;
     procedure ReduceMovesPower;
@@ -139 +141 @@
     procedure LoadFromNode(Node: TDOMNode); override;
     procedure SaveToNode(Node: TDOMNode); override;
-    constructor Create;
+    constructor Create; override;
     destructor Destroy; override;
     procedure Assign(Source: TItem); override;
@@ -153 +155 @@
   { TPlayers }
 
-  TPlayers = class(TFPGObjectList<TPlayer>)
+  TPlayers = class(TItemList)
   public
     Game: TObject; //TGame;
-    NewId: Integer;
-    function FindById(Id: Integer): TPlayer;
+    class function GetItemClass: TItemClass; override;
     procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
-    function GetNewId: Integer;
-    procedure LoadFromNode(Node: TDOMNode);
-    procedure SaveToNode(Node: TDOMNode);
-    constructor Create(FreeObjects: Boolean = True);
+    function CreateItem(Name: string = ''): TItem; override;
     function GetFirstHuman: TPlayer;
-    procedure Assign(Source: TPlayers);
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
@@ -216 +213 @@
   SDefenderPowerPositive = 'Defender power have to be higher then or equal to 0.';
   SUnfinishedBattle = 'Unfinished battle';
+  SLow = 'Low';
+  SMedium = 'Medium';
+  SHigh = 'High';
+  SHuman = 'Human';
+  SComputer = 'Computer';
+  SNation = 'Nation';
+  SMode = 'Mode';
+  SColor = 'Color';
+  SAgressivity = 'Agressivity';
+  SStartUnits = 'Start units';
+  SDefensive = 'Defensive';
 
 function ComparePointer(const Item1, Item2: Integer): Integer;
@@ -497 +505 @@
 function TPlayers.GetAliveCount: Integer;
 var
-  Player: TPlayer;
+  I: Integer;
 begin
   Result := 0;
-  for Player in Self do
-    if Player.IsAlive then Inc(Result);
+  for I := 0 to Count - 1 do
+    if TPlayer(Items[I]).IsAlive then Inc(Result);
 end;
 
 procedure TPlayers.GetAlivePlayers(Players: TPlayers);
 var
-  Player: TPlayer;
+  I: Integer;
 begin
   Players.Clear;
-  for Player in Self do
-    if Player.IsAlive then Players.Add(Player);
-end;
-
-function TPlayers.FindById(Id: Integer): TPlayer;
+  for I := 0 to Count - 1 do
+    if TPlayer(Items[I]).IsAlive then Players.Add(TPlayer(Items[I]));
+end;
+
+class function TPlayers.GetItemClass: TItemClass;
+begin
+  Result := TPlayer;
+end;
+
+procedure TPlayers.New(Name: string; Color: TColor; Mode: TPlayerMode);
+begin
+  AddItem(Name);
+  TPlayer(Last).Color := Color;
+  TPlayer(Last).Mode := Mode;
+  if Mode = pmComputer then
+    TPlayer(Last).Agressivity := caMedium;
+end;
+
+function TPlayers.CreateItem(Name: string): TItem;
+begin
+  Result := inherited;
+  TPlayer(Result).Game := Game;
+end;
+
+function TPlayers.GetFirstHuman: TPlayer;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (Items[I].Id <> Id) do Inc(I);
-  if I < Count then Result := Items[I]
+  while (I < Count) and (TPlayer(Items[I]).Mode <> pmHuman) do Inc(I);
+  if I < Count then Result := TPlayer(Items[I])
     else Result := nil;
-end;
-
-procedure TPlayers.New(Name: string; Color: TColor; Mode: TPlayerMode);
-var
-  NewPlayer: TPlayer;
-begin
-  NewPlayer := TPlayer.Create;
-  NewPlayer.Game := Game;
-  NewPlayer.Name := Name;
-  NewPlayer.Color := Color;
-  NewPlayer.Mode := Mode;
-  NewPlayer.Id := GetNewId;
-  if Mode = pmComputer then
-    NewPlayer.Agressivity := caMedium;
-  Add(NewPlayer);
-end;
-
-function TPlayers.GetNewId: Integer;
-begin
-  Result := NewId;
-  Inc(NewId);
-end;
-
-procedure TPlayers.LoadFromNode(Node: TDOMNode);
-var
-  Node2: TDOMNode;
-  NewPlayer: TPlayer;
-begin
-  Count := 0;
-  Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = 'Player') do begin
-    NewPlayer := TPlayer.Create;
-    NewPlayer.Game := Game;
-    NewPlayer.LoadFromNode(Node2);
-    Add(NewPlayer);
-    Node2 := Node2.NextSibling;
-  end;
-end;
-
-procedure TPlayers.SaveToNode(Node: TDOMNode);
-var
-  I: Integer;
-  NewNode: TDOMNode;
-begin
-  for I := 0 to Count - 1 do begin;
-    NewNode := Node.OwnerDocument.CreateElement('Player');
-    Node.AppendChild(NewNode);
-    Items[I].SaveToNode(NewNode);
-  end;
-end;
-
-constructor TPlayers.Create(FreeObjects: Boolean = True);
-begin
-  inherited;
-  NewId := 1;
-end;
-
-function TPlayers.GetFirstHuman: TPlayer;
-var
-  I: Integer;
-begin
-  I := 0;
-  while (I < Count) and (Items[I].Mode <> pmHuman) do Inc(I);
-  if I < Count then Result := Items[I]
-    else Result := nil;
-end;
-
-procedure TPlayers.Assign(Source: TPlayers);
-var
-  I: Integer;
-begin
-  while Count > Source.Count do
-    Delete(Count - 1);
-  while Count < Source.Count do
-    Add(TPlayer.Create);
-  for I := 0 to Count - 1 do begin
-    Items[I].Assign(Source[I]);
-    Items[I].Game := Game;
-  end;
-  NewId := Source.NewId;
 end;
 
@@ -615 +563 @@
       Count := NewCount;
       for I := 0 to Count - 1 do begin
-        Items[I] := TPlayer.Create;
-        Items[I].Id := GetNewId;
-        Items[I].Game := Game;
-        Items[I].LoadConfig(Config, Path + '/Player' + IntToStr(I));
+        Items[I] := CreateItem;
+        TPlayer(Items[I]).LoadConfig(Config, Path + '/Player' + IntToStr(I));
       end;
     end;
@@ -629 +575 @@
 begin
   for I := 0 to Count - 1 do
-    Items[I].SaveConfig(Config, Path + '/Player' + IntToStr(I));
+    TPlayer(Items[I]).SaveConfig(Config, Path + '/Player' + IntToStr(I));
   with Config do begin
     SetValue(DOMString(Path + '/Count'), Count);
@@ -637 +583 @@
 function TPlayers.GetAlivePlayers: TPlayerArray;
 var
-  Player: TPlayer;
+  I: Integer;
 begin
   SetLength(Result, 0);
-  for Player in Self do
-    if Player.IsAlive then begin
+  for I := 0 to Count - 1 do
+    if TPlayer(Items[I]).IsAlive then begin
       SetLength(Result, Length(Result) + 1);
-      Result[Length(Result) - 1] := Player;
+      Result[Length(Result) - 1] := TPlayer(Items[I]);
     end;
 end;
@@ -649 +595 @@
 function TPlayers.GetAlivePlayersWithCities: TPlayerArray;
 var
-  Player: TPlayer;
+  I: Integer;
 begin
   SetLength(Result, 0);
-  for Player in Self do
-    if Player.TotalCities > 0 then begin
+  for I := 0 to Count - 1 do
+    if TPlayer(Items[I]).TotalCities > 0 then begin
       SetLength(Result, Length(Result) + 1);
-      Result[Length(Result) - 1] := Player;
+      Result[Length(Result) - 1] := TPlayer(Items[I]);
     end;
 end;
@@ -803 +749 @@
   NewNode: TDOMNode;
 begin
-  Id := ReadInteger(Node, 'Id', 0);
-  Name := ReadString(Node, 'Name', '');
-  Color := ReadInteger(Node, 'Color', clSilver);
-  Mode := TPlayerMode(ReadInteger(Node, 'Mode', Integer(pmHuman)));
+  inherited;
   StartCell := TGame(FGame).Map.Cells.FindById(ReadInteger(Node, 'StartCell', 0));
-  StartUnits := ReadInteger(Node, 'StartUnits', 0);
-  Agressivity := TComputerAgressivity(ReadInteger(Node, 'Agressivity', Integer(caMedium)));
-  Defensive := ReadBoolean(Node, 'Defensive', False);
 
   with Node do begin
@@ -834 +774 @@
   NewNode: TDOMNode;
 begin
-  WriteInteger(Node, 'Id', Id);
-  WriteString(Node, 'Name', Name);
-  WriteInteger(Node, 'Color', Color);
-  WriteInteger(Node, 'Mode', Integer(Mode));
+  inherited;
   WriteInteger(Node, 'StartCell', StartCell.Id);
-  WriteInteger(Node, 'StartUnits', StartUnits);
-  WriteInteger(Node, 'Agressivity', Integer(Agressivity));
-  WriteBoolean(Node, 'Defensive', Defensive);
 
   with Node do begin
@@ -862 +796 @@
 constructor TPlayer.Create;
 begin
+  inherited;
   Units := TUnits.Create(False);
   Moves := TUnitMoves.Create;
@@ -879 +814 @@
   FreeAndNil(Moves);
   FreeAndNil(Units);
-  inherited Destroy;
+  inherited;
 end;
 
 procedure TPlayer.Assign(Source: TItem);
 begin
-  Id := Source.Id;
-  Name := Source.Name;
-  Color := TPlayer(Source).Color;
-  Mode := TPlayer(Source).Mode;
-  Game := TPlayer(Source).Game;
+  inherited;
+  //Game := TPlayer(Source).Game;
   TotalCells := TPlayer(Source).TotalCells;
   TotalUnits := TPlayer(Source).TotalUnits;
@@ -894 +826 @@
   TotalDiscovered := TPlayer(Source).TotalDiscovered;
   TotalWinObjectiveCells := TPlayer(Source).TotalWinObjectiveCells;
-  StartUnits := TPlayer(Source).StartUnits;
   StartCell := TPlayer(Source).StartCell;
-  Agressivity := TPlayer(Source).Agressivity;
-  Defensive := TPlayer(Source).Defensive;
-  Nation := TPlayer(Source).Nation;
 end;
 
@@ -1266 +1194 @@
 
 class function TPlayer.GetFields: TItemFields;
+var
+  Field: TItemField;
 begin
   Result := inherited;
-  Result.AddField(2, 'Color', 'Color', dtColor);
-  Result.AddField(3, 'Mode', 'Mode', dtInteger);
-  Result.AddField(4, 'StartUnits', 'StartUnits', dtInteger);
-  Result.AddField(5, 'Agressivity', 'Agressivity', dtInteger);
-  Result.AddField(6, 'Defensive', 'Defensive', dtBoolean);
+  Field := Result.AddField(2, 'Nation', SNation, dtReference);
+  Field := Result.AddField(3, 'Mode', SMode, dtEnumeration);
+  Field.EnumStates.Add(SHuman);
+  Field.EnumStates.Add(SComputer);
+  Result.AddField(4, 'Color', SColor, dtColor);
+  Field := Result.AddField(5, 'Agressivity', SAgressivity, dtEnumeration);
+  Field.EnumStates.Add(SLow);
+  Field.EnumStates.Add(SMedium);
+  Field.EnumStates.Add(SHigh);
+  Result.AddField(6, 'Defensive', SDefensive, dtBoolean);
+  Result.AddField(7, 'StartUnits', SStartUnits, dtInteger);
 end;
 
 procedure TPlayer.GetValue(Index: Integer; out Value);
 begin
-  inherited GetValue(Index, Value);
+  if Index = 1 then string(Value) := Name
+  else if Index = 2 then TNation(Value) := Nation
+  else if Index = 3 then TPlayerMode(Value) := Mode
+  else if Index = 4 then TColor(Value) := Color
+  else if Index = 5 then TComputerAgressivity(Value) := Agressivity
+  else if Index = 6 then Boolean(Value) := Defensive
+  else if Index = 7 then Integer(Value) := StartUnits
+  else inherited;
 end;
 
 procedure TPlayer.SetValue(Index: Integer; var Value);
 begin
-  inherited SetValue(Index, Value);
+  if Index = 1 then Name := string(Value)
+  else if Index = 2 then Nation := TNation(Value)
+  else if Index = 3 then Mode := TPlayerMode(Value)
+  else if Index = 4 then Color := TColor(Value)
+  else if Index = 5 then Agressivity := TComputerAgressivity(Value)
+  else if Index = 6 then Defensive := Boolean(Value)
+  else if Index = 7 then StartUnits := Integer(Value)
+  else inherited;
+end;
+
+function TPlayer.GetReferenceList(Index: Integer): TItemList;
+begin
+  if Index = 2 then Result := TGame(Game).GameSystem.Nations
+  else Result := nil;
 end;
 
@@ -1288 +1244 @@
 begin
   Result := 'Player';
+end;
+
+class function TPlayer.GetClassName: string;
+begin
+  Result := SPlayer;
 end;