Merge pull request #205 from Cazzar/fix-mcdf-import

Allow scales to be loaded via MCDF files
XIV-Tools · Oct 17, 2023 · eb38374 · eb38374
2 parents cb95168 + db4cceb
commit eb38374
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CustomizePlus/Data/Profile/CharacterProfile.cs b/CustomizePlus/Data/Profile/CharacterProfile.cs
@@ -56,6 +56,7 @@ public CharacterProfile(CharacterProfile original) : this()
 
         public string CharacterName { get; set; } = "Default";
         public string ProfileName { get; set; } = "Profile";
+        public nint? Address { get; set; } = null;
         public bool OwnedOnly { get; set; } = false;
         public int ConfigVersion { get; set; } = Constants.ConfigurationVersion;
         public bool Enabled { get; set; }
@@ -76,6 +77,8 @@ public CharacterProfile(CharacterProfile original) : this()
         /// </summary>
         public bool AppliesTo(Dalamud.Game.ClientState.Objects.Types.GameObject obj)
         {
+            if (Address != null && obj.Address == Address) return true;
+
             //PluginLog.Verbose($"Checking on {obj.ObjectIndex} for scale {ProfileName}");
             if (obj.Name.TextValue.IsNullOrEmpty() && (obj.ObjectIndex == 200 || obj.ObjectIndex == 201))
             {

diff --git a/CustomizePlus/Data/Profile/ProfileManager.cs b/CustomizePlus/Data/Profile/ProfileManager.cs
@@ -263,6 +263,8 @@ public void StopEditing(CharacterProfile prof)
 
         public void AddTemporaryProfile(nint characterAddress, CharacterProfile prof)
         {
+            prof.Enabled = true;
+            prof.Address = characterAddress;
             var key = TempLocalProfiles.Keys.FirstOrDefault(f => f.Address == characterAddress);
             if (key != null)
             {