sod Expertise

Modules/Config/MeleeSection.lua

@@ -92,7 +92,7 @@ function _Config:LoadMeleeSection()
                 desc = function() return i18n("Shows/Hides the expertise value.") end,
                 width = 1.5,
                 hidden = function()
-                    return (not ECS.IsWotlk)
+                    return ECS.IsClassic
                 end,
                 disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
                 get = function () return ExtendedCharacterStats.profile.melee.expertise.display; end,
@@ -383,4 +383,4 @@ function _Config:LoadMeleeSection()
             },
         },
     }
-end
+end

Modules/Data/Constants.lua

@@ -347,7 +347,15 @@ Data.Aura.SpellCrit = {
     [51470] = 5, -- Elemental Oath Rank 2
 }
 Data.Enchant = {}
+Data.Enchant.BlockValue = {
+    [2583] = 15, -- Presence of Might
+    [2653] = 18, -- Enchant Shield - Tough Shield
+    [2655] = 15, -- Enchant Shield - Shield Block
+    [3849] = 81, -- Titanium Plating
+    [7633] = 15, -- Presence of Valor
+}
 Data.Enchant.Ids = {
+    ANIMALISTIC_EXPERTISE = 7875, -- Your melee attacks have 5% less chance to be Dodged or Parried.
     BIZNICK_SCOPE = 2523, -- 3% Hit from Biznicks 247x128 Accurascope
 }
 Data.Enchant.MP5 = {
@@ -374,13 +382,6 @@ Data.Enchant.MP5 = {
     [3836] = 8, -- Master's Inscription of the Crag
     [7099] = 12, -- Blackfathom Mana Oil. This effect only applies within Blackfathom Deeps.
 }
-Data.Enchant.BlockValue = {
-    ["2583"] = 15, -- Presence of Might
-    ["2653"] = 18, -- Enchant Shield - Tough Shield
-    ["2655"] = 15, -- Enchant Shield - Shield Block
-    ["3849"] = 81, -- Titanium Plating
-    ["7633"] = 15, -- Presence of Valor
-}
 Data.Gem = {}
 Data.Gem.MP5 = {
     [23106] = 1,
@@ -403,19 +404,284 @@ Data.Gem.MP5 = {
     [32216] = 2,
     [32225] = 2,
 }
+Data.Item = {}
+Data.Item.IncreaseExpertise = {
+    [233376] = 1,
+    [233397] = 1,
+    [233401] = 1,
+    [233412] = 1,
+    [233413] = 1,
+    [233415] = 1,
+    [233442] = 1,
+    [233579] = 1,
+    [233582] = 1,
+    [233585] = 1,
+    [233600] = 1,
+    [233612] = 1,
+    [233614] = 2,
+    [233618] = 1,
+    [233634] = 1,
+    [233635] = 1,
+    [233637] = 1,
+    [233640] = 2,
+    [233642] = 1,
+    [233651] = 1,
+    [233658] = 1,
+    [233659] = 1,
+    [233661] = 1,
+    [233662] = 1,
+    [233663] = 1,
+    [233665] = 1,
+    [233666] = 1,
+    [233668] = 1,
+    [233689] = 1,
+    [233692] = 1,
+    [233693] = 1,
+    [233699] = 1,
+    [233700] = 1,
+    [233711] = 1,
+    [233992] = 1,
+    [234650] = 1,
+    [234748] = 1,
+    [234984] = 1,
+    [234985] = 2,
+    [235005] = 1,
+    [235888] = 1,
+    [236005] = 1,
+    [236006] = 1,
+    [236007] = 1,
+    [236008] = 1,
+    [236009] = 1,
+    [236010] = 1,
+    [236011] = 1,
+    [236012] = 1,
+    [236013] = 1,
+    [236016] = 1,
+    [236019] = 1,
+    [236020] = 1,
+    [236021] = 1,
+    [236022] = 1,
+    [236023] = 1,
+    [236026] = 1,
+    [236029] = 1,
+    [236030] = 1,
+    [236031] = 1,
+    [236032] = 1,
+    [236033] = 1,
+    [236034] = 1,
+    [236035] = 1,
+    [236036] = 1,
+    [236037] = 1,
+    [236038] = 1,
+    [236039] = 1,
+    [236040] = 1,
+    [236050] = 1,
+    [236051] = 1,
+    [236052] = 1,
+    [236054] = 1,
+    [236055] = 1,
+    [236056] = 1,
+    [236124] = 1,
+    [236125] = 1,
+    [236128] = 1,
+    [236129] = 1,
+    [236130] = 1,
+    [236133] = 1,
+    [236134] = 1,
+    [236135] = 1,
+    [236136] = 1,
+    [236137] = 1,
+    [236138] = 1,
+    [236139] = 1,
+    [236140] = 1,
+    [236141] = 1,
+    [236170] = 1,
+    [236171] = 1,
+    [236172] = 1,
+    [236174] = 1,
+    [236175] = 1,
+    [236176] = 1,
+    [236201] = 1,
+    [236202] = 1,
+    [236203] = 1,
+    [236204] = 1,
+    [236205] = 1,
+    [236206] = 1,
+    [236207] = 1,
+    [236208] = 1,
+    [236209] = 1,
+    [236210] = 1,
+    [236211] = 1,
+    [236212] = 1,
+    [236215] = 1,
+    [236216] = 1,
+    [236218] = 1,
+    [236222] = 1,
+    [236255] = 1,
+    [236260] = 1,
+    [236262] = 1,
+    [236263] = 1,
+    [236293] = 1,
+    [236300] = 2,
+    [236304] = 1,
+    [236306] = 1,
+    [236309] = 1,
+    [236311] = 1,
+    [236319] = 1,
+    [236339] = 1,
+    [236341] = 1,
+    [237275] = 1,
+    [237512] = 1,
+}
+Data.Item.IsTimeworn = {
+    [233496] = true,
+    [233505] = true,
+    [233506] = true,
+    [233514] = true,
+    [233516] = true,
+    [233517] = true,
+    [233518] = true,
+    [233520] = true,
+    [233521] = true,
+    [233522] = true,
+    [233523] = true,
+    [233559] = true,
+    [233560] = true,
+    [233561] = true,
+    [233563] = true,
+    [233564] = true,
+    [233566] = true,
+    [233567] = true,
+    [233568] = true,
+    [233573] = true,
+    [233574] = true,
+    [233575] = true,
+    [233577] = true,
+    [233578] = true,
+    [233579] = true,
+    [233582] = true,
+    [233583] = true,
+    [233584] = true,
+    [233590] = true,
+    [233591] = true,
+    [233592] = true,
+    [233593] = true,
+    [233594] = true,
+    [233595] = true,
+    [233598] = true,
+    [233603] = true,
+    [233604] = true,
+    [233607] = true,
+    [233608] = true,
+    [233610] = true,
+    [233611] = true,
+    [233612] = true,
+    [233613] = true,
+    [233614] = true,
+    [233617] = true,
+    [233618] = true,
+    [233619] = true,
+    [233622] = true,
+    [233623] = true,
+    [233624] = true,
+    [233625] = true,
+    [233631] = true,
+    [233632] = true,
+    [233633] = true,
+    [233635] = true,
+    [233637] = true,
+    [233644] = true,
+    [233645] = true,
+    [233646] = true,
+    [234062] = true,
+    [234063] = true,
+    [234064] = true,
+    [234065] = true,
+    [234066] = true,
+    [234068] = true,
+    [234069] = true,
+    [234070] = true,
+    [234071] = true,
+    [234072] = true,
+    [234073] = true,
+    [234075] = true,
+    [234077] = true,
+    [234078] = true,
+    [234081] = true,
+    [234082] = true,
+    [234084] = true,
+    [234087] = true,
+    [234088] = true,
+    [234090] = true,
+    [234091] = true,
+    [234093] = true,
+    [234094] = true,
+    [234095] = true,
+    [234098] = true,
+    [234099] = true,
+    [234100] = true,
+    [234102] = true,
+    [234103] = true,
+    [234105] = true,
+    [234106] = true,
+    [234107] = true,
+    [234108] = true,
+    [234109] = true,
+    [234110] = true,
+    [234111] = true,
+    [234114] = true,
+    [234117] = true,
+    [234120] = true,
+    [234123] = true,
+    [234146] = true,
+    [234147] = true,
+    [234148] = true,
+    [234149] = true,
+    [234150] = true,
+    [234156] = true,
+    [234157] = true,
+    [234161] = true,
+    [234162] = true,
+    [234163] = true,
+    [234164] = true,
+    [234165] = true,
+    [234166] = true,
+    [234167] = true,
+    [234168] = true,
+    [234171] = true,
+    [234173] = true,
+    [234174] = true,
+    [234962] = true,
+    [234963] = true,
+    [235047] = true,
+}
+Data.Item.TimewornExpertise = {
+    [234018] = 1,
+    [234022] = 1,
+    [234027] = 1,
+    [234031] = 1,
+    [234035] = 1,
+}
 Data.setNames = {
     AUGURS_REGALIA = "Augur's Regalia",
     BLOODSOUL_EMBRACE = "Bloodsoul Embrace",
+    BONESCYTHE_LEATHERS = "Bonescythe Leathers",
     DAWN_OF_TRANSCENDENCE = "Dawn of Transcendence",
+    DREAMWALKER_GUARDIAN = "Dreamwalker Guardian",
+    DREADNOUGHTS_BATTLEGEAR = "Dreadnought's Battlegear",
     FEL_IRON_CHAIN = "Fel Iron Chain",
     FREETHINKERS_ARMOR = "Freethinker's Armor",
     GREEN_DRAGON_MAIL = "Green Dragon Mail",
     HARUSPEXS_GARB = "Haruspex's Garb",
     LIVING_GREEN_DRAGON_MAIL = "Living Green Dragon Mail",
+    PLAGUEHEART_STITCHINGS = "Plagueheart Stitchings",
     PRIMAL_MOONCLOTH = "Primal Mooncloth",
+    REDEMPTION_BULWARK = "Redemption Bulwark",
     STORMRAGE_RAIMENT = "Stormrage Raiment",
+    SYMBOLS_OF_UNENDING_LIFE = "Symbols of Unending Life",
     TEN_STORMS = "The Ten Storms",
     THE_EARTHSHATTERER = "The Earthshatterer",
+    THE_EARTHSHATTERER_RESOLVE = "The Earthshatterer Resolve",
     VESTMENTS_OF_TRANSCENDENCE = "Vestments of Transcendence",
     WINDHAWK_ARMOR = "Windhawk Armor",
 }

Modules/Data/DataUtils.lua

@@ -107,7 +107,7 @@ function DataUtils:GetEnchantFromItemLink(itemLink)
     if itemLink then
         local _, itemStringLink = GetItemInfo(itemLink)
         if itemStringLink then
-            local _, _, enchant = string.find(itemStringLink, "item:%d+:(%d*)")
+            local _, _, enchant, _ = strsplit(":", itemStringLink, 4)
             return tonumber(enchant)
         end
     end
@@ -129,12 +129,12 @@ function DataUtils.GetRuneForEquipSlot(equipSlot)
 end
 
 ---@param itemLink ItemLink
----@return (number, number, number) | nil
+---@return (string, string, string) | nil
 function DataUtils:GetSocketedGemsFromItemLink(itemLink)
     if itemLink then
         local _, itemStringLink = GetItemInfo(itemLink)
         if itemStringLink then
-            local _, _, gem1, gem2, gem3 = string.find(itemStringLink, "item:%d*:%d*:(%d*):(%d*):(%d*)")
+            local _, _, gem1, gem2, gem3, _ = strsplit(":", itemStringLink, 6)
             return gem1, gem2, gem3
         end
     end