Better humanoid npc detection

Code/client/Games/Skyrim/Actor.cpp

@@ -44,6 +44,8 @@
 #include <Games/Skyrim/BSAnimationGraphManager.h>
 #include <Havok/hkbStateMachine.h>
 #include <Havok/hkbBehaviorGraph.h>
+#include <Forms/BGSOutfit.h>
+#include <Forms/TESObjectARMO.h>
 
 #ifdef SAVE_STUFF
 
@@ -196,9 +198,44 @@ bool Actor::IsWearingBodyPiece() const noexcept
     return GetContainerChanges()->GetArmor(32) != nullptr;
 }
 
-bool Actor::IsHumanoidNPC() const noexcept
+bool Actor::ShouldWearBodyPiece() const noexcept
 {
-    return Cast<TESNPC>(baseForm)->outfits[0] != nullptr;
+    TESNPC* pBase = Cast<TESNPC>(baseForm);
+    if (!pBase)
+        return false;
+
+    BGSOutfit* pDefaultOutfit = pBase->outfits[0];
+    if (!pDefaultOutfit)
+        return false;
+
+    for (auto* pItem : pDefaultOutfit->outfitItems)
+    {
+        TESObjectARMO* pArmor = nullptr;
+
+        if (pItem->formType == FormType::Armor)
+            pArmor = Cast<TESObjectARMO>(pItem);
+        else if (pItem->formType == FormType::LeveledItem)
+        {
+            // TODO: leveled items can probably also be handled but afaik,
+            // the naked npc bug mostly occurs to town NPCs.
+            // Since this is a bit more complex and possibly error prone, leave out for now.
+#if 0
+            TESLevItem* pLevItem = Cast<TESLevItem>(pItem);
+            if (!pLevItem)
+                continue;
+#endif
+        }
+        else
+            continue;
+
+        if (!pArmor)
+            continue;
+
+        if (pArmor->slotType & 0x4) // 0x4 is flag for body piece
+            return true;
+    }
+
+    return false;
 }
 
 // Get owner of a summon or raised corpse

Code/client/Games/Skyrim/Actor.h

@@ -206,7 +206,7 @@ struct Actor : TESObjectREFR
     [[nodiscard]] bool HasPerk(uint32_t aPerkFormId) const noexcept;
     [[nodiscard]] uint8_t GetPerkRank(uint32_t aPerkFormId) const noexcept;
     [[nodiscard]] bool IsWearingBodyPiece() const noexcept;
-    [[nodiscard]] bool IsHumanoidNPC() const noexcept;
+    [[nodiscard]] bool ShouldWearBodyPiece() const noexcept;
 
     // Setters
     void SetSpeed(float aSpeed) noexcept;

Code/client/Games/Skyrim/Forms/BGSOutfit.h

@@ -4,4 +4,5 @@
 
 struct BGSOutfit : TESForm
 {
+    GameArray<TESForm*> outfitItems;
 };

Code/client/Games/Skyrim/Forms/TESForm.h

@@ -14,6 +14,7 @@ enum class FormType : uint8_t
     Npc = 43,
     LeveledCharacter = 44,
     Alchemy = 46,
+    LeveledItem = 53,
     Character = 62,
     QuestItem = 77,
     Count = 0x87

Code/client/Games/Skyrim/Forms/TESLevItem.h

@@ -0,0 +1,6 @@
+#pragma once
+
+struct TESLevItem : BaseFormComponent
+{
+
+};

Code/client/Games/Skyrim/Forms/TESObjectARMO.h

@@ -4,4 +4,6 @@
 
 struct TESObjectARMO : TESForm
 {
+    uint8_t unk20[0x1B8 - sizeof(TESForm)];
+    uint32_t slotType;
 };

Code/client/Services/Debug/DebugService.cpp

@@ -213,7 +213,15 @@ void DebugService::OnUpdate(const UpdateEvent& acUpdateEvent) noexcept
         {
             s_f8Pressed = true;
 
-            PlaceActorInWorld();
+            //PlaceActorInWorld();
+            Actor* pActor = Cast<Actor>(TESForm::GetById(m_formId));
+            if (pActor)
+            {
+                if (pActor->ShouldWearBodyPiece())
+                    spdlog::warn("Actor has body piece");
+                else
+                    spdlog::error("Actor does not have body piece");
+            }
         }
     }
     else

Code/client/Services/Generic/InventoryService.cpp

@@ -24,6 +24,7 @@
 #include <Games/Overrides.h>
 #include <EquipManager.h>
 #include <Games/ActorExtension.h>
+#include <Forms/TESNPC.h>
 
 #if TP_FALLOUT4
 #include <Forms/BGSObjectInstance.h>
@@ -324,10 +325,10 @@ void InventoryService::RunNakedNPCBugChecks() noexcept
         if (pActor->IsDead())
             continue;
 
-        if (!pActor->IsHumanoidNPC())
+        if (pActor->IsWearingBodyPiece())
             continue;
 
-        if (pActor->IsWearingBodyPiece())
+        if (!pActor->ShouldWearBodyPiece())
             continue;
 
         // Don't broadcast changes if a remote actor needs fixing