Skip to content

Commit

Permalink
👌 IMPROVE: Updated Event Tracker. Remove WorldSoul tracking and add m…
Browse files Browse the repository at this point in the history
…ore Quest IDs for Emisary
  • Loading branch information
Merathilis committed Sep 8, 2024
1 parent b8677a7 commit eb2eadb
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 61 deletions.
15 changes: 8 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
### Changes ###

* [Armory/Objective Tracker]: Try to prevent some db errors on profile switch/dual profiles
* [Delves Skin]: Fix the shadow
* [Announcement]: Added an missing event
* [Event Tracker]: New weekly events
* [MicroBar]: Updated friends counter on MicroBar
* [SuperTracker]: Now also supports mapIDs
* [AutoButtons]: Added more items
* [Objective Tracker]: Fix an issue with Cosmetic Bars
* [Friends List]: Added an option to hide the realm on the Friends List
* [Scale]: More frames are now scaleable
* [AutoButtons]: Tooltip is now by default enable on Bar 1
* [AutoButtons]: A lot more items now on the AutoButtons
* [Event Tracker]: Use Icon instead of text on the Event Tracker
* [mMediaTag Profile]: Updated the Profile with the recent changes. Thx Blinkiiiiii <3
* [Locales]: deDe locale updates from Dlarge
19 changes: 15 additions & 4 deletions ElvUI_MerathilisUI/Core/Changelog/6.39.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
local MER = unpack(ElvUI_MerathilisUI)

MER.Changelog[639] = {
RELEASE_DATE = "TBD",
FIXES = {},
NEW = {},
IMPROVEMENTS = {},
RELEASE_DATE = "08.09.2024",
FIXES = {
"[Objective Tracker]: Fix an issue with Cosmetic Bars",
},
NEW = {
"[Friends List]: Added an option to hide the realm on the Friends List",
"[Scale]: More frames are now scaleable",
},
IMPROVEMENTS = {
"[AutoButtons]: Tooltip is now by default enable on Bar 1",
"[AutoButtons]: A lot more items now on the AutoButtons",
"[Event Tracker]: Use Icon instead of text on the Event Tracker",
"[mMediaTag Profile]: Updated the Profile with the recent changes. Thx Blinkiiiiii <3",
"[Locales]: deDe locale updates from Dlarge",
},
}
4 changes: 0 additions & 4 deletions ElvUI_MerathilisUI/Core/Profile/Profile.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1757,10 +1757,6 @@ P.maps = {
enable = true,
desaturate = true,
},
worldSoul = {
enable = true,
desaturate = true,
},
khazAlgarEmissary = {
enable = true,
desaturate = true,
Expand Down
10 changes: 9 additions & 1 deletion ElvUI_MerathilisUI/Core/Update.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function MER:UpdateScripts() -- DB Convert
end
end

if profileVersion and profileVersion <= 6.38 then
if profileVersion <= 6.38 then
if E.db.mui and E.db.mui.maps.eventTracker then
if E.db.mui.maps.eventTracker.iskaaranFishingNet then
E.db.mui.maps.eventTracker.iskaaranFishingNet.enable = false
Expand All @@ -67,6 +67,14 @@ function MER:UpdateScripts() -- DB Convert
end
end

if profileVersion < 6.39 then
if E.db.mui and E.db.mui.maps.eventTracker then
if E.db.mui.maps.eventTracker.worldSoul then
E.db.mui.maps.eventTracker.worldSoul = nil
end
end
end

if globalVersion < 6.39 then
if E.global.mui and E.global.mui.core then
E.global.mui.core.fixPlaystyle = nil
Expand Down
75 changes: 50 additions & 25 deletions ElvUI_MerathilisUI/Modules/Maps/EventTracker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ local LeftButtonIcon = "|TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:13:11:0:-1
local eventList = {
-- TWW
-- "TWWProfessions",
"WorldSoul",
"KhazAlgarEmissary",
"TheaterTroupe",
"RingingDeeps",
Expand Down Expand Up @@ -916,33 +915,49 @@ local eventData = {
onClickHelpText = L["Click to show location"],
},
},
WorldSoul = {
dbKey = "worldSoul",
KhazAlgarEmissary = {
dbKey = "khazAlgarEmissary",
args = {
icon = 2565092,
icon = 236681,
type = "weekly",
questIDs = {
82449,
82452,
82453,
82482,
82483,
82485,
82486,
82487,
82488,
82489,
82490,
82491,
82492,
82493,
82494,
82495,
82496,
82497,
82498,
82499,
82500,
82501,
82502,
82503,
82504,
82505,
82506,
82507,
82508,
82509,
82510,
82511,
},
hasWeeklyReward = true,
eventName = L["World Soul"],
location = GetMapInfo(2339).name,
label = L["World Soul"],
onClick = worldMapIDSetter(2339),
onClickHelpText = L["Click to show location"],
},
},
KhazAlgarEmissary = {
dbKey = "khazAlgarEmissary",
args = {
icon = 236681,
type = "weekly",
questIDs = {
83443,
83457,
82512,
82516,
82659,
82678,
82708,
},
hasWeeklyReward = true,
eventName = L["Khaz Algar Emissary"],
Expand All @@ -957,7 +972,9 @@ local eventData = {
args = {
icon = 5788303,
type = "loopTimer",
questIDs = { 83240 },
questIDs = {
83240,
},
hasWeeklyReward = true,
duration = 15 * 60,
interval = 60 * 60,
Expand Down Expand Up @@ -994,7 +1011,9 @@ local eventData = {
args = {
icon = 2120036,
type = "weekly",
questIDs = { 83333 },
questIDs = {
83333,
},
hasWeeklyReward = true,
eventName = L["Ringing Deeps"],
location = GetMapInfo(2214).name,
Expand All @@ -1008,7 +1027,9 @@ local eventData = {
args = {
icon = 5927633,
type = "weekly",
questIDs = { 76586 },
questIDs = {
76586,
},
hasWeeklyReward = true,
eventName = L["Spreading The Light"],
location = GetMapInfo(2215).name,
Expand All @@ -1022,7 +1043,11 @@ local eventData = {
args = {
icon = 5309857,
type = "weekly",
questIDs = { 80670, 80671, 80672 },
questIDs = {
80670,
80671,
80672,
},
hasWeeklyReward = true,
eventName = L["Underworld Operative"],
location = GetMapInfo(2255).name,
Expand Down
19 changes: 0 additions & 19 deletions ElvUI_MerathilisUI/Options/Modules/Maps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1199,25 +1199,6 @@ options.maps.args.eventTracker = {
},
},
},
worldSoul = {
order = 10,
type = "group",
inline = true,
name = L["World Soul"],
args = {
enable = {
order = 1,
type = "toggle",
name = L["Enable"],
},
desaturate = {
order = 2,
type = "toggle",
name = L["Desaturate"],
desc = L["Desaturate icon if the event is completed in this week."],
},
},
},
khazAlgarEmissary = {
order = 12,
type = "group",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<img src="https://raw.githubusercontent.com/Merathilis/ElvUI_MerathilisUI/development/m4.png"/><br>
<img src="https://img.shields.io/badge/ElvUI-13.76-blue.svg?longCache=true&style=for-the-badge"/>
<img src="https://img.shields.io/badge/Version-6.38-orange.svg?longCache=true&style=for-the-badge"/>
<img src="https://img.shields.io/badge/Version-6.39-orange.svg?longCache=true&style=for-the-badge"/>
</div>

---
Expand Down

0 comments on commit eb2eadb

Please sign in to comment.