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

Make stuff not apply in Aesthetician in general.

Browse source
This commit is contained in:
Ottermandias 2023-08-22 15:48:55 +02:00
parent 89b1a22800
commit e64e94f78d
6 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Glamourer/Interop/ChangeCustomizeService.cs
View file

@ -6,6 +6,7 @@ using Glamourer.Customization;
using Glamourer.Events;
using Glamourer.Interop.Structs;
using OtterGui.Classes;
using Penumbra.String.Functions;
using CustomizeData = Penumbra.GameData.Structs.CustomizeData;
namespace Glamourer.Interop;
@ -74,9 +75,7 @@ public unsafe class ChangeCustomizeService : EventWrapper<Action<Model, Ref<Cust
{
var customize = new Ref<Customize>(new Customize(*(CustomizeData*)data));
Invoke(this, (Model)human, customize);
fixed (byte* ptr = customize.Value.Data.Data)
{
return _changeCustomizeHook.Original(human, ptr, skipEquipment);
}
((Customize*)data)->Load(customize.Value);
return _changeCustomizeHook.Original(human, data, skipEquipment);
}
}

6
Glamourer/Interop/Structs/Actor.cs
View file

@ -43,7 +43,7 @@ public readonly unsafe struct Actor : IEquatable<Actor>
=> actor.Address;
public bool IsGPoseOrCutscene
=> Index is >= (int)ScreenActor.CutsceneStart and < (int)ScreenActor.CutsceneEnd;
=> Index.Index is >= (int)ScreenActor.CutsceneStart and < (int)ScreenActor.CutsceneEnd;
public ActorIdentifier GetIdentifier(ActorManager actors)
=> actors.FromObject(AsObject, out _, true, true, false);
@ -63,8 +63,8 @@ public readonly unsafe struct Actor : IEquatable<Actor>
return false;
}
public int Index
=> Valid ? AsObject->ObjectIndex : -1;
public ObjectIndex Index
=> Valid ? AsObject->ObjectIndex : ObjectIndex.AnyIndex;
public Model Model
=> Valid ? AsObject->DrawObject : null;

2
Glamourer/Interop/UpdateSlotService.cs
View file

@ -51,7 +51,7 @@ public unsafe class UpdateSlotService : IDisposable
var slot = slotIdx.ToEquipSlot();
var returnValue = ulong.MaxValue;
SlotUpdatingEvent.Invoke(drawObject, slot, ref *data, ref returnValue);
Glamourer.Log.Excessive($"[FlagSlotForUpdate] Called with 0x{drawObject:X} for slot {slot} with {*data} ({returnValue}).");
Glamourer.Log.Excessive($"[FlagSlotForUpdate] Called with 0x{drawObject:X} for slot {slot} with {*data} ({returnValue:X}).");
return returnValue == ulong.MaxValue ? _flagSlotForUpdateHook.Original(drawObject, slotIdx, data) : returnValue;
}

3
Glamourer/Services/DalamudServices.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Game;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Keys;
using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.Gui;
@ -23,6 +24,7 @@ public class DalamudServices
services.AddSingleton(Commands);
services.AddSingleton(GameData);
services.AddSingleton(ClientState);
services.AddSingleton(Condition);
services.AddSingleton(GameGui);
services.AddSingleton(Chat);
services.AddSingleton(Framework);
@ -40,6 +42,7 @@ public class DalamudServices
[PluginService][RequiredVersion("1.0")] public ICommandManager Commands { get; private set; } = null!;
[PluginService][RequiredVersion("1.0")] public IDataManager GameData { get; private set; } = null!;
[PluginService][RequiredVersion("1.0")] public IClientState ClientState { get; private set; } = null!;
[PluginService][RequiredVersion("1.0")] public Condition Condition { get; private set; } = null!;
[PluginService][RequiredVersion("1.0")] public IGameGui GameGui { get; private set; } = null!;
[PluginService][RequiredVersion("1.0")] public ChatGui Chat { get; private set; } = null!;
[PluginService][RequiredVersion("1.0")] public Framework Framework { get; private set; } = null!;

2
Glamourer/State/FunModule.cs
View file

@ -35,7 +35,7 @@ public unsafe class FunModule
if (actor.AsCharacter->CharacterData.ModelCharaId != 0)
return;
ApplyEmperor(new Span<CharacterArmor>(ref armor));
ApplyEmperor(new Span<CharacterArmor>(ref armor), slot);
ApplyClown(new Span<CharacterArmor>(ref armor));
}

28
Glamourer/State/StateListener.cs
View file

