From 0999ab804a11e840d188c09ab13207c27282a2e0 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Mon, 12 Jun 2023 00:55:59 +0200
Subject: [PATCH] Fix ninja weapons.

---
 Penumbra.GameData/Enums/FullEquipType.cs | 4 ++--
 Penumbra.GameData/Structs/EquipItem.cs   | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Penumbra.GameData/Enums/FullEquipType.cs b/Penumbra.GameData/Enums/FullEquipType.cs
index c3956ae2..a45d0800 100644
--- a/Penumbra.GameData/Enums/FullEquipType.cs
+++ b/Penumbra.GameData/Enums/FullEquipType.cs
@@ -341,8 +341,8 @@ public static class FullEquipTypeExtensions
             WeaponCategory.BotanistOff               => FullEquipType.GardenScythe,
             WeaponCategory.FisherMain                => FullEquipType.FishingRod,
             WeaponCategory.FisherOff                 => FullEquipType.Gig,
-            WeaponCategory.Rogue when mainhand       => FullEquipType.DaggersOff,
-            WeaponCategory.Rogue                     => FullEquipType.Daggers,
+            WeaponCategory.Rogue when mainhand       => FullEquipType.Daggers,
+            WeaponCategory.Rogue                     => FullEquipType.DaggersOff,
             WeaponCategory.DarkKnight                => FullEquipType.Broadsword,
             WeaponCategory.Machinist when mainhand   => FullEquipType.Gun,
             WeaponCategory.Machinist                 => FullEquipType.GunOff,
diff --git a/Penumbra.GameData/Structs/EquipItem.cs b/Penumbra.GameData/Structs/EquipItem.cs
index 9e26b27c..78d73870 100644
--- a/Penumbra.GameData/Structs/EquipItem.cs
+++ b/Penumbra.GameData/Structs/EquipItem.cs
@@ -38,7 +38,7 @@ public readonly struct EquipItem
     public EquipItem(string name, uint id, ushort iconId, SetId modelId, WeaponType weaponType, byte variant, FullEquipType type,
         EquipSlot slot)
     {
-        Name       = name;
+        Name       = string.Intern(name);
         Id         = id;
         IconId     = iconId;
         ModelId    = modelId;
@@ -48,12 +48,11 @@ public readonly struct EquipItem
         Slot       = slot;
     }
 
-
     public static EquipItem FromArmor(Item item)
     {
         var type    = item.ToEquipType();
         var slot    = type.ToSlot();
-        var name    = string.Intern(item.Name.ToDalamudString().TextValue);
+        var name    = item.Name.ToDalamudString().TextValue;
         var id      = item.RowId;
         var icon    = item.Icon;
         var model   = (SetId)item.ModelMain;
@@ -65,7 +64,7 @@ public readonly struct EquipItem
     public static EquipItem FromMainhand(Item item)
     {
         var type    = item.ToEquipType();
-        var name    = string.Intern(item.Name.ToDalamudString().TextValue);
+        var name    = item.Name.ToDalamudString().TextValue;
         var id      = item.RowId;
         var icon    = item.Icon;
         var model   = (SetId)item.ModelMain;
@@ -77,7 +76,7 @@ public readonly struct EquipItem
     public static EquipItem FromOffhand(Item item)
     {
         var type    = item.ToEquipType().Offhand();
-        var name    = string.Intern(item.Name.ToDalamudString().TextValue + type.OffhandTypeSuffix());
+        var name    = item.Name.ToDalamudString().TextValue + type.OffhandTypeSuffix();
         var id      = item.RowId;
         var icon    = item.Icon;
         var model   = (SetId)item.ModelSub;