Skip to content

Commit d30e0b9

Browse files
Vae2009Vae2009
committed
Fix for Heroism
frame strata adjust
1 parent 0115705 commit d30e0b9

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

‎ConRO.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Title:-|cffFFFFFFConRO|r- Conflict Rotation Optimizer
22
## Notes: Rotation helper framework.
3-
## Version: 10.0.18
3+
## Version: 10.0.19
44
## Author: Vae
55
## Interface: 100002
66
## SavedVariables: ConROPreferences

‎buttons.lua

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ function ConRO:DisplayToggleFrame()
176176
end
177177

178178
frame:SetFrameStrata('MEDIUM');
179-
frame:SetFrameLevel('52')
179+
frame:SetFrameLevel('73')
180180
frame:SetSize((40 * hori) + 14, (15 * vert) + 14)
181181
frame:SetScale(ConRO.db.profile.toggleButtonSize)
182182
if ConRO.db.profile._Hide_Toggle then
@@ -227,7 +227,7 @@ function ConRO:CreateAutoButton()
227227
local Color = RAID_CLASS_COLORS[Class]
228228
local tbutton = CreateFrame("Button", 'ConRO_AutoButton', ConROButtonFrame)
229229
tbutton:SetFrameStrata('MEDIUM')
230-
tbutton:SetFrameLevel('53')
230+
tbutton:SetFrameLevel('74')
231231
tbutton:SetPoint("BOTTOMRIGHT", "ConROButtonFrame", "BOTTOMRIGHT", -7, 7)
232232
tbutton:SetSize(40, 15)
233233
if ConROCharacter.ConRO_Settings_Auto then
@@ -286,7 +286,7 @@ function ConRO:CreateSingleButton()
286286
local Color = RAID_CLASS_COLORS[Class]
287287
local tbutton = CreateFrame("Button", 'ConRO_SingleButton', ConROButtonFrame)
288288
tbutton:SetFrameStrata('MEDIUM')
289-
tbutton:SetFrameLevel('53')
289+
tbutton:SetFrameLevel('74')
290290
tbutton:SetPoint("BOTTOMRIGHT", "ConROButtonFrame", "BOTTOMRIGHT", -7, 7)
291291
tbutton:SetSize(40, 15)
292292
if ConROCharacter.ConRO_Settings_Single then
@@ -345,7 +345,7 @@ function ConRO:CreateAoEButton()
345345
local Color = RAID_CLASS_COLORS[Class]
346346
local tbutton = CreateFrame("Button", 'ConRO_AoEButton', ConROButtonFrame)
347347
tbutton:SetFrameStrata('MEDIUM');
348-
tbutton:SetFrameLevel('53')
348+
tbutton:SetFrameLevel('74')
349349
tbutton:SetPoint("BOTTOMRIGHT", "ConROButtonFrame", "BOTTOMRIGHT", -7, 7)
350350
tbutton:SetSize(40, 15)
351351
if ConROCharacter.ConRO_Settings_AoE then
@@ -412,7 +412,7 @@ function ConRO:CreateFullButton()
412412
local Color = RAID_CLASS_COLORS[Class]
413413
local tbutton = CreateFrame("Button", 'ConRO_FullButton', ConROButtonFrame)
414414
tbutton:SetFrameStrata('MEDIUM');
415-
tbutton:SetFrameLevel('53')
415+
tbutton:SetFrameLevel('74')
416416
tbutton:SetPoint("TOPLEFT", "ConROButtonFrame", "TOPLEFT", 7, -7)
417417
tbutton:SetSize(40, 15)
418418
tbutton:SetAlpha(1)
@@ -485,7 +485,7 @@ function ConRO:CreateBurstButton()
485485
local Color = RAID_CLASS_COLORS[Class]
486486
local tbutton = CreateFrame("Button", 'ConRO_BurstButton', ConROButtonFrame)
487487
tbutton:SetFrameStrata('MEDIUM');
488-
tbutton:SetFrameLevel('53')
488+
tbutton:SetFrameLevel('74')
489489
tbutton:SetPoint("TOPLEFT", "ConROButtonFrame", "TOPLEFT", 7, -7)
490490
tbutton:SetSize(40, 15)
491491
tbutton:SetAlpha(1)
@@ -556,7 +556,7 @@ end
556556
function ConRO:CreateBlockBurstButton()
557557
local tbutton = CreateFrame("Button", 'ConRO_BlockBurstButton', ConROButtonFrame)
558558
tbutton:SetFrameStrata('MEDIUM');
559-
tbutton:SetFrameLevel('53')
559+
tbutton:SetFrameLevel('74')
560560
tbutton:SetPoint("TOPLEFT", "ConROButtonFrame", "TOPLEFT", 7, -7)
561561
tbutton:SetSize(40, 15)
562562
tbutton:Hide()
@@ -591,7 +591,7 @@ end
591591
function ConRO:CreateBlockAoEButton()
592592
local tbutton = CreateFrame("Button", 'ConRO_BlockAoEButton', ConROButtonFrame)
593593
tbutton:SetFrameStrata('MEDIUM');
594-
tbutton:SetFrameLevel('53')
594+
tbutton:SetFrameLevel('74')
595595
tbutton:SetPoint("BOTTOMRIGHT", "ConROButtonFrame", "BOTTOMRIGHT", -7, 7)
596596
tbutton:SetSize(40, 15)
597597
tbutton:Hide()
@@ -781,7 +781,7 @@ function ConRO:DisplayWindowFrame()
781781
frame:SetPoint("CENTER", -200, 50);
782782
frame:SetSize(ConRO.db.profile.windowIconSize, ConRO.db.profile.windowIconSize);
783783
frame:SetFrameStrata('MEDIUM');
784-
frame:SetFrameLevel('52');
784+
frame:SetFrameLevel('73');
785785
frame:SetAlpha(ConRO.db.profile.transparencyWindow);
786786
if ConRO.db.profile.combatWindow or ConRO:HealSpec() then
787787
frame:Hide();
@@ -877,7 +877,7 @@ function ConRO:DisplayNextWindowFrame()
877877
frame:SetPoint("BOTTOMRIGHT", "ConROWindow", "BOTTOMLEFT", -3, 0);
878878
frame:SetSize(ConRO.db.profile.windowIconSize/1.35, ConRO.db.profile.windowIconSize/1.35);
879879
frame:SetFrameStrata('MEDIUM');
880-
frame:SetFrameLevel('52');
880+
frame:SetFrameLevel('73');
881881
frame:SetAlpha(ConRO.db.profile.transparencyWindow);
882882
if ConRO.db.profile.combatWindow or ConRO:HealSpec() then
883883
frame:Hide();
@@ -915,7 +915,7 @@ function ConRO:DefenseWindowFrame()
915915
frame:SetPoint("CENTER", -280, 50);
916916
frame:SetSize(ConRO.db.profile.windowIconSize * .75, ConRO.db.profile.windowIconSize * .75);
917917
frame:SetFrameStrata('MEDIUM');
918-
frame:SetFrameLevel('52');
918+
frame:SetFrameLevel('73');
919919
frame:SetAlpha(ConRO.db.profile.transparencyWindow);
920920
if ConRO.db.profile.combatWindow then
921921
frame:Hide();
@@ -1024,7 +1024,7 @@ function ConRO:InterruptWindowFrame()
10241024
frame:SetPoint("LEFT", "ConROWindow", "RIGHT", 5, 10);
10251025
frame:SetSize(ConRO.db.profile.flashIconSize * .25, ConRO.db.profile.flashIconSize * .25);
10261026
frame:SetFrameStrata('MEDIUM');
1027-
frame:SetFrameLevel('52');
1027+
frame:SetFrameLevel('73');
10281028
if ConRO.db.profile.enableInterruptWindow == true and ConRO.db.profile._Unlock_ConRO == true then
10291029
frame:Show();
10301030
else
@@ -1062,7 +1062,7 @@ function ConRO:PurgeWindowFrame()
10621062
frame:SetPoint("LEFT", "ConROWindow", "RIGHT", 5, -10);
10631063
frame:SetSize(ConRO.db.profile.flashIconSize * .25, ConRO.db.profile.flashIconSize * .25);
10641064
frame:SetFrameStrata('MEDIUM');
1065-
frame:SetFrameLevel('52');
1065+
frame:SetFrameLevel('73');
10661066
if ConRO.db.profile.enablePurgeWindow == true and ConRO.db.profile._Unlock_ConRO == true then
10671067
frame:Show();
10681068
else
@@ -1122,7 +1122,7 @@ function ConRO:CreateDamageOverlay(parent, id)
11221122

