Changeset 391

Timestamp:

Jan 5, 2025, 9:08:52 PM (3 days ago)

Author:

chronos

Message:

• Fixed: Add new players with different colors.

Location:

trunk

Files:

• Packages/Common/Forms/FormList.pas (modified) (2 diffs)
• Packages/Common/ItemList.pas (modified) (1 diff)
• Packages/Common/Languages/FormList.cs.po (modified) (1 diff)
• Packages/Common/Languages/FormList.pot (modified) (1 diff)
• Player.pas (modified) (4 diffs)

trunk/Packages/Common/Forms/FormList.pas

@@ -72 +72 @@
   SRemoveItems = 'Remove items';
   SRemoveItemsQuery = 'Do you want to remove selected items?';
-  SNew = 'New';
 
 { TFormList }
@@ -129 +128 @@
   FormItem := TFormItem.Create(Self);
   try
-    TempEntry.Name := FList.GetNextAvailableName(SNew + ' ' + LowerCase(List.GetName));
+    TempEntry.Name := FList.GetNextAvailableName(List.GetName);
     FormItem.Item := TempEntry;
     if FormItem.ShowModal = mrOk then begin

trunk/Packages/Common/ItemList.pas

@@ -368 +368 @@
   NewName: string);
 begin
-  NewName := Name;
+  NewName := Name + ' 1';
   while Assigned(FindByName(NewName)) do
     NewName := IncrementName(NewName);

trunk/Packages/Common/Languages/FormList.cs.po

@@ -12 +12 @@
 "X-Generator: Poedit 3.5\n"
 
-#: formlist.snew
-msgid "New"
-msgstr "Nová"
-
 #: formlist.sremoveitems
 msgid "Remove items"

trunk/Packages/Common/Languages/FormList.pot

@@ -1 +1 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
-
-#: formlist.snew
-msgid "New"
-msgstr ""
 
 #: formlist.sremoveitems

trunk/Player.pas

@@ -137 +137 @@
   public
     Game: TObject; //TGame;
+    function GetPlayerByColor(Color: TColor): TPlayer;
+    function GetUnusedColor: TColor;
     procedure Assign(Source: TItemList<TPlayer>); override;
     procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
@@ -206 +208 @@
   SDefensive = 'Defensive';
 
+const
+  PlayerColors: array[0..11] of TColor = (clBlue, clRed, clGreen, clYellow,
+    clFuchsia, clAqua, clOlive, clMaroon, clNavy, clPurple, clTeal, clGray);
+
 function ComparePointer(constref Item1, Item2: Integer): Integer;
 begin
@@ -502 +508 @@
 end;
 
+function TPlayers.GetPlayerByColor(Color: TColor): TPlayer;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) do begin
+    if Assigned(Items[I]) and (Items[I].Color = Color) then Break;
+    Inc(I);
+  end;
+  if I < Count then Result := Items[I]
+    else Result := nil;
+end;
+
+function TPlayers.GetUnusedColor: TColor;
+var
+  I: Integer;
+begin
+  Result := clBlack;
+  for I := 0 to Length(PlayerColors) - 1 do
+    if not Assigned(GetPlayerByColor(PlayerColors[I])) then begin
+      Result := PlayerColors[I];
+      Exit;
+    end;
+end;
+
 procedure TPlayers.Assign(Source: TItemList<TPlayer>);
 var
@@ -526 +557 @@
   Result := inherited;
   Result.Game := Game;
+  Result.Color := GetUnusedColor;
 end;