Commit 3b74e4d5 authored by Benik's avatar Benik

Merge branch 'development'

parents aae40983 2ea5e62a
3.52
*Group Archy tokens by expansion
*Show the new Service Medal token for the correct faction only
*Categorized the Tokens by expansion
*Added patch 8.1 currencies
*toc update for patch 8.1
3.51
*toc update for patch 8.1
3.50
*toc update for patch 8.1
*Fixed various errors from patch 8.1
......
## Interface: 80100
## Author: Benik
## Version: 3.5
## Version: 3.52
## Title: |cff1784d1ElvUI|r |cff00c0faBenikUI|r
## Notes: an ElvUI 10+ decorative/enhancement edit
## RequiredDeps: ElvUI
......
......@@ -13,7 +13,6 @@ V['dashboards'] = {
['tokens'] = {
['chooseTokens'] = {
[1560] = true, -- War Resources
[1565] = true, -- Rich Azerite Fragment
[1580] = true, -- Seal of Wartorn Fate
},
},
......
......@@ -255,11 +255,6 @@ P['benikuiDatabars'] = {
['enable'] = true,
['buiStyle'] = true,
['buttonStyle'] = "TRANSPARENT",
['color'] = {
['default'] = true,
['xp'] = { r = 0, g = 0.4, b = 1, a = .8 },
['rested'] = { r = 1, g = 0, b = 1, a = .2 },
},
['notifiers'] = {
['enable'] = true,
['combat'] = false,
......@@ -272,13 +267,6 @@ P['benikuiDatabars'] = {
['buiStyle'] = true,
['buttonStyle'] = "TRANSPARENT",
['autotrack'] = false,
['color'] = {
['default'] = true,
['friendly'] = {r = 0, g = .6, b = .1, a = .8 },
['neutral'] = {r = .9, g = .7, b = 0, a = .8 },
['unfriendly'] = {r = .75, g = .27, b = 0, a = .8 },
['hated'] = {r = 1, g = 0, b = 0, a = .8 },
},
['notifiers'] = {
['enable'] = true,
['combat'] = false,
......@@ -290,10 +278,6 @@ P['benikuiDatabars'] = {
['enable'] = true,
['buiStyle'] = true,
['buttonStyle'] = "TRANSPARENT",
['color'] = {
['default'] = true,
['af'] = {r = .901, g = .8, b = .601, a = .8 },
},
['notifiers'] = {
['enable'] = true,
['combat'] = false,
......@@ -305,10 +289,6 @@ P['benikuiDatabars'] = {
['enable'] = true,
['buiStyle'] = true,
['buttonStyle'] = "TRANSPARENT",
['color'] = {
['default'] = true,
['hn'] = {r = .941, g = .447, b = .254, a = .8 },
},
['notifiers'] = {
['enable'] = true,
['combat'] = false,
......
......@@ -15,29 +15,11 @@ local ENABLE, MISCELLANEOUS, FONT_SIZE = ENABLE, MISCELLANEOUS, FONT_SIZE
-- GLOBALS: AceGUIWidgetLSMlists, hooksecurefunc
local dungeonTokens = {
776, -- Warforged Seal
752, -- Mogu Rune of Fate
697, -- Elder Charm of Good Fortune
738, -- Lesser Charm of Good Fortune
614, -- Mote of Darkness
615, -- Essence of Corrupted Deathwing
395, -- Justice Points
823, -- Apexis Crystal (for gear, like the valors)
994, -- Seal of Tempered Fate (Raid loot roll)
1129, -- Seal of Inevitable Fate
1191, -- Valor Points (6.23)
1273, -- Seal of Broken Fate (Raid)
1580, -- Seal of Wartorn Fate
1166, -- Timewarped Badge (6.22)
}
local pvpTokens = {
391, -- Tol Barad Commendation
944, -- Artifact Fragment (PvP)
1149, -- Sightless Eye (PvP)
1268, -- Timeworn Artifact (Honor Points?)
1356, -- Echoes of Battle (PvP Gear)
1357, -- Echoes of Domination (Elite PvP Gear)
1587, -- War Supplies
}
local secondaryTokens = {
......@@ -51,33 +33,59 @@ local miscTokens = {
241, -- Champion's Seal
416, -- Mark of the World Tree
515, -- Darkmoon Prize Ticket
777, -- Timeless Coin
789, -- Bloody Coin
980, -- Dingy Iron Coins (rogue only, from pickpocketing)
}
local mopTokens = {
697, -- Elder Charm of Good Fortune
738, -- Lesser Charm of Good Fortune
776, -- Warforged Seal
777, -- Timeless Coin
}
local wodTokens = {
824, -- Garrison Resources
823, -- Apexis Crystal (for gear, like the valors)
994, -- Seal of Tempered Fate (Raid loot roll)
980, -- Dingy Iron Coins (rogue only, from pickpocketing)
944, -- Artifact Fragment (PvP)
1101, -- Oil
1166, -- Timewarped Badge (6.22)
-- Legion
1129, -- Seal of Inevitable Fate
1191, -- Valor Points (6.23)
}
local legionTokens = {
1155, -- Ancient Mana
1220, -- Order Resources
1275, -- Curious Coin (Buy stuff :P)
1226, -- Nethershard (Invasion scenarios)
1273, -- Seal of Broken Fate (Raid)
1154, -- Shadowy Coins
1149, -- Sightless Eye (PvP)
1268, -- Timeworn Artifact (Honor Points?)
1299, -- Brawler's Gold
1314, -- Lingering Soul Fragment
1314, -- Lingering Soul Fragment (Good luck with this one :D)
1342, -- Legionfall War Supplies (Construction at the Broken Shore)
1355, -- Felessence (Craft Legentary items)
1356, -- Echoes of Battle (PvP Gear)
1357, -- Echoes of Domination (Elite PvP Gear)
1416, -- Coins of Air
1508, -- Veiled Argunite
1533, -- Wakening Essence
-- BfA
}
local bfaTokens = {
1560, -- War Resources
1565, -- Rich Azerite Fragment
1580, -- Seal of Wartorn Fate
1587, -- War Supplies
1710, -- Seafarer's Dubloon
--1716, -- Honorbound Service Medal (Horde)
--1717, -- 7th Legion Service Medal (Alliance)
1718, -- Titan Residuum
}
local archyTokens = {
-- Archaeology tokens
local archyClassic = {
384, -- Dwarf Archaeology Fragment
385, -- Troll Archaeology Fragment
393, -- Fossil Archaeology Fragment
......@@ -87,25 +95,49 @@ local archyTokens = {
399, -- Vrykul Archaeology Fragment
400, -- Nerubian Archaeology Fragment
401, -- Tol'vir Archaeology Fragment
}
local archyMop = {
676, -- Pandaren Archaeology Fragment
677, -- Mogu Archaeology Fragment
754, -- Mantid Archaeology Fragment
}
local archyWod = {
821, -- Draenor Clans Archaeology Fragment
828, -- Ogre Archaeology Fragment
829, -- Arakkoa Archaeology Fragment
}
local archyLegion = {
1172, -- Highborne Archaeology Fragment
1173, -- Highmountain Tauren Archaeology Fragment
1174, -- Demonic Archaeology Fragment
}
local archyBfa = {
1534, -- Zandalari Archaeology Fragment
1535, -- Drust Archaeology Fragment
}
local currencyTables = {
{dungeonTokens, 'dTokens'},
{pvpTokens, 'pTokens'},
{secondaryTokens, 'sTokens'},
{miscTokens, 'mTokens'},
{archyTokens, 'aTokens'},
-- table, option
{dungeonTokens, 'dungeonTokens'},
{pvpTokens, 'pvpTokens'},
{secondaryTokens, 'secondaryTokens'},
{miscTokens, 'miscTokens'},
{mopTokens, 'mopTokens'},
{wodTokens, 'wodTokens'},
{legionTokens, 'legionTokens'},
{bfaTokens, 'bfaTokens'},
}
local archyTables = {
-- table, option, name
{archyClassic, 'classic', EXPANSION_NAME0},
{archyMop, 'mop', EXPANSION_NAME4},
{archyWod, 'wod', EXPANSION_NAME5},
{archyLegion, 'legion', EXPANSION_NAME6},
{archyBfa, 'bfa', EXPANSION_NAME7},
}
local boards = {"FPS", "MS", "Durability", "Bags", "Volume"}
......@@ -139,7 +171,13 @@ end
-- these options must be updated when the player discovers a new token.
local function UpdateTokenOptions()
for i, v in ipairs(currencyTables) do
if E.myfaction == 'Alliance' then
tinsert(bfaTokens, 1717)
elseif E.myfaction == 'Horde' then
tinsert(bfaTokens, 1716)
end
for _, v in ipairs(currencyTables) do
local tableName, optionName = unpack(v)
local optionOrder = 1
for _, id in ipairs(tableName) do
......@@ -162,6 +200,34 @@ local function UpdateTokenOptions()
end
end
end
for i, v in ipairs(archyTables) do
local tableName, option, optionName = unpack(v)
local optionOrder = 1
for _, id in ipairs(tableName) do
E.Options.args.benikui.args.dashboards.args.tokens.args.archyGroup.args[option] = {
order = i,
type = 'group',
name = optionName,
args = {
},
}
for _, id in ipairs(tableName) do
local tname, _, icon, _, _, _, isDiscovered = GetCurrencyInfo(id)
if tname then
E.Options.args.benikui.args.dashboards.args.tokens.args.archyGroup.args[option].args[tname] = {
order = optionOrder + 1,
type = 'toggle',
name = '|T'..icon..':18|t '..(tname:gsub(' '..PROFESSIONS_ARCHAEOLOGY..' ', ' ')), -- remove 'Archaeology' from the name, to shorten the options a bit.
desc = L['Enable/Disable ']..tname,
get = function(info) return E.private.dashboards.tokens.chooseTokens[id] end,
set = function(info, value) E.private.dashboards.tokens.chooseTokens[id] = value; BUID:UpdateTokens(); BUID:UpdateTokenSettings(); end,
disabled = function() return not isDiscovered end,
}
end
end
end
end
end
local function UpdateProfessionOptions()
......@@ -528,39 +594,72 @@ local function dashboardsTable()
type = 'description',
name = "\n\n",
},
dTokens = {
dungeonTokens = {
order = 21,
type = 'group',
name = format('%s & %s', CALENDAR_TYPE_DUNGEON, CALENDAR_TYPE_RAID),
args = {
},
},
pTokens = {
pvpTokens = {
order = 22,
type = 'group',
name = format('%s', PLAYER_V_PLAYER),
args = {
},
},
sTokens = {
bfaTokens = {
order = 23,
type = 'group',
name = format('%s', (SECONDARY_SKILLS:gsub(':', ''))),
name = format('%s', EXPANSION_NAME7),
args = {
},
},
mTokens = {
legionTokens = {
order = 24,
type = 'group',
name = format('%s', MISCELLANEOUS),
name = format('%s', EXPANSION_NAME6),
args = {
},
},
aTokens = {
wodTokens = {
order = 25,
type = 'group',
name = format('%s', EXPANSION_NAME5),
args = {
},
},
mopTokens = {
order = 26,
type = 'group',
name = format('%s', EXPANSION_NAME4),
args = {
},
},
miscTokens = {
order = 27,
type = 'group',
name = format('%s', MISCELLANEOUS),
args = {
},
},
secondaryTokens = {
order = 28,
type = 'group',
name = format('%s', (SECONDARY_SKILLS:gsub(':', ''))),
args = {
},
},
archyGroup = {
order = 29,
type = 'group',
name = format('%s', PROFESSIONS_ARCHAEOLOGY),
args = {
desc = {
order = 1,
name = BUI:cOption(L['Tip: Grayed tokens are not yet discovered']),
type = 'header',
},
},
},
},
......
......@@ -21,23 +21,11 @@ local SPACING = 1
local classColor = E.myclass == 'PRIEST' and E.PriestColors or (CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS[E.myclass] or RAID_CLASS_COLORS[E.myclass])
local Currency = {
241, -- Champion's Seal
361, -- Illustrious Jewelcrafter's Token
391, -- Tol Barad Commendation
402, -- Ironpaw Token
416, -- Mark of the World Tree
515, -- Darkmoon Prize Ticket
61, -- Dalaran Jewelcrafter's Token
-- unused/old
614, -- Mote of Darkness
615, -- Essence of Corrupted Deathwing
697, -- Elder Charm of Good Fortune
738, -- Lesser Charm of Good Fortune
752, -- Mogu Rune of Fate
776, -- Warforged Seal
777, -- Timeless Coin
789, -- Bloody Coin
81, -- Epicurean's Award
-- Archaeology
384, -- Dwarf Archaeology Fragment
385, -- Troll Archaeology Fragment
......@@ -51,16 +39,40 @@ local Currency = {
676, -- Pandaren Archaeology Fragment
677, -- Mogu Archaeology Fragment
754, -- Mantid Archaeology Fragment
821, -- Draenor Clans Archaeology Fragment
828, -- Ogre Archaeology Fragment
829, -- Arakkoa Archaeology Fragment
1172, -- Highborne Archaeology Fragment
1173, -- Highmountain Tauren Archaeology Fragment
1174, -- Demonic Archaeology Fragment
1534, -- Zandalari Archaeology Fragment
1535, -- Drust Archaeology Fragment
-- dungeon
1166, -- Timewarped Badge (6.22)
-- pvp
391, -- Tol Barad Commendation
-- secondary
81, -- Epicurean's Award
402, -- Ironpaw Token
61, -- Dalaran Jewelcrafter's Token
361, -- Illustrious Jewelcrafter's Token
-- misc
241, -- Champion's Seal
416, -- Mark of the World Tree
515, -- Darkmoon Prize Ticket
789, -- Bloody Coin
-- MoP
697, -- Elder Charm of Good Fortune
738, -- Lesser Charm of Good Fortune
776, -- Warforged Seal
777, -- Timeless Coin
-- WoD
821, -- Draenor Clans Archaeology Fragment
828, -- Ogre Archaeology Fragment
829, -- Arakkoa Archaeology Fragment
824, -- Garrison Resources
823, -- Apexis Crystal (for gear, like the valors)
994, -- Seal of Tempered Fate (Raid loot roll)
......@@ -68,7 +80,6 @@ local Currency = {
944, -- Artifact Fragment (PvP)
1101, -- Oil
1129, -- Seal of Inevitable Fate
1166, -- Timewarped Badge (6.22)
1191, -- Valor Points (6.23)
-- Legion
......@@ -92,10 +103,12 @@ local Currency = {
-- BfA
1560, -- War Resources
1565, -- Rich Azerite Fragment
1580, -- Seal of Wartorn Fate
1587, -- War Supplies
1710, -- Seafarer's Dubloon
1716, -- Honorbound Service Medal (Horde)
1717, -- 7th Legion Service Medal (Alliance)
1718, -- Titan Residuum
}
local function Icon_OnEnter(self)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment