Merge pull request #43 from FalloutCascadia/main

Misc. updates.

Author: qudix

include/RE/A/ActorUtils.h

@@ -60,5 +60,12 @@ namespace RE
 			BSScrapArray<TESBoundObject*> foundArmor;  // 20
 		};
 		static_assert(sizeof(ArmorRatingVisitor) == 0x40);
+
+		static float GetEquippedArmorDamageResistance(Actor* a_actor, const ActorValueInfo* a_info)
+		{
+			using func_t = decltype(ActorUtils::GetEquippedArmorDamageResistance);
+			static REL::Relocation<func_t> func{ ID::ActorUtils::GetEquippedArmorDamageResistance };
+			return func(a_actor, a_info);
+		}
 	}
 }

include/RE/B/BGSInventoryItem.h

@@ -219,6 +219,13 @@ namespace RE
 			return func(this);
 		}
 
+		bool IsEquipped(std::uint32_t a_stackID)
+		{
+			using func_t = decltype(&BGSInventoryItem::IsEquipped);
+			static REL::Relocation<func_t> func{ ID::BGSInventoryItem::IsEquipped };
+			return func(this, a_stackID);
+		}
+
 		// members
 		TESBoundObject*        object;     // 00
 		BSTSmartPointer<Stack> stackData;  // 08

include/RE/C/CombatFormulas.h

@@ -34,5 +34,12 @@ namespace RE
 			static REL::Relocation<func_t> func{ ID::CombatFormulas::GetWeaponDisplayRateOfFire };
 			return func(a_weapon, a_data);
 		}
+
+		[[nodiscard]] inline float CalcTargetedLimbDamage(Actor* a_target, const BGSBodyPart* a_bodyPart, float a_physicalDamage, BSTArray<BSTTuple<TESForm*, BGSTypedFormValuePair::SharedVal>, BSTArrayHeapAllocator>* a_damageTypes)
+		{
+			using func_t = decltype(&CombatFormulas::CalcTargetedLimbDamage);
+			static REL::Relocation<func_t> func{ ID::CombatFormulas::CalcWeaponDamage };
+			return func(a_target, a_bodyPart, a_physicalDamage, a_damageTypes);
+		}
 	}
 }

include/RE/Fallout.h

@@ -611,6 +611,8 @@
 #include "RE/G/GridCell.h"
 #include "RE/G/GridCellArray.h"
 #include "RE/H/HUDColorTypes.h"
+#include "RE/H/HUDCompassMarkerBase.h"
+#include "RE/H/HUDMarkerData.h"
 #include "RE/H/HUDMenu.h"
 #include "RE/H/HUDMenuUtils.h"
 #include "RE/H/HUDModeEvent.h"
@@ -750,6 +752,7 @@
 #include "RE/L/LockpickingMenu.h"
 #include "RE/L/LocksPicked.h"
 #include "RE/L/LookHandler.h"
+#include "RE/M/MARKER_TYPE.h"
 #include "RE/M/MELEE_ATTACK_SPEED.h"
 #include "RE/M/MENU_RENDER_CONTEXT.h"
 #include "RE/M/MESSAGEBOX_BUTTON.h"
@@ -758,6 +761,7 @@
 #include "RE/M/MagicTarget.h"
 #include "RE/M/Main.h"
 #include "RE/M/MapMarkerData.h"
+#include "RE/M/MarkerIconTypes.h"
 #include "RE/M/MeleeThrowHandler.h"
 #include "RE/M/MemoryManager.h"
 #include "RE/M/MenuControls.h"
@@ -937,6 +941,7 @@
 #include "RE/R/RefAttachTechniqueInput.h"
 #include "RE/R/ReferenceEffect.h"
 #include "RE/R/ReferenceEffectController.h"
+#include "RE/R/RelativeMarkerHeight.h"
 #include "RE/R/RepairFailureCallback.h"
 #include "RE/R/RepeaterData.h"
 #include "RE/R/ResponseListWrapper.h"

include/RE/H/HUDCompassMarkerBase.h

@@ -0,0 +1,12 @@
+#pragma once
+
+namespace RE
+{
+	class __declspec(novtable) alignas(0x08) HUDCompassMarkerBase : public BSGFxShaderFXTarget
+	{
+	public:
+		// members
+		bool showHudWarningColor;  // B0
+	};
+	static_assert(sizeof(HUDCompassMarkerBase) == 0xB8);
+}

include/RE/H/HUDMarkerData.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "RE/M/MARKER_TYPE.h"
+#include "RE/M/MarkerIconTypes.h"
+#include "RE/R/RelativeMarkerHeight.h"
+
+namespace RE
+{
+	enum class MapMarkerSubCategories : std::int32_t;
+
+	class __declspec(novtable) alignas(0x04) HUDMarkerData
+	{
+	public:
+		// members
+		BSPointerHandle<TESObjectREFR, BSUntypedPointerHandle<21, 5>> marketTarget;             // 00
+		NiPoint3                                                      markerLocation;           // 04
+		NiPoint2                                                      movieCoords;              // 10
+		float                                                         heading;                  // 18
+		float                                                         distanceToPlayerSq;       // 1C
+		float                                                         markerDisplayDistance;    // 20
+		MarkerIconTypes                                               markerIconType;           // 24
+		RelativeMarkerHeight                                          relativeMarkerHeight;     // 28
+		MapMarkerSubCategories                                        mapMarkerSubCategories;   // 2C
+		MARKER_TYPE                                                   mapMarkerType;            // 30
+		bool                                                          showFloatingQuestMarker;  // 34
+		bool                                                          hostile;                  // 35
+	};
+	static_assert(sizeof(HUDMarkerData) == 0x38);
+}