Implement UMAClothingContainer.RemoveClothing

mysticfall · Dec 17, 2017 · 908149f · 908149f
1 parent 80c8d25
commit 908149f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/Assets/Alensia/Core/Item/ClothingContainer.cs b/Assets/Alensia/Core/Item/ClothingContainer.cs
@@ -73,7 +73,7 @@ public void Remove(string key)
             {
                 var cloth = CheckItem(item);
 
-                RemoveClothing(slot, cloth);
+                RemoveClothing(cloth);
 
                 _mappings.Remove(slot);
 
@@ -86,7 +86,7 @@ public void Remove(string key)
 
         protected abstract void ApplyClothing(TItem item);
 
-        protected abstract void RemoveClothing(string key, TItem item);
+        protected abstract void RemoveClothing(TItem item);
 
         private string CheckSlot(string key)
         {

diff --git a/Assets/Alensia/Integrations/UMA/UMAClothingContainer.cs b/Assets/Alensia/Integrations/UMA/UMAClothingContainer.cs
@@ -1,6 +1,9 @@
+using System;
 using System.Linq;
 using Alensia.Core.Character;
 using Alensia.Core.Item;
+using UMA;
+using UMA.CharacterSystem;
 using Zenject;
 
 namespace Alensia.Integrations.UMA
@@ -12,23 +15,24 @@ public class UMAClothingContainer : ClothingContainer<UMAClothing, UMAClothingLi
 
         protected override IRace Race => MorphSet.Race;
 
-        protected override void ApplyClothing(UMAClothing item)
+        protected override void ApplyClothing(UMAClothing item) =>
+            ProcessSlot(item, (avatar, recipe) => avatar.SetSlot(recipe));
+
+        protected override void RemoveClothing(UMAClothing item) =>
+            ProcessSlot(item, (avatar, recipe) => avatar.ClearSlot(recipe.wardrobeSlot));
+
+        protected void ProcessSlot(UMAClothing item, Action<DynamicCharacterAvatar, UMATextRecipe> process)
         {
             var umaRace = MorphSet.RaceData.raceName;
             var recipe = item.Form.Recipes.FirstOrDefault(r => r.compatibleRaces.Contains(umaRace));
 
-            if (recipe != null)
-            {
-                var avatar = MorphSet.Avatar;
+            if (recipe == null) return;
 
-                avatar.SetSlot(recipe);
-                avatar.BuildCharacter();
-            }
-        }
+            var avatar = MorphSet.Avatar;
 
-        protected override void RemoveClothing(string key, UMAClothing item)
-        {
-            throw new System.NotImplementedException();
+            process(avatar, recipe);
+
+            avatar.BuildCharacter();
         }
     }
 }