Merge pull request #64 from Amadeus-/master

Update to version 11.0.2

Broker_WorldQuests.toc

@@ -1,12 +1,12 @@
-## Interface: 100002
-## Author: myno (original author; up through 8.x), Amadeus (maintainer: 9.x and 10.x)
+## Interface: 110002
+## Author: myno (original author; up through 8.x), Amadeus (maintainer since 9.0)
 ## Title: Broker_WorldQuests
-## Version: 10.0.2.1
+## Version: 11.0.2.9
 ## SavedVariables: BWQcfg
 ## SavedVariablesPerCharacter: BWQcache, BWQcfgPerCharacter
 ## Notes: Broker plugin to display world quests as a list.
 
 libs/CallbackHandler-1.0.lua
 libs/LibDataBroker-1.1.lua
 Constants.lua
-WorldQuests.lua
+WorldQuests.lua

CHANGELOG.md

@@ -1,27 +1,110 @@
+### 11.0.2.9
+* Fixed currencies being incorrect or showing as zero.
+* Increased the max width of the BWQ window.
+* Increased the size of the red highlight arrow (that appears on the map
+  when you click on a WQ in the addon) by 35%.
+
+### 11.0.2.8
+* Added support for Kej currency
+
+### 11.0.2.7
+* Added support for Valorstones currency
+
+### 11.0.2.6
+* Added support for Azj-Kahet
+
+### 11.0.2.5
+* Added support for Hallowfall Arathi currency
+
+### 11.0.2.4
+* World Quests will now properly unlock for all appropriate characters in The War Within
+
+### 11.0.2.3
+* Disabled text notification for unhandled currency.  This is intended for developers.
+
+### 11.0.2.2
+* Fixed criteria for unlocking World Quests in The War Within
+* Added support for currency:  Resonance Crystals
+* Added support for currency:  The Assembly of the Deeps
+
+### 11.0.2.1
+* Initial updates required for The War Within
+* New users will be set to the expansion appropriate to their current level instead of defaulting
+  to the latest expansion.
+
+### 11.0.2.0
+* Fixed deprecated call to IsAddonLoaded()
+
+### 11.0.0.2
+* Updates to Faction related calls due to API changes with 11.0.0
+
+### 11.0.0.1
+* Updates for WoW version 11.0.0
+
+### 10.2.7.0
+* Updates for Dragonflight 10.2.7
+
+### 10.2.5.1
+* Fixed an issue affecting Polished Pet Charms (thanks tflo for catching it.)
+
+### 10.2.5.0
+* Updates for Dragonflight 10.1, 10.2 and 10.2.5
+
+### 10.1.7
+* TOC Bump
+
+### 10.1.0
+* Added Zaralek Cavern and Flightstone currency
+
+### 10.0.7
+* Added Forbidden Reach zone and Elemental Overflow currency 
+
+### 10.0.2.8
+* Fixed WQs not properly showing for "Primalist Tomorrow" zone (Dragonflight)
+
+### 10.0.2.7
+* Added support for "Rustbolt Resistance" reputation currency (added in WoW v. 8.2.0.30918)
+
+### 10.0.2.6
+* Added support for "Primalist Tomorrow" zone (Dragonflight)
+
+### 10.0.2.5
+Changes below submitted by ntowle (github)
+* Broker options for Dragon Isles Supplies, Bloody Tokens, Polished Pet Charms
+* Filters for Dragon Isles Supplies, Bloody Tokens
+* Split DF reputation out
+* Options for DF reputation by faction
+* Total Polished Pet Charms available
+* Total Dragon Isles Supplies available
+* Reorganize menus to move old expansion options to submenus
+* Fix Grateful Offering checkbox
+* Fix Conduits icon
+
+### 10.0.2.4
+* Add support for Valdrakken Accord (Dragonflight reputation currency)
+
+### 10.0.2.3
+* Add support for Bloody Tokens (Dragonflight PVP Currency)
+
 ### 10.0.2.1
 * Updates for Shadowlands compatibility
 * Initial Updates for Dragonflight compatibility
 
 ### 9.0.63
-
 * Bug fixes
 
 ### 9.0.62
