feat(magic): intercept SummonCreatureEffect

tiltedphoques · Nov 3, 2021 · 9fa92ac · 9fa92ac
1 parent d366018
commit 9fa92ac
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/Code/client/Games/Skyrim/Actor.cpp b/Code/client/Games/Skyrim/Actor.cpp
@@ -18,9 +18,11 @@
 #include <World.h>
 #include <Services/PapyrusService.h>
 
-#include <Effects/ValueModifierEffect.h>
 #include <Forms/ActorValueInfo.h>
 
+#include <Effects/ValueModifierEffect.h>
+#include <Effects/SummonCreatureEffect.h>
+
 #ifdef SAVE_STUFF
 
 #include <Games/Skyrim/SaveLoad.h>
@@ -499,6 +501,18 @@ static TApplyActorEffect* RealApplyActorEffect = nullptr;
 
 void TP_MAKE_THISCALL(HookApplyActorEffect, ActiveEffect, Actor* apTarget, float aEffectValue, unsigned int unk1)
 {
+    const auto* pSummonCreatureEffect = RTTI_CAST(apThis, ActiveEffect, SummonCreatureEffect);
+    if (pSummonCreatureEffect)
+    {
+        spdlog::warn("SummonCreatureEffect triggered, actor id: {:X}, effect value: {}", apTarget ? apTarget->formID : 0, aEffectValue);
+        if (apTarget)
+        {
+            const auto* pExtendedActor = apTarget->GetExtension();
+            if (pExtendedActor->IsLocal())
+                return;
+        }
+    }
+
     const auto* pValueModEffect = RTTI_CAST(apThis, ActiveEffect, ValueModifierEffect);
 
     if (pValueModEffect)

diff --git a/Code/client/Games/Skyrim/Effects/SummonCreatureEffect.h b/Code/client/Games/Skyrim/Effects/SummonCreatureEffect.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "ActiveEffect.h"
+
+struct SummonCreatureEffect : ActiveEffect
+{
+
+};
diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -1133,6 +1133,7 @@ void CharacterService::OnNotifyAttachArrow(const NotifyAttachArrow& acMessage) c
 
 void CharacterService::OnInterruptCast(const InterruptCastEvent& acEvent) const noexcept
 {
+#if TP_SKYRIM64
     auto formId = acEvent.CasterFormID;
 
     auto view = m_world.view<FormIdComponent, LocalComponent>();
@@ -1149,10 +1150,12 @@ void CharacterService::OnInterruptCast(const InterruptCastEvent& acEvent) const
     InterruptCastRequest request;
     request.CasterId = localComponent.Id;
     m_transport.Send(request);
+#endif
 }
 
 void CharacterService::OnNotifyInterruptCast(const NotifyInterruptCast& acMessage) const noexcept
 {
+#if TP_SKYRIM64
     auto remoteView = m_world.view<RemoteComponent, FormIdComponent>();
     const auto remoteIt = std::find_if(std::begin(remoteView), std::end(remoteView), [remoteView, Id = acMessage.CasterId](auto entity)
     {
@@ -1173,4 +1176,5 @@ void CharacterService::OnNotifyInterruptCast(const NotifyInterruptCast& acMessag
     pActor->InterruptCast(false);
 
     spdlog::info("Interrupt remote cast successful");
+#endif
 }