Skip to content

Commit

Permalink
Updated Mage to Auto Detect
Browse files Browse the repository at this point in the history
  • Loading branch information
Vae2009 committed Jan 24, 2023
1 parent f0bf7d6 commit 371f28f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ConRO.toc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Title:-|cffFFFFFFConRO|r- Conflict Rotation Optimizer
## Notes: Rotation helper framework.
## Version: 10.0.24
## Version: 10.0.25
## Author: Vae
## Interface: 100002
## SavedVariables: ConROPreferences
Expand Down
10 changes: 5 additions & 5 deletions core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2478,7 +2478,7 @@ end

function ConRO:ACTIVE_PLAYER_SPECIALIZATION_CHANGED()
--self:Print(self.Colors.Success .. 'Talent');
C_Timer.After(1, function()
C_Timer.After(2, function()
self:DisableRotation();
self:DisableDefense();
self:LoadModule();
Expand All @@ -2502,7 +2502,7 @@ end

function ConRO:ACTIVE_COMBAT_CONFIG_CHANGED()
--self:Print(self.Colors.Success .. 'Talent');
C_Timer.After(1, function()
C_Timer.After(2, function()
self:DisableRotation();
self:DisableDefense();
self:LoadModule();
Expand Down Expand Up @@ -2687,7 +2687,7 @@ function ConRO:PLAYER_LEAVING_WORLD()
end

function ConRO:PLAYER_ENTERING_WORLD()
C_Timer.After(1, function()
C_Timer.After(3, function()
self:UpdateButtonGlow();
if not self.rotationEnabled and not UnitHasVehicleUI("player") then
self:Print(self.Colors.Success .. 'Auto enable on login!');
Expand All @@ -2706,7 +2706,7 @@ function ConRO:LOADING_SCREEN_ENABLED()
end

function ConRO:LOADING_SCREEN_DISABLED()
C_Timer.After(1, function()
C_Timer.After(3, function()
self:UpdateButtonGlow();
if not self.rotationEnabled and not UnitHasVehicleUI("player") then
self:Print(self.Colors.Success .. 'Auto enable on login!');
Expand Down Expand Up @@ -2957,7 +2957,7 @@ function ConRO:MeleeSpec()
[12] = 'DemonHunter',
[13] = 'Evoker', ]]

if classId == 1 or classId == 2 or classId == 3 or classId == 4 or classId == 5 or classId == 6 or classId == 7 or classId == 10 or classId == 11 or classId == 12 or classId == 13 then
if classId == 1 or classId == 2 or classId == 3 or classId == 4 or classId == 5 or classId == 6 or classId == 7 or classId == 8 or classId == 10 or classId == 11 or classId == 12 or classId == 13 then
return true;
end
return false;
Expand Down
12 changes: 12 additions & 0 deletions helper.lua
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,18 @@ function ConRO:Targets(spellID)
end
end
end
elseif spellID == "15" then
if IsItemInRange(33069, "target") then
target_in_range = true;
end

for i = 1, 15 do
if not UnitIsFriend("player", 'nameplate' .. i) then
if UnitExists('nameplate' .. i) and IsItemInRange(33069, "nameplate"..i) == true then
number_in_range = number_in_range + 1
end
end
end
elseif spellID == "25" then
if IsItemInRange(24268, "target") then
target_in_range = true;
Expand Down

0 comments on commit 371f28f

Please sign in to comment.