diff --git a/Glamourer/Designs/DesignBase64Migration.cs b/Glamourer/Designs/DesignBase64Migration.cs index 99d8347..989d463 100644 --- a/Glamourer/Designs/DesignBase64Migration.cs +++ b/Glamourer/Designs/DesignBase64Migration.cs @@ -74,13 +74,13 @@ public static class DesignBase64Migration { data.Customize.Load(*(Customize*)(ptr + 4)); var cur = (CharacterWeapon*)(ptr + 30); - var main = items.Identify(EquipSlot.MainHand, cur[0].Set, cur[0].Type, (byte)cur[0].Variant); + var main = cur[0].Set.Value == 0 ? items.DefaultSword : items.Identify(EquipSlot.MainHand, cur[0].Set, cur[0].Type, (byte)cur[0].Variant); if (!main.Valid) throw new Exception($"Base64 string invalid, weapon could not be identified."); data.SetItem(EquipSlot.MainHand, main); data.SetStain(EquipSlot.MainHand, cur[0].Stain); - var off = items.Identify(EquipSlot.OffHand, cur[1].Set, cur[1].Type, (byte)cur[1].Variant, main.Type); + var off = cur[0].Set.Value == 0 ? ItemManager.NothingItem(FullEquipType.Shield) : items.Identify(EquipSlot.OffHand, cur[1].Set, cur[1].Type, (byte)cur[1].Variant, main.Type); if (main.Type.ValidOffhand() != FullEquipType.Unknown && !off.Valid) throw new Exception($"Base64 string invalid, weapon could not be identified."); diff --git a/Glamourer/Glamourer.csproj b/Glamourer/Glamourer.csproj index b800a20..63eaf6b 100644 --- a/Glamourer/Glamourer.csproj +++ b/Glamourer/Glamourer.csproj @@ -5,8 +5,8 @@ x64 Glamourer Glamourer - 0.2.0.1 - 0.2.0.1 + 0.2.0.2 + 0.2.0.2 SoftOtter Glamourer Copyright © 2020 diff --git a/Glamourer/Glamourer.json b/Glamourer/Glamourer.json index fc46b26..8607143 100644 --- a/Glamourer/Glamourer.json +++ b/Glamourer/Glamourer.json @@ -5,7 +5,7 @@ "Description": "Adds functionality to change and store appearance of players, customization and equip. Requires Penumbra to be installed and activated to work. Can also add preview options to the Changed Items tab for Penumbra.", "Tags": [ "Appearance", "Glamour", "Race", "Outfit", "Armor", "Clothes", "Skins", "Customization", "Design", "Character" ], "InternalName": "Glamourer", - "AssemblyVersion": "0.2.0.1", + "AssemblyVersion": "0.2.0.2", "RepoUrl": "https://github.com/Ottermandias/Glamourer", "ApplicableVersion": "any", "DalamudApiLevel": 8, diff --git a/GlamourerTest.zip b/GlamourerTest.zip index b9e0ee4..e977f32 100644 Binary files a/GlamourerTest.zip and b/GlamourerTest.zip differ diff --git a/repo.json b/repo.json index a854b43..062a681 100644 --- a/repo.json +++ b/repo.json @@ -7,7 +7,7 @@ "Tags": [ "Appearance", "Glamour", "Race", "Outfit", "Armor", "Clothes", "Skins", "Customization", "Design", "Character" ], "InternalName": "Glamourer", "AssemblyVersion": "0.1.1.5", - "TestingAssemblyVersion": "0.2.0.1", + "TestingAssemblyVersion": "0.2.0.2", "RepoUrl": "https://github.com/Ottermandias/Glamourer", "ApplicableVersion": "any", "DalamudApiLevel": 8,