Merge pull request #99 from shad0wshayd3/dev

Misc Blood Magic Defs

include/RE/A/AIProcess.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "RE/A/ActorPackage.h"
+#include "RE/A/ActorValues.h"
 #include "RE/B/BGSDefaultObjectManager.h"
 #include "RE/B/BSTArray.h"
 #include "RE/B/BSTList.h"
@@ -161,6 +162,7 @@ namespace RE
 		[[nodiscard]] bool      GetIsSummonedCreature() const noexcept;
 		NiAVObject*             GetMagicNode(const BSTSmartPointer<BipedAnim>& a_biped) const;
 		ObjectRefHandle         GetOccupiedFurniture() const;
+		float                   GetRegenDelay(ActorValue a_actorvalue) const;
 		TESPackage*             GetRunningPackage() const;
 		Actor*                  GetUserData() const;
 		float                   GetVoiceRecoveryTime() const;
@@ -181,6 +183,7 @@ namespace RE
 		bool                    SetupSpecialIdle(Actor* a_actor, DEFAULT_OBJECT a_action, TESIdleForm* a_idle, bool a_arg5, bool a_arg6, TESObjectREFR* a_target);
 		void                    StopCurrentIdle(Actor* a_actor, bool a_forceIdleStop);
 		void                    Update3DModel(Actor* a_actor);
+		void                    UpdateRegenDelay(ActorValue a_actorValue, float a_regenDelay);
 
 		// members
 		MiddleLowProcessData*                           middleLow;                      // 000

include/RE/A/Actor.h

@@ -543,6 +543,7 @@ namespace RE
 		double                       GetMoveDirectionRelativeToFacing();
 		ObjectRefHandle              GetOccupiedFurniture() const;
 		TESRace*                     GetRace() const;
+		float                        GetRegenDelay(ActorValue a_actorValue) const;
 		bool                         GetRider(NiPointer<Actor>& a_outRider);
 		[[nodiscard]] TESObjectARMO* GetSkin() const;
 		[[nodiscard]] TESObjectARMO* GetSkin(BGSBipedObjectForm::BipedObjectSlot a_slot, bool a_noInit = false);
@@ -616,6 +617,7 @@ namespace RE
 		void                         UpdateAwakeSound(NiAVObject* a_obj3D);
 		void                         Update3DModel();
 		void                         UpdateHairColor();
+		void                         UpdateRegenDelay(ActorValue a_actorValue, float a_regenDelay);
 		void                         UpdateSkinColor();
 		void                         UpdateWeaponAbility(TESForm* a_weapon, ExtraDataList* a_extraData, bool a_leftHand);
 		void                         VisitArmorAddon(TESObjectARMO* a_armor, TESObjectARMA* a_arma, std::function<void(bool a_firstPerson, NiAVObject& a_obj)> a_visitor);

include/RE/G/GFxValue.h

@@ -260,6 +260,7 @@ namespace RE
 			bool SetText(void* a_data, const char* a_text, bool a_isHTML);
 
 			bool AttachMovie(void* a_data, GFxValue* a_movieClip, const char* a_symbolName, const char* a_instanceName, std::int32_t a_depth, const GFxValue* a_initObj);
+			bool CreateEmptyMovieClip(void* a_data, GFxValue* a_movieClip, const char* a_instanceName, std::int32_t a_depth);
 			bool GotoAndPlay(void* a_data, const char* a_frame, bool a_stop);
 
 			bool IsSameContext(const ObjectInterface* a_rhs) const;
@@ -399,6 +400,7 @@ namespace RE
 
 		// AS MovieClip support. Valid for MovieClips.
 		bool AttachMovie(GFxValue* a_movieClip, const char* a_symbolName, const char* a_instanceName, std::int32_t a_depth = -1, const GFxValue* a_initObj = nullptr);
+		bool CreateEmptyMovieClip(GFxValue* a_movieClip, const char* a_instanceName, std::int32_t a_depth = -1);
 		bool GotoAndPlay(const char* a_frame);
 		bool GotoAndStop(const char* a_frame);
 

include/RE/H/HUDMenu.h

@@ -40,6 +40,13 @@ namespace RE
 		// override (BSTEventSink<BSRemoteGamepadEvent>)
 		BSEventNotifyControl ProcessEvent(const BSRemoteGamepadEvent* a_event, BSTEventSource<BSRemoteGamepadEvent>* a_eventSource) override;  // 01
 
