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

Fix BodyType issues.

Browse source
This commit is contained in:
Ottermandias 2024-03-01 23:38:28 +01:00
parent a501d97252
commit 4bbb48b7b9
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Glamourer/Designs/Links/DesignMerger.cs
View file

@ -22,8 +22,7 @@ public class DesignMerger(
=> Merge(designs.Select(d => ((IDesignStandIn)d.Link, d.Type)), currentCustomize, baseRef, respectOwnership, modAssociations);
public MergedDesign Merge(IEnumerable<(IDesignStandIn, ApplicationType)> designs, in CustomizeArray currentCustomize, in DesignData baseRef,
bool respectOwnership,
bool modAssociations)
bool respectOwnership, bool modAssociations)
{
var ret = new MergedDesign(designManager);
ret.Design.SetCustomize(_customize, currentCustomize);
@ -211,7 +210,10 @@ public class DesignMerger(
private void ReduceCustomize(in DesignData design, CustomizeFlag customizeFlags, ref CustomizeFlag fixFlags, MergedDesign ret,
StateSource source, bool respectOwnership)
{
customizeFlags &= ~ret.Design.ApplyCustomizeRaw;
customizeFlags &= ~ret.Design.ApplyCustomizeExcludingBodyType;
if (ret.Design.DesignData.Customize.BodyType != 1)
customizeFlags &= ~CustomizeFlag.BodyType;
if (customizeFlags == 0)
return;
@ -246,6 +248,13 @@ public class DesignMerger(
ret.Sources[CustomizeIndex.Face] = source;
}
if (customizeFlags.HasFlag(CustomizeFlag.BodyType))
{
customize[CustomizeIndex.BodyType] = design.Customize.BodyType;
customizeFlags &= ~CustomizeFlag.BodyType;
ret.Sources[CustomizeIndex.BodyType] = source;
}
var set = _customize.Manager.GetSet(customize.Clan, customize.Gender);
var face = customize.Face;
foreach (var index in Enum.GetValues<CustomizeIndex>())