Skip to content

sod Expertise #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alessandro-Barbieri wants to merge 28 commits into
base: master
Choose a base branch
from
Open

sod Expertise #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
937a654
wip
Alessandro-Barbieri Mar 11, 2025
f049e85
wip
Alessandro-Barbieri Mar 11, 2025
b019b4e
wip
Alessandro-Barbieri Mar 14, 2025
8477a74
wip
Alessandro-Barbieri Mar 16, 2025
766c38a
wip
Alessandro-Barbieri Mar 16, 2025
5c2f5ad
wip
Alessandro-Barbieri Mar 16, 2025
28c8e58
wip
Alessandro-Barbieri Mar 16, 2025
e473553
wip
Alessandro-Barbieri Mar 16, 2025
0e03932
wip
Alessandro-Barbieri Mar 16, 2025
fcc960c
Merge branch 'master' into expertise
Alessandro-Barbieri Dec 14, 2025
c6c003f
change expertise logic
Alessandro-Barbieri Dec 14, 2025
8e58240
Update itemsTimewornExpertise values to numeric
Alessandro-Barbieri Dec 14, 2025
4b444f0
change count timeworn items logic
Alessandro-Barbieri Dec 14, 2025
79ad11f
Fix syntax errors in Constants.lua
Alessandro-Barbieri Dec 14, 2025
e2bffe5
make id local
Alessandro-Barbieri Dec 14, 2025
7fb21dd
Fix indentation in itemsTimeworn table
Alessandro-Barbieri Dec 14, 2025
327cc9b
hide expertise only in classic
Alessandro-Barbieri Dec 14, 2025
17a96b2
Refactor enchant and item data structures
Alessandro-Barbieri Dec 23, 2025
f6d33b8
wip
Alessandro-Barbieri Dec 23, 2025
b2ba1d5
sort
Alessandro-Barbieri Dec 23, 2025
174bb61
Merge branch 'master' into expertise
Alessandro-Barbieri Dec 23, 2025
5ca347a
fixes
Alessandro-Barbieri Dec 23, 2025
b6b8bcd
Rename HasSetBonusModifierMP5 to GetSetBonusModifierMP5
Alessandro-Barbieri Dec 23, 2025
e006ef9
restructure tables
Alessandro-Barbieri Dec 29, 2025
132d85f
Merge branch 'master' into expertise
Alessandro-Barbieri Jan 7, 2026
94b05de
Update MeleeSection.lua
Alessandro-Barbieri Jan 12, 2026
d633f8b
Update Constants.lua
Alessandro-Barbieri Jan 12, 2026
24e3df6
wip
Alessandro-Barbieri Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Modules/Config/MeleeSection.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 not (ECS.IsTbc or ECS.IsWotlk or ECS.IsSod)
end,
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
get = function () return ExtendedCharacterStats.profile.melee.expertise.display; end,
Expand Down Expand Up @@ -383,4 +383,4 @@ function _Config:LoadMeleeSection()
},
},
}
end
end
307 changes: 287 additions & 20 deletions Modules/Data/Constants.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,15 @@ Data.Aura = {
[10491] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 2
[10493] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 3
[10494] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 4
[19742] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 1
[19850] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 2
[19852] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 3
[19853] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 4
[19854] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 5
[25290] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 6
[19742] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 1
[19850] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 2
[19852] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 3
[19853] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 4
[19854] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 5
[25290] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 6
[25569] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 5
[25894] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 1
[25918] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 2
[25894] = (ECS.IsClassic and nil or 1), -- Greater Blessing of Wisdom rank 1
[25918] = (ECS.IsClassic and nil or 1), -- Greater Blessing of Wisdom rank 2
[27142] = 1, -- Blessing of Wisdom rank 7
[27143] = 1, -- Greater Blessing of Wisdom rank 3
[48935] = 1, -- Blessing of Wisdom rank 8
Expand All @@ -243,12 +243,12 @@ Data.Aura = {
[58777] = 5/2, -- Mana Spring rank 8
},
PercentageMp5 = {
[12051] = ((ECS.IsTbc or ECS.IsWotlk) and 0.15/2*5 or nil), -- Evocation
[18792] = ((ECS.IsTbc or ECS.IsWotlk) and 0.03/4 or 0.02/4)*5, -- Fel Energy
[12051] = (ECS.IsClassic and nil or 0.15/2*5), -- Evocation
[18792] = (ECS.IsClassic and 0.02/4 or 0.03/4)*5, -- Fel Energy
[24355] = 0.02*5, -- Drink
[24707] = 0.03*5, -- Food
[25990] = 0.05*5, -- Graccu's Mince Meat Fruitcake
[26263] = ((ECS.IsTbc or ECS.IsWotlk) and 0.03 or 0.04)*5, -- Dim Sum
[26263] = (ECS.IsClassic and 0.04 or 0.03)*5, -- Dim Sum
[29055] = 0.04*5, -- Refreshing Red Apple
[30024] = 0.2*5, -- Drink
[30254] = 0.05*5, -- Evocation
Expand Down Expand Up @@ -325,19 +325,19 @@ Data.Aura = {
[10491] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 2
[10493] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 3
[10494] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 4
[19742] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 1
[19850] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 2
[19852] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 3
[19853] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 4
[19854] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 5
[19742] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 1
[19850] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 2
[19852] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 3
[19853] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 4
[19854] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 5
[24853] = 5/2, -- Mana Spring
[25290] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 6
[25290] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 6
[25569] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 5
[25894] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 1
[25918] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 2
[25894] = (ECS.IsClassic and 1 or nil), -- Greater Blessing of Wisdom rank 1
[25918] = (ECS.IsClassic and 1 or nil), -- Greater Blessing of Wisdom rank 2
},
SpellCrit = {
[24907] = ((ECS.IsTBC or ECS.IsWotlk) and 5 or nil), -- Moonkin Aura
[24907] = (ECS.IsClassic and nil or 5), -- Moonkin Aura
[29177] = 6, -- Elemental Devastation Rank 2
[29178] = 9, -- Elemental Devastation Rank 3
[30165] = 3, -- Elemental Devastation Rank 1
Expand All @@ -356,6 +356,7 @@ Data.Enchant = {
[7633] = 15, -- Presence of Valor
},
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
},
MP5 = {
Expand Down Expand Up @@ -444,19 +445,285 @@ Data.Gem = {
[42146] = 17, -- Lustrous Dragon's Eye
},
}
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,
},
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,
},
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_EARTHSHATTERERS_RESOLVE = "The Earthshatterer Resolve",
VESTMENTS_OF_TRANSCENDENCE = "Vestments of Transcendence",
WINDHAWK_ARMOR = "Windhawk Armor",
}
Loading
Loading