Merge pull request #684 from tiltedphoques/dev

V1.6.7

Author: RobbeBryssinck

Code/client/Events/AddTargetEvent.h

@@ -8,6 +8,7 @@ struct AddTargetEvent
     AddTargetEvent() = default;
 
     uint32_t TargetID{};
+    uint32_t CasterID{};
     uint32_t SpellID{};
     uint32_t EffectID{};
     float Magnitude{};

Code/client/Events/BeastFormChangeEvent.h

@@ -0,0 +1,8 @@
+#pragma once
+
+/**
+ * @brief Dispatched when the local player enters or leaves beast form (vampire lord, werewolf).
+ */
+struct BeastFormChangeEvent
+{
+};

Code/client/Events/LeaveBeastFormEvent.h

@@ -17,6 +17,7 @@
 TP_THIS_FUNCTION(TPerformAction, uint8_t, ActorMediator, TESActionData* apAction);
 static TPerformAction* RealPerformAction;
 
+// TODO: make scoped override
 thread_local bool g_forceAnimation = false;
 
 uint8_t TP_MAKE_THISCALL(HookPerformAction, ActorMediator, TESActionData* apAction)

Code/client/Games/Animation.cpp

@@ -21,6 +21,7 @@
 #include <Services/PapyrusService.h>
 
 #include <Forms/ActorValueInfo.h>
+#include <Forms/TESRace.h>
 
 #include <Effects/ValueModifierEffect.h>
 
@@ -579,12 +580,58 @@ void Actor::Reset() noexcept
     s_pReset(this, 0, nullptr);
 }
 
+bool Actor::PlayIdle(TESIdleForm* apIdle) noexcept
+{
+    PAPYRUS_FUNCTION(bool, Actor, PlayIdle, TESIdleForm*);
+    return s_pPlayIdle(this, apIdle);
+}
+
 void Actor::Respawn() noexcept
 {
     Resurrect(false);
     Reset();
 }
 
+bool Actor::IsVampireLord() const noexcept
+{
+    return race && race->formID == 0x200283A;
+}
+
+extern thread_local bool g_forceAnimation;
+
+void Actor::FixVampireLordModel() noexcept
+{
+    TESBoundObject* pObject = Cast<TESBoundObject>(TESForm::GetById(0x2011a84));
+    if (!pObject)
+        return;
+
+    {
+        ScopedInventoryOverride _;
+        AddObjectToContainer(pObject, nullptr, 1, nullptr);
+    }
+
+    EquipManager::Get()->Equip(this, pObject, nullptr, 1, nullptr, false, true, false, false);
+
+    g_forceAnimation = true;
+
+    BSFixedString str("isLevitating");
+    uint32_t isLevitating = GetAnimationVariableInt(&str);
+    spdlog::critical("isLevitating {}", isLevitating);
+
+    // By default, a loaded vampire lord is not levitating.
+    if (isLevitating)
+    {
+        BSFixedString levitation("LevitationToggle");
+        SendAnimationEvent(&levitation);
+    }
+
+    // TODO: weapon draw code does not seem to take care of this
+    //BSFixedString weapEquip("WeapEquip");
+    //SendAnimationEvent(&weapEquip);
+
+    g_forceAnimation = false;
+}
+
 TP_THIS_FUNCTION(TForceState, void, Actor, const NiPoint3&, float, float, TESObjectCELL*, TESWorldSpace*, bool);
 static TForceState* RealForceState = nullptr;
 

Code/client/Games/Skyrim/Actor.cpp

@@ -21,6 +21,7 @@ struct ExPlayerCharacter;
 struct ActorExtension;
 struct AIProcess;
 struct CombatController;