11231123
frame:SetParent(parent);
11241124
frame:SetFrameStrata('MEDIUM');
1125-
frame:SetFrameLevel('52');
1125+
frame:SetFrameLevel('73');
11261126
frame:SetPoint('CENTER', 0, 0);
11271127
frame:SetWidth(parent:GetWidth() * 1.6);
11281128
frame:SetHeight(parent:GetHeight() * 1.6);
@@ -1193,7 +1193,7 @@ function ConRO:CreateCoolDownOverlay(parent, id)
11931193

11941194
frame:SetParent(parent);
11951195
frame:SetFrameStrata('MEDIUM');
1196-
frame:SetFrameLevel('52')
1196+
frame:SetFrameLevel('73')
11971197
frame:SetPoint('CENTER', 0, 0);
11981198
frame:SetWidth(parent:GetWidth() * 1.6);
11991199
frame:SetHeight(parent:GetHeight() * 1.6);
@@ -1259,7 +1259,7 @@ function ConRO:CreateDefenseOverlay(parent, id)
12591259

12601260
frame:SetParent(parent);
12611261
frame:SetFrameStrata('MEDIUM');
1262-
frame:SetFrameLevel('52')
1262+
frame:SetFrameLevel('73')
12631263
frame:SetPoint('CENTER', 0, 0);
12641264
frame:SetWidth(parent:GetWidth() * 1.6);
12651265
frame:SetHeight(parent:GetHeight() * 1.6);
@@ -1325,7 +1325,7 @@ function ConRO:CreateTauntOverlay(parent, id)
13251325

