Initial Profile Updates - Druid, Hunter, Mage

CuteOne · May 11, 2024 · 60748fa · 60748fa
1 parent 437d617
commit 60748fa
Show file tree

Hide file tree

Showing 3 changed files with 158 additions and 101 deletions.
diff --git a/Rotations/Druid/Initial/DruidInitial.lua b/Rotations/Druid/Initial/DruidInitial.lua
@@ -248,6 +248,7 @@ actionList.PreCombat = function()
     if not unit.inCombat() then
         if unit.valid("target") then
             local thisDistance = unit.distance("target") or 99
+            -- Wrath
             if not unit.moving() and not (buff.catForm.exists() or buff.bearForm.exists()) and thisDistance < 40 then
                 if cast.able.wrath("target") and (unit.level() < 2 or not cast.last.wrath() or cast.timeSinceLast.wrath() > unit.gcd(true) + 0.5) then
                     if cast.wrath("target") then
@@ -297,11 +298,11 @@ local function runRotation()
     profileStop = profileStop or false
     haltProfile = (unit.inCombat() and profileStop) or br.pause() or ui.mode.rotation == 4 or unit.id("target") == 156716
     -- Units
-    units.get(5)       -- Makes a variable called, units.dyn5
+    units.get(5)        -- Makes a variable called, units.dyn5
     units.get(40, true) -- Makes a variable called, units.dyn40AOE
     -- Enemies
-    enemies.get(5)     -- Makes a varaible called, enemies.yards5
-    enemies.get(40)    -- Makes a varaible called, enemies.yards40
+    enemies.get(5)      -- Makes a varaible called, enemies.yards5
+    enemies.get(40)     -- Makes a varaible called, enemies.yards40
 
     -- Profile Specific Locals
     fbMaxEnergy = energy >= 50

diff --git a/Rotations/Hunter/Initial/InitialHunter.lua b/Rotations/Hunter/Initial/InitialHunter.lua
@@ -48,11 +48,8 @@ local function createOptions()
         section = br.ui:createSection(br.ui.window.profile, "General")
         -- Hunter's Mark
         br.ui:createCheckbox(section, "Hunter's Mark")
-        -- Trinkets
-        br.ui:createDropdownWithout(section, "Trinket 1",
-            { "|cff00FF00Everything", "|cffFFFF00Cooldowns", "|cffFF0000Never" }, 1, "|cffFFFFFFWhen to use Trinket 1.")
-        br.ui:createDropdownWithout(section, "Trinket 2",
-            { "|cff00FF00Everything", "|cffFFFF00Cooldowns", "|cffFF0000Never" }, 1, "|cffFFFFFFWhen to use Trinket 2.")
+        -- Basic Trinkets Module
+        br.player.module.BasicTrinkets(nil, section)
         br.ui:checkSectionState(section)
         -------------------
         --- PET OPTIONS ---
@@ -114,12 +111,10 @@ local cast
 local cd
 local debuff
 local enemies
-local equiped
 local module
 local ui
 local unit
 local units
-local use
 -- Profile Specific Locals
 local actionList = {}
 local var = {}
@@ -136,8 +131,10 @@ var.specificToggle = br._G["SpecificToggle"]
 -- Action List - Extra
 actionList.Extra = function()
     -- Hunter's Mark
-    if ui.checked("Hunter's Mark") and cast.able.huntersMark(units.dyn40) and not debuff.huntersMark.exists(units.dyn40) then
-        if cast.huntersMark(units.dyn40) then
+    if ui.checked("Hunter's Mark") and cast.able.huntersMark("target") and not debuff.huntersMark.exists("target")
+        and not unit.friend("target") and unit.hp("target") > 80
+    then
+        if cast.huntersMark("target") then
             ui.debug("Cast Hunter's Mark")
             return true
         end
@@ -245,12 +242,10 @@ local function runRotation()
     cd              = br.player.cd
     debuff          = br.player.debuff
     enemies         = br.player.enemies
-    equiped         = br.player.equiped
     module          = br.player.module
     ui              = br.player.ui
     unit            = br.player.unit
     units           = br.player.units
-    use             = br.player.use
     -- General Locals
     var.haltProfile = (unit.inCombat() and var.profileStop) or unit.mounted() or br.pause() or buff.feignDeath.exists() or
         ui.mode.rotation == 2
@@ -307,21 +302,8 @@ local function runRotation()
                 if not br._G.IsAutoRepeatSpell(br._G.GetSpellInfo(6603)) and unit.exists(units.dyn40) and unit.distance(units.dyn40) < 40 then
                     br._G.StartAttack(units.dyn40)
                 end
-                -- Trinket - Non-Specific
-                if unit.exists(units.dyn40) and unit.distance(units.dyn40) < 40 then
-                    local thisTrinket
-                    for i = 13, 14 do
-                        thisTrinket = i == 13 and "Trinket 1" or "Trinket 2"
-                        local opValue = ui.value(thisTrinket)
-                        if (opValue == 1 or (opValue == 2 and ui.useCDs())) and use.able.slot(i)
-                            and (not equiped.touchOfTheVoid(i) or (equiped.touchOfTheVoid(i) and (#enemies.yards8 > 2 or (ui.useCDs() and opValue ~= 3))))
-                        then
-                            use.slot(i)
-                            ui.debug("Using Trinket in Slot " .. i)
-                            return
-                        end
-                    end
-                end
+                -- Basic Trinkets Module
+                module.BasicTrinkets()
                 -- Arcane Shot
                 if cast.able.arcaneShot() then
                     if cast.arcaneShot() then