+struct TESIdleForm;
 
 struct Actor : TESObjectREFR
 {
@@ -208,6 +209,7 @@ struct Actor : TESObjectREFR
     [[nodiscard]] uint8_t GetPerkRank(uint32_t aPerkFormId) const noexcept;
     [[nodiscard]] bool IsWearingBodyPiece() const noexcept;
     [[nodiscard]] bool ShouldWearBodyPiece() const noexcept;
+    [[nodiscard]] bool IsVampireLord() const noexcept;
 
     // Setters
     void SetSpeed(float aSpeed) noexcept;
@@ -246,6 +248,8 @@ struct Actor : TESObjectREFR
     void SetCombatTargetEx(Actor* apTarget) noexcept;
     void StartCombat(Actor* apTarget) noexcept;
     void StopCombat() noexcept;
+    bool PlayIdle(TESIdleForm* apIdle) noexcept;
+    void FixVampireLordModel() noexcept;
 
     enum ActorFlags
     {

Code/client/Games/Skyrim/Actor.h

@@ -40,7 +40,9 @@ struct ActiveEffect
 
     static ActiveEffect* Instantiate(Actor* apCaster, MagicItem* apSpell, EffectItem* apEffect);
 
-    uint8_t pad8[0x38];
+    uint8_t pad8[0x34 - 0x8];
+    uint32_t hCaster;
+    NiNode* pSourceNode;
     MagicItem* pSpell;
     void* pEffect;
     MagicTarget* pTarget;

Code/client/Games/Skyrim/Effects/ActiveEffect.h

@@ -91,6 +91,7 @@ bool TP_MAKE_THISCALL(HookAddTarget, MagicTarget, MagicTarget::AddTargetData& ar
 
     AddTargetEvent addTargetEvent{};
     addTargetEvent.TargetID = pTargetActor->formID;
+    addTargetEvent.CasterID = arData.pCaster ? arData.pCaster->formID : 0;
     addTargetEvent.SpellID = arData.pSpell->formID;
     addTargetEvent.EffectID = arData.pEffectItem->pEffectSetting->formID;
     addTargetEvent.Magnitude = arData.fMagnitude;

Code/client/Games/Skyrim/Magic/MagicTarget.cpp

@@ -2,11 +2,12 @@
 #include <Games/ActorExtension.h>
 
 #include <Structs/Skyrim/AnimationGraphDescriptor_Master_Behavior.h>
+#include <Structs/Skyrim/AnimationGraphDescriptor_VampireLordBehavior.h>
 
 #include <Games/Overrides.h>
 
 #include <Events/InventoryChangeEvent.h>
-#include <Events/LeaveBeastFormEvent.h>
+#include <Events/BeastFormChangeEvent.h>
 #include <Events/AddExperienceEvent.h>
 #include <Events/SetWaypointEvent.h>
 #include <Events/RemoveWaypointEvent.h>
@@ -162,7 +163,7 @@ void TP_MAKE_THISCALL(HookSetBeastForm, void, void* apUnk1, void* apUnk2, bool a
     if (!aEntering)
     {
         PlayerCharacter::Get()->GetExtension()->GraphDescriptorHash = AnimationGraphDescriptor_Master_Behavior::m_key;
-        World::Get().GetRunner().Trigger(LeaveBeastFormEvent());
+        World::Get().GetRunner().Trigger(BeastFormChangeEvent());
     }
 
     TiltedPhoques::ThisCall(RealSetBeastForm, apThis, apUnk1, apUnk2, aEntering);

Code/client/Games/Skyrim/PlayerCharacter.cpp

@@ -49,7 +49,10 @@ struct Projectile : TESObjectREFR
         bool bForceConeOfFire;       // unsure // usually false
     };
 
-    uint8_t unk98[0xF0];
+    uint8_t unkA0[0x120 - sizeof(TESObjectREFR)];
+    void* pActorCause;
+    uint32_t hShooter;
+    uint8_t unk[0x190 - 0x12C];
     float fPower;
     float fSpeedMult;
     float fRange;
@@ -60,3 +63,4 @@ struct Projectile : TESObjectREFR
 };
 
 static_assert(sizeof(Projectile::LaunchData) == 0xA8);
+static_assert(offsetof(Projectile, fPower) == 0x190);