Update world marker code for DF

ATAutoReactivateGoliath/ATAutoReactivateGoliath.toc

@@ -1,6 +1,6 @@
-## Interface: 90005
+## Interface: 100000
 ## Title: ATReactivateGoliath
 ## Author: Andrew Tomaka
-## Version: 1.0
+## Version: 1.1
 
 ATAutoReactivateGoliath.lua

ATMe/ATMe.lua

@@ -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)
 
@@ -100,29 +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
-
-  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)
+  -- 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(...)
@@ -148,24 +135,12 @@ 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
-      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_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)
         SendChatMessage(link, "PARTY")
 
         return
@@ -207,14 +182,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
@@ -241,10 +221,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 +240,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

ATMe/ATMe.toc

@@ -1,4 +1,4 @@
-## Interface: 90005
+## Interface: 100002
 ## Title: ATMe
 ## Author: Andrew Tomaka
 ## Version: 0.1