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 some issues with Crests

Browse source
This commit is contained in:
Ottermandias 2024-11-27 23:28:56 +01:00
parent 66ed721105
commit 533c53fd8d
4 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer/Glamourer.cs
View file

@ -139,7 +139,7 @@ public class Glamourer : IDalamudPlugin
ReadOnlySpan<string> relevantPlugins =
[
"Penumbra", "MareSynchronos", "CustomizePlus", "SimpleHeels", "VfxEditor", "heliosphere-plugin", "Ktisis", "Brio", "DynamicBridge",
"LoporritSync",
"LoporritSync", "GagSpeak", "RoleplayingVoiceDalamud",
];
var plugins = _services.GetService<IDalamudPluginInterface>().InstalledPlugins
.GroupBy(p => p.InternalName)

25
Glamourer/Interop/CrestService.cs
View file

@ -2,6 +2,7 @@
using Dalamud.Plugin.Services;
using Dalamud.Utility.Signatures;
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using FFXIVClientStructs.FFXIV.Client.Game.Event;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using OtterGui.Classes;
using Penumbra.GameData;
@ -37,6 +38,7 @@ public sealed unsafe class CrestService : EventWrapperRef3<Actor, CrestFlag, boo
_humanSetFreeCompanyCrestVisibleOnSlot.Enable();
_weaponSetFreeCompanyCrestVisibleOnSlot.Enable();
_crestChangeHook.Enable();
_crestChangeCallerHook.Enable();
}
public void UpdateCrests(Actor gameObject, CrestFlag flags)
@ -60,6 +62,7 @@ public sealed unsafe class CrestService : EventWrapperRef3<Actor, CrestFlag, boo
_humanSetFreeCompanyCrestVisibleOnSlot.Dispose();
_weaponSetFreeCompanyCrestVisibleOnSlot.Dispose();
_crestChangeHook.Dispose();
_crestChangeCallerHook.Dispose();
}
private delegate void CrestChangeDelegate(DrawDataContainer* container, byte crestFlags);
@ -83,6 +86,28 @@ public sealed unsafe class CrestService : EventWrapperRef3<Actor, CrestFlag, boo
_crestChangeHook.Original(container, crestFlags);
}
[Signature(Sigs.CrestChangeCaller, DetourName = nameof(CrestChangeCallerDetour))]
private readonly Hook<CrestChangeCallerDelegate> _crestChangeCallerHook = null!;
private delegate void CrestChangeCallerDelegate(DrawDataContainer* container, byte* data);
private void CrestChangeCallerDetour(DrawDataContainer* container, byte* data)
{
var actor = (Actor)container->OwnerObject;
ref var flags = ref data[16];
foreach (var slot in CrestExtensions.AllRelevantSet)
{
var newValue = ((CrestFlag)flags).HasFlag(slot);
Invoke(actor, slot, ref newValue);
flags = (byte)(newValue ? flags | (byte)slot : flags & (byte)~slot);
}
Glamourer.Log.Verbose(
$"Called inlined CrestChange via CrestChangeCaller on {(ulong)container:X} with {(flags & 0x1F):X} and prior flags {actor.CrestBitfield}.");
using var _ = _inUpdate.EnterMethod();
_crestChangeCallerHook.Original(container, data);
}
public static bool GetModelCrest(Actor gameObject, CrestFlag slot)
{
if (!gameObject.IsCharacter)

2
Glamourer/Interop/Penumbra/ModSettingApplier.cs
View file

@ -18,7 +18,7 @@ public class ModSettingApplier(PenumbraService penumbra, Configuration config, O
if (!objects.TryGetValue(state.Identifier, out var data))
{
Glamourer.Log.Verbose(
$"[Mod Applier] No mod settings applied because no actor for {state.Identifier} could be found to associate collection.");
$"[Mod Applier] No mod settings applied because no actor for {state.Identifier.Incognito(null)} could be found to associate collection.");
return;
}

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 79d8d782b3b454a41f7f87f398806ec4d08d485f
Subproject commit cceebd89a19e27ac843b0a7d17d3c2bb41c77367