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

Remove initial reduction of apply rules on designs.

Browse source
This commit is contained in:
Ottermandias 2023-09-30 23:41:57 +02:00
parent 31d3922296
commit 5cd7d607ef
4 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer/Designs/Design.cs
View file

@ -15,7 +15,7 @@ public sealed class Design : DesignBase, ISavable
{ {
#region Data #region Data
internal Design(CustomizationService customize, ItemManager items) internal Design(CustomizationService customize, ItemManager items)
: base(customize, items) : base(items)
{ } { }
internal Design(DesignBase other) internal Design(DesignBase other)

13
Glamourer/Designs/DesignBase.cs
View file

@ -16,10 +16,9 @@ public class DesignBase
{ {
public const int FileVersion = 1; public const int FileVersion = 1;
internal DesignBase(CustomizationService customize, ItemManager items) internal DesignBase(ItemManager items)
{ {
DesignData.SetDefaultEquipment(items); DesignData.SetDefaultEquipment(items);
FixCustomizeApplication(customize);
} }
internal DesignBase(DesignBase clone) internal DesignBase(DesignBase clone)
@ -152,12 +151,6 @@ public class DesignBase
return true; 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) public void FixCustomizeApplication(CustomizationService service, CustomizeFlag flags)
=> FixCustomizeApplication(service.AwaitedService.GetList(DesignData.Customize.Clan, DesignData.Customize.Gender), 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) 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); LoadCustomize(customizations, json["Customize"], ret, "Temporary Design", false, true);
LoadEquip(items, json["Equipment"], ret, "Temporary Design", true); LoadEquip(items, json["Equipment"], ret, "Temporary Design", true);
return ret; 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) public void MigrateBase64(ItemManager items, HumanModelList humans, string base64)

2
Glamourer/Designs/DesignConverter.cs
View file

@ -129,7 +129,7 @@ public class DesignConverter
} }
else else
{ {
ret.FixCustomizeApplication(_customize); ret.FixCustomizeApplication(_customize, ret.ApplyCustomize);
} }
if (!equip) if (!equip)

2
Glamourer/Designs/DesignManager.cs
View file

@ -85,7 +85,7 @@ public class DesignManager
/// <summary> Create a new temporary design without adding it to the manager. </summary> /// <summary> Create a new temporary design without adding it to the manager. </summary>
public DesignBase CreateTemporary() public DesignBase CreateTemporary()
=> new(_customizations, _items); => new(_items);
/// <summary> Create a new design of a given name. </summary> /// <summary> Create a new design of a given name. </summary>
public Design CreateEmpty(string name, bool handlePath) public Design CreateEmpty(string name, bool handlePath)