+		static void FlashMeter(ActorValue a_actorValue)
+		{
+			using func_t = decltype(&HUDMenu::FlashMeter);
+			REL::Relocation<func_t> func{ RELOCATION_ID(51907, 52845) };
+			return func(a_actorValue);
+		}
+
 		static void UpdateCrosshairMagicTarget(bool a_valid)
 		{
 			using func_t = decltype(&HUDMenu::UpdateCrosshairMagicTarget);

include/RE/M/MagicCaster.h

@@ -78,6 +78,7 @@ namespace RE
 		float        GetCurrentSpellCost();
 		void         InterruptCast(bool a_refund);
 		void         PlayReleaseSound(MagicItem* a_item);
+		void         SetCurrentSpell(MagicItem* a_item);
 		bool         TestProjectilePlacement(const Effect& a_effect, const bhkPickData& a_pickData);
 		void         UpdateImpl(float a_delta);
 

include/RE/M/MagicTarget.h

@@ -86,12 +86,13 @@ namespace RE
 		virtual float                        CheckResistance(MagicItem* a_magicItem, Effect* a_effect, TESBoundObject* a_object);  // 0A - { return 1.0; }
 		virtual bool                         CheckAbsorb(Actor* a_actor, MagicItem* a_magicItem, const Effect* a_effect);          // 0B - { return false; }
 
-		bool DispelEffect(MagicItem* a_spell, BSPointerHandle<Actor>& a_caster, ActiveEffect* a_effect = nullptr);
-		void DispelEffectsWithArchetype(Archetype a_type, bool a_force);
-		bool HasEffectWithArchetype(Archetype a_type);
-		bool HasMagicEffect(EffectSetting* a_effect);
-		bool HasMagicEffectWithKeyword(BGSKeyword* a_keyword, std::uint64_t a_arg2);
-		void VisitEffects(ForEachActiveEffectVisitor& visitor);
+		bool   DispelEffect(MagicItem* a_spell, BSPointerHandle<Actor>& a_caster, ActiveEffect* a_effect = nullptr);
+		void   DispelEffectsWithArchetype(Archetype a_type, bool a_force);
+		Actor* GetTargetAsActor();
+		bool   HasEffectWithArchetype(Archetype a_type);
+		bool   HasMagicEffect(EffectSetting* a_effect);
+		bool   HasMagicEffectWithKeyword(BGSKeyword* a_keyword, std::uint64_t a_arg2);
+		void   VisitEffects(ForEachActiveEffectVisitor& visitor);
 
 		// members
 		SpellDispelData* postUpdateDispelList;  // 08

include/RE/P/PlayerCharacter.h

@@ -367,6 +367,7 @@ namespace RE
 		TintMask*                GetTintMask(std::uint32_t a_tintType, std::uint32_t a_index);
 		bool                     HasActorDoingCommand() const;
 		bool                     IsGrabbing() const;
+		void                     PlayMagicFailureSound(MagicSystem::SpellType a_spellType);
 		void                     PlayPickupEvent(TESForm* a_item, TESForm* a_containerOwner, TESObjectREFR* a_containerRef, EventType a_eventType);
 		void                     SetAIDriven(bool a_enable);
 		void                     SetEscaping(bool a_flag, bool a_escaped);

include/RE/T/TESObjectREFR.h

@@ -366,6 +366,7 @@ namespace RE
 		ObjectRefHandle                         CreateRefHandle();
 		void                                    DoTrap(TrapData& a_data);
 		void                                    DoTrap(TrapEntry* a_trap, TargetEntry* a_target);
+		void                                    Enable(bool a_resetInventory);
 		NiAVObject*                             Get3D() const;
 		NiAVObject*                             Get3D(bool a_firstPerson) const;
 		TESNPC*                                 GetActorOwner();

include/RE/T/TutorialMenu.h

@@ -20,6 +20,13 @@ namespace RE
 		void               Accept(CallbackProcessor* a_processor) override;  // 01
 		UI_MESSAGE_RESULTS ProcessMessage(UIMessage& a_message) override;    // 04
 
+		static void OpenTutorialMenu(DEFAULT_OBJECT a_tutorial)
+		{
+			using func_t = decltype(&TutorialMenu::OpenTutorialMenu);
+			REL::Relocation<func_t> func{ RELOCATION_ID(51818, 52692) };
+			return func(a_tutorial);
+		}
+
 		// members
 		GFxValue root;  // 30 - "Menu_mc"
 	};

src/RE/A/AIProcess.cpp

@@ -96,6 +96,23 @@ namespace RE
 		}
 	}
 
