Skip to content

Commit 28a6a44

Browse files
Alessandro-BarbieriAlessandro-Barbieri
authored
Merge branch 'master' into health-regen
2 parents adab133 + 0eb2d6c commit 28a6a44

29 files changed

Lines changed: 488 additions & 563 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
# IntelliJ settings
1212
.idea/
1313

14+
# vscode settings
15+
.vscode/
16+
1417
#This is used for the atom build package, enables the build to happen on each save.
1518
.atom-build.yml
1619

‎Modules/Config/DefenseSection.lua‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---@type Config
1+
---@class Config
22
local Config = ECSLoader:ImportModule("Config")
33
local _Config = Config.private
44

@@ -111,9 +111,7 @@ function _Config:LoadDefenseSection()
111111
name = function() return i18n("Defense Rating") end,
112112
desc = function() return i18n("Shows/Hides the defense rating.") end,
113113
width = 1.5,
114-
hidden = function()
115-
return (not ECS.IsWotlk)
116-
end,
114+
hidden = function() return ECS.IsClassic end,
117115
disabled = function() return (not ExtendedCharacterStats.profile.defense.display); end,
118116
get = function () return ExtendedCharacterStats.profile.defense.defenseRating.display; end,
119117
set = function (_, value)
@@ -192,9 +190,7 @@ function _Config:LoadDefenseSection()
192190
name = function() return i18n("Resilience") end,
193191
desc = function() return i18n("Shows/Hides the resilience value.") end,
194192
width = 1.5,
195-
hidden = function()
196-
return (not ECS.IsWotlk)
197-
end,
193+
hidden = function() return ECS.IsClassic end,
198194
disabled = function() return (not ExtendedCharacterStats.profile.defense.display); end,
199195
get = function () return ExtendedCharacterStats.profile.defense.resilience.display; end,
200196
set = function (_, value)

‎Modules/Config/GeneralSection.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---@type Config
1+
---@class Config
22
local Config = ECSLoader:ImportModule("Config")
33
local _Config = Config.private
44

‎Modules/Config/ManaSection.lua‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---@type Config
1+
---@class Config
22
local Config = ECSLoader:ImportModule("Config")
33
local _Config = Config.private
44