-
 * Added BfA assault zones
 * Fixed paragon faction bar performance issue
 * Fixed some filters
 
 ### 9.0.61
-
 * Bug fixes for Shadowlands pre-patch
 
 ### 8.1.58
-
 * Fixed incorrect questIds for Battle on Zandalar and Kul Tiras
 
 ### 8.1.57
-
 * Added quest title highlight for achievement quest criterias
     - Fishing 'Round The Isles (Legion Fishing)
     - Battle on the Broken Isles (Legion Pet Battle)
@@ -30,8 +113,7 @@
 * Fixed no world quests error message showing when all zones are collapsed
 
 ### 8.1.56
-
 * Added basic TomTom support. Clicking a row will set this quest as waypoint.
 * Added option to hide paragon reputation bars
 * Removed expansion toggle in dropdown menu (use the buttons in the top-right corner)
-* Moved some options to reduce number of dropdown items
+* Moved some options to reduce number of dropdown items

Constants.lua

@@ -1,12 +1,12 @@
 local _, addon = ...
 local CONSTANTS = {}
 
-
 CONSTANTS.EXPANSIONS = {
 	LEGION = "LEGION",
 	BFA = "BFA",
 	SHADOWLANDS = "SHADOWLANDS",
 	DRAGONFLIGHT = "DRAGONFLIGHT",
+	THEWARWITHIN = "THEWARWITHIN"
 }
 CONSTANTS.FACTIONS = {
 	NEUTRAL = 0,
@@ -39,6 +39,7 @@ CONSTANTS.WORLD_QUEST_TYPES = {
 	RAID = 8,
 }
 
+-- The name here should match the currency name in game (verified via Wowhead).  Some currencies are singular, some are plural.
 CONSTANTS.REWARD_TYPES = {
 	IRRELEVANT = -1,
 	ARTIFACTPOWER = 0,
@@ -50,15 +51,35 @@ CONSTANTS.REWARD_TYPES = {
 	HONOR = 6, 
 	NETHERSHARD = 7, 
 	ARGUNITE = 8, 
-	WAKENING_ESSENCES = 9,
+	WAKENING_ESSENCE = 9,
 	WAR_RESOURCES = 10,
 	MARK_OF_HONOR = 11,
-	SERVICE_MEDALS = 12,
+	SERVICE_MEDAL = 12,
 	PRISMATIC_MANAPEARL = 13,
 	SOULBIND_CONDUIT = 14,
 	ANIMA_CONTAINER = 15,
 	GRATEFUL_OFFERING = 15,
 	CYPHERS_OF_THE_FIRST_ONES = 16,
+	BLOODY_TOKENS = 17,
+	DRAGON_ISLES_SUPPLIES = 18,
+	ELEMENTAL_OVERFLOW = 19,
+	FLIGHTSTONES = 20,
+	POLISHED_PET_CHARM = 21,
+	BATTLE_PET_BANDAGE = 22,
+	WHELPLINGS_DREAMING_CREST = 23,
+	DRAKES_DREAMING_CREST = 24,
+	WYRMS_DREAMING_CREST = 25,
+	ASPECTS_DREAMING_CREST = 26,
+	WHELPLINGS_AWAKENED_CREST = 27,
+	DRAKES_AWAKENED_CREST = 28,
+	WYRMS_AWAKENED_CREST = 29,
+	ASPECTS_AWAKENED_CREST = 30,
+	MYSTERIOUS_FRAGMENT = 31,
+	RESONANCE_CRYSTALS = 32,
+	THE_ASSEMBLY_OF_THE_DEEPS = 33,
+	HALLOWFALL_ARATHI = 34,
+	VALORSTONES = 35,
+	KEJ = 36,
 }
 
 CONSTANTS.QUEST_TYPES = {
@@ -96,22 +117,30 @@ CONSTANTS.WORLD_QUEST_ICONS_BY_TAG_ID = {
 	[260] = isHorde and "worldquest-icon-horde" or "worldquest-icon-alliance",
 }
 
-
 CONSTANTS.CURRENCIES_AFFECTED_BY_WARMODE = {
 	[1226] = true, -- nethershard
 	[1508] = true, -- argunite
 	[1533] = true, -- wakening essence
 	[1342] = true, -- legionfall supplies
 	[1220] = true, -- order hall (legion)
 	[1560] = true, -- war resources (bfa)
-	[1553] = true, -- azerite
+	[1553] = true, -- azerite (bfa)
+	[2123] = true, -- Bloody Tokens (dragonflight)
+}
+
+CONSTANTS.THEWARWITHIN_REPUTATION_CURRENCY_IDS = {
+	[2902] = true, -- The Assembly of the Deeps
+	[2899] = true, -- Hallowfall Arathi
 }
 
 CONSTANTS.DRAGONFLIGHT_REPUTATION_CURRENCY_IDS = {
-	[2003] = true, -- Dragon Isles Supplies
+	[2107] = true, -- Artisan's Consortium
 	[2108] = true, -- Maruuk Centaur
 	[2109] = true, -- Iskaara Tuskarr
 	[2031] = true, -- Dragonscale Expedition
+	[2106] = true, -- Valdrakken Accord
+	[2420] = true, -- Loamm Niffen
+	[2652] = true, -- Dream wardens
 }
 
 CONSTANTS.SHADOWLANDS_REPUTATION_CURRENCY_IDS = {
@@ -129,16 +158,17 @@ CONSTANTS.SHADOWLANDS_REPUTATION_CURRENCY_IDS = {
 }
 
 CONSTANTS.BFA_REPUTATION_CURRENCY_IDS = {
-	[1579] = true, -- both
-	[1598] = true,
-	[1600] = true, -- alliance
-	[1595] = true,
-	[1597] = true,
-	[1596] = true,
-	[1599] = true, -- horde
-	[1593] = true,
-	[1594] = true,
-	[1592] = true,
+	[1579] = true, -- Champions of Azeroth
+	[1598] = true, -- Tortollan Seekers
+	[1600] = true, -- Honorbound
+	[1595] = true, -- Talanji's Expedition
+	[1597] = true, -- Zandalari Empire
+	[1596] = true, -- Voldunai
+	[1599] = true, -- 7th Legion
+	[1593] = true, -- Proudmoore Admiralty
+	[1594] = true, -- Storm's Wake
+	[1592] = true, -- Order of Embers
+	[1742] = true, -- Rustbolt Resistance
 }
 
 CONSTANTS.FAMILY_FAMILIAR_QUEST_IDS = { -- WQ pet battle achievement
@@ -161,6 +191,7 @@ CONSTANTS.FAMILY_FAMILIAR_QUEST_IDS = { -- WQ pet battle achievement
 
 CONSTANTS.ACHIEVEMENT_IDS = {
 	PET_BATTLE_WQ = {
+		[CONSTANTS.EXPANSIONS.THEWARWITHIN] = 40153,
 		[CONSTANTS.EXPANSIONS.DRAGONFLIGHT] = 16464,
 		[CONSTANTS.EXPANSIONS.SHADOWLANDS] = 14625,
 		[CONSTANTS.EXPANSIONS.BFA] = 12936,
@@ -339,12 +370,19 @@ CONSTANTS.PARAGON_FACTIONS = {
 		[2478] = "inv_misc_enlightenedbrokers_paragoncache01", -- TheEnlightened
 	},
 	dragonflight = {
-		order = {2507, 2503, 2511, 2510 },
+		order = {2507, 2503, 2511, 2510, 2564, 2574 },
 		[2507] = "ui_majorfaction_expedition", -- Dragonscale Expedition
 		[2503] = "ui_majorfaction_centaur", -- Maruuk Centaur
 		[2511] = "ui_majorfaction_tuskarr", -- Iskaara Tuskarr
 		[2510] = "ui_majorfaction_valdrakken", -- Valdrakken Accord
+		[2564] = "ui_majorfaction_niffen", -- Loamm Niffen
+		[2574] = "ui_majorfaction_denizens", -- Dream Wardens
+	},
+	thewarwithin = {
+		order = {2902, 2899 },
+		[2902] = "ui_majorfactions_candle", -- The Assembly of the Deeps
+		[2899] = "ui_majorfactions_flame", -- Hallowfall Arathi
 	},
 }
 
-addon.CONSTANTS = CONSTANTS
+addon.CONSTANTS = CONSTANTS