From e221c275a2c0b8921c675771b3669566617eb584 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sat, 3 Dec 2022 20:42:19 +0100 Subject: [PATCH] Names can have a hyphen as last character apparently. --- Penumbra.GameData/Actors/ActorManager.Identifiers.cs | 4 ++-- Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Penumbra.GameData/Actors/ActorManager.Identifiers.cs b/Penumbra.GameData/Actors/ActorManager.Identifiers.cs index a84f0e8f..75cb7043 100644 --- a/Penumbra.GameData/Actors/ActorManager.Identifiers.cs +++ b/Penumbra.GameData/Actors/ActorManager.Identifiers.cs @@ -345,7 +345,7 @@ public partial class ActorManager last = current; } - return part[^1] != '-'; + return true; } private static bool CheckNamePart(ReadOnlySpan part, int minLength, int maxLength) @@ -375,7 +375,7 @@ public partial class ActorManager last = current; } - return part[^1] != (byte)'-'; + return true; } /// Checks if the world is a valid public world or ushort.MaxValue (any world). diff --git a/Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs b/Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs index 275e358d..16ae8253 100644 --- a/Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs +++ b/Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs @@ -278,6 +278,11 @@ public partial class ConfigWindow return true; } + ImGui.SameLine(); + ImGuiComponents.HelpMarker( "- Bell Retainers also apply to Mannequins named after them, but not to outdoor retainers, since they only carry their owners name.\n" + + "- Some NPCs are available as Battle- and Event NPCs and need to be setup for both if desired.\n" + + "- Battle- and Event NPCs may apply to more than one ID if they share the same name. This is language dependent. If you change your clients language, verify that your collections are still correctly assigned." ); + return false; }