@@ -27,19 +27,6 @@ function _Config:LoadManaSection()
2727
Stats.RebuildStatInfos()
2828
end,
2929
},
30-
mp5Items = {
31-
type = "toggle",
32-
order = 1,
33-
name = function() return i18n("MP5 Items") end,
34-
desc = function() return i18n("Shows/Hides the MP5 value from items.") end,
35-
width = 1.5,
36-
disabled = function() return (not ExtendedCharacterStats.profile.regen.display); end,
37-
get = function () return ExtendedCharacterStats.profile.regen.mp5Items.display; end,
38-
set = function (_, value)
39-
ExtendedCharacterStats.profile.regen.mp5Items.display = value
40-
Stats.RebuildStatInfos()
41-
end,
42-
},
4330
mp5Spirit = {
4431
type = "toggle",
4532
order = 2,
@@ -53,19 +40,6 @@ function _Config:LoadManaSection()
5340
Stats.RebuildStatInfos()
5441
end,
5542
},
56-
mp5Buffs = {
57-
type = "toggle",
58-
order = 3,
59-
name = function() return i18n("MP5 Buffs") end,
60-
desc = function() return i18n("Shows/Hides the MP5 value from buffs.") end,
61-
width = 1.5,
62-
disabled = function() return (not ExtendedCharacterStats.profile.regen.display); end,
63-
get = function () return ExtendedCharacterStats.profile.regen.mp5Buffs.display; end,
64-
set = function (_, value)
65-
ExtendedCharacterStats.profile.regen.mp5Buffs.display = value
66-
Stats.RebuildStatInfos()
67-
end,
68-
},
6943
mp5Casting = {
7044
type = "toggle",
7145
order = 4,

‎Modules/Config/MeleeSection.lua‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---@type Config
1+
---@class Config
22
local Config = ECSLoader:ImportModule("Config")
33
local _Config = Config.private
44

@@ -59,9 +59,6 @@ function _Config:LoadMeleeSection()
5959
name = function() return i18n("Armor Pen.") end,
6060
desc = function() return i18n("Shows/Hides the armor penetration value.") end,
6161
width = 1.5,
62-
hidden = function()
63-
return (not ECS.IsWotlk)
64-
end,
6562
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
6663
get = function () return ExtendedCharacterStats.profile.melee.penetration.display; end,
6764
set = function (_, value)
@@ -75,9 +72,7 @@ function _Config:LoadMeleeSection()
7572
name = function() return i18n("Armor Pen. Rating") end,
7673
desc = function() return i18n("Shows/Hides the armor penetration rating value.") end,
7774
width = 1.5,
78-
hidden = function()
79-
return (not ECS.IsWotlk)
80-
end,
75+
hidden = function() return ECS.IsClassic end,
8176
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
8277
get = function () return ExtendedCharacterStats.profile.melee.penetrationRating.display; end,
8378
set = function (_, value)
@@ -91,9 +86,7 @@ function _Config:LoadMeleeSection()
9186
name = function() return i18n("Expertise") end,
9287
desc = function() return i18n("Shows/Hides the expertise value.") end,
9388
width = 1.5,
94-
hidden = function()
95-
return (not ECS.IsWotlk)
96-
end,
89+
hidden = function() return ECS.IsClassic end,
9790
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
9891
get = function () return ExtendedCharacterStats.profile.melee.expertise.display; end,
9992
set = function (_, value)
@@ -107,9 +100,7 @@ function _Config:LoadMeleeSection()
107100
name = function() return i18n("Expertise Rating") end,
108101
desc = function() return i18n("Shows/Hides the expertise rating.") end,
109102
width = 1.5,
110-
hidden = function()
111-
return (not ECS.IsWotlk)
112-
end,
103+
hidden = function() return ECS.IsClassic end,
113104
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
114105
get = function () return ExtendedCharacterStats.profile.melee.expertiseRating.display; end,
115106
set = function (_, value)
@@ -123,9 +114,7 @@ function _Config:LoadMeleeSection()
123114
name = function() return i18n("Haste Rating") end,
124115
desc = function() return i18n("Shows/Hides the melee haste rating.") end,
125116
width = 1.5,
126-
hidden = function()
127-
return (not ECS.IsWotlk)
128-
end,
117+
hidden = function() return ECS.IsClassic end,
129118
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
130119
get = function () return ExtendedCharacterStats.profile.melee.hasteRating.display; end,
131120
set = function (_, value)
@@ -139,9 +128,6 @@ function _Config:LoadMeleeSection()
139128
name = function() return i18n("Haste Bonus") end,
140129
desc = function() return i18n("Shows/Hides the melee haste bonus value.") end,
141130
width = 1.5,
142-
hidden = function()
143-
return (not ECS.IsWotlk)
144-
end,
145131
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
146132
get = function () return ExtendedCharacterStats.profile.melee.hasteBonus.display; end,
147133
set = function (_, value)
@@ -174,9 +160,7 @@ function _Config:LoadMeleeSection()
174160
name = function() return i18n("Hit Rating") end,
175161
desc = function() return i18n("Shows/Hides the melee hit rating.") end,
176162
width = 1.5,
177-
hidden = function()
178-
return (not ECS.IsWotlk)
179-
end,
163+
hidden = function() return ECS.IsClassic end,
180164
disabled = function()
181165
return ((not ExtendedCharacterStats.profile.melee.display) or
182166
(not ExtendedCharacterStats.profile.melee.hit.display))
@@ -243,9 +227,7 @@ function _Config:LoadMeleeSection()
243227
name = function() return i18n("Glancing Blow") end,
244228
desc = function() return i18n("Shows/Hides all glancing blow stats") end,
245229
width = 1.5,
246-
hidden = function()
247-
return (not ECS.IsClassic)
248-
end,
230+
hidden = function() return ECS.IsWotlk end,
249231
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
250232
get = function () return ExtendedCharacterStats.profile.melee.glance.display; end,
251233
set = function (_, value)
@@ -258,9 +240,7 @@ function _Config:LoadMeleeSection()
258240
order = 6,
259241
inline = true,
260242
name = function() return i18n("Melee Glance Values") end,
261-
hidden = function()
262-
return (not ECS.IsClassic)
263-
end,
243+
hidden = function() return ECS.IsWotlk end,
264244
args = {
265245
meleeGlance = {
266246
type = "toggle",
@@ -322,7 +302,7 @@ function _Config:LoadMeleeSection()
322302
end,
323303
get = function () return ExtendedCharacterStats.profile.melee.glance.damageBossLevel.display; end,
324304
set = function (_, value)
325-
ExtendedCharacterStats.profile.melee.glance.damageSameLevel.display = value
305+
ExtendedCharacterStats.profile.melee.glance.damageBossLevel.display = value
326306
Stats.RebuildStatInfos()
327307
end,
328308
},
@@ -383,4 +363,4 @@ function _Config:LoadMeleeSection()
383363
},
384364
},
385365
}
386-
end
366+
end