+	float AIProcess::GetRegenDelay(ActorValue a_actorValue) const
+	{
+		if (high) {
+			switch (a_actorValue) {
+			case ActorValue::kHealth:
+				return high->healthRegenDelay;
+			case ActorValue::kMagicka:
+				return high->magickaRegenDelay;
+			case ActorValue::kStamina:
+				return high->staminaRegenDelay;
+			default:
+				break;
+			}
+		}
+		return 0.0f;
+	}
+
 	TESPackage* AIProcess::GetRunningPackage() const
 	{
 		TESPackage* package = nullptr;
@@ -254,4 +271,23 @@ namespace RE
 		REL::Relocation<func_t> func{ Offset::AIProcess::Update3DModel };
 		return func(this, a_actor);
 	}
+
+	void AIProcess::UpdateRegenDelay(ActorValue a_actorValue, float a_regenDelay)
+	{
+		if (high) {
+			switch (a_actorValue) {
+			case ActorValue::kHealth:
+				high->healthRegenDelay = a_regenDelay;
+				break;
+			case ActorValue::kMagicka:
+				high->magickaRegenDelay = a_regenDelay;
+				break;
+			case ActorValue::kStamina:
+				high->staminaRegenDelay = a_regenDelay;
+				break;
+			default:
+				break;
+			}
+		}
+	}
 }

src/RE/A/Actor.cpp

@@ -527,6 +527,14 @@ namespace RE
 		return base ? base->race : nullptr;
 	}
 
+	float Actor::GetRegenDelay(ActorValue a_actorValue) const
+	{
+		if (currentProcess) {
+			return currentProcess->GetRegenDelay(a_actorValue);
+		}
+		return 0.0f;
+	}
+
 	bool Actor::GetRider(NiPointer<Actor>& a_outRider)
 	{
 		using func_t = decltype(&Actor::GetRider);
@@ -1088,6 +1096,13 @@ namespace RE
 		}
 	}
 
+	void Actor::UpdateRegenDelay(ActorValue a_actorValue, float a_regenDelay)
+	{
+		if (currentProcess) {
+			currentProcess->UpdateRegenDelay(a_actorValue, a_regenDelay);
+		}
+	}
+
 	void Actor::UpdateSkinColor()
 	{
 		const auto* npc = GetActorBase();

src/RE/G/GFxValue.cpp

@@ -424,6 +424,13 @@ namespace RE
 		return func(this, a_data, a_movieClip, a_symbolName, a_instanceName, a_depth, a_initObj);
 	}
 
+	bool GFxValue::ObjectInterface::CreateEmptyMovieClip(void* a_data, GFxValue* a_movieClip, const char* a_instanceName, std::int32_t a_depth)
+	{
+		using func_t = decltype(&GFxValue::ObjectInterface::CreateEmptyMovieClip);
+		REL::Relocation<func_t> func{ RELOCATION_ID(80201, 82224) };
+		return func(this, a_data, a_movieClip, a_instanceName, a_depth);
+	}
+
 	bool GFxValue::ObjectInterface::GotoAndPlay(void* a_data, const char* a_frame, bool a_stop)
 	{
 		using func_t = decltype(&GFxValue::ObjectInterface::GotoAndPlay);
@@ -967,6 +974,12 @@ namespace RE
 		return _objectInterface->AttachMovie(_value.obj, a_movieClip, a_symbolName, a_instanceName, a_depth, a_initObj);
 	}
 
+	bool GFxValue::CreateEmptyMovieClip(GFxValue* a_movieClip, const char* a_instanceName, std::int32_t a_depth)
+	{
+		assert(IsDisplayObject());
+		return _objectInterface->CreateEmptyMovieClip(_value.obj, a_movieClip, a_instanceName, a_depth);
+	}
+
 	bool GFxValue::GotoAndPlay(const char* a_frame)
 	{
 		assert(IsDisplayObject());

src/RE/M/MagicCaster.cpp

@@ -16,7 +16,7 @@ namespace RE
 	bool MagicCaster::FindTargets(float a_effectivenessMult, std::uint32_t& a_targetCount, TESBoundObject* a_source, bool a_loadCast, bool a_adjustOnlyHostileEffectiveness)
 	{
 		using func_t = decltype(&MagicCaster::FindTargets);
-		REL::Relocation<func_t> func{ RELOCATION_ID(33676, 34456) };
+		REL::Relocation<func_t> func{ RELOCATION_ID(33632, 34410) };
 		return func(this, a_effectivenessMult, a_targetCount, a_source, a_loadCast, a_adjustOnlyHostileEffectiveness);
 	}
 
@@ -48,6 +48,13 @@ namespace RE
 		return func(this, a_item);
 	}
 
