diff --git a/src/interact/addon/Interact.lua b/src/interact/addon/Interact.lua index 44f9cdf..e676260 100644 --- a/src/interact/addon/Interact.lua +++ b/src/interact/addon/Interact.lua @@ -1,31 +1,3 @@ -- Interact addon (embedded in DLL, loaded from memory) --- Part of WeirdUtils - only loaded when interact module is compiled - -INTERACT_VERSION = 1 BINDING_HEADER_INTERACT = "Interact" - -local frame = CreateFrame("Frame") -frame:RegisterEvent("ADDON_LOADED") -frame:RegisterEvent("PLAYER_LOGIN") - -frame:SetScript("OnEvent", function() - if event == "PLAYER_LOGIN" then - DEFAULT_CHAT_FRAME:AddMessage("|cff00ff00Interact|r v" .. INTERACT_VERSION .. " loaded") - end -end) - -SLASH_INTERACT1 = "/interact" -SlashCmdList["INTERACT"] = function(msg) - msg = string.lower(msg or "") - if msg == "" or msg == "help" then - DEFAULT_CHAT_FRAME:AddMessage("|cff00ff00Interact|r commands:") - DEFAULT_CHAT_FRAME:AddMessage(" /interact - Show this help") - DEFAULT_CHAT_FRAME:AddMessage(" Key bind: Interact - Interact with nearest NPC/object") - DEFAULT_CHAT_FRAME:AddMessage(" Key bind: Interact (auto-loot) - Interact and auto-loot") - DEFAULT_CHAT_FRAME:AddMessage(" Key bind: Loot All Corpses - Loot all nearby corpses") - DEFAULT_CHAT_FRAME:AddMessage(" /run InteractNearest(0) - Interact without loot") - DEFAULT_CHAT_FRAME:AddMessage(" /run InteractNearest(1) - Interact with auto-loot") - DEFAULT_CHAT_FRAME:AddMessage(" /run LootAllCorpses() - Loot all nearby corpses") - end -end diff --git a/src/main.zig b/src/main.zig index f5a6b47..80da211 100644 --- a/src/main.zig +++ b/src/main.zig @@ -132,7 +132,6 @@ const FileEntry = struct { const screenshot_files = if (build_opts.screenshot) [_]FileEntry{ .{ .name = "Screenshot.toc", .data = @embedFile("screenshot/addon/Screenshot.toc") }, .{ .name = "Screenshot.lua", .data = @embedFile("screenshot/addon/Screenshot.lua") }, - .{ .name = "Bindings.xml", .data = @embedFile("screenshot/addon/Bindings.xml") }, } else [_]FileEntry{}; const interact_files = if (build_opts.interact) [_]FileEntry{ @@ -661,11 +660,6 @@ fn loadAddonsDetour(error_handler: u32) callconv(fc) void { &md5ctx, error_handler, ); - callLoadUIBindingsFromFile( - "Interface\\AddOns\\Screenshot\\Bindings.xml", - &md5ctx, - error_handler, - ); } if (build_opts.interact) { callLoadFileListWithIncludes( diff --git a/src/markers/addon/Markers.lua b/src/markers/addon/Markers.lua index a396680..524bec8 100644 --- a/src/markers/addon/Markers.lua +++ b/src/markers/addon/Markers.lua @@ -1,18 +1,9 @@ -- WorldMarkers addon (embedded in DLL, loaded from memory) --- Part of WeirdUtils - only loaded when worldmarkers module is compiled WORLDMARKERS_VERSION = 4 BINDING_HEADER_WORLDMARKERS = "World 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) @@ -80,7 +71,6 @@ local function startSyncing() syncTimer.delay = 5 syncTimer.callback = function() if syncing then - log("sync timeout (5s), clearing sync state") syncing = false syncSender = nil end @@ -97,7 +87,6 @@ local function broadcastPlace(index, x, y, z, areaId) local ch = getChannel() if not ch then return end local msg = "P:" .. index .. ":" .. x .. ":" .. y .. ":" .. z .. ":" .. areaId - log("SEND [" .. ch .. "] " .. msg) SendAddonMessage(MSG_PREFIX, msg, ch) end @@ -106,7 +95,6 @@ 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 @@ -114,24 +102,19 @@ local function broadcastClearAll() clearSyncState() 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 = WorldMarkers.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 -- ============================================================================= @@ -214,13 +197,7 @@ end 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 sender == UnitName("player") then return end -- Parse colon-delimited message local parts = {} @@ -229,49 +206,33 @@ local function onAddonMessage(prefix, message, channel, sender) end local cmd = parts[1] - log(" cmd=" .. tostring(cmd) .. " n=" .. table.getn(parts)) if cmd == "SR" then - -- Normal sync request: only leader/assist responds - log(" sync request from " .. tostring(sender)) if CanSetWorldMarkers() then broadcastAllDefs() end return elseif cmd == "LSR" then - -- Leader sync request: anyone with defs responds (leader relogged) - log(" leader sync request from " .. tostring(sender)) broadcastAllDefs() return elseif cmd == "SF" then - -- Sync fill: only process if we're in sync mode - if not syncing then - log(" ignoring SF (not syncing)") - return - end + if not syncing then return end if syncSender == nil then syncSender = sender - log(" sync responder locked: " .. sender) elseif syncSender ~= sender then - log(" ignoring SF from " .. sender .. " (locked to " .. syncSender .. ")") return end local idx, x, y, z, areaId = parseMarkerFields(parts) if idx then WorldMarkers.SetMarkerDef(idx, x, y, z, areaId, sender) - else - log(" PARSE FAIL") end return end - -- P, C, CA - DLL checks sender permission via SetMarkerDef/ClearMarkerDef if cmd == "P" then local idx, x, y, z, areaId = parseMarkerFields(parts) if idx then WorldMarkers.SetMarkerDef(idx, x, y, z, areaId, sender) - else - log(" PARSE FAIL") end elseif cmd == "C" then local idx = tonumber(parts[2]) @@ -280,8 +241,6 @@ local function onAddonMessage(prefix, message, channel, sender) end elseif cmd == "CA" then WorldMarkers.ClearMarkerDef(sender) - else - log(" unknown: " .. tostring(cmd)) end end @@ -291,13 +250,9 @@ end local function broadcastSyncRequest() local ch = getChannel() - if not ch then - log("syncReq: no channel (not in group)") - return - end + if not ch then return end startSyncing() local cmd = CanSetWorldMarkers() and "LSR" or "SR" - log("SEND [" .. ch .. "] " .. cmd) SendAddonMessage(MSG_PREFIX, cmd, ch) end @@ -307,11 +262,9 @@ local function scheduleSyncRequest() syncTimer.elapsed = 0 syncTimer.delay = 5 syncTimer.callback = function() - log("login sync timer fired") broadcastSyncRequest() end syncTimer:Show() - log("sync request scheduled (5s)") end -- ============================================================================= @@ -343,7 +296,6 @@ rosterTimer:SetScript("OnUpdate", function() rosterTimer:Hide() rosterTimer.pending = false rosterTimer.extensions = 0 - log("roster timer fired, broadcasting") if CanSetWorldMarkers() then broadcastAllDefs() end @@ -357,23 +309,16 @@ local function onRosterChange() local oldSize = lastGroupSize lastGroupSize = newSize - if newSize <= oldSize then - log("roster: " .. oldSize .. "->" .. newSize .. " (no increase)") - return - end - - log("roster: " .. oldSize .. "->" .. newSize .. " (grew)") + if newSize <= oldSize then return end if not rosterTimer.pending then rosterTimer.remaining = ROSTER_INITIAL_DELAY rosterTimer.pending = true rosterTimer.extensions = 0 rosterTimer:Show() - log("roster timer started (" .. ROSTER_INITIAL_DELAY .. "s)") elseif rosterTimer.extensions < MAX_EXTENSIONS then rosterTimer.remaining = rosterTimer.remaining + ROSTER_EXTEND_SEC rosterTimer.extensions = rosterTimer.extensions + 1 - log("roster timer +" .. ROSTER_EXTEND_SEC .. "s (ext " .. rosterTimer.extensions .. "/" .. MAX_EXTENSIONS .. ")") end end @@ -385,7 +330,6 @@ frame:RegisterEvent("RAID_ROSTER_UPDATE") frame:SetScript("OnEvent", function() if event == "PLAYER_LOGIN" then - DEFAULT_CHAT_FRAME:AddMessage("|cff00ff00WorldMarkers|r v" .. WORLDMARKERS_VERSION .. " loaded") lastGroupSize = getGroupSize() scheduleSyncRequest() elseif event == "CHAT_MSG_ADDON" then @@ -393,7 +337,6 @@ frame:SetScript("OnEvent", function() elseif event == "RAID_ROSTER_UPDATE" then onRosterChange() elseif event == "PARTY_MEMBERS_CHANGED" then - -- Skip party events when in a raid (RAID_ROSTER_UPDATE handles it) if GetNumRaidMembers() == 0 then onRosterChange() end @@ -409,7 +352,6 @@ SLASH_WORLDMARKER2 = "/wm" SlashCmdList["WORLDMARKER"] = function(msg) msg = string.lower(msg or "") - -- Parse arguments local parts = {} for word in string.gfind(msg, "%S+") do table.insert(parts, word) diff --git a/src/screenshot/addon/Bindings.xml b/src/screenshot/addon/Bindings.xml deleted file mode 100644 index 2e8583d..0000000 --- a/src/screenshot/addon/Bindings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - local on = WeirdUtilsScreenshot(); WeirdUtilsScreenshot(on and "disable" or "enable") - - diff --git a/src/screenshot/addon/Screenshot.lua b/src/screenshot/addon/Screenshot.lua index bdfc9dc..d6dcd8d 100644 --- a/src/screenshot/addon/Screenshot.lua +++ b/src/screenshot/addon/Screenshot.lua @@ -1,21 +1,7 @@ -- Screenshot addon (embedded in DLL, loaded from memory) --- Part of WeirdUtils - only loaded when screenshot module is compiled - -SCREENSHOT_VERSION = 1 BINDING_HEADER_SCREENSHOT = "Screenshot" -local frame = CreateFrame("Frame") -frame:RegisterEvent("ADDON_LOADED") -frame:RegisterEvent("PLAYER_LOGIN") - -frame:SetScript("OnEvent", function() - if event == "PLAYER_LOGIN" then - local on, level = WeirdUtilsScreenshot() - DEFAULT_CHAT_FRAME:AddMessage("|cff00ff00Screenshot|r v" .. SCREENSHOT_VERSION .. " loaded (" .. (on and "enabled" or "disabled") .. ", quality " .. level .. ")") - end -end) - SLASH_SCREENSHOT1 = "/ss" SLASH_SCREENSHOT2 = "/screenshot" SlashCmdList["SCREENSHOT"] = function(msg)