‎Modules/Config/RangeSection.lua‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---@type Config
1+
---@class Config
22
local Config = ECSLoader:ImportModule("Config")
33
local _Config = Config.private
44

@@ -59,9 +59,6 @@ function _Config:LoadRangeSection()
5959
name = function() return i18n("Armor Pen.") end,
6060
desc = function() return i18n("Shows/Hides the armor penetration value.") end,
6161
width = 1.5,
62-
hidden = function()
63-
return (not ECS.IsWotlk)
64-
end,
6562
disabled = function() return (not ExtendedCharacterStats.profile.ranged.display); end,
6663
get = function () return ExtendedCharacterStats.profile.ranged.penetration.display; end,
6764
set = function (_, value)
@@ -75,9 +72,7 @@ function _Config:LoadRangeSection()
7572
name = function() return i18n("Armor Pen. Rating") end,
7673
desc = function() return i18n("Shows/Hides the armor penetration rating value.") end,
7774
width = 1.5,
78-
hidden = function()
79-
return (not ECS.IsWotlk)
80-
end,
75+
hidden = function() return ECS.IsClassic end,
8176
disabled = function() return (not ExtendedCharacterStats.profile.ranged.display); end,
8277
get = function () return ExtendedCharacterStats.profile.ranged.penetrationRating.display; end,
8378
set = function (_, value)
@@ -91,9 +86,7 @@ function _Config:LoadRangeSection()
9186
name = function() return i18n("Haste Rating") end,
9287
desc = function() return i18n("Shows/Hides the ranged haste rating.") end,
9388
width = 1.5,
94-
hidden = function()
95-
return (not ECS.IsWotlk)
96-
end,
89+
hidden = function() return ECS.IsClassic end,
9790
disabled = function() return (not ExtendedCharacterStats.profile.ranged.display); end,
9891
get = function () return ExtendedCharacterStats.profile.ranged.hasteRating.display; end,
9992
set = function (_, value)
@@ -107,9 +100,6 @@ function _Config:LoadRangeSection()
107100
name = function() return i18n("Haste Bonus") end,
108101
desc = function() return i18n("Shows/Hides the ranged haste bonus value.") end,
109102
width = 1.5,
110-
hidden = function()
111-
return (not ECS.IsWotlk)
112-
end,
113103
disabled = function() return (not ExtendedCharacterStats.profile.ranged.display); end,
114104
get = function () return ExtendedCharacterStats.profile.ranged.hasteBonus.display; end,
115105
set = function (_, value)
@@ -155,9 +145,7 @@ function _Config:LoadRangeSection()
155145
name = function() return i18n("Hit Rating") end,
156146
desc = function() return i18n("Shows/Hides the ranged hit rating.") end,
157147
width = 1.5,
158-
hidden = function()
159-
return (not ECS.IsWotlk)
160-
end,
148+
hidden = function() return ECS.IsClassic end,
161149
disabled = function()
162150
return ((not ExtendedCharacterStats.profile.ranged.display) or
163151
(not ExtendedCharacterStats.profile.ranged.hit.display))

