Skip to content

Commit

Permalink
- SpawnMaster support
Browse files Browse the repository at this point in the history
  • Loading branch information
DerpleMQ2 committed Jan 4, 2024
1 parent db73af3 commit 716bec3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
19 changes: 19 additions & 0 deletions utils/rgmercs_utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1208,6 +1208,25 @@ end
function Utils.IsNamed(spawn)
if not spawn() then return false end

if mq.TLO.Plugin("MQ2SpawnMaster").IsLoaded() then
local oldTarget = mq.TLO.Target.ID()

if oldTarget ~= spawn.ID() then
mq.cmdf("/target id %d", spawn.ID())
mq.delay("3s", function() return mq.TLO.Target.ID() == spawn.ID() end)
end

---@diagnostic disable-next-line: undefined-field
local ret = mq.TLO.SpawnMaster.HasTarget()

if oldTarget ~= mq.TLO.Target.ID() then
mq.cmdf("/target id %d", oldTarget)
mq.delay("3s", function() return mq.TLO.Target.ID() == oldTarget end)
end

return ret
end

for _, n in ipairs(Utils.NamedList) do
if spawn.Name() == n or spawn.CleanName() == n then return true end
end
Expand Down
2 changes: 1 addition & 1 deletion version.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
return { commitId = '3d27bfa 2024-01-04' }
return { commitId = 'db73af3 2024-01-04' }

0 comments on commit 716bec3

Please sign in to comment.