13261326
frame:SetParent(parent);
13271327
frame:SetFrameStrata('MEDIUM');
1328-
frame:SetFrameLevel('52')
1328+
frame:SetFrameLevel('73')
13291329
frame:SetPoint('CENTER', 0, 0);
13301330
frame:SetWidth(parent:GetWidth() * 1.5);
13311331
frame:SetHeight(parent:GetHeight() * 1.5);
@@ -1391,7 +1391,7 @@ function ConRO:CreateInterruptOverlay(parent, id)
13911391

13921392
frame:SetParent(parent);
13931393
frame:SetFrameStrata('MEDIUM');
1394-
frame:SetFrameLevel('52')
1394+
frame:SetFrameLevel('73')
13951395
frame:SetPoint('CENTER', 0, 0);
13961396
frame:SetWidth(parent:GetWidth() * 1.8);
13971397
frame:SetHeight(parent:GetHeight() * 1.8);
@@ -1457,7 +1457,7 @@ function ConRO:CreatePurgableOverlay(parent, id)
14571457

14581458
frame:SetParent(parent);
14591459
frame:SetFrameStrata('MEDIUM');
1460-
frame:SetFrameLevel('52')
1460+
frame:SetFrameLevel('73')
14611461
frame:SetPoint('CENTER', 0, 0);
14621462
frame:SetWidth(parent:GetWidth() * 2);
14631463
frame:SetHeight(parent:GetHeight() * 2);
@@ -1523,7 +1523,7 @@ function ConRO:CreateRaidBuffsOverlay(parent, id)
15231523

15241524
frame:SetParent(parent);
15251525
frame:SetFrameStrata('MEDIUM');
1526-
frame:SetFrameLevel('52')
1526+
frame:SetFrameLevel('73')
15271527
frame:SetPoint('CENTER', 0, 0);
15281528
frame:SetWidth(parent:GetWidth() * 1.5);
15291529
frame:SetHeight(parent:GetHeight() * 1.65);
@@ -1589,7 +1589,7 @@ function ConRO:CreateMovementOverlay(parent, id)
15891589

15901590
frame:SetParent(parent);
15911591
frame:SetFrameStrata('MEDIUM');
1592-
frame:SetFrameLevel('52')
1592+
frame:SetFrameLevel('73')
15931593
frame:SetPoint('CENTER', 0, -3);
15941594
frame:SetWidth(parent:GetWidth() * 1.65);
15951595
frame:SetHeight(parent:GetHeight() * 1.85);

‎helper.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ function ConRO:Heroism()
435435
local _Bloodlust = 2825;
436436
local _TimeWarp = 80353;
437437
local _Heroism = 32182;
438+
local _PrimalRage = 264667;
438439
local _AncientHysteria = 90355;
439440
local _Netherwinds = 160452;
440441
local _DrumsofFury = 120257;
@@ -446,7 +447,7 @@ function ConRO:Heroism()
446447
local _Sated = 57724;
447448
local _TemporalDisplacement = 80354;
448449
local _Insanity = 95809;
449-
local _Fatigued = 160455;
450+
local _Fatigued = 264689;
450451

451452
local buffed = false;
452453
local sated = false;
@@ -455,6 +456,7 @@ function ConRO:Heroism()
455456
bl = ConRO:Aura(_Bloodlust, timeShift);
456457
tw = ConRO:Aura(_TimeWarp, timeShift);
457458
hero = ConRO:Aura(_Heroism, timeShift);
459+
pr = ConRO:Aura(_PrimalRage, timeShift);
458460
ah = ConRO:Aura(_AncientHysteria, timeShift);
459461
nw = ConRO:Aura(_Netherwinds, timeShift);
460462
dof = ConRO:Aura(_DrumsofFuryBuff, timeShift);

0 commit comments

Comments
 (0)