added world name to GetCharacterName

Jaksuhn · Oct 21, 2023 · e41a988 · e41a988
1 parent a3e06ab
commit e41a988
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/SomethingNeedDoing/Interface/HelpWindow.cs b/SomethingNeedDoing/Interface/HelpWindow.cs
@@ -293,7 +293,11 @@ static void DisplayChangelog(string date, string changes, bool separator = true)
         ImGui.PushFont(UiBuilder.MonoFont);
 
         DisplayChangelog(
-           "2023-10-17",
+           "2023-10-21",
+           "- Added an optional bool to pass to GetCharacterName to return the world name in addition.\n");
+
+        DisplayChangelog(
+           "2023-10-20",
            "- Changed GetItemCount() to support HQ items. Default behaviour includes both HQ and NQ. Pass false to the function to do only NQ.\n");
 
         DisplayChangelog(

diff --git a/SomethingNeedDoing/Misc/CommandInterface.cs b/SomethingNeedDoing/Misc/CommandInterface.cs
@@ -446,7 +446,10 @@ public int GetZoneID() =>
         Service.ClientState.TerritoryType;
 
     /// <inheritdoc/>
-    public string GetCharacterName() => Service.ClientState.LocalPlayer == null ? "null" : Service.ClientState.LocalPlayer.Name.ToString();
+    public string GetCharacterName(bool includeWorld = false) =>
+        Service.ClientState.LocalPlayer == null ? "null"
+        : includeWorld ? $"{Service.ClientState.LocalPlayer.Name}@{Service.ClientState.LocalPlayer.HomeWorld.GameData.Name}"
+        : Service.ClientState.LocalPlayer.Name.ToString();
 
     /// <inheritdoc/>
     public unsafe int GetItemCount(int itemID, bool includeHQ = true) =>

diff --git a/SomethingNeedDoing/Misc/ICommandInterface.cs b/SomethingNeedDoing/Misc/ICommandInterface.cs
@@ -209,8 +209,9 @@ public interface ICommandInterface
     /// <summary>
     /// Gets the character's name.
     /// </summary>
+    /// <param name="includeWorld">Bool to include the world in the string.</param>
     /// <returns>Returns the current's name, string.</returns>
-    public string GetCharacterName();
+    public string GetCharacterName(bool includeWorld = false);
 
     /// <summary>
     /// Gets an item count from your inventory.

diff --git a/SomethingNeedDoing/SomethingNeedDoing.csproj b/SomethingNeedDoing/SomethingNeedDoing.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <Authors>daemitus, croizat</Authors>
         <Company>-</Company>
-        <Version>1.4.1.7</Version>
+        <Version>1.4.1.8</Version>
         <Description></Description>
         <Copyright></Copyright>
         <PackageProjectUrl>https://github.com/Jaksuhn/SomethingNeedDoing</PackageProjectUrl>