Full BCC support. Fixes #100 (#101)

DeadlyBossMods · May 19, 2021 · 27be562 · 27be562
1 parent 5e57328
commit 27be562
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 14 deletions.
diff --git a/.luacheckrc b/.luacheckrc
@@ -21,6 +21,7 @@ globals = {
 	"WOW_PROJECT_ID",
 	"WOW_PROJECT_BURNING_CRUSADE_CLASSIC",
 	"WOW_PROJECT_CLASSIC",
+	"WOW_PROJECT_MAINLINE",
 
 	-- Lua functions
 	"strsplit",

diff --git a/DBM-PvP/Battlegrounds/Alterac.lua b/DBM-PvP/Battlegrounds/Alterac.lua
@@ -25,7 +25,7 @@ do
 			)
 			local assaultID
 			if zoneID == 30 then
-				assaultID = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC and 1459 or 91
+				assaultID = WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) and 1459 or 91
 			elseif zoneID == 2197 then
 				assaultID = 1537
 			end

diff --git a/DBM-PvP/Battlegrounds/Arathi.lua b/DBM-PvP/Battlegrounds/Arathi.lua
@@ -1,4 +1,4 @@
-local mod = DBM:NewMod(WOW_PROJECT_ID == WOW_PROJECT_CLASSIC and "z529" or "z2107", "DBM-PvP")
+local mod = DBM:NewMod(WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) and "z529" or "z2107", "DBM-PvP")
 
 mod:SetRevision("@file-date-integer@")
 mod:SetZone(DBM_DISABLE_ZONE_DETECTION)

diff --git a/DBM-PvP/Battlegrounds/Ashran.lua b/DBM-PvP/Battlegrounds/Ashran.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
+if WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) then -- Added in BfA
 	return
 end
 local mod	= DBM:NewMod("z1191", "DBM-PvP")

diff --git a/DBM-PvP/Battlegrounds/Deepwind.lua b/DBM-PvP/Battlegrounds/Deepwind.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
+if WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) then -- Added in MoP
 	return
 end
 local mod	= DBM:NewMod("z2245", "DBM-PvP")

diff --git a/DBM-PvP/Battlegrounds/EyeOfTheStorm.lua b/DBM-PvP/Battlegrounds/EyeOfTheStorm.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == (WOW_PROJECT_CLASSIC or 2) then
+if WOW_PROJECT_ID == (WOW_PROJECT_CLASSIC or 2) then -- Added in TBC
 	return
 end
 local mod	= DBM:NewMod("z566", "DBM-PvP")
@@ -17,7 +17,15 @@ do
 		if not bgzone and (zoneID == 566 or zoneID == 968) then
 			bgzone = true
 			local generalMod = DBM:GetModByName("PvPGeneral")
-			generalMod:SubscribeAssault(DBM:GetCurrentArea() == 566 and 112 or 397, 4)
+			local assaultID
+			if WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
+				assaultID = 1956
+			elseif zoneID == 566 then
+				assaultID = 122
+			elseif zoneID == 968 then
+				assaultID = 397
+			end
+			generalMod:SubscribeAssault(assaultID, 4)
 			generalMod:SubscribeFlags()
 		elseif bgzone and (zoneID ~= 566 and zoneID ~= 968) then
 			bgzone = false

diff --git a/DBM-PvP/Battlegrounds/Gilneas.lua b/DBM-PvP/Battlegrounds/Gilneas.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
+if WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) then -- Added in Cata
 	return
 end
 local mod	= DBM:NewMod("z761", "DBM-PvP")

diff --git a/DBM-PvP/Battlegrounds/IsleOfConquest.lua b/DBM-PvP/Battlegrounds/IsleOfConquest.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
+if WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) then -- Added in WotLK
 	return
 end
 local mod	= DBM:NewMod("z628", "DBM-PvP")

diff --git a/DBM-PvP/Battlegrounds/SeethingShore.lua b/DBM-PvP/Battlegrounds/SeethingShore.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
+if WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) then -- Added in Legion
 	return
 end
 local mod	= DBM:NewMod("z1803", "DBM-PvP")

diff --git a/DBM-PvP/Battlegrounds/SilvershardMines.lua b/DBM-PvP/Battlegrounds/SilvershardMines.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
+if WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) then -- Added in MoP
 	return
 end
 local mod	= DBM:NewMod("z727", "DBM-PvP")

diff --git a/DBM-PvP/Battlegrounds/TempleOfKotmogu.lua b/DBM-PvP/Battlegrounds/TempleOfKotmogu.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
+if WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) then -- Added in MoP
 	return
 end
 local mod	= DBM:NewMod("z998", "DBM-PvP")

diff --git a/DBM-PvP/Battlegrounds/TwinPeaks.lua b/DBM-PvP/Battlegrounds/TwinPeaks.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
+if WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) then -- Added in Cata
 	return
 end
 local mod	= DBM:NewMod("z726", "DBM-PvP")

diff --git a/DBM-PvP/Battlegrounds/Warsong.lua b/DBM-PvP/Battlegrounds/Warsong.lua
@@ -1,4 +1,4 @@
-local mod = DBM:NewMod(WOW_PROJECT_ID == WOW_PROJECT_CLASSIC and "z489" or "z2106", "DBM-PvP")
+local mod = DBM:NewMod(WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) and "z489" or "z2106", "DBM-PvP")
 
 mod:SetRevision("@file-date-integer@")
 mod:SetZone(DBM_DISABLE_ZONE_DETECTION)

diff --git a/DBM-PvP/Battlegrounds/Wintergrasp.lua b/DBM-PvP/Battlegrounds/Wintergrasp.lua
@@ -1,4 +1,4 @@
-if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
+if WOW_PROJECT_ID ~= (WOW_PROJECT_MAINLINE or 1) then -- Added in BfA
 	return
 end
 local mod	= DBM:NewMod("z2118", "DBM-PvP")