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

.

Browse source
This commit is contained in:
Ottermandias 2023-07-07 21:09:14 +02:00
parent f8e9cc8988
commit 8526ce4f33
4 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Glamourer/Automation/AutoDesignApplier.cs
View file

@ -143,9 +143,9 @@ public class AutoDesignApplier : IDisposable
continue; continue;
var (equipFlags, customizeFlags, applyHat, applyVisor, applyWeapon, applyWet) = design.ApplyWhat(); var (equipFlags, customizeFlags, applyHat, applyVisor, applyWeapon, applyWet) = design.ApplyWhat();
Reduce(state, in design.Design.DesignData, equipFlags, ref totalEquipFlags, respectManual);
Reduce(state, in design.Design.DesignData, customizeFlags, ref totalCustomizeFlags, respectManual);
Reduce(state, in design.Design.DesignData, applyHat, applyVisor, applyWeapon, applyWet, ref totalMetaFlags, respectManual); Reduce(state, in design.Design.DesignData, applyHat, applyVisor, applyWeapon, applyWet, ref totalMetaFlags, respectManual);
Reduce(state, in design.Design.DesignData, customizeFlags, ref totalCustomizeFlags, respectManual);
Reduce(state, in design.Design.DesignData, equipFlags, ref totalEquipFlags, respectManual);
} }
} }

4
Glamourer/Designs/DesignManager.cs
View file

@ -337,14 +337,14 @@ public class DesignManager
if (item.Type != currentMain.Type) if (item.Type != currentMain.Type)
{ {
var newOffId = FullEquipTypeExtensions.OffhandTypes.Contains(item.Type) var newOffId = item.Type.Offhand().IsOffhandType()
? item.Id ? item.Id
: ItemManager.NothingId(item.Type.Offhand()); : ItemManager.NothingId(item.Type.Offhand());
if (!_items.IsOffhandValid(item, newOffId, out newOff)) if (!_items.IsOffhandValid(item, newOffId, out newOff))
return; return;
} }
if (!design.DesignData.SetItem(EquipSlot.MainHand, item) && !design.DesignData.SetItem(EquipSlot.OffHand, newOff)) if (!(design.DesignData.SetItem(EquipSlot.MainHand, item) | design.DesignData.SetItem(EquipSlot.OffHand, newOff)))
return; return;
design.LastEdit = DateTimeOffset.UtcNow; design.LastEdit = DateTimeOffset.UtcNow;

2
Glamourer/Interop/MetaService.cs
View file

@ -51,7 +51,7 @@ public unsafe class MetaService : IDisposable
if (!actor.IsCharacter) if (!actor.IsCharacter)
return; return;
_hideWeaponsHook.Original(&actor.AsCharacter->DrawData, value); _hideWeaponsHook.Original(&actor.AsCharacter->DrawData, !value);
} }
private void HideHatDetour(DrawDataContainer* drawData, uint id, byte value) private void HideHatDetour(DrawDataContainer* drawData, uint id, byte value)

42
Glamourer/State/StateManager.cs
View file

