Skip to content

New Engine Feature: Add companion opcodes for op248/op249 #121

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 2 commits into
base: devel
Choose a base branch
from
Open

New Engine Feature: Add companion opcodes for op248/op249 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a09fff
Op410/op411
4Luke4 May 15, 2026
04ea1a6
Formatting
4Luke4 May 16, 2026
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
38 changes: 38 additions & 0 deletions EEex/copy/EEex_scripts/EEex_Mix_Patch.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,44 @@
})
)

----------------------------------------------------------
-- [EEex.dll] EEex::Opcode_Hook_ApplyMissMeleeEffects() --
----------------------------------------------------------

EEex_HookConditionalJumpOnSuccessWithLabels(EEex_Label("Hook-CGameSprite::Swing()-MeleeMissResultJmp"), 0, {
{"hook_integrity_watchdog_ignore_registers", {
EEex_HookIntegrityWatchdogRegister.RAX, EEex_HookIntegrityWatchdogRegister.RCX, EEex_HookIntegrityWatchdogRegister.RDX,
EEex_HookIntegrityWatchdogRegister.R8, EEex_HookIntegrityWatchdogRegister.R9, EEex_HookIntegrityWatchdogRegister.R10,
EEex_HookIntegrityWatchdogRegister.R11
}}},
{[[
#MAKE_SHADOW_SPACE
mov rdx, r15 ; target
mov rcx, rbx ; attacker
call #L(EEex::Opcode_Hook_ApplyMissMeleeEffects)
#DESTROY_SHADOW_SPACE
]]}
)

-----------------------------------------------------------
-- [EEex.dll] EEex::Opcode_Hook_ApplyMissRangedEffects() --
-----------------------------------------------------------

EEex_HookConditionalJumpOnFailWithLabels(EEex_Label("Hook-CGameSprite::Swing()-RangedMissResultJmp"), 7, {
{"hook_integrity_watchdog_ignore_registers", {
EEex_HookIntegrityWatchdogRegister.RAX, EEex_HookIntegrityWatchdogRegister.RCX, EEex_HookIntegrityWatchdogRegister.RDX,
EEex_HookIntegrityWatchdogRegister.R8, EEex_HookIntegrityWatchdogRegister.R9, EEex_HookIntegrityWatchdogRegister.R10,
EEex_HookIntegrityWatchdogRegister.R11
}}},
{[[
#MAKE_SHADOW_SPACE
mov rdx, r15 ; target
mov rcx, rbx ; attacker
call #L(EEex::Opcode_Hook_ApplyMissRangedEffects)
#DESTROY_SHADOW_SPACE
]]}
)

EEex_EnableCodeProtection()

end)()
22 changes: 22 additions & 0 deletions EEex/copy/EEex_scripts/EEex_Opcode.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,28 @@ function EEex_Opcode_Private_ApplyExtraRangedEffects(sprite, targetSprite)
end)
end

function EEex_Opcode_Private_IterateMissEffects(sprite, ranged, func)

-- op410/op411 children are owned by EEex-side derived-stat storage rather than
-- the vanilla m_cExtraMeleeEffects / m_cExtraRangedEffects lists.
local count = ranged and EEex.GetMissRangedEffectCount(sprite) or EEex.GetMissMeleeEffectCount(sprite)

for i = 0, count - 1 do
local effect = ranged and EEex.GetMissRangedEffect(sprite, i) or EEex.GetMissMeleeEffect(sprite, i)
if effect ~= nil then
func(effect, i)
end
end
end

function EEex_Opcode_IterateMissMeleeEffects(sprite, func)
EEex_Opcode_Private_IterateMissEffects(sprite, false, func)
end

function EEex_Opcode_IterateMissRangedEffects(sprite, func)
EEex_Opcode_Private_IterateMissEffects(sprite, true, func)
end

-----------
-- Hooks --
-----------
Expand Down
94 changes: 87 additions & 7 deletions EEex/copy/EEex_scripts/EEex_Opcode_Patch.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
+------------------------------------------------------------------------------------------------------------------------------------------+
| (special & 1) != 0 -> .EFF bypasses op120 |
+------------------------------------------------------------------------------------------------------------------------------------------+
| [EEex.dll] EEex::Opcode_Hook_OnOp248AddTail(pOp248: CGameEffect*, pExtraEffect: CGameEffect*) |
| [EEex.dll] EEex::Opcode_Hook_OnOp248AddTail(pOp248: CGameEffect*, pExtraEffect: CGameEffect*, pNode: CNode*, pSprite: CGameSprite*) |
+------------------------------------------------------------------------------------------------------------------------------------------+
| [Lua] [EEex_Mix_Patch.lua] EEex_Opcode_Hook_OnAfterSwingCheckedOp248(sprite: CGameSprite, targetSprite: CGameSprite, blocked: boolean) |
+------------------------------------------------------------------------------------------------------------------------------------------+
Expand All @@ -234,11 +234,22 @@
---------------------------------------------------

