Skip to content

Commit 411e4bb

Browse files
authored
feat: merge pull request #46 from FalloutCascadia/main
feat: Misc RE prior to AE release.
2 parents 3486476 + 49511e8 commit 411e4bb

25 files changed

Lines changed: 333 additions & 3 deletions

include/RE/A/ACTOR_AGGRESSION.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
enum class ACTOR_AGGRESSION : std::uint32_t
6+
{
7+
kCalmed = 0xFFFFFFFF,
8+
kUnagressive = 0x0,
9+
kAggressive = 0x1,
10+
kVeryAggressive = 0x2,
11+
kFrenzied = 0x3,
12+
kMax = 0x3
13+
};
14+
}

include/RE/A/ACTOR_AGGRO_RADIUS.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
enum class ACTOR_AGGRO_RADIUS : std::uint32_t
6+
{
7+
kWarn = 0x0,
8+
kWarnAndAttack = 0x1,
9+
kAttack = 0x2,
10+
kCount = 0x3
11+
};
12+
}

include/RE/A/ACTOR_ASSISTANCE.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
enum class ACTOR_ASSISTANCE : std::uint32_t
6+
{
7+
kHelpsNobody = 0x0,
8+
kHelpsAllies = 0x1,
9+
kHelpsFriends = 0x2,
10+
kCount = 0x3
11+
};
12+
}

include/RE/A/ACTOR_COMBAT_STATE.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
enum class ACTOR_COMBAT_STATE : std::int32_t
6+
{
7+
kNone = 0x0,
8+
kCombat = 0x1,
9+
kSearching = 0x2
10+
};
11+
}

include/RE/A/ACTOR_CONFIDENCE.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
enum class ACTOR_CONFIDENCE : std::uint32_t
6+
{
7+
kCowardly = 0x0,
8+
kCautious = 0x1,
9+
kAverage = 0x2,
10+
kBrave = 0x3,
11+
kFoolhardy = 0x4,
12+
kCount = 0x5
13+
};
14+
}

include/RE/A/ACTOR_STANCE.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
enum class ACTOR_STANCE : std::uint32_t
6+
{
7+
kNormal = 0x0,
8+
kSneaking = 0x1,
9+
kCoverVeryLow = 0x2,
10+
kCoverLow = 0x3,
11+
kCoverMid = 0x4,
12+
kCoverHigh = 0x5,
13+
kCount = 0x6
14+
};
15+
}

include/RE/A/AIFormulas.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
namespace AIFormulas
6+
{
7+
inline float GetBarterValue(float a_baseValue, float a_charisma, bool a_selling, TESObjectREFR* a_refTarget)
8+
{
9+
using func_t = decltype(&AIFormulas::GetBarterValue);
10+
static REL::Relocation<func_t> func{ ID::AIFormulas::GetBarterValue };
11+
return func(a_baseValue, a_charisma, a_selling, a_refTarget);
12+
}
13+
}
14+
}

include/RE/A/Actor.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,20 @@ namespace RE
573573
return func(this);
574574
}
575575

576+
std::uint8_t GetMobilityCrippled()
577+
{
578+
using func_t = decltype(&Actor::GetMobilityCrippled);
579+
static REL::Relocation<func_t> func{ ID::Actor::GetMobilityCrippled };
580+
return func(this);
581+
}
582+
583+
void SPECIALModifiedCallback(const ActorValueInfo* a_info, float a_originalValue, float a_delta)
584+
{
585+
using func_t = decltype(&Actor::SPECIALModifiedCallback);
586+
static REL::Relocation<func_t> func{ ID::Actor::SPECIALModifiedCallback };
587+
return func(this, a_info, a_originalValue, a_delta);
588+
}
589+
576590
// members
577591
NiTFlags<std::uint32_t, Actor> niFlags; // 2D0
578592
float updateTargetTimer; // 2D4

include/RE/B/BGSMaterialObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace RE
2121
{
2222
public:
2323
// members
24-
std::int8_t* nuffer; // 00
24+
char* buffer; // 00
2525
std::uint32_t bufferSize; // 08
2626
};
2727
static_assert(sizeof(FILE_DATA) == 0x10);

include/RE/B/BGSMod.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ namespace RE::BGSMod
4949
kPair
5050
};
5151

52+
enum class BLOCKIDS : std::uint32_t
53+
{
54+
kOMOD = 0x0,
55+
kPMOD = 0x1
56+
};
57+
5258
class Mod // id == 1
5359
{
5460
public:

0 commit comments

Comments
 (0)