@ -205,6 +205,8 @@ public class StateManager : IReadOnlyDictionary<ActorIdentifier, ActorState>
ChangeEquip(state, slot, ItemManager.NothingItem(slot), 0, source); ChangeEquip(state, slot, ItemManager.NothingItem(slot), 0, source);
ChangeEquip(state, EquipSlot.MainHand, _items.DefaultSword, 0, source); ChangeEquip(state, EquipSlot.MainHand, _items.DefaultSword, 0, source);
ChangeEquip(state, EquipSlot.OffHand, ItemManager.NothingItem(FullEquipType.Shield), 0, source); ChangeEquip(state, EquipSlot.OffHand, ItemManager.NothingItem(FullEquipType.Shield), 0, source);
var objects = _objects.TryGetValue(state.Identifier, out var d) ? d : ActorData.Invalid;
_editor.ChangeModelId(objects, 0);
} }
/// <summary> Change a customization value. </summary> /// <summary> Change a customization value. </summary>
@ -446,6 +448,14 @@ public class StateManager : IReadOnlyDictionary<ActorIdentifier, ActorState>
if (design.DoApplyHatVisible()) if (design.DoApplyHatVisible())
ChangeHatState(state, design.DesignData.IsHatVisible(), StateChanged.Source.Manual); ChangeHatState(state, design.DesignData.IsHatVisible(), StateChanged.Source.Manual);
if (design.DoApplyWeaponVisible())
ChangeWeaponState(state, design.DesignData.IsWeaponVisible(), StateChanged.Source.Manual);
if (design.DoApplyVisorToggle())
ChangeVisorState(state, design.DesignData.IsVisorToggled(), StateChanged.Source.Manual);
if (design.DoApplyWetness())
ChangeWetness(state, design.DesignData.IsWet(), StateChanged.Source.Manual);
ChangeCustomize(state, design.DesignData.Customize, design.ApplyCustomize, StateChanged.Source.Manual);
foreach (var slot in EquipSlotExtensions.EqdpSlots) foreach (var slot in EquipSlotExtensions.EqdpSlots)
HandleEquip(slot, design.DoApplyEquip(slot), design.DoApplyStain(slot)); HandleEquip(slot, design.DoApplyEquip(slot), design.DoApplyStain(slot));
@ -458,18 +468,16 @@ public class StateManager : IReadOnlyDictionary<ActorIdentifier, ActorState>
design.DoApplyEquip(EquipSlot.OffHand) design.DoApplyEquip(EquipSlot.OffHand)
&& design.DesignData.Item(EquipSlot.OffHand).Type == state.BaseData.Item(EquipSlot.OffHand).Type, && design.DesignData.Item(EquipSlot.OffHand).Type == state.BaseData.Item(EquipSlot.OffHand).Type,
design.DoApplyStain(EquipSlot.OffHand)); design.DoApplyStain(EquipSlot.OffHand));
if (design.DoApplyWeaponVisible())
ChangeWeaponState(state, design.DesignData.IsWeaponVisible(), StateChanged.Source.Manual);
if (design.DoApplyVisorToggle())
ChangeVisorState(state, design.DesignData.IsVisorToggled(), StateChanged.Source.Manual);
if (design.DoApplyWetness())
ChangeWetness(state, design.DesignData.IsWet(), StateChanged.Source.Manual);
ChangeCustomize(state, design.DesignData.Customize, design.ApplyCustomize, StateChanged.Source.Manual);
} }
public void ResetState(ActorState state) public void ResetState(ActorState state)
{ {
ChangeHatState(state, state.BaseData.IsHatVisible(), StateChanged.Source.Game);
ChangeVisorState(state, state.BaseData.IsVisorToggled(), StateChanged.Source.Game);
ChangeWeaponState(state, state.BaseData.IsWeaponVisible(), StateChanged.Source.Game);
ChangeWetness(state, false, StateChanged.Source.Game);
ChangeCustomize(state, state.BaseData.Customize, CustomizeFlagExtensions.All, StateChanged.Source.Game);
foreach (var slot in EquipSlotExtensions.EqdpSlots) foreach (var slot in EquipSlotExtensions.EqdpSlots)
ChangeEquip(state, slot, state.BaseData.Item(slot), state.BaseData.Stain(slot), StateChanged.Source.Game); ChangeEquip(state, slot, state.BaseData.Item(slot), state.BaseData.Stain(slot), StateChanged.Source.Game);
@ -477,11 +485,6 @@ public class StateManager : IReadOnlyDictionary<ActorIdentifier, ActorState>
StateChanged.Source.Game); StateChanged.Source.Game);
ChangeEquip(state, EquipSlot.OffHand, state.BaseData.Item(EquipSlot.OffHand), state.BaseData.Stain(EquipSlot.OffHand), ChangeEquip(state, EquipSlot.OffHand, state.BaseData.Item(EquipSlot.OffHand), state.BaseData.Stain(EquipSlot.OffHand),
StateChanged.Source.Game); StateChanged.Source.Game);
ChangeHatState(state, state.BaseData.IsHatVisible(), StateChanged.Source.Game);
ChangeVisorState(state, state.BaseData.IsVisorToggled(), StateChanged.Source.Game);
ChangeWeaponState(state, state.BaseData.IsWeaponVisible(), StateChanged.Source.Game);
ChangeWetness(state, false, StateChanged.Source.Game);
ChangeCustomize(state, state.BaseData.Customize, CustomizeFlagExtensions.All, StateChanged.Source.Game);
_objects.Update(); _objects.Update();
var objects = _objects.TryGetValue(state.Identifier, out var d) ? d : ActorData.Invalid; var objects = _objects.TryGetValue(state.Identifier, out var d) ? d : ActorData.Invalid;
@ -501,18 +504,21 @@ public class StateManager : IReadOnlyDictionary<ActorIdentifier, ActorState>
var data = new ActorData(actor, string.Empty); var data = new ActorData(actor, string.Empty);
var customizeFlags = Customize.Compare(mdl.GetCustomize(), state.ModelData.Customize); var customizeFlags = Customize.Compare(mdl.GetCustomize(), state.ModelData.Customize);
_editor.ChangeHatState(data, state.ModelData.IsHatVisible());
_editor.ChangeWetness(data, false);
_editor.ChangeWeaponState(data, state.ModelData.IsWeaponVisible());
_editor.ChangeVisor(data, state.ModelData.IsVisorToggled());
_editor.ChangeCustomize(data, state.ModelData.Customize); _editor.ChangeCustomize(data, state.ModelData.Customize);
if (customizeFlags.RequiresRedraw()) if (customizeFlags.RequiresRedraw())
return; return;
foreach (var slot in EquipSlotExtensions.EqdpSlots) if (state.ModelData.IsHatVisible())
_editor.ChangeArmor(data, EquipSlot.Head, state.ModelData.Armor(EquipSlot.Head));
foreach (var slot in EquipSlotExtensions.EqdpSlots.Skip(1))
_editor.ChangeArmor(data, slot, state.ModelData.Armor(slot)); _editor.ChangeArmor(data, slot, state.ModelData.Armor(slot));
_editor.ChangeMainhand(data, state.ModelData.Item(EquipSlot.MainHand), state.ModelData.Stain(EquipSlot.MainHand)); _editor.ChangeMainhand(data, state.ModelData.Item(EquipSlot.MainHand), state.ModelData.Stain(EquipSlot.MainHand));
_editor.ChangeOffhand(data, state.ModelData.Item(EquipSlot.OffHand), state.ModelData.Stain(EquipSlot.OffHand)); _editor.ChangeOffhand(data, state.ModelData.Item(EquipSlot.OffHand), state.ModelData.Stain(EquipSlot.OffHand));
_editor.ChangeWetness(data, false);
_editor.ChangeWeaponState(data, state.ModelData.IsWeaponVisible());
_editor.ChangeHatState(data, state.ModelData.IsHatVisible());
_editor.ChangeVisor(data, state.ModelData.IsVisorToggled());
} }
public void DeleteState(ActorIdentifier identifier) public void DeleteState(ActorIdentifier identifier)