EEex_HookAfterCallWithLabels(EEex_Label("Hook-CGameEffectMeleeEffect::ApplyEffect()-AddTail"), {
{"hook_integrity_watchdog_ignore_registers", {EEex_HookIntegrityWatchdogRegister.RAX}}},
{"hook_integrity_watchdog_ignore_registers", {
EEex_HookIntegrityWatchdogRegister.RAX, EEex_HookIntegrityWatchdogRegister.RCX, EEex_HookIntegrityWatchdogRegister.RDX,
EEex_HookIntegrityWatchdogRegister.R8, EEex_HookIntegrityWatchdogRegister.R9, EEex_HookIntegrityWatchdogRegister.R10,
EEex_HookIntegrityWatchdogRegister.R11
}}},
{[[
; op410 reuses CGameEffectMeleeEffect::ApplyEffect(), so the child is
; appended to m_cExtraMeleeEffects first. Pass the newly returned node and
; sprite to C++ so op410 can detach that exact child into miss-only storage.
mov r9, rsi ; pSprite
mov r8, rax ; pNode
mov rdx, rbx ; pEffect
mov rcx, rdi ; pOp248
mov rcx, rdi ; pOp248 / pOp410
#MAKE_SHADOW_SPACE(32)
call #L(EEex::Opcode_Hook_OnOp248AddTail)
#DESTROY_SHADOW_SPACE
]]}
)

Expand All @@ -248,7 +259,7 @@
+------------------------------------------------------------------------------------------------------------------------------------------+
| (special & 1) != 0 -> .EFF bypasses op120 |
+------------------------------------------------------------------------------------------------------------------------------------------+
| [EEex.dll] EEex::Opcode_Hook_OnOp249AddTail(pOp249: CGameEffect*, pExtraEffect: CGameEffect*) |
| [EEex.dll] EEex::Opcode_Hook_OnOp249AddTail(pOp249: CGameEffect*, pExtraEffect: CGameEffect*, pNode: CNode*, pSprite: CGameSprite*) |
+------------------------------------------------------------------------------------------------------------------------------------------+
| [Lua] [EEex_Mix_Patch.lua] EEex_Opcode_Hook_OnAfterSwingCheckedOp249(sprite: CGameSprite, targetSprite: CGameSprite, blocked: boolean) |
+------------------------------------------------------------------------------------------------------------------------------------------+
Expand All @@ -265,11 +276,22 @@
]]})

EEex_HookAfterCallWithLabels(EEex_Label("Hook-CGameEffectRangeEffect::ApplyEffect()-AddTail"), {
{"hook_integrity_watchdog_ignore_registers", {EEex_HookIntegrityWatchdogRegister.RAX}}},
{"hook_integrity_watchdog_ignore_registers", {
EEex_HookIntegrityWatchdogRegister.RAX, EEex_HookIntegrityWatchdogRegister.RCX, EEex_HookIntegrityWatchdogRegister.RDX,
EEex_HookIntegrityWatchdogRegister.R8, EEex_HookIntegrityWatchdogRegister.R9, EEex_HookIntegrityWatchdogRegister.R10,
EEex_HookIntegrityWatchdogRegister.R11
}}},
{[[
; op411 reuses CGameEffectRangeEffect::ApplyEffect(), so the child is
; appended to m_cExtraRangedEffects first. Pass the parent, child, node,
; and sprite to C++ so only op411 children are moved to miss-only storage.
mov r9, rdi ; pSprite
mov r8, rax ; pNode
mov rdx, rbx ; pEffect
mov rcx, qword ptr ss:[#$(1)] ]], {op249SavedEffect}, [[ ; pOp249
mov rcx, qword ptr ss:[#$(1)] ]], {op249SavedEffect}, [[ ; pOp249 / pOp411
#MAKE_SHADOW_SPACE(32)
call #L(EEex::Opcode_Hook_OnOp249AddTail)
#DESTROY_SHADOW_SPACE
]]}
)

Expand Down Expand Up @@ -1111,6 +1133,54 @@
]]},
})

