Add more Darkmoon Faire chores

ThingEngineering · Sep 6, 2024 · 05d4356 · 05d4356
1 parent 1d52d26
commit 05d4356
Show file tree

Hide file tree

Showing 3 changed files with 211 additions and 3 deletions.
diff --git a/Data/Chores/Events.lua b/Data/Chores/Events.lua
@@ -57,6 +57,185 @@ Addon.data.chores.choresEvents = {
                 },
             },
         },
+        {
+            key = 'darkmoonFaire',
+            quests = {
+                {
+                    key = 'gameHammerTime',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    alwaysQuestName = true,
+                    dailyQuest = true,
+                    entries = {
+                        { quest=29463 }, -- It's Hammer Time
+                    }
+                },
+                {
+                    key = 'gameHumanoidCannonball',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    alwaysQuestName = true,
+                    dailyQuest = true,
+                    entries = {
+                        { quest=29436 }, -- The Humanoid Cannonball
+                    }
+                },
+                {
+                    key = 'gameHeShootsHeScores',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    alwaysQuestName = true,
+                    dailyQuest = true,
+                    entries = {
+                        { quest=29438 }, -- He Shoots, He Scores!
+                    }
+                },
+                {
+                    key = 'gameTonkCommander',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    alwaysQuestName = true,
+                    dailyQuest = true,
+                    entries = {
+                        { quest=29434 }, -- Tonk Commander
+                    }
+                },
+                {
+                    key = 'gameTargetTurtle',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    alwaysQuestName = true,
+                    dailyQuest = true,
+                    entries = {
+                        { quest=29455 }, -- Target: Turtle
+                    }
+                },
+                {
+                    key = 'gameFirebirdsChallenge',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    alwaysQuestName = true,
+                    dailyQuest = true,
+                    entries = {
+                        { quest=36481 }, -- Firebird's Challenge
+                    }
+                },
+                {
+                    key = 'race',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    alwaysQuestName = true,
+                    dailyQuest = true,
+                    entries = {
+                        { quest=37910 }, -- The Real Race
+                    }
+                },
+                {
+                    key = 'bigRace',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    alwaysQuestName = true,
+                    dailyQuest = true,
+                    entries = {
+                        { quest=37911 }, -- The Real Big Race
+                    }
+                },
+                {
+                    key = 'petBattleJeremy',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    dailyQuest = true,
+                    entries = {
+                        { quest=32175, item=91086 }, -- Darkmoon Pet Battle!/Darkmoon Pet Supplies
+                    }
+                },
+                {
+                    key = 'petBattleChristoph',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    dailyQuest = true,
+                    entries = {
+                        { quest=36471, item=116062 }, -- A New Darkmoon Challenger!/Greater Darkmoon Pet Supplies
+                    }
+                },
+                {
+                    key = 'testYourStrength',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    entries = {
+                        { quest=29433 }, -- Test Your Strength
+                    }
+                },
+                {
+                    key = 'denMother',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    entries = {
+                        { quest=33354 }, -- Den Mother's Demise
+                    }
+                },
+                {
+                    key = 'aTreatiseOnStrategy',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    onlyItemName = true,
+                    entries = {
+                        { quest=29451, item=71715 }, -- The Master Strategist/A Treatise on Strategy
+                    }
+                },
+                {
+                    key = 'bannerOfTheFallen',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    onlyItemName = true,
+                    entries = {
+                        { quest=29456, item=71951 }, -- A Captured Banner/Banner of the Fallen
+                    }
+                },
+                {
+                    key = 'capturedInsignia',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    onlyItemName = true,
+                    entries = {
+                        { quest=29457, item=71952 }, -- The Enemy's Insignia/Captured Insignia
+                    }
+                },
+                {
+                    key = 'fallenAdventurersJournal',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    onlyItemName = true,
+                    entries = {
+                        { quest=29458, item=71953 }, -- The Captured Journal/Fallen Adventurer's Journal
+                    }
+                },
+                {
+                    key = 'imbuedCrystal',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    onlyItemName = true,
+                    entries = {
+                        { quest=29443, item=71635 }, -- A Curious Crystal/Imbued Crystal
+                    }
+                },
+                {
+                    key = 'monstrousEgg',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    onlyItemName = true,
+                    entries = {
+                        { quest=29444, item=71636 }, -- An Exotic Egg/Monstrous Egg
+                    }
+                },
+                {
+                    key = 'mysteriousGrimoire',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    onlyItemName = true,
+                    entries = {
+                        { quest=29445, item=71637 }, -- An Intriguing Grimoire/Mysterious Grimoire
+                    }
+                },
+                {
+                    key = 'ornateWeapon',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    onlyItemName = true,
+                    entries = {
+                        { quest=29446, item=71638 }, -- A Wondrous Weapon/Ornate Weapon
+                    }
+                },
+                {
+                    key = 'soothsayersRunes',
+                    requiredEventIds = { 479 }, -- Darkmoon Faire
+                    onlyItemName = true,
+                    entries = {
+                        { quest=29464, item=71716 }, -- Tools of Divination/Soothsayer's Runes
+                    }
+                },
+            },
+        },
         {
             key = 'holidays',
             quests = {

diff --git a/Locales/enUS.lua b/Locales/enUS.lua
@@ -98,6 +98,28 @@ L['chore:dragonflight:patch_10_0_0:quests:grandHuntEpic'] = 'Grand Hunt: Epic'
 L['chore:dragonflight:patch_10_0_0:quests:heroicDungeons'] = 'Heroic Dungeons'
 L['chore:dragonflight:patch_10_0_0:quests:showYourMettle'] = 'Show Your Mettle'
 
+L['chore:events:darkmoonFaire:quests:gameHammerTime'] = 'Game: Whack-a-Gnoll'
+L['chore:events:darkmoonFaire:quests:gameHumanoidCannonball'] = 'Game: Darkmoon Cannon'
+L['chore:events:darkmoonFaire:quests:gameHeShootsHeScores'] = 'Game: Shooting Gallery'
+L['chore:events:darkmoonFaire:quests:gameTonkCommander'] = 'Game: Tonk Challenge'
+L['chore:events:darkmoonFaire:quests:gameTargetTurtle'] = 'Game: Ring Toss'
+L['chore:events:darkmoonFaire:quests:gameFirebirdsChallenge'] = "Game: Firebird's Challenge"
+L['chore:events:darkmoonFaire:quests:race'] = 'The Real Race'
+L['chore:events:darkmoonFaire:quests:bigRace'] = 'The Real Big Race'
+L['chore:events:darkmoonFaire:quests:petBattleJeremy'] = 'Battle Jeremy'
+L['chore:events:darkmoonFaire:quests:petBattleChristoph'] = 'Battle Christoph'
+L['chore:events:darkmoonFaire:quests:testYourStrength'] = 'Test Your Strength'
+L['chore:events:darkmoonFaire:quests:denMother'] = 'Kill Moonfang'
+L['chore:events:darkmoonFaire:quests:aTreatiseOnStrategy'] = 'Item: A Treatise on Strategy'
+L['chore:events:darkmoonFaire:quests:bannerOfTheFallen'] = 'Item: Banner of the Fallen'
+L['chore:events:darkmoonFaire:quests:capturedInsignia'] = 'Item: Captured Insignia'
+L['chore:events:darkmoonFaire:quests:fallenAdventurersJournal'] = "Item: Adventurer's Journal"
+L['chore:events:darkmoonFaire:quests:imbuedCrystal'] = 'Item: Imbued Crystal'
+L['chore:events:darkmoonFaire:quests:monstrousEgg'] = 'Item: Monstrous Egg'
+L['chore:events:darkmoonFaire:quests:mysteriousGrimoire'] = 'Item: Mysterious Grimoire'
+L['chore:events:darkmoonFaire:quests:ornateWeapon'] = 'Item: Ornate Weapon'
+L['chore:events:darkmoonFaire:quests:soothsayersRunes'] = "Item: Soothsayer's Runes"
+
 L['chore:events:holidays:quests:arenaSkirmishes'] = 'Arena Skirmishes'
 L['chore:events:holidays:quests:battlegrounds'] = 'Battlegrounds'
 L['chore:events:holidays:quests:mythicDungeons'] = 'Mythic Dungeons'

diff --git a/Modules/Display.lua b/Modules/Display.lua
@@ -677,7 +677,7 @@ function Module:GetEntryText(translated, entry, state, weekState, options)
         else
             -- This will just return the key if there's no translation entry, check for that
             local translatedName = L['questName:' .. entry.quest]
-            if translatedName:find('^questName') == nil then
+            if translatedName:find('^questName:') == nil then
                 questName = translatedName
             else
                 questName = '???'
@@ -686,7 +686,7 @@ function Module:GetEntryText(translated, entry, state, weekState, options)
     end
 
     local thingString = ''
-    if state.status == 1 and options.alwaysQuestName then
+    if state.status <= 1 and options.alwaysQuestName then
         thingString = '|cFFFFFFFF' .. questName
     elseif state.status == 1 and state.objectives ~= nil and #state.objectives == 1 then
         local objective = state.objectives[1]
@@ -740,9 +740,16 @@ function Module:GetEntryText(translated, entry, state, weekState, options)
         final = final .. STATUS_ICON[state.status] .. ' '
     end
 
+    if options.dailyQuest then
+        final = final .. '|cFF00CFFF[D] '
+    end
+
     final = final .. STATUS_COLOR[state.status]
 
-    if not (options.inProgressQuestName == false and state.status == 1) then
+    if not (options.alwaysQuestName) and
+        not (options.inProgressQuestName == false and state.status == 1) and
+        not (options.onlyItemName == true and entry.item ~= nil)
+    then
         final = final .. translated .. '|r: '
     end