Skip to content

New Engine Features: Weapon Style utils #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
4Luke4 wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

New Engine Features: Weapon Style utils #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions EEex-v2.6.6.0/headers/EEex-v2.6.6.0/EEex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ namespace EEex {
// Opcode //
////////////

// op73
int Opcode_Hook_DamageMod_ApplyEffect(CGameEffect* pEffect, CGameSprite* pSprite);
// op101
bool Opcode_Hook_Op101_ShouldEffectBypassImmunity(CGameEffect* pEffect);
// op248
Expand Down Expand Up @@ -127,7 +129,12 @@ namespace EEex {
void Sprite_Hook_OnDestruct(CGameSprite* pSprite);
void Sprite_Hook_OnAfterEffectListUnmarshalled(CGameSprite* pSprite);
void Sprite_Hook_OnBeforeEffectListMarshalled(CGameSprite* pSprite);
int Sprite_Hook_AdjustDisplayedDamage(CGameSprite* pSprite, CItem* pItem, int damage, int hand);
int Sprite_Hook_AdjustDamageRollHandBonus(CGameSprite* pSprite, int handBonus);
byte Sprite_Hook_OnGetAttackFrameType(CGameSprite* pSprite, byte numAttacks);
byte Sprite_Hook_OnSwingGetAttackFrameType(CGameSprite* pSprite, byte numAttacks);
void Sprite_Hook_ApplyOp342OffhandFrame(CGameSprite* pSprite);
int Sprite_Hook_GetOp342OffhandTHAC0(CGameSprite* pSprite, int thac0);

////////////
// Action //
Expand Down
17 changes: 17 additions & 0 deletions EEex-v2.6.6.0/headers/EEex-v2.6.6.0_generated/Baldur-v2.6.6.0_generated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4902,6 +4902,7 @@ namespace EEex
void ForceScrollbarRenderForItemName(lua_State* L);
const char* FormatPointerAsEngine(uintptr_t ptr);
int GetExtendedStatValue(CGameSprite* pSprite, int exStatID);
void GetWeaponStyle(lua_State* L, CGameSprite* pSprite);
int GetHighestRefreshRate();
void GetINIString(lua_State* L, const char* iniPath, const char* section, const char* key, const char* def);
long long GetMicroseconds();
Expand Down Expand Up @@ -18445,6 +18446,9 @@ struct CGameSprite : CGameAIBase
typedef CDerivedStats* (__thiscall *type_GetActiveStats)(CGameSprite* pThis);
static type_GetActiveStats p_GetActiveStats;

typedef int (__thiscall *type_GetActiveWeaponStyleAndLevel)(CGameSprite* pThis, int* pProficiencyLevel);
static type_GetActiveWeaponStyleAndLevel p_GetActiveWeaponStyleAndLevel;

typedef short (__thiscall *type_GetCasterLevel)(CGameSprite* pThis, CSpell* pSpell, int includeWildMage);
static type_GetCasterLevel p_GetCasterLevel;

Expand Down Expand Up @@ -18490,6 +18494,9 @@ struct CGameSprite : CGameAIBase
typedef short (__thiscall *type_SpellPoint)(CGameSprite* pThis);
static type_SpellPoint p_SpellPoint;

typedef __int16 (__thiscall *type_Swing)(CGameSprite* pThis, CGameSprite* target);
static type_Swing p_Swing;

typedef void (__thiscall *type_UpdateTarget)(CGameSprite* pThis, CGameObject* target);
static type_UpdateTarget p_UpdateTarget;

Expand Down Expand Up @@ -18531,6 +18538,11 @@ struct CGameSprite : CGameAIBase
return p_GetActiveStats(this);
}

int GetActiveWeaponStyleAndLevel(int* pProficiencyLevel)
{
return p_GetActiveWeaponStyleAndLevel(this, pProficiencyLevel);
}

short GetCasterLevel(CSpell* pSpell, int includeWildMage)
{
return p_GetCasterLevel(this, pSpell, includeWildMage);
Expand Down Expand Up @@ -18606,6 +18618,11 @@ struct CGameSprite : CGameAIBase
return p_SpellPoint(this);
}

__int16 Swing(CGameSprite* target)
{
return p_Swing(this, target);
}

void UpdateTarget(CGameObject* target)
{
p_UpdateTarget(this, target);
Expand Down
1 change: 1 addition & 0 deletions EEex-v2.6.6.0/scripts/generate_bindings/in/bindings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ namespace EEex
$external_implementation $pass_lua_state void ForceScrollbarRenderForItemName();
$external_implementation primitive const char* FormatPointerAsEngine(uintptr_t ptr);
$external_implementation int GetExtendedStatValue(CGameSprite* pSprite, int exStatID);
$external_implementation $custom_return_3 GetWeaponStyle(CGameSprite* pSprite);
$external_implementation int GetHighestRefreshRate();
$external_implementation $custom_return_1 GetINIString(primitive const char* iniPath, primitive const char* section, primitive const char* key, primitive const char* def);
$external_implementation long long GetMicroseconds();
Expand Down
Loading