From 9d696743255aff528c6f8280c8d43234b671463b Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Wed, 14 Apr 2021 09:37:18 -0400 Subject: [PATCH 1/7] Pull NPC and Zone checks to identifiers --- ATAutoReactivateGoliath/ATAutoReactivateGoliath.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ATAutoReactivateGoliath/ATAutoReactivateGoliath.lua b/ATAutoReactivateGoliath/ATAutoReactivateGoliath.lua index c2d6d60..78b9f1c 100644 --- a/ATAutoReactivateGoliath/ATAutoReactivateGoliath.lua +++ b/ATAutoReactivateGoliath/ATAutoReactivateGoliath.lua @@ -15,8 +15,11 @@ StaticPopupDialogs["GOLIATH_MISSING"] = { f:RegisterEvent("GOSSIP_SHOW") f:SetScript("OnEvent", function(self, event, ...) - local isNecroticWake = GetZoneText() == "The Necrotic Wake" - local isSteward = GetUnitName("npc") == "Steward" + -- check if The Necrotic Wake + local isNecroticWake = C_Map.GetBestMapForUnit("player") == 1666 + -- check if Steward + local guid = UnitGUID("npc") + local isSteward = tonumber(guid and strsub(guid, 27, 32)) == 166663 if isNecroticWake and isSteward then options = C_GossipInfo.GetOptions() From 803a0225549af78a0c0c221195c293a44e9bbb5c Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Tue, 1 Nov 2022 09:38:52 -0400 Subject: [PATCH 2/7] Bump TOC --- ATAutoReactivateGoliath/ATAutoReactivateGoliath.toc | 4 ++-- ATMe/ATMe.toc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ATAutoReactivateGoliath/ATAutoReactivateGoliath.toc b/ATAutoReactivateGoliath/ATAutoReactivateGoliath.toc index 68221c9..ca930d2 100644 --- a/ATAutoReactivateGoliath/ATAutoReactivateGoliath.toc +++ b/ATAutoReactivateGoliath/ATAutoReactivateGoliath.toc @@ -1,6 +1,6 @@ -## Interface: 90005 +## Interface: 100000 ## Title: ATReactivateGoliath ## Author: Andrew Tomaka -## Version: 1.0 +## Version: 1.1 ATAutoReactivateGoliath.lua diff --git a/ATMe/ATMe.toc b/ATMe/ATMe.toc index 16d2804..dc67ca9 100755 --- a/ATMe/ATMe.toc +++ b/ATMe/ATMe.toc @@ -1,4 +1,4 @@ -## Interface: 90005 +## Interface: 100000 ## Title: ATMe ## Author: Andrew Tomaka ## Version: 0.1 From 6cfb35ebc52a25500cb2df63083f77dbc4d7b29e Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Tue, 1 Nov 2022 09:39:45 -0400 Subject: [PATCH 3/7] Cleanup/Removal from new UI changes --- ATMe/ATMe.lua | 52 ++------------------------------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/ATMe/ATMe.lua b/ATMe/ATMe.lua index aa50302..4d44e80 100755 --- a/ATMe/ATMe.lua +++ b/ATMe/ATMe.lua @@ -18,7 +18,7 @@ ATMe.taunts = { [185245] = true, -- Torment [6795] = true, -- Growl [115546] = true, -- Provke - [62124] = true, -- Hand of Reckoning + [62124] = true, -- Hand of Reckoning [355] = true, -- Taunt [1161] = true, -- Challenging Shout @@ -32,9 +32,6 @@ inspectInitialized = false local InspectFontStrings = {} function ATMe.SlashHandler(cmd) - if cmd == "frames" then - ATMe.moveFrames() - end end function ATMe.OnEvent(self, event, ...) @@ -57,7 +54,7 @@ end function events:INSPECT_READY(guid) if not inspectInitialized and InspectFrame then InspectFontStrings["itemLevel"] = InspectFrame:CreateFontString(nil, "OVERLAY") - InspectFontStrings["itemLevel"]:SetPoint("BOTTOMRIGHT", -5, 5) + InspectFontStrings["itemLevel"]:SetPoint("BOTTOMLEFT", 10, 5) InspectFontStrings["itemLevel"]:SetFont("Fonts\\FRIZQT__.ttf", 24, "OUTLINE") InspectFontStrings["itemLevel"]:SetTextColor(1, 1, 1) @@ -102,27 +99,6 @@ end function events:PLAYER_LOGIN(...) -- found from some forums local b=ActionButton8 _MH=_MH or(b:SetAttribute("*type5","macro")or SecureHandlerWrapScript(b,"PreClick",b,'Z=IsAltKeyDown()and 0 or(Z or 0)%8+1 self:SetAttribute("macrotext5","/wm [nomod]"..Z)'))or 1 - - QuickJoinToastButton:Hide() - ChatFrameChannelButton:Hide() - ChatFrameMenuButton:Hide() - ChatFrame1ButtonFrame:Hide() - - -- ChatFrame1.ScrollBar:Hide() - -- ChatFrame1.ScrollToBottomButton:Hide() - - ChatFrame1:SetWidth(400) - ChatFrame1:SetHeight(150) - - ChatFrame1:ClearAllPoints() - ChatFrame1:SetClampRectInsets(0, 0, 0, 0) - ChatFrame1:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", 0, 0) - - ChatFrame1EditBox:ClearAllPoints() - ChatFrame1EditBox:SetPoint("BOTTOMLEFT", ChatFrame1, "TOPLEFT", 0, 0) - ChatFrame1EditBox:SetPoint("RIGHT", ChatFrame1, 0, 0) - - ChatFrame1:SetUserPlaced(true) end function events:PLAYER_REGEN_DISABLED(...) @@ -148,18 +124,6 @@ function events:PLAYER_UPDATE_RESTING(...) if ATMe.needsRepair() then StaticPopup_Show("REPAIR_ALERT") end end -function ATMe.moveFrames() - print("Moving frames to ATMe default locations") - PlayerFrame:ClearAllPoints() - PlayerFrame:SetPoint("CENTER",UIParent,-350,-225)PlayerFrame:SetUserPlaced(true) - - TargetFrame:ClearAllPoints() - TargetFrame:SetPoint("CENTER",UIParent,350,-225)TargetFrame:SetUserPlaced(true) - - FocusFrame:ClearAllPoints() - FocusFrame:SetPoint("CENTER",UIParent,-350,150)TargetFrame:SetUserPlaced(true) -end - function ATMe.announceKey() for bag = 0, NUM_BAG_SLOTS do for slot = 1, GetContainerNumSlots(bag)do @@ -241,10 +205,6 @@ for event, method in pairs(events) do end f:SetScript("OnEvent", ATMe.OnEvent) ---[[ hooksecurefunc("TalkingHeadFrame_PlayCurrent", function() - TalkingHeadFrame:Hide() -end) ]]-- - function PaperDollFrame_SetMovementSpeed(statFrame, unit) statFrame.wasSwimming = nil statFrame.unit = unit @@ -264,12 +224,4 @@ CharacterStatsPane.statsFramePool.resetterFunc = end table.insert(PAPERDOLL_STATCATEGORIES[1].stats, { stat = "MOVESPEED"}) -for i = 1, 7 do - local chat = _G["ChatFrame"..i] - local font, size = chat:GetFont() - chat:SetFont(font, size, "THINOUTLINE") - chat:SetShadowOffset(0, 0) - chat:SetShadowColor(0, 0, 0, 0) -end - SlashCmdList["ATME"] = ATMe.SlashHandler From 13224b547cc4eee5bb8f27b9100b4c6bc5a1335b Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Thu, 17 Nov 2022 21:03:27 -0500 Subject: [PATCH 4/7] Update for Dragonflight bag API changes --- ATMe/ATMe.lua | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/ATMe/ATMe.lua b/ATMe/ATMe.lua index 4d44e80..c70a591 100755 --- a/ATMe/ATMe.lua +++ b/ATMe/ATMe.lua @@ -125,11 +125,11 @@ function events:PLAYER_UPDATE_RESTING(...) end function ATMe.announceKey() - for bag = 0, NUM_BAG_SLOTS do - for slot = 1, GetContainerNumSlots(bag)do - itemID = GetContainerItemID(bag, slot) - if GetContainerItemID(bag, slot) == ATMe.keyItemID then - local link = GetContainerItemLink(bag, slot) + for bag = BACKPACK_CONTAINER, NUM_TOTAL_EQUIPPED_BAG_SLOTS do + for slot = 1, C_ContainerGetContainerNumSlots(bag)do + itemID = C_Container.GetContainerItemID(bag, slot) + if C_Container.GetContainerItemID(bag, slot) == ATMe.keyItemID then + local link = C_Container.GetContainerItemLink(bag, slot) SendChatMessage(link, "PARTY") return @@ -171,14 +171,19 @@ end function ATMe.sellGrayItems() sellTotal = 0 - for bag = 0, NUM_BAG_SLOTS do - for slot = 1, GetContainerNumSlots(bag) do - local _, count, _, quality, _, _, link = GetContainerItemInfo(bag, slot) + for bag = BACKPACK_CONTAINER, NUM_TOTAL_EQUIPPED_BAG_SLOTS do + for slot = 1, C_Container.GetContainerNumSlots(bag) do + local item = C_Container.GetContainerItemInfo(bag, slot) + + local count = item and item.stackCount + local quality = item and item.quality + local link = item and item.hyperlink + if quality and quality == 0 then local price = select(11, GetItemInfo(link)) sellTotal = sellTotal + (price * count) print("Selling "..count.."x"..link) - UseContainerItem(bag, slot) + C_Container.UseContainerItem(bag, slot) end end end From 90b9b22368f7d9e34e80f675e112812510a13b7e Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Fri, 18 Nov 2022 11:44:03 -0500 Subject: [PATCH 5/7] Bump TOC --- ATMe/ATMe.toc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ATMe/ATMe.toc b/ATMe/ATMe.toc index dc67ca9..6bb4edb 100755 --- a/ATMe/ATMe.toc +++ b/ATMe/ATMe.toc @@ -1,4 +1,4 @@ -## Interface: 100000 +## Interface: 100002 ## Title: ATMe ## Author: Andrew Tomaka ## Version: 0.1 From 1e03a13d3911615df984f6afb1364bd608edf9d7 Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Wed, 23 Nov 2022 21:12:10 -0500 Subject: [PATCH 6/7] xD --- ATMe/ATMe.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ATMe/ATMe.lua b/ATMe/ATMe.lua index c70a591..a7b4cc8 100755 --- a/ATMe/ATMe.lua +++ b/ATMe/ATMe.lua @@ -126,7 +126,7 @@ end function ATMe.announceKey() for bag = BACKPACK_CONTAINER, NUM_TOTAL_EQUIPPED_BAG_SLOTS do - for slot = 1, C_ContainerGetContainerNumSlots(bag)do + for slot = 1, C_Container.GetContainerNumSlots(bag)do itemID = C_Container.GetContainerItemID(bag, slot) if C_Container.GetContainerItemID(bag, slot) == ATMe.keyItemID then local link = C_Container.GetContainerItemLink(bag, slot) From f2c6935c06865478707fdd817ba15682ec41b8fa Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Wed, 30 Nov 2022 11:55:22 -0500 Subject: [PATCH 7/7] Update world marker code for DF --- ATMe/ATMe.lua | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ATMe/ATMe.lua b/ATMe/ATMe.lua index a7b4cc8..914ab44 100755 --- a/ATMe/ATMe.lua +++ b/ATMe/ATMe.lua @@ -97,8 +97,19 @@ function events:MERCHANT_SHOW(...) end function events:PLAYER_LOGIN(...) - -- found from some forums - local b=ActionButton8 _MH=_MH or(b:SetAttribute("*type5","macro")or SecureHandlerWrapScript(b,"PreClick",b,'Z=IsAltKeyDown()and 0 or(Z or 0)%8+1 self:SetAttribute("macrotext5","/wm [nomod]"..Z)'))or 1 + -- Updated for DF from + -- https://www.reddit.com/r/CompetitiveWoW/comments/yy4ldr/one_button_world_marker_circle_marco_df_prepatch/ + local button = ActionButton8 + _MH = _MH + or ( + button:SetAttribute("*type5","macro") + or SecureHandlerWrapScript( + button, "PreClick", button, + 'marker = (marker or 0) % 8 + 1\n'.. + 'self:SetAttribute("macrotext5", "/wm "..marker)' + ) + ) + or 1 end function events:PLAYER_REGEN_DISABLED(...)