+	void MagicCaster::SetCurrentSpell(MagicItem* a_item)
+	{
+		using func_t = decltype(&MagicCaster::SetCurrentSpell);
+		REL::Relocation<func_t> func{ RELOCATION_ID(33644, 34422) };
+		return func(this, a_item);
+	}
+
 	bool MagicCaster::TestProjectilePlacement(const Effect& a_effect, const bhkPickData& a_pickData)
 	{
 		if (auto baseEffect = a_effect.baseEffect) {

src/RE/M/MagicSystem.cpp

@@ -2,24 +2,27 @@
 
 namespace RE
 {
-	const char* GetCannotCastString(MagicSystem::CannotCastReason a_reason)
+	namespace MagicSystem
 	{
-		using func_t = decltype(&MagicSystem::GetCannotCastString);
-		REL::Relocation<func_t> func{ RELOCATION_ID(11295, 11423) };
-		return func(a_reason);
-	}
+		const char* GetCannotCastString(MagicSystem::CannotCastReason a_reason)
+		{
+			using func_t = decltype(&MagicSystem::GetCannotCastString);
+			REL::Relocation<func_t> func{ RELOCATION_ID(11295, 11423) };
+			return func(a_reason);
+		}
 
-	float GetMagicCasterTargetUpdateInterval()
-	{
-		using func_t = decltype(&MagicSystem::GetMagicCasterTargetUpdateInterval);
-		REL::Relocation<func_t> func{ RELOCATION_ID(11294, 11422) };
-		return func();
-	}
+		float GetMagicCasterTargetUpdateInterval()
+		{
+			using func_t = decltype(&MagicSystem::GetMagicCasterTargetUpdateInterval);
+			REL::Relocation<func_t> func{ RELOCATION_ID(11294, 11422) };
+			return func();
+		}
 
-	BGSSoundDescriptorForm* GetMagicFailureSound(MagicSystem::SpellType a_type)
-	{
-		using func_t = decltype(&MagicSystem::GetMagicFailureSound);
-		REL::Relocation<func_t> func{ RELOCATION_ID(11286, 11411) };
-		return func(a_type);
+		BGSSoundDescriptorForm* GetMagicFailureSound(MagicSystem::SpellType a_type)
+		{
+			using func_t = decltype(&MagicSystem::GetMagicFailureSound);
+			REL::Relocation<func_t> func{ RELOCATION_ID(11286, 11411) };
+			return func(a_type);
+		}
 	}
 }

src/RE/M/MagicTarget.cpp

@@ -1,6 +1,7 @@
 #include "RE/M/MagicTarget.h"
 
 #include "RE/A/ActiveEffect.h"
+#include "RE/A/Actor.h"
 #include "RE/B/BSTList.h"
 #include "RE/E/EffectSetting.h"
 
@@ -33,6 +34,15 @@ namespace RE
 		}
 	}
 
+	Actor* MagicTarget::GetTargetAsActor()
+	{
+		if (MagicTargetIsActor()) {
+			return static_cast<Actor*>(this);
+		}
+
+		return nullptr;
+	}
+
 	bool MagicTarget::HasEffectWithArchetype(Archetype a_type)
 	{
 		auto effects = GetActiveEffectList();

src/RE/P/PlayerCharacter.cpp

@@ -150,6 +150,13 @@ namespace RE
 		return static_cast<bool>(grabbedObject);
 	}
 
+	void PlayerCharacter::PlayMagicFailureSound(MagicSystem::SpellType a_spellType)
+	{
+		using func_t = decltype(&PlayerCharacter::PlayMagicFailureSound);
+		REL::Relocation<func_t> func{ RELOCATION_ID(39486, 40565) };
+		return func(this, a_spellType);
+	}
+
 	void PlayerCharacter::PlayPickupEvent(TESForm* a_item, TESForm* a_containerOwner, TESObjectREFR* a_containerRef, EventType a_eventType)
 	{
 		using func_t = decltype(&PlayerCharacter::PlayPickupEvent);

src/RE/T/TESObjectREFR.cpp

@@ -92,6 +92,13 @@ namespace RE
 		return DoTrap2(a_trap, a_target);
 	}
 
+	void TESObjectREFR::Enable(bool a_resetInventory)
+	{
+		using func_t = decltype(&TESObjectREFR::Enable);
+		REL::Relocation<func_t> func{ RELOCATION_ID(19373, 19800) };
+		return func(this, a_resetInventory);
+	}
+
 	NiAVObject* TESObjectREFR::Get3D() const
 	{
 		return Get3D2();