@ -11,6 +11,7 @@ using Penumbra.GameData.Data;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using System;
using Dalamud.Game.ClientState.Conditions;
namespace Glamourer.State;
@ -40,6 +41,7 @@ public class StateListener : IDisposable
private readonly MovedEquipment _movedEquipment;
private readonly GPoseService _gPose;
private readonly ChangeCustomizeService _changeCustomizeService;
private readonly Condition _condition;
private ActorIdentifier _creatingIdentifier = ActorIdentifier.Invalid;
private ActorState? _creatingState;
@ -55,7 +57,7 @@ public class StateListener : IDisposable
SlotUpdating slotUpdating, WeaponLoading weaponLoading, VisorStateChanged visorState, WeaponVisibilityChanged weaponVisibility,
HeadGearVisibilityChanged headGearVisibility, AutoDesignApplier autoDesignApplier, FunModule funModule, HumanModelList humans,
StateApplier applier, MovedEquipment movedEquipment, ObjectManager objects, GPoseService gPose,
ChangeCustomizeService changeCustomizeService, CustomizationService customizations)
ChangeCustomizeService changeCustomizeService, CustomizationService customizations, Condition condition)
{
_manager = manager;
_items = items;
@ -76,6 +78,7 @@ public class StateListener : IDisposable
_gPose = gPose;
_changeCustomizeService = changeCustomizeService;
_customizations = customizations;
_condition = condition;
if (Enabled)
Subscribe();
@ -123,6 +126,9 @@ public class StateListener : IDisposable
private unsafe void OnCreatingCharacterBase(nint actorPtr, string _, nint modelPtr, nint customizePtr, nint equipDataPtr)
{
var actor = (Actor)actorPtr;
if (_condition[ConditionFlag.CreatingCharacter] && actor.Index >= ObjectIndex.CutsceneStart)
return;
_creatingIdentifier = actor.GetIdentifier(_actors.AwaitedService);
ref var modelId = ref *(uint*)modelPtr;
@ -154,7 +160,7 @@ public class StateListener : IDisposable
private unsafe void OnCustomizeChange(Model model, Ref<Customize> customize)
{
if (!model.IsHuman)
if (_condition[ConditionFlag.CreatingCharacter] || !model.IsHuman)
return;
var actor = _penumbra.GameObjectFromDrawObject(model);
@ -206,6 +212,9 @@ public class StateListener : IDisposable
/// </summary>
private void OnSlotUpdating(Model model, EquipSlot slot, Ref<CharacterArmor> armor, Ref<ulong> returnValue)
{
if (_condition[ConditionFlag.CreatingCharacter])
return;
var actor = _penumbra.GameObjectFromDrawObject(model);
if (actor.Identifier(_actors.AwaitedService, out var identifier)
&& _manager.TryGetValue(identifier, out var state))
@ -259,6 +268,9 @@ public class StateListener : IDisposable
/// </summary>
private void OnWeaponLoading(Actor actor, EquipSlot slot, Ref<CharacterWeapon> weapon)
{
if (_condition[ConditionFlag.CreatingCharacter])
return;
// Fist weapon gauntlet hack.
if (slot is EquipSlot.OffHand && weapon.Value.Variant == 0 && weapon.Value.Set.Id != 0 && _lastFistOffhand.Set.Id != 0)
weapon.Value = _lastFistOffhand;
@ -448,6 +460,9 @@ public class StateListener : IDisposable
/// <summary> Handle visor state changes made by the game. </summary>
private void OnVisorChange(Model model, Ref<bool> value)
{
if (_condition[ConditionFlag.CreatingCharacter])
return;
// Find appropriate actor and state.
// We do not need to handle fixed designs,
// since a fixed design would already have established state-tracking.
@ -478,6 +493,9 @@ public class StateListener : IDisposable
/// <summary> Handle Hat Visibility changes. These act on the game object. </summary>
private void OnHeadGearVisibilityChange(Actor actor, Ref<bool> value)
{
if (_condition[ConditionFlag.CreatingCharacter])
return;
// Find appropriate state.
// We do not need to handle fixed designs,
// if there is no model that caused a fixed design to exist yet,
@ -508,6 +526,9 @@ public class StateListener : IDisposable
/// <summary> Handle Weapon Visibility changes. These act on the game object. </summary>
private void OnWeaponVisibilityChange(Actor actor, Ref<bool> value)
{
if (_condition[ConditionFlag.CreatingCharacter])
return;
// Find appropriate state.
// We do not need to handle fixed designs,
// if there is no model that caused a fixed design to exist yet,
@ -579,6 +600,9 @@ public class StateListener : IDisposable
private void OnCreatedCharacterBase(nint gameObject, string _, nint drawObject)
{
if (_condition[ConditionFlag.CreatingCharacter])
return;
if (_creatingState == null)
return;