Skip to content

Commit edfd501

Browse files
Vae2009Vae2009
committed
Fixed some Healer Spec targeting.
1 parent eb54b68 commit edfd501

File tree

7 files changed

+87
-10
lines changed

7 files changed

+87
-10
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎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: 11.0.15
3+
## Version: 11.0.16
44
## Author: Vae
55
## Interface: 110007
66
## SavedVariables: ConROPreferences

‎Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ local methods = {
132132
end,
133133

134134
["LayoutFinished"] = function(self, width, height)
135-
self.content:SetHeight(height or 0 + 20)
135+
self.content:SetHeight((height or 0) + 20)
136136

137137
-- update the scrollframe
138138
self:FixScroll()

‎Libs/AceTab-3.0/AceTab-3.0.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ function AceTab:OnTabPressed(this)
427427
if next(matches) then
428428
-- Replace the original string with the greatest common substring of all valid completions.
429429
this.at3curMatch = 1
430-
this.at3origWord = strsub(text_precursor, this.at3matchStart, this.at3matchStart + pmolengths[desc] - 1) .. allGCBS or ""
430+
this.at3origWord = strsub(text_precursor, this.at3matchStart, this.at3matchStart + pmolengths[desc] - 1) .. (allGCBS or "")
431431
this.at3origMatch = allGCBS or ""
432432
this.at3lastWord = this.at3origWord
433433
this.at3lastMatch = this.at3origMatch

‎buttons.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function ConROTTOnEnter(self)
8383
GameTooltip:AddLine('"This can be toggled during combat as phases change."', 1, 1, 0, true)
8484
end
8585

86-
if ttFrameName == "ConROWindow" or ttFrameName == "ConROWindow2" then
86+
if ttFrameName == "ConROWindow" or ttFrameName == "ConROWindow2" or ttFrameName == "ConROWindow3" then
8787
GameTooltip:SetText("ConRO Window") -- This sets the top line of text, in gold.
8888
GameTooltip:AddLine("", .2, 1, .2)
8989
GameTooltip:AddLine("This window displays up to the next three(3) suggested abilities in your rotation.", 1, 1, 1, true)

‎core.lua

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,16 @@ local options = {
303303

304304
if ConRO:HealSpec() then
305305
ConROWindow:Hide();
306+
ConROWindow2:Hide();
307+
ConROWindow3:Hide();
306308
elseif ConRO.db.profile.enableWindow and not ConRO.db.profile.combatWindow then
307309
ConROWindow:Show();
310+
ConROWindow2:Show();
311+
ConROWindow3:Show();
308312
else
309313
ConROWindow:Hide();
314+
ConROWindow2:Hide();
315+
ConROWindow3:Hide();
310316
end
311317
end,
312318
get = function(info) return ConRO.db.profile._Spec_1_Enabled end
@@ -328,10 +334,16 @@ local options = {
328334

329335
if ConRO:HealSpec() then
330336
ConROWindow:Hide();
337+
ConROWindow2:Hide();
338+
ConROWindow3:Hide();
331339
elseif ConRO.db.profile.enableWindow and not ConRO.db.profile.combatWindow then
332340
ConROWindow:Show();
341+
ConROWindow2:Show();
342+
ConROWindow3:Show();
333343
else
334344
ConROWindow:Hide();
345+
ConROWindow2:Hide();
346+
ConROWindow3:Hide();
335347
end
336348
end,
337349
get = function(info) return ConRO.db.profile._Spec_2_Enabled end
@@ -354,10 +366,16 @@ local options = {
354366

355367
if ConRO:HealSpec() then
356368
ConROWindow:Hide();
369+
ConROWindow2:Hide();
370+
ConROWindow3:Hide();
357371
elseif ConRO.db.profile.enableWindow and not ConRO.db.profile.combatWindow then
358372
ConROWindow:Show();
373+
ConROWindow2:Show();
374+
ConROWindow3:Show();
359375
else
360376
ConROWindow:Hide();
377+
ConROWindow2:Hide();
378+
ConROWindow3:Hide();
361379
end
362380
end,
363381
get = function(info) return ConRO.db.profile._Spec_3_Enabled end
@@ -380,10 +398,16 @@ local options = {
380398

381399
if ConRO:HealSpec() then
382400
ConROWindow:Hide();
401+
ConROWindow2:Hide();
402+
ConROWindow3:Hide();
383403
elseif ConRO.db.profile.enableWindow and not ConRO.db.profile.combatWindow then
384404
ConROWindow:Show();
405+
ConROWindow2:Show();
406+
ConROWindow3:Show();
385407
else
386408
ConROWindow:Hide();
409+
ConROWindow2:Hide();
410+
ConROWindow3:Hide();
387411
end
388412
end,
389413
get = function(info) return ConRO.db.profile._Spec_4_Enabled end
@@ -1827,8 +1851,12 @@ local options = {
18271851
ConRO.db.profile.enableWindow = val;
18281852
if val == true and not ConRO:HealSpec() then
18291853
ConROWindow:Show();
1854+
ConROWindow2:Show();
1855+
ConROWindow3:Show();
18301856
else
18311857
ConROWindow:Hide();
1858+
ConROWindow2:Hide();
1859+
ConROWindow3:Hide();
18321860
end
18331861
end,
18341862
get = function(info) return ConRO.db.profile.enableWindow end
@@ -1843,9 +1871,13 @@ local options = {
18431871
ConRO.db.profile.combatWindow = val;
18441872
if val == true then
18451873
ConROWindow:Hide();
1874+
ConROWindow2:Hide();
1875+
ConROWindow3:Hide();
18461876
ConRODefenseWindow:Hide();
18471877
else
18481878
ConROWindow:Show();
1879+
ConROWindow2:Show();
1880+
ConROWindow3:Show();
18491881
ConRODefenseWindow:Show();
18501882
end
18511883
end,
@@ -1908,9 +1940,13 @@ local options = {
19081940
ConRO.db.profile.enableWindowKeybinds = val;
19091941
if val == true then
19101942
ConROWindow.fontkey:Show();
1943+
ConROWindow2.fontkey:Show();
1944+
ConROWindow3.fontkey:Show();
19111945
ConRODefenseWindow.fontkey:Show();
19121946
else
19131947
ConROWindow.fontkey:Hide();
1948+
ConROWindow2.fontkey:Hide();
1949+
ConROWindow3.fontkey:Hide();
19141950
ConRODefenseWindow.fontkey:Hide();
19151951
end
19161952
end,
@@ -2373,10 +2409,16 @@ function ConRO:ACTIVE_PLAYER_SPECIALIZATION_CHANGED()
23732409

23742410
if ConRO:HealSpec() then
23752411
ConROWindow:Hide();
2412+
ConROWindow2:Hide();
2413+
ConROWindow3:Hide();
23762414
elseif ConRO.db.profile.enableWindow and not ConRO.db.profile.combatWindow then
23772415
ConROWindow:Show();
2416+
ConROWindow2:Show();
2417+
ConROWindow3:Show();
23782418
else
23792419
ConROWindow:Hide();
2420+
ConROWindow2:Hide();
2421+
ConROWindow3:Hide();
23802422
end
23812423

23822424
ConRO:ButtonFetch()
@@ -2394,10 +2436,16 @@ function ConRO:ACTIVE_COMBAT_CONFIG_CHANGED()
23942436

23952437
if ConRO:HealSpec() then
23962438
ConROWindow:Hide();
2439+
ConROWindow2:Hide();
2440+
ConROWindow3:Hide();
23972441
elseif ConRO.db.profile.enableWindow and not ConRO.db.profile.combatWindow then
23982442
ConROWindow:Show();
2443+
ConROWindow2:Show();
2444+
ConROWindow3:Show();
23992445
else
24002446
ConROWindow:Hide();
2447+
ConROWindow2:Hide();
2448+
ConROWindow3:Hide();
24012449
end
24022450

24032451
ConRO:ButtonFetch()
@@ -2415,10 +2463,16 @@ function ConRO:PLAYER_SPECIALIZATION_CHANGED()
24152463

24162464
if ConRO:HealSpec() then
24172465
ConROWindow:Hide();
2466+
ConROWindow2:Hide();
2467+
ConROWindow3:Hide();
24182468
elseif ConRO.db.profile.enableWindow and not ConRO.db.profile.combatWindow then
24192469
ConROWindow:Show();
2470+
ConROWindow2:Show();
2471+
ConROWindow3:Show();
24202472
else
24212473
ConROWindow:Hide();
2474+
ConROWindow2:Hide();
2475+
ConROWindow3:Hide();
24222476
end
24232477

24242478
ConRO:ButtonFetch()
@@ -2437,10 +2491,16 @@ function ConRO:TRAIT_CONFIG_UPDATED()
24372491

24382492
if ConRO:HealSpec() then
24392493
ConROWindow:Hide();
2494+
ConROWindow2:Hide();
2495+
ConROWindow3:Hide();
24402496
elseif ConRO.db.profile.enableWindow and not ConRO.db.profile.combatWindow then
24412497
ConROWindow:Show();
2498+
ConROWindow2:Show();
2499+
ConROWindow3:Show();
24422500
else
24432501
ConROWindow:Hide();
2502+
ConROWindow2:Hide();
2503+
ConROWindow3:Hide();
24442504
end
24452505

24462506
ConRO:ButtonFetch()
@@ -2505,6 +2565,8 @@ function ConRO:PET_BATTLE_OPENING_START()
25052565
self:DisableRotation();
25062566
self:DisableDefense();
25072567
ConROWindow:Hide();
2568+
ConROWindow2:Hide();
2569+
ConROWindow3:Hide();
25082570
ConRODefenseWindow:Hide();
25092571
end
25102572

@@ -2518,10 +2580,16 @@ function ConRO:PET_BATTLE_OVER()
25182580

25192581
if ConRO.db.profile.enableWindow and (ConRO.db.profile.combatWindow or ConRO:HealSpec()) and ConRO:TarHostile() then
25202582
ConROWindow:Show();
2583+
ConROWindow2:Show();
2584+
ConROWindow3:Show();
25212585
elseif ConRO.db.profile.enableWindow and not (ConRO.db.profile.combatWindow or ConRO:HealSpec()) then
25222586
ConROWindow:Show();
2587+
ConROWindow2:Show();
2588+
ConROWindow3:Show();
25232589
else
25242590
ConROWindow:Hide();
2591+
ConROWindow2:Hide();
2592+
ConROWindow3:Hide();
25252593
end
25262594

25272595
if ConRO.db.profile.enableDefenseWindow and ConRO.db.profile.combatWindow and ConRO:TarHostile() then
@@ -2570,8 +2638,8 @@ end
25702638

25712639
function ConRO:LOADING_SCREEN_ENABLED()
25722640
-- self:Print(self.Colors.Success .. 'Lost Control!');
2573-
self:DisableRotation();
2574-
self:DisableDefense();
2641+
self:DisableRotation();
2642+
self:DisableDefense();
25752643
end
25762644

25772645
function ConRO:LOADING_SCREEN_DISABLED()
@@ -2602,10 +2670,16 @@ function ConRO:PLAYER_TARGET_CHANGED()
26022670

26032671
if ConRO.db.profile.enableWindow and (ConRO.db.profile.combatWindow or ConRO:HealSpec()) and ConRO:TarHostile() then
26042672
ConROWindow:Show();
2673+
ConROWindow2:Show();
2674+
ConROWindow3:Show();
26052675
elseif ConRO.db.profile.enableWindow and not (ConRO.db.profile.combatWindow or ConRO:HealSpec()) then
26062676
ConROWindow:Show();
2677+
ConROWindow2:Show();
2678+
ConROWindow3:Show();
26072679
else
26082680
ConROWindow:Hide();
2681+
ConROWindow2:Hide();
2682+
ConROWindow3:Hide();
26092683
end
26102684

26112685
if ConRO.db.profile.enableDefenseWindow and ConRO.db.profile.combatWindow and ConRO:TarHostile() then

‎helper.lua

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,10 +1414,14 @@ function ConRO:AbilityReady(spellCheck, timeShift, spelltype)
14141414
if have then
14151415
known = true;
14161416
end
1417-
if known and usable and _CD <= 0 and not notEnough then
1418-
rdy = true;
1417+
if spelltype == 'known' then
1418+
if known and _CD <= 0 then
1419+
rdy = true;
1420+
end
14191421
else
1420-
rdy = false;
1422+
if known and usable and _CD <= 0 and not notEnough then
1423+
rdy = true;
1424+
end
14211425
end
14221426
if castTimeMilli ~= nil then
14231427
castTime = castTimeMilli/1000;

0 commit comments

Comments
 (0)