michael/darktide-AutoMark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(again): shadow set_tag directly on the SmartTagSystem INSTANCE (rawset) — three class-table hook attempts all provably missed the instance call path (marker nil, counter 0, zero fires); instance shadow also re-arms per mission since systems are recreated

Browse Source
This commit is contained in:
michael
2026-10-03 16:03:37 -04:00
parent 5ab17ac22e
commit 297fbcdb93
1 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutoMark/scripts/mods/AutoMark/mark/servo_skull_mark.lua
+48 -52
View File
@@ -28,65 +28,61 @@ local Vector3_distance = Vector3.distance
local HACK_TAG_NAME = "hacking_over_here_companion" local HACK_TAG_NAME = "hacking_over_here_companion"
local CANCEL_INTERVAL = 0.5 local CANCEL_INTERVAL = 0.5
-- set_tag() for off-LOS units is silently rejected: as HOST, SmartTagSystem:set_tag() runs -- set_tag() for off-LOS targets is silently rejected: as HOST, SmartTagSystem:set_tag() runs
-- _tagger_is_looking_at_target() (dot-0.75 aim cone + LOS sweep, from the game source) and -- _tagger_is_looking_at_target() (dot-0.75 aim cone + LOS sweep, from game source) and returns
-- returns before creating the tag. Since we hold the full source of the accept-branch -- before creating the tag. Probes proved class-table hooks (CLASS registry, metatable,
-- (_generate_tag_id -> _create_tag_locally -> group limit check -> rpc to clients), the hook -- metatable.__index) never land on this instance's call path — so we rawset an instance-level
-- below reproduces it verbatim, minus the look check, for our flagged auto-hack targets only. -- shadow that beats every lookup chain. It replicates set_tag's host accept-branch
-- (_generate_tag_id -> _create_tag_locally -> group limit -> rpc to clients) minus the gate.
local function ensure_automark_tag_hook() local function ensure_automark_tag_hook()
if mod.omni_hack_tag_hooked then
return
end
local smart_tag_system = context.smart_tag_system local smart_tag_system = context.smart_tag_system
if not smart_tag_system then if not smart_tag_system or mod.omni_hack_patched_sys == smart_tag_system then
return return
end end
local cls = getmetatable(smart_tag_system) local orig_set_tag = smart_tag_system.set_tag
if type(cls) == "table" and rawget(cls, "set_tag") == nil then if type(orig_set_tag) ~= "function" then
cls = rawget(cls, "__index") or cls return
end end
if type(cls) == "table" and cls.set_tag ~= nil then local patched = {}
mod:hook(cls, "set_tag", function(previous_hook, self, template_name, tagger_unit, target_unit, target_location) patched.set_tag = function(self, template_name, tagger_unit, target_unit, target_location)
mod.omni_hack_hook_count = (mod.omni_hack_hook_count or 0) + 1 if self ~= smart_tag_system then
if template_name == HACK_TAG_NAME and mod_settings.debug_mode and not mod.omni_hack_hook_fired then return orig_set_tag(self, template_name, tagger_unit, target_unit, target_location)
mod.omni_hack_hook_fired = true end
local ext = target_unit and self._unit_extension_data[target_unit] mod.omni_hack_hook_count = (mod.omni_hack_hook_count or 0) + 1
mod:diag("OMNI-HACK-DIAG hook FIRE is_server=", tostring(self._is_server), " flagged=", tostring(ext and ext._automark_hack_order), " has_ext=", tostring(ext ~= nil), " target=", tostring(target_unit), " loc=", tostring(target_location)) if template_name == HACK_TAG_NAME and target_unit and self._is_server and not patched.in_branch then
end local target_extension = self._unit_extension_data[target_unit]
if template_name == HACK_TAG_NAME and target_unit and self._is_server then if target_extension and target_extension._automark_hack_order then
local target_extension = self._unit_extension_data[target_unit] if mod_settings.debug_mode and not mod.omni_hack_hook_fired then
if target_extension and target_extension._automark_hack_order then mod.omni_hack_hook_fired = true
local ok, err = pcall(function() mod:diag("OMNI-HACK-DIAG hook FIRE is_server=", tostring(self._is_server))
local tag_id = self:_generate_tag_id() end
local tag = self:_create_tag_locally(tag_id, template_name, tagger_unit, target_unit, target_location) patched.in_branch = true
self:_server_check_tag_group_limit(tagger_unit, tag:group()) local ok, err = pcall(function()
local template_name_id = NetworkLookup.smart_tag_templates[template_name] local tag_id = self:_generate_tag_id()
local tagger_game_object_id = Managers.state.unit_spawner:game_object_id(tagger_unit) local tag = self:_create_tag_locally(tag_id, template_name, tagger_unit, target_unit, target_location)
local target_game_object_id = Managers.state.unit_spawner:game_object_id(target_unit) self:_server_check_tag_group_limit(tagger_unit, tag:group())
Managers.state.game_session:send_rpc_clients("rpc_set_smart_tag", tag_id, template_name_id, tagger_game_object_id, target_game_object_id, nil, target_location) local template_name_id = NetworkLookup.smart_tag_templates[template_name]
end) local tagger_game_object_id = Managers.state.unit_spawner:game_object_id(tagger_unit)
if ok then local target_game_object_id = Managers.state.unit_spawner:game_object_id(target_unit)
return Managers.state.game_session:send_rpc_clients("rpc_set_smart_tag", tag_id, template_name_id, tagger_game_object_id, target_game_object_id, nil, target_location)
end end)
if mod_settings.debug_mode and not mod.omni_hack_taghook_err_logged then patched.in_branch = nil
mod.omni_hack_taghook_err_logged = true if ok then
mod:diag("OMNI-HACK-DIAG tag-branch replication FAILED:", tostring(err)) return
end end
if mod_settings.debug_mode and not mod.omni_hack_taghook_err_logged then
mod.omni_hack_taghook_err_logged = true
mod:diag("OMNI-HACK-DIAG tag-branch replication FAILED:", tostring(err))
end end
end end
return previous_hook(self, template_name, tagger_unit, target_unit, target_location)
end)
mod.omni_hack_tag_hooked = true
mod.omni_hack_hooked_ptr = tostring(cls.set_tag)
pcall(function()
cls.set_tag.omni_hook_marker = true
end)
if mod_settings.debug_mode then
mod:diag("OMNI-HACK-DIAG set_tag hook INSTALLED cls_ptr=", tostring(cls.set_tag), " sys_ptr=", tostring(smart_tag_system.set_tag), " same_sys_obj=", tostring(smart_tag_system == context.smart_tag_system))
end end
elseif mod_settings.debug_mode and not mod.omni_hack_taghook_fail_logged then return orig_set_tag(self, template_name, tagger_unit, target_unit, target_location)
mod.omni_hack_taghook_fail_logged = true end
mod:diag("OMNI-HACK-DIAG set_tag hook FAILED to locate class, mt=", tostring(cls)) rawset(smart_tag_system, "set_tag", patched.set_tag)
patched.set_tag.omni_hook_marker = true
mod.omni_hack_patched_sys = smart_tag_system
if mod_settings.debug_mode then
mod:diag("OMNI-HACK-DIAG set_tag instance-shadow INSTALLED marker=", tostring(rawget(smart_tag_system, "set_tag") == patched.set_tag))
end end
end end
@@ -367,7 +363,7 @@ function mod:auto_hack(dt, t, fixed_frame)
if hack_check.ttl <= 0 then if hack_check.ttl <= 0 then
if mod_settings.debug_mode then if mod_settings.debug_mode then
local smart_tag_system = context.smart_tag_system local smart_tag_system = context.smart_tag_system
mod:diag(string.format("OMNI-HACK-DIAG tagcheck %s alive=%s tag_applied=%s skull_hacking=%s hooked=%s hookcalls=%s", tostring(hack_check.n), tostring(HEALTH_ALIVE[hack_check.unit] == true), tostring(smart_tag_system and smart_tag_system:unit_tag(hack_check.unit) ~= nil), tostring(mod:is_servo_skull_hacking()), tostring(mod.omni_hack_tag_hooked), tostring(mod.omni_hack_hook_count))) mod:diag(string.format("OMNI-HACK-DIAG tagcheck %s alive=%s tag_applied=%s skull_hacking=%s hooked=%s hookcalls=%s", tostring(hack_check.n), tostring(HEALTH_ALIVE[hack_check.unit] == true), tostring(smart_tag_system and smart_tag_system:unit_tag(hack_check.unit) ~= nil), tostring(mod:is_servo_skull_hacking()), tostring(mod.omni_hack_patched_sys ~= nil), tostring(mod.omni_hack_hook_count)))
end end
hack_check = nil hack_check = nil
end end