Add marker persistence, proximity respawn, and group sync
Markers now survive zone transitions via persistent MarkerDef structs (position + area ID) that are NOT cleared during world teardown. The per-frame tick detects zombie entities (refcount <= 1 from game culling) and respawns markers when the player approaches within 200 yards. New DLL Lua APIs: SetMarkerDef, ClearMarkerDef, GetMarkerDef for the addon to store/query definitions without immediate entity creation. Addon layer adds group sync via CHAT_MSG_ADDON messages using colon- delimited protocol (P:idx:x:y:z:area, C:idx, CA, SR, SF:...). Wraps WorldMarker/ClearWorldMarker to broadcast on placement. Permission model: raid leader/assist or party leader only. Fix lua_pushnumber calling convention: Ghidra confirms it is thiscall (ECX=L, f64 on stack [EBP+8]/[EBP+0xc], ret 8), not fastcall. The patched inreg fastcall was shoving the f64's low dword into EDX, producing garbage values like 1.17e-250 from 1810.
This commit is contained in:
MarcelineVQ
@@ -1,19 +1,250 @@
|
||||
-- Markers addon (embedded in DLL, loaded from memory)
|
||||
-- Part of WeirdUtils - only loaded when markers module is compiled
|
||||
|
||||
MARKERS_VERSION = 2
|
||||
MARKERS_VERSION = 3
|
||||
|
||||
BINDING_HEADER_MARKERS = "Markers"
|
||||
|
||||
-- =============================================================================
|
||||
-- Debug logging
|
||||
-- =============================================================================
|
||||
|
||||
local function log(msg)
|
||||
DEFAULT_CHAT_FRAME:AddMessage("|cff88aaff[WMark]|r " .. msg)
|
||||
end
|
||||
|
||||
-- =============================================================================
|
||||
-- Addon message protocol
|
||||
-- Delimiter is ":" (pipe "|" is WoW's escape char for color codes)
|
||||
-- =============================================================================
|
||||
|
||||
local MSG_PREFIX = "WMark"
|
||||
local NUM_MARKERS = 5
|
||||
|
||||
local function getChannel()
|
||||
if GetNumRaidMembers() > 0 then
|
||||
return "RAID"
|
||||
elseif GetNumPartyMembers() > 0 then
|
||||
return "PARTY"
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
local function canSetMarkers()
|
||||
if GetNumRaidMembers() > 0 then
|
||||
for i = 1, 40 do
|
||||
local name, rank = GetRaidRosterInfo(i)
|
||||
if name == UnitName("player") then
|
||||
log("canSet: raid rank=" .. rank .. (rank >= 1 and " YES" or " NO"))
|
||||
return rank >= 1 -- 1=assist, 2=leader
|
||||
end
|
||||
end
|
||||
log("canSet: not in raid roster")
|
||||
return false
|
||||
elseif GetNumPartyMembers() > 0 then
|
||||
local result = IsPartyLeader()
|
||||
log("canSet: party leader=" .. tostring(result))
|
||||
return result
|
||||
end
|
||||
log("canSet: solo YES")
|
||||
return true -- solo: always allowed
|
||||
end
|
||||
|
||||
local function senderHasPermission(sender)
|
||||
if GetNumRaidMembers() > 0 then
|
||||
for i = 1, 40 do
|
||||
local name, rank = GetRaidRosterInfo(i)
|
||||
if name == sender then
|
||||
log("perm: " .. sender .. " rank=" .. rank .. (rank >= 1 and " OK" or " NO"))
|
||||
return rank >= 1
|
||||
end
|
||||
end
|
||||
log("perm: " .. sender .. " not in roster")
|
||||
return false
|
||||
elseif GetNumPartyMembers() > 0 then
|
||||
-- Find the sender's unit ID to check if they're party leader
|
||||
for i = 1, GetNumPartyMembers() do
|
||||
if UnitName("party" .. i) == sender then
|
||||
local isLeader = UnitIsPartyLeader("party" .. i)
|
||||
log("perm: " .. sender .. "=party" .. i .. " ldr=" .. tostring(isLeader))
|
||||
return isLeader == 1
|
||||
end
|
||||
end
|
||||
log("perm: " .. sender .. " not in party")
|
||||
return false
|
||||
end
|
||||
log("perm: no group")
|
||||
return false
|
||||
end
|
||||
|
||||
local function broadcastPlace(index, x, y, z, areaId)
|
||||
local ch = getChannel()
|
||||
if not ch then
|
||||
log("send: no channel")
|
||||
return
|
||||
end
|
||||
local msg = "P:" .. index .. ":" .. x .. ":" .. y .. ":" .. z .. ":" .. areaId
|
||||
log("SEND [" .. ch .. "] " .. msg)
|
||||
SendAddonMessage(MSG_PREFIX, msg, ch)
|
||||
end
|
||||
|
||||
local function broadcastClear(index)
|
||||
local ch = getChannel()
|
||||
if not ch then return end
|
||||
local msg = "C:" .. index
|
||||
log("SEND [" .. ch .. "] " .. msg)
|
||||
SendAddonMessage(MSG_PREFIX, msg, ch)
|
||||
end
|
||||
|
||||
local function broadcastClearAll()
|
||||
local ch = getChannel()
|
||||
if not ch then return end
|
||||
log("SEND [" .. ch .. "] CA")
|
||||
SendAddonMessage(MSG_PREFIX, "CA", ch)
|
||||
end
|
||||
|
||||
local function broadcastAllDefs()
|
||||
local ch = getChannel()
|
||||
if not ch then return end
|
||||
local count = 0
|
||||
for i = 1, NUM_MARKERS do
|
||||
local x, y, z, areaId = GetMarkerDef(i)
|
||||
if x then
|
||||
local msg = "SF:" .. i .. ":" .. x .. ":" .. y .. ":" .. z .. ":" .. areaId
|
||||
log("SEND [" .. ch .. "] " .. msg)
|
||||
SendAddonMessage(MSG_PREFIX, msg, ch)
|
||||
count = count + 1
|
||||
end
|
||||
end
|
||||
log("syncAll: " .. count .. " on " .. ch)
|
||||
end
|
||||
|
||||
-- =============================================================================
|
||||
-- Wrap DLL functions to broadcast on group placement/clear
|
||||
-- =============================================================================
|
||||
|
||||
local RawWorldMarker = WorldMarker
|
||||
function WorldMarker(index, ...)
|
||||
log("WorldMarker(" .. tostring(index) .. ")")
|
||||
RawWorldMarker(index, unpack(arg))
|
||||
local ch = getChannel()
|
||||
if ch then
|
||||
if canSetMarkers() then
|
||||
local x, y, z, areaId = GetMarkerDef(index)
|
||||
if x then
|
||||
log("def ok, broadcasting")
|
||||
broadcastPlace(index, x, y, z, areaId)
|
||||
else
|
||||
log("GetMarkerDef(" .. index .. ")=nil")
|
||||
end
|
||||
else
|
||||
log("no perm to broadcast")
|
||||
end
|
||||
else
|
||||
log("solo, no broadcast")
|
||||
end
|
||||
end
|
||||
|
||||
local RawClearWorldMarker = ClearWorldMarker
|
||||
function ClearWorldMarker(index)
|
||||
log("ClearWorldMarker(" .. tostring(index) .. ")")
|
||||
RawClearWorldMarker(index)
|
||||
if canSetMarkers() and getChannel() then
|
||||
if index then
|
||||
broadcastClear(index)
|
||||
else
|
||||
broadcastClearAll()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- =============================================================================
|
||||
-- Addon message handler
|
||||
-- =============================================================================
|
||||
|
||||
local function onAddonMessage(prefix, message, channel, sender)
|
||||
if prefix ~= MSG_PREFIX then return end
|
||||
|
||||
log("RECV [" .. channel .. "] " .. tostring(sender) .. ": " .. tostring(message))
|
||||
|
||||
if sender == UnitName("player") then
|
||||
log(" own msg, skip")
|
||||
return
|
||||
end
|
||||
|
||||
if not senderHasPermission(sender) then
|
||||
log(" no perm, skip")
|
||||
return
|
||||
end
|
||||
|
||||
-- Parse colon-delimited message
|
||||
local parts = {}
|
||||
for part in string.gfind(message, "[^:]+") do
|
||||
table.insert(parts, part)
|
||||
end
|
||||
|
||||
local cmd = parts[1]
|
||||
log(" cmd=" .. tostring(cmd) .. " n=" .. table.getn(parts))
|
||||
|
||||
if cmd == "P" or cmd == "SF" then
|
||||
-- Place / Sync Full: P:index:x:y:z:areaId
|
||||
local idx = tonumber(parts[2])
|
||||
local x = tonumber(parts[3])
|
||||
local y = tonumber(parts[4])
|
||||
local z = tonumber(parts[5])
|
||||
local areaId = tonumber(parts[6])
|
||||
if idx and x and y and z and areaId then
|
||||
log(" SetMarkerDef(" .. idx .. "," .. x .. "," .. y .. "," .. z .. "," .. areaId .. ")")
|
||||
SetMarkerDef(idx, x, y, z, areaId)
|
||||
else
|
||||
log(" PARSE FAIL")
|
||||
end
|
||||
elseif cmd == "C" then
|
||||
local idx = tonumber(parts[2])
|
||||
if idx then
|
||||
log(" ClearMarkerDef(" .. idx .. ")")
|
||||
ClearMarkerDef(idx)
|
||||
end
|
||||
elseif cmd == "CA" then
|
||||
log(" ClearAll")
|
||||
ClearMarkerDef()
|
||||
elseif cmd == "SR" then
|
||||
log(" sync request")
|
||||
if canSetMarkers() then
|
||||
broadcastAllDefs()
|
||||
end
|
||||
else
|
||||
log(" unknown: " .. tostring(cmd))
|
||||
end
|
||||
end
|
||||
|
||||
-- =============================================================================
|
||||
-- Event frame
|
||||
-- =============================================================================
|
||||
|
||||
local frame = CreateFrame("Frame")
|
||||
frame:RegisterEvent("PLAYER_LOGIN")
|
||||
frame:RegisterEvent("CHAT_MSG_ADDON")
|
||||
frame:RegisterEvent("PARTY_MEMBERS_CHANGED")
|
||||
frame:RegisterEvent("RAID_ROSTER_UPDATE")
|
||||
|
||||
frame:SetScript("OnEvent", function()
|
||||
if event == "PLAYER_LOGIN" then
|
||||
DEFAULT_CHAT_FRAME:AddMessage("|cff00ff00Markers|r v" .. MARKERS_VERSION .. " loaded")
|
||||
elseif event == "CHAT_MSG_ADDON" then
|
||||
onAddonMessage(arg1, arg2, arg3, arg4)
|
||||
elseif event == "PARTY_MEMBERS_CHANGED" or event == "RAID_ROSTER_UPDATE" then
|
||||
log("EVT " .. event .. " r=" .. GetNumRaidMembers() .. " p=" .. GetNumPartyMembers())
|
||||
if canSetMarkers() then
|
||||
broadcastAllDefs()
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
-- =============================================================================
|
||||
-- Slash commands
|
||||
-- =============================================================================
|
||||
|
||||
SLASH_WORLDMARKER1 = "/worldmarker"
|
||||
SLASH_WORLDMARKER2 = "/wm"
|
||||
SlashCmdList["WORLDMARKER"] = function(msg)
|
||||
@@ -35,10 +266,8 @@ SlashCmdList["WORLDMARKER"] = function(msg)
|
||||
end
|
||||
|
||||
if parts[2] then
|
||||
-- /wm 1 target
|
||||
WorldMarker(index, parts[2])
|
||||
else
|
||||
-- /wm 1 (cursor position)
|
||||
WorldMarker(index)
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user