NPC Appearance force

Author: AsgardXIV

Brio/Game/Actor/ActorRedrawService.cs

@@ -9,7 +9,7 @@
 using System.Runtime.InteropServices;
 using System;
 using DrawObjectObject = FFXIVClientStructs.FFXIV.Client.Graphics.Scene.Object;
-
+using Brio.Config;
 
 namespace Brio.Game.Actor;
 
@@ -95,10 +95,17 @@ public unsafe RedrawResult Redraw(GameObject gameObject, RedrawType redrawType)
             return RedrawResult.Failed;
         }
 
+        var wasNpcHack = RenderHookService.Instance.ApplyNPCOverride;
+        if(redrawType.HasFlag(RedrawType.ForceAllowNPCAppearance))
+            RenderHookService.Instance.ApplyNPCOverride = true;
+
         // Full redraw
         raw->DisableDraw();
         raw->EnableDraw();
 
+        if(redrawType.HasFlag(RedrawType.ForceAllowNPCAppearance))
+            RenderHookService.Instance.ApplyNPCOverride = wasNpcHack;
+
         // Handle position update
         if(redrawType.HasFlag(RedrawType.PreservePosition))
         {
@@ -134,8 +141,9 @@ public enum RedrawType
     AllowFull = 2,
     ForceRedrawWeaponsOnOptimized = 4,
     PreservePosition = 8,
+    ForceAllowNPCAppearance = 16,
 
-    All = AllowOptimized | AllowFull | ForceRedrawWeaponsOnOptimized | PreservePosition
+    All = AllowOptimized | AllowFull | ForceRedrawWeaponsOnOptimized | PreservePosition | ForceAllowNPCAppearance
 }
 
 public enum RedrawResult

Brio/UI/Components/ActorRedrawControls.cs

@@ -6,7 +6,7 @@ namespace Brio.UI.Components;
 
 public static class ActorRedrawControls
 {
-    private static RedrawType _redrawType = RedrawType.AllowOptimized | RedrawType.AllowFull | RedrawType.PreservePosition;
+    private static RedrawType _redrawType = RedrawType.AllowOptimized | RedrawType.AllowFull | RedrawType.PreservePosition | RedrawType.ForceAllowNPCAppearance;
 
     public unsafe static void Draw(GameObject gameObject)
     {
@@ -35,6 +35,13 @@ public unsafe static void Draw(GameObject gameObject)
         else
             _redrawType &= ~RedrawType.AllowOptimized;
 
+        bool forceAllowNPC = _redrawType.HasFlag(RedrawType.ForceAllowNPCAppearance);
+        ImGui.Checkbox("Force Allow NPC Appearance", ref forceAllowNPC);
+        if(forceAllowNPC)
+            _redrawType |= RedrawType.ForceAllowNPCAppearance;
+        else
+            _redrawType &= ~RedrawType.ForceAllowNPCAppearance;
+
         bool forceWeapon = _redrawType.HasFlag(RedrawType.ForceRedrawWeaponsOnOptimized);
         ImGui.Checkbox("Force Weapon Redraw", ref forceWeapon);
         if(forceWeapon)