From 5cd7d607ef7d50ef21e901604ad285d2d7f2bac6 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sat, 30 Sep 2023 23:41:57 +0200 Subject: [PATCH] Remove initial reduction of apply rules on designs. --- Glamourer/Designs/Design.cs | 2 +- Glamourer/Designs/DesignBase.cs | 13 +++---------- Glamourer/Designs/DesignConverter.cs | 2 +- Glamourer/Designs/DesignManager.cs | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Glamourer/Designs/Design.cs b/Glamourer/Designs/Design.cs index eb2f322..aa1e5e6 100644 --- a/Glamourer/Designs/Design.cs +++ b/Glamourer/Designs/Design.cs @@ -15,7 +15,7 @@ public sealed class Design : DesignBase, ISavable { #region Data internal Design(CustomizationService customize, ItemManager items) - : base(customize, items) + : base(items) { } internal Design(DesignBase other) diff --git a/Glamourer/Designs/DesignBase.cs b/Glamourer/Designs/DesignBase.cs index 5635286..47937dd 100644 --- a/Glamourer/Designs/DesignBase.cs +++ b/Glamourer/Designs/DesignBase.cs @@ -16,10 +16,9 @@ public class DesignBase { public const int FileVersion = 1; - internal DesignBase(CustomizationService customize, ItemManager items) + internal DesignBase(ItemManager items) { DesignData.SetDefaultEquipment(items); - FixCustomizeApplication(customize); } internal DesignBase(DesignBase clone) @@ -152,12 +151,6 @@ public class DesignBase return true; } - public void FixCustomizeApplication(CustomizationService service) - => FixCustomizeApplication(service, ApplyCustomize); - - public void FixCustomizeApplication(CustomizationSet set) - => FixCustomizeApplication(set, ApplyCustomize); - public void FixCustomizeApplication(CustomizationService service, CustomizeFlag flags) => FixCustomizeApplication(service.AwaitedService.GetList(DesignData.Customize.Clan, DesignData.Customize.Gender), flags); @@ -257,7 +250,7 @@ public class DesignBase private static DesignBase LoadDesignV1Base(CustomizationService customizations, ItemManager items, JObject json) { - var ret = new DesignBase(customizations, items); + var ret = new DesignBase(items); LoadCustomize(customizations, json["Customize"], ret, "Temporary Design", false, true); LoadEquip(items, json["Equipment"], ret, "Temporary Design", true); return ret; @@ -411,7 +404,7 @@ public class DesignBase } } - design.FixCustomizeApplication(set); + design.FixCustomizeApplication(set, design.ApplyCustomize); } public void MigrateBase64(ItemManager items, HumanModelList humans, string base64) diff --git a/Glamourer/Designs/DesignConverter.cs b/Glamourer/Designs/DesignConverter.cs index 09de0cf..0c17e6b 100644 --- a/Glamourer/Designs/DesignConverter.cs +++ b/Glamourer/Designs/DesignConverter.cs @@ -129,7 +129,7 @@ public class DesignConverter } else { - ret.FixCustomizeApplication(_customize); + ret.FixCustomizeApplication(_customize, ret.ApplyCustomize); } if (!equip) diff --git a/Glamourer/Designs/DesignManager.cs b/Glamourer/Designs/DesignManager.cs index ca3a605..8628c85 100644 --- a/Glamourer/Designs/DesignManager.cs +++ b/Glamourer/Designs/DesignManager.cs @@ -85,7 +85,7 @@ public class DesignManager /// Create a new temporary design without adding it to the manager. public DesignBase CreateTemporary() - => new(_customizations, _items); + => new(_items); /// Create a new design of a given name. public Design CreateEmpty(string name, bool handlePath)