ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ninja weapons.

Browse source
This commit is contained in:
Ottermandias 2023-06-12 00:55:59 +02:00
parent 4f63e32df3
commit 0999ab804a
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra.GameData/Enums/FullEquipType.cs
View file

@ -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,

9
Penumbra.GameData/Structs/EquipItem.cs
View file

@ -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;