--[[
+------------------------------------------------------------------------------------------------------------+
| New Opcode #410 (MeleeMissEffect) |
+------------------------------------------------------------------------------------------------------------+
| This opcode intentionally reuses CGameEffectMeleeEffect::ApplyEffect() so its child EFF decoding stays |
| byte-for-byte aligned with vanilla op248. The temporary vanilla list insertion is handled by the op248 |
| AddTail hook above: when the parent effect ID is 410, C++ removes the just-added child from |
| m_cExtraMeleeEffects and stores it in EEex-owned miss-only derived-stat storage. |
| |
| EEex_Mix_Patch.lua applies those stored children from the melee attack-roll miss branch only. |
+------------------------------------------------------------------------------------------------------------+
--]]

local EEex_MeleeMissEffect = genOpcodeDecode({
["ApplyEffect"] = {[[
#STACK_MOD(8) ; This was called, the ret ptr broke alignment
#MAKE_SHADOW_SPACE
call #L(CGameEffectMeleeEffect::ApplyEffect)
#DESTROY_SHADOW_SPACE
ret
]]},
})

--[[
+------------------------------------------------------------------------------------------------------------+
| New Opcode #411 (RangeMissEffect) |
+------------------------------------------------------------------------------------------------------------+
| This opcode intentionally reuses CGameEffectRangeEffect::ApplyEffect() so its child EFF decoding stays |
| byte-for-byte aligned with vanilla op249. The temporary vanilla list insertion is handled by the op249 |
| AddTail hook above: when the parent effect ID is 411, C++ removes the just-added child from |
| m_cExtraRangedEffects and stores it in EEex-owned miss-only derived-stat storage. |
| |
| EEex_Mix_Patch.lua applies those stored children from the ranged attack-roll miss branch only; the C++ |
| applicator mirrors op249 target handling, except target type 0 is delivered directly to the missed |
| target because a miss has no later projectile impact to carry preset-target children. |
+------------------------------------------------------------------------------------------------------------+
--]]

local EEex_RangeMissEffect = genOpcodeDecode({
["ApplyEffect"] = {[[
#STACK_MOD(8) ; This was called, the ret ptr broke alignment
#MAKE_SHADOW_SPACE
call #L(CGameEffectRangeEffect::ApplyEffect)
#DESTROY_SHADOW_SPACE
ret
]]},
})

--[[
+-------------------------------------+
| [JIT] Decode switch for new opcodes |
Expand Down Expand Up @@ -1154,8 +1224,18 @@

_409:
cmp eax, 409
jne #L(jmp_success)
jne _410
]], EEex_EnableActionListener, [[

_410:
cmp eax, 410
jne _411
]], EEex_MeleeMissEffect, [[

_411:
cmp eax, 411
jne #L(jmp_success)
]], EEex_RangeMissEffect, [[
]]})
)
EEex_HookIntegrityWatchdog_IgnoreStackSizes(EEex_Label("Hook-CGameEffect::DecodeEffect()-DefaultJmp"), {{0x60, 8}})
Expand Down
16 changes: 16 additions & 0 deletions EEex/loader/InfinityLoader.db
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2235,6 +2235,10 @@ Operations=ADD -10
Pattern=F6472004
Operations=ADD 25

[CGameEffectMeleeEffect::ApplyEffect]
Pattern=4889442430488BF2
Operations=ADD -25

[Hook-CGameEffectOverrideAnimation::ApplyEffect()-LastParam2Jmp]
Pattern=4889742420574883EC30488BF1488BFA
Operations=ADD 40
Expand All @@ -2247,6 +2251,10 @@ Operations=ADD 17
Pattern=4885C9747B
Operations=ADD -43

[CGameEffectRangeEffect::ApplyEffect]
Pattern=4885C9747B
Operations=ADD -43

[Hook-CGameEffectRangeEffect::ApplyEffect()-AddTail]
Pattern=488D8FC81C0000
Operations=ADD 20
Expand Down Expand Up @@ -2460,6 +2468,14 @@ Operations=ADD -7
Pattern=4D8D6F0CE95E010000
Operations=ADD 36

[Hook-CGameSprite::Swing()-RangedMissResultJmp]
Pattern=751A488B8BD84A0000
Operations=ADD 0

[Hook-CGameSprite::Swing()-MeleeMissResultJmp]
Pattern=0F8464080000
Operations=ADD 0

[Hook-CGameSprite::Swing()-GetAttackFrameType()]
Pattern=488983D84A00004439B3A44E0000
Operations=ADD 75
Expand Down