Added preliminary support for Battleground Blitz

Author: AcidWeb

REPorter.lua

@@ -14,6 +14,7 @@ local IsShiftKeyDown = _G.IsShiftKeyDown
 local IsAltKeyDown = _G.IsAltKeyDown
 local IsControlKeyDown = _G.IsControlKeyDown
 local IsInBrawl = _G.C_PvP.IsInBrawl
+local IsBrawlSoloRBG = _G.C_PvP.IsBrawlSoloRBG
 local IsRatedBattleground = _G.C_PvP.IsRatedBattleground
 local GetTime = _G.GetTime
 local GetBattlefieldInstanceRunTime = _G.GetBattlefieldInstanceRunTime
@@ -114,7 +115,7 @@ RE.BlinkPOIValue = 0.3
 RE.BlinkPOIUp = true
 
 RE.FoundNewVersion = false
-RE.AddonVersionCheck = 2910
+RE.AddonVersionCheck = 21000
 RE.ScreenHeight, RE.ScreenWidth = _G.UIParent:GetCenter()
 
 RE.MapSettings = {
@@ -127,7 +128,7 @@ RE.MapSettings = {
 	[TP] = {["PlayerNumber"] = 10},
 	[TOK] = {["PlayerNumber"] = 10},
 	[SM] = {["PlayerNumber"] = 10, ["WidgetID"] = 1687},
-	[DG] = {["PlayerNumber"] = 15, ["NodeTimer"] = 60, ["WidgetID"] = 2074},
+	[DG] = {["PlayerNumber"] = 15, ["WidgetID"] = 2074},
 	[TMVS] = {["PlayerNumber"] = 40},
 	[SS] = {["PlayerNumber"] = 10, ["NodeTimer"] = 40},
 	[BFW] = {["PlayerNumber"] = 40},
@@ -535,6 +536,18 @@ function RE:CreatePOI(index)
 end
 
 function RE:TimerJoinCheck()
+	RE.IsBrawl = IsInBrawl()
+	RE.IsRated = IsRatedBattleground()
+
+	if IsBrawlSoloRBG() then
+		RE:LoadMapSettings()
+		RE.DefaultTimer = 30
+	elseif RE.MapSettings[RE.CurrentMap].NodeTimer then
+		RE.DefaultTimer = RE.MapSettings[RE.CurrentMap].NodeTimer
+	else
+		RE.DefaultTimer = 60
+	end
+
 	if RE.CurrentMap ~= -1 and GetBattlefieldInstanceRunTime() / 1000 > 120 then
 		RE.PlayedFromStart = false
 		RE:OnPOIUpdate()
@@ -808,7 +821,7 @@ function RE:OnPOIUpdate()
 	for _, v in pairs(RE.POINodes) do
 		v.active = false
 	end
-	if RE.CurrentMap == EOTS and RE.IsRated then
+	if RE.CurrentMap == EOTS and (RE.IsRated or RE.IsBrawl) then
 		RE.POIList = GetAreaPOIForMap(EOTSR)
 	elseif RE.CurrentMap == SS or RE.CurrentMap == CI then
 		RE.POIList = GetVignettes()
@@ -841,7 +854,7 @@ function RE:OnPOIUpdate()
 					RE.POIInfo.textureIndex = 2000
 				end
 			end
-		elseif RE.CurrentMap == EOTS and RE.IsRated then
+		elseif RE.CurrentMap == EOTS and (RE.IsRated or RE.IsBrawl) then
 			RE.POIInfo = GetAreaPOIInfo(EOTSR, RE.POIList[i])
 		else
 			RE.POIInfo = GetAreaPOIInfo(RE.CurrentMap, RE.POIList[i])
@@ -1306,9 +1319,7 @@ end
 function RE:Create()
 	_G.REPorterFrameCore:SetScript("OnUpdate", nil)
 	_G.REPorterFrameEstimator:ClearAllPoints()
-	_G.REPorterFrameEstimator:SetPoint("TOP", _G.UIWidgetTopCenterContainerFrame, "BOTTOM")
-	RE.IsBrawl = IsInBrawl()
-	RE.IsRated = IsRatedBattleground()
+	_G.REPorterFrameEstimator:SetPoint("TOP", _G.UIWidgetTopCenterContainerFrame, "BOTTOM", 0, -10)
 	RE.POINodes = {}
 
 	if RE.CurrentMap == IOC then
@@ -1324,12 +1335,6 @@ function RE:Create()
 		RE.EstimatorData = {0, 0, 0, 0, -1}
 	end
 
-	if RE.MapSettings[RE.CurrentMap].NodeTimer then
-		RE.DefaultTimer = RE.MapSettings[RE.CurrentMap].NodeTimer
-	else
-		RE.DefaultTimer = 60
-	end
-
 	if Contains({AV, BFG, IOC, AB, DG, SS, EOTS, BFW, CI, ASH, TOK}, RE.CurrentMap) then
 		RE.CareAboutNodes = true
 		if RE.CurrentMap == SS then
@@ -1615,12 +1620,17 @@ function RE:LoadMapSettings()
 
 		local textures
 		if RE.CurrentMap == AB and RE.IsBrawl then
-			if GetBestMapForUnit("player") == ABJ then
+			local currentMap = GetBestMapForUnit("player")
+			if currentMap == ABJ then
 				textures = GetMapArtLayerTextures(AB, 1)
-			else
+				RE.ZonesWithoutSubZones[AB] = true
+			elseif currentMap == ABW then
 				textures = GetMapArtLayerTextures(ABW, 1)
+				RE.ZonesWithoutSubZones[AB] = true
+			else
+				textures = GetMapArtLayerTextures(RE.CurrentMap, 1)
+				RE.ZonesWithoutSubZones[AB] = nil
 			end
-			RE.ZonesWithoutSubZones[AB] = true
 		else
 			textures = GetMapArtLayerTextures(RE.CurrentMap, 1)
 			RE.ZonesWithoutSubZones[AB] = nil

REPorter.toc

@@ -1,7 +1,7 @@
-## Interface: 100107
+## Interface: 100200
 ## Title: |cFF74D06CRE|rPorter
 ## Notes: Provide battleground map.
-## Version: 2.9.10
+## Version: 2.10.0
 ## Author: AcidWeb
 ## SavedVariables: REPorterSettings
 ## IconTexture: Interface\AddOns\REPorter\RELogo

TaintLess.xml

@@ -1,62 +1,42 @@
 <Ui><Script><![CDATA[--[[
 
-TaintLess [23-05-18]
+TaintLess [23-09-09]
 https://www.townlong-yak.com/addons/taintless
 
 All rights reserved.
 
 Permission is hereby granted to distribute unmodified copies of this file.
 ]]
 
-local function purgeKey(t, k)
-	local logLevel, c = GetCVar("taintLog"), -42
-	if (tonumber(logLevel) or 0) > 1 then
-		if CVarCallbackRegistry then
-			CVarCallbackRegistry:UnregisterEvent("CVAR_UPDATE")
-		end
-		SetCVar("taintLog", "1")
-	else
-		logLevel = nil
-	end
-	t[k] = nil
-	repeat
-		if t[c] == nil then
-			t[c] = nil
-		end
-		c = c - 1
-	until issecurevariable(t, k)
-	if logLevel then
-		SetCVar("taintLog", logLevel)
-		if CVarCallbackRegistry then
-			CVarCallbackRegistry:RegisterEvent("CVAR_UPDATE")
-		end
+local purgeKey do
+	local e = {}
+	function purgeKey(t, k)
+		e.textures = t
+		TextureLoadingGroupMixin.RemoveTexture(e, k)
 	end
 end
 
 local patch do
-	local q, skips = {}, securecall(function()
+	local skips = securecall(function()
 		local cb, r, _, an = select(4,GetBuildInfo()), {moon="haunted"}
 		r.moon, _, an = nil, issecurevariable(r, "moon")
-		for m, v, clo, chi in (GetAddOnMetadata(an, "X-TaintLess-DisableMitigations") or ""):gmatch("([%a_]+)=(%d+):?(%d*):?(%d*)") do
+		for m, v, clo, chi in (C_AddOns.GetAddOnMetadata(an, "X-TaintLess-DisableMitigations") or ""):gmatch("([%a_]+)=(%d+):?(%d*):?(%d*)") do
 			if (clo == "" or cb >= clo+0) and (chi == "" or chi+0 >= cb) then
 				r[m] = v + 0
 			end
 		end
 		return r
 	end)
 	function patch(name, version, impl)
-		if name == nil then
-			for qf, v in pairs(q) do
-				securecall(qf, v)
-			end
-		elseif not ((tonumber(_G[name]) or 0) >= version or skips and skips[name] == version) then
-			_G[name], q[impl] = version, version
+		if not ((tonumber(_G[name]) or 0) >= version or skips and skips[name] == version) then
+			_G[name] = version
+			securecall(impl, version)
 		end
 	end
 end
 
 -- https://www.townlong-yak.com/addons/taintless/fixes/RefreshOverread
-patch("UIDD_REFRESH_OVERREAD_PATCH_VERSION", 3, function(V)
+patch("UIDD_REFRESH_OVERREAD_PATCH_VERSION", 5, function(V)
 	hooksecurefunc("UIDropDownMenu_InitializeHelper", function()
 		for i=1, UIDD_REFRESH_OVERREAD_PATCH_VERSION == V and UIDROPDOWNMENU_MAXLEVELS or 0 do
 			for j=1+_G["DropDownList" .. i].numButtons, UIDROPDOWNMENU_MAXBUTTONS do
@@ -69,7 +49,7 @@ patch("UIDD_REFRESH_OVERREAD_PATCH_VERSION", 3, function(V)
 end)
 
 -- https://www.townlong-yak.com/addons/taintless/fixes/DisplayModeTaint
-patch("UIDROPDOWNMENU_OPEN_PATCH_VERSION", 1, function(V)
+patch("UIDROPDOWNMENU_OPEN_PATCH_VERSION", 3, function(V)
 	hooksecurefunc("UIDropDownMenu_InitializeHelper", function(frame)
 		if UIDROPDOWNMENU_OPEN_PATCH_VERSION == V
 		   and UIDROPDOWNMENU_OPEN_MENU and UIDROPDOWNMENU_OPEN_MENU ~= frame
@@ -79,19 +59,8 @@ patch("UIDROPDOWNMENU_OPEN_PATCH_VERSION", 1, function(V)
 	end)
 end)
 
--- https://www.townlong-yak.com/addons/taintless/fixes/IOFrameSelection
-patch("IOFRAME_SELECTION_PATCH_VERSION", 5, function(V)
-	if type(InterfaceOptionsFrame) == "table" and type(InterfaceOptionsFrame.HookScript) == "function" then
-		InterfaceOptionsFrame:HookScript("OnHide", function()
-			if IOFRAME_SELECTION_PATCH_VERSION == V then
-				InterfaceOptionsFrameCategories.selection = nil
-			end
-		end)
-	end
-end)
-
 -- https://www.townlong-yak.com/addons/taintless/fixes/EditModeOpenDrop
-patch("EDITMAN_OPENDROP_PATCH_VERSION", 3, function(V)
+patch("EDITMAN_OPENDROP_PATCH_VERSION", 5, function(V)
 	if not (type(EditModeManagerFrame) == "table" and
 	        type(EditModeManagerFrame.GetAttribute) == "function" and
 	        type(FriendsFrameStatusDropDown) == "table") then
@@ -117,7 +86,7 @@ patch("EDITMAN_OPENDROP_PATCH_VERSION", 3, function(V)
 end)
 
 -- https://www.townlong-yak.com/addons/taintless/fixes/ObjectiveTrackerUpdate
-patch("OBJTRACK_DELAYUPDATE_PATCH_VERSION", 3, function(V)
+patch("OBJTRACK_DELAYUPDATE_PATCH_VERSION", 5, function(V)
 	if not (type(ObjectiveTrackerFrame) == "table" and
 	        type(ObjectiveTrackerFrame.HeaderMenu) == "table" and
 	        type(ObjectiveTrackerFrame.HeaderMenu.Title) == "table") then
@@ -134,8 +103,7 @@ patch("OBJTRACK_DELAYUPDATE_PATCH_VERSION", 3, function(V)
 	end)
 	hooksecurefunc("ObjectiveTracker_Update", function()
 		if OBJTRACK_DELAYUPDATE_PATCH_VERSION == V and didDelayUpdate then
-			didDelayUpdate = nil
-			purgeKey(ObjectiveTrackerFrame, "isUpdating")
+			ObjectiveTrackerFrame.isUpdating, didDelayUpdate = nil
 		end
 	end)
 	hooksecurefunc(ObjectiveTrackerFrame.HeaderMenu.Title, "ClearAllPoints", function()
@@ -154,5 +122,4 @@ patch("OBJTRACK_DELAYUPDATE_PATCH_VERSION", 3, function(V)
 	end)
 end)
 
-patch()
 ]]></Script></Ui>