Multi-toc for Classic

nebularg · nebularg · commit aec20dbc3c33 · 2022-09-29T03:31:35.000-05:00
diff --git a/.github/workflows/build-classic.yml b/.github/workflows/build-classic.yml
@@ -28,10 +28,3 @@ jobs:
 
       - name: Package Classic
         uses: BigWigsMods/packager@master
-        with:
-          args: -g classic
-
-      - name: Package BCC
-        uses: BigWigsMods/packager@master
-        with:
-          args: -g bcc
diff --git a/.luacheckrc b/.luacheckrc
@@ -92,7 +92,9 @@ globals = {
 	"DISABLE",
 	"ENABLE",
 	"LARGE_NUMBER_SEPERATOR",
+	"WOW_PROJECT_WRATH",
 	"WOW_PROJECT_BURNING_CRUSADE_CLASSIC",
 	"WOW_PROJECT_CLASSIC",
+	"WOW_PROJECT_MAINLINE",
 	"WOW_PROJECT_ID",
 }
diff --git a/Code/AnimationStyles.lua b/Code/AnimationStyles.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("AnimationStyles")
 
 local animationStyles = {}
diff --git a/Code/CombatEvents.lua b/Code/CombatEvents.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("CombatEvents", "AceEvent-3.0", "AceTimer-3.0")
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
diff --git a/Code/Display.lua b/Code/Display.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("Display")
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
diff --git a/Code/Parrot.lua b/Code/Parrot.lua
@@ -6,6 +6,9 @@ local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 local AceConfig = LibStub("AceConfig-3.0")
 local AceConfigDialog = LibStub("AceConfigDialog-3.0")
 
+Parrot.wow_classic_era = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
+Parrot.wow_classic = WOW_PROJECT_ID == WOW_PROJECT_WRATH
+
 -- Debug
 local debug = function() end
 --@debug@
diff --git a/Code/ScrollAreas.lua b/Code/ScrollAreas.lua
@@ -1,8 +1,11 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("ScrollAreas", "AceTimer-3.0")
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
+
 local Parrot_AnimationStyles = Parrot:GetModule("AnimationStyles")
 
 local db = nil
diff --git a/Code/Suppressions.lua b/Code/Suppressions.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("Suppressions")
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
diff --git a/Code/TriggerConditions.lua b/Code/TriggerConditions.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("TriggerConditions", "AceEvent-3.0")
 
 local Parrot_Triggers
diff --git a/Code/Triggers.lua b/Code/Triggers.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("Triggers", "AceEvent-3.0", "AceTimer-3.0")
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
diff --git a/Data/AnimationStyles.lua b/Data/AnimationStyles.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
 local math_max, math_min = math.max, math.min
diff --git a/Data/Auras.lua b/Data/Auras.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
 local newList, newDict = Parrot.newList, Parrot.newDict
diff --git a/Data/CombatEvents.lua b/Data/CombatEvents.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local mod = Parrot:NewModule("CombatEventsData")
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
diff --git a/Data/CombatStatus.lua b/Data/CombatStatus.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
 Parrot:RegisterCombatEvent{
diff --git a/Data/Cooldowns.lua b/Data/Cooldowns.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("Cooldowns", "AceEvent-3.0", "AceTimer-3.0")
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
diff --git a/Data/Loot.lua b/Data/Loot.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
 local newDict = Parrot.newDict
diff --git a/Data/PointGains.lua b/Data/PointGains.lua
@@ -1,13 +1,15 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("PointGains")
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
 local newDict, newList = Parrot.newDict, Parrot.newList
 local Deformat = Parrot.Deformat
 
-local wow_classic = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
-local wow_bcc = WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC
+local wow_classic_era = Parrot.wow_classic_era
+local wow_classic = Parrot.wow_classic
 
 local currentXP = 0
 
@@ -49,15 +51,15 @@ end
 local function parseHonorGain(chatmsg)
 	local amount = tonumber(chatmsg:match("%d+"))
 	if amount then
-		if wow_bcc then
+		if wow_classic then
 			local info = C_CurrencyInfo.GetCurrencyInfo(1901)
 			return newDict(
 				"currency", info.name,
 				"amount", amount,
 				"total", info.totalEarned,
 				"icon", info.iconFileID
 			)
-		elseif wow_classic then
+		elseif wow_classic_era then
 			local total = GetPVPSessionStats()
 			local _, rank = GetPVPRankInfo(UnitPVPRank("player"))
 			local icon = nil
diff --git a/Data/TriggerConditions.lua b/Data/TriggerConditions.lua
@@ -1,5 +1,7 @@
 local _, ns = ...
 local Parrot = ns.addon
+if not Parrot then return end
+
 local module = Parrot:NewModule("TriggerConditionsData", "AceEvent-3.0")
 local L = LibStub("AceLocale-3.0"):GetLocale("Parrot")
 
diff --git a/Parrot_Vanilla.toc b/Parrot_Vanilla.toc
@@ -1,6 +1,4 @@
-## Interface: 20501
-## Interface-BCC: 20501
-## Interface-Classic: 11307
+## Interface: 11403
 ## Title: Parrot 2
 ## Notes: Floating Combat Text of awesomeness. Caw. It'll eat your crackers.
 ## Notes-esES: Floating Combat Text of awesomeness. Caw. It'll eat your crackers.
diff --git a/Parrot_Wrath.toc b/Parrot_Wrath.toc
@@ -0,0 +1,45 @@
+## Interface: 30400
+## Title: Parrot 2
+## Notes: Floating Combat Text of awesomeness. Caw. It'll eat your crackers.
+## Notes-esES: Floating Combat Text of awesomeness. Caw. It'll eat your crackers.
+## Notes-esMX: Floating Combat Text of awesomeness. Caw. It'll eat your crackers.
+## Notes-deDE: Scrollender Kampftext der Ungeheuerlichkeit. Kraaaah!
+## Notes-frFR: Texte de combat flottant. Croac. Coco veut un gâteau.
+## Notes-itIT: Floating Combat Text of awesomeness. Caw. It'll eat your crackers.
+## Notes-koKR: Floating Combat Text of awesomeness. Caw. It'll eat your crackers.
+## Notes-ptBR: Floating Combat Text of awesomeness. Caw. It'll eat your crackers.
+## Notes-ruRU: Мощный плавающий текст боя.
+## Notes-zhCN: 绝妙的浮动战斗文本。来人，喂公子吃饼。真香。
+## Notes-zhTW: 絕妙的戰鬥記錄指示器。
+## Author: Neb
+## Version: @project-version@
+
+## X-Credits: ckknight, profalbert
+## X-Category: Combat
+## X-License: LGPLv2.1
+## X-Curse-Project-ID: 101768
+## X-WoWI-ID: 24143
+
+## SavedVariables: ParrotDB
+## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDDI-1.0, LibSink-2.0
+
+embeds.xml
+locales.xml
+
+Code\Parrot.lua
+Code\AnimationStyles.lua
+Code\CombatEvents.lua
+Code\Display.lua
+Code\ScrollAreas.lua
+Code\Suppressions.lua
+Code\TriggerConditions.lua
+Code\Triggers.lua
+
+Data\AnimationStyles.lua
+Data\CombatEvents.lua
+Data\TriggerConditions.lua
+Data\Auras.lua
+Data\Cooldowns.lua
+Data\Loot.lua
+Data\PointGains.lua
+Data\CombatStatus.lua
