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

.

Browse source
This commit is contained in:
Ottermandias 2023-06-21 01:01:41 +02:00
parent 65ce391051
commit 5e6f797af4
3 changed files with 69 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Glamourer/Designs/Design.cs
View file

@ -35,6 +35,46 @@ public class Design : ISavable
internal DesignData DesignData;
/// <summary> Unconditionally apply a design to a designdata. </summary>
/// <returns>Whether a redraw is required for the changes to take effect.</returns>
public bool ApplyDesign(ref DesignData data)
{
var modelChanged = data.ModelId != DesignData.ModelId;
data.ModelId = DesignData.ModelId;
CustomizeFlag customizeFlags = 0;
foreach (var index in Enum.GetValues<CustomizeIndex>())
{
if (!DoApplyCustomize(index))
continue;
if (data.Customize.Set(index, DesignData.Customize[index]))
customizeFlags |= index.ToFlag();
}
foreach (var slot in EquipSlotExtensions.EqdpSlots.Append(EquipSlot.MainHand).Append(EquipSlot.OffHand))
{
if (DoApplyEquip(slot))
data.SetItem(slot, DesignData.Item(slot));
if (DoApplyStain(slot))
data.SetStain(slot, DesignData.Stain(slot));
}
if (DoApplyHatVisible())
data.SetHatVisible(DesignData.IsHatVisible());
if (DoApplyVisorToggle())
data.SetVisor(DesignData.IsVisorToggled());
if (DoApplyWeaponVisible())
data.SetWeaponVisible(DesignData.IsWeaponVisible());
if (DoApplyWetness())
data.SetIsWet(DesignData.IsWet());
return modelChanged || customizeFlags.RequiresRedraw();
}
#endregion
#region Application Data
@ -45,7 +85,8 @@ public class Design : ISavable
ApplyHatVisible = 0x01,
ApplyVisorState = 0x02,
ApplyWeaponVisible = 0x04,
WriteProtected = 0x08,
ApplyWetness = 0x08,
WriteProtected = 0x10,
}
internal CustomizeFlag ApplyCustomize = CustomizeFlagExtensions.All;
@ -61,6 +102,9 @@ public class Design : ISavable
public bool DoApplyWeaponVisible()
=> _designFlags.HasFlag(DesignFlags.ApplyWeaponVisible);
public bool DoApplyWetness()
=> _designFlags.HasFlag(DesignFlags.ApplyWetness);
public bool WriteProtected()
=> _designFlags.HasFlag(DesignFlags.WriteProtected);
@ -94,6 +138,16 @@ public class Design : ISavable
return true;
}
public bool SetApplyWetness(bool value)
{
var newFlag = value ? _designFlags | DesignFlags.ApplyWetness : _designFlags & ~DesignFlags.ApplyWetness;
if (newFlag == _designFlags)
return false;
_designFlags = newFlag;
return true;
}
public bool SetWriteProtected(bool value)
{
var newFlag = value ? _designFlags | DesignFlags.WriteProtected : _designFlags & ~DesignFlags.WriteProtected;
@ -209,7 +263,12 @@ public class Design : ISavable
};
}
ret["IsWet"] = DesignData.IsWet();
ret["Wetness"] = new JObject()
{
["Value"] = DesignData.IsWet(),
["Apply"] = DoApplyWetness(),
};
return ret;
}
@ -368,7 +427,9 @@ public class Design : ISavable
design.SetApplyCustomize(idx, apply);
}
design.DesignData.SetIsWet(json["IsWet"]?.ToObject<bool>() ?? false);
var wetness = QuadBool.FromJObject(json["Wetness"], "Value", "Apply", QuadBool.NullFalse);
design.DesignData.SetIsWet(wetness.ForcedValue);
design.SetApplyWetness(wetness.Enabled);
}
#endregion
@ -403,6 +464,7 @@ public class Design : ISavable
SetApplyHatVisible(applyHat);
SetApplyVisorToggle(applyVisor);
SetApplyWeaponVisible(applyWeapon);
SetApplyWetness(DesignData.IsWet());
}
//

6
Glamourer/Designs/DesignBase64Migration.cs
View file

@ -25,9 +25,9 @@ public static class DesignBase64Migration
byte applicationFlags;
ushort equipFlagsS;
var bytes = Convert.FromBase64String(base64);
applyHat = false;
applyVisor = false;
applyWeapon = false;
applyHat = false;
applyVisor = false;
applyWeapon = false;
var data = new DesignData();
switch (bytes[0])
{

3
Glamourer/State/StateManager.cs
View file

@ -10,7 +10,7 @@ using Glamourer.Interop;
using Glamourer.Interop.Penumbra;
using Glamourer.Interop.Structs;
using Glamourer.Services;
using OtterGui.Classes;
using Glamourer.Structs;
using Penumbra.GameData.Actors;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
@ -29,7 +29,6 @@ public class StateManager : IReadOnlyDictionary<ActorIdentifier, ActorState>
private readonly Dictionary<ActorIdentifier, ActorState> _states = new();
public StateManager(ActorService actors, ItemManager items, CustomizationService customizations, VisorService visor, StateChanged @event,
PenumbraService penumbra)
{