‎Modules/Config/SpellSchoolsSection.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---@type Config
1+
---@class Config
22
local Config = ECSLoader:ImportModule("Config")
33
local _Config = Config.private
44

‎Modules/Config/SpellSection.lua‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---@type Config
1+
---@class Config
22
local Config = ECSLoader:ImportModule("Config")
33
local _Config = Config.private
44

@@ -46,9 +46,7 @@ function _Config:LoadSpellSection()
4646
name = function() return i18n("Haste Rating") end,
4747
desc = function() return i18n("Shows/Hides the spell haste rating value.") end,
4848
width = 1.5,
49-
hidden = function()
50-
return (not ECS.IsWotlk)
51-
end,
49+
hidden = function() return ECS.IsClassic end,
5250
disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end,
5351
get = function () return ExtendedCharacterStats.profile.spell.hasteRating.display; end,
5452
set = function (_, value)
@@ -62,9 +60,6 @@ function _Config:LoadSpellSection()
6260
name = function() return i18n("Haste Bonus") end,
6361
desc = function() return i18n("Shows/Hides the spell haste bonus value.") end,
6462
width = 1.5,
65-
hidden = function()
66-
return (not ECS.IsWotlk)
67-
end,
6863
disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end,
6964
get = function () return ExtendedCharacterStats.profile.spell.hasteBonus.display; end,
7065
set = function (_, value)
@@ -97,9 +92,7 @@ function _Config:LoadSpellSection()
9792
name = function() return i18n("Hit Rating") end,
9893
desc = function() return i18n("Shows/Hides the spell hit rating.") end,
9994
width = 1.5,
100-
hidden = function()
101-
return (not ECS.IsWotlk)
102-
end,
95+
hidden = function() return ECS.IsClassic end,
10396
disabled = function()
10497
return ((not ExtendedCharacterStats.profile.spell.display) or
10598
(not ExtendedCharacterStats.profile.spell.hit.display))

‎Modules/Data/Constants.lua‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---@type Data
1+
---@class Data
22
local Data = ECSLoader:ImportModule("Data")
33

44
Data.PHYSICAL_SCHOOL = 1
@@ -181,6 +181,24 @@ Data.Aura = {
181181
[49280] = true, -- Lightning Shield rank 10
182182
[49281] = true, -- Lightning Shield rank 11
183183
},
184+
ModifyManaRegen = {
185+
[5419] = (ECS.IsTbc and -0.11 or nil), -- Travel Form (Passive)
186+
[5421] = (ECS.IsTbc and -0.11 or nil), -- Aquatic Form (Passive)
187+
[12051] = (ECS.IsClassic and 15 or nil), -- Evocation
188+
[18371] = (ECS.IsClassic and 1 or nil), -- Soul Siphon
189+
[24705] = (ECS.IsClassic and 0.25 or nil), -- Invocation of the Wickerman
190+
[29166] = (ECS.IsWotlk and nil or 4), -- Innervate
191+
[33948] = (ECS.IsTbc and -0.11 or nil), -- Flight Form (Passive)
192+
[34754] = (ECS.IsWotlk and 0.16 or nil), -- Holy Concentration Rank 1
193+
[40121] = (ECS.IsTbc and -0.11 or nil), -- Swift Flight Form (Passive)
194+
[49307] = 1, -- Full Mana Regen
195+
[51623] = 5, -- Sholazar Guardian Heartbeat
196+
[63724] = 0.32, -- Holy Concentration Rank 2
197+
[63725] = 0.5, -- Holy Concentration Rank 3
198+
[425124] = 3, -- Arcane Surge
199+
[456195] = 4, -- Innervate
200+
[468466] = 15, -- Unmaking the Simulacrum
201+
},
184202
MP5 = {
185203
[430] = 42, -- drink
186204
[431] = 104, -- drink

0 commit comments

Comments
 (0)