More Updates

Author: CuteOne

.gitignore

@@ -33,4 +33,5 @@ Settings/*
 Unlockers/mmb.lua
 Unlockers/daemonic.lua
 Unlockers/icc.lua
-Rotations/Rogue/Outlaw/OutlawRavens\.lua
+Rotations/Rogue/Outlaw/OutlawRavens\.lua
+Deprecated/*

BadRotations.toc

@@ -58,8 +58,6 @@ misc.xml
 System\Unlockers.lua
 System\Core.lua
 System\Debugging.lua
-System\LootManager.lua
-System\UsefulFeatures.lua
 System\SlashCommands.lua
 
 ## Functions
@@ -118,12 +116,15 @@ System\Engines\HealingEngineFrame.lua
 System\Engines\HealingEngineFunctions.lua
 #System\Engines\InterruptsFrame.lua -- Unused
 System\Engines\Interrupts.lua
+System\Engines\LootEngine.lua
+System\Engines\LootEngineFunctions.lua
 System\Engines\ttdTable.lua
 System\Engines\QuestTracker.lua
 System\Engines\Tracker.lua
 
 ## BadRotations UI
 
+System\UI\Tooltips.lua
 System\UI\Colors.lua
 System\UI\DropOptions.lua
 System\UI\SettingsManagement.lua
@@ -205,8 +206,6 @@ System\Updater.lua
 # System\Unlockers.lua
 # System\Core.lua
 # System\Debugging.lua
-# System\LootManager.lua
-# System\UsefulFeatures.lua
 # System\SlashCommands.lua
 
 # ## Functions
@@ -283,12 +282,15 @@ System\Updater.lua
 # System\Engines\HealingEngineFunctions.lua
 # #System\Engines\InterruptsFrame.lua -- Unused
 # System\Engines\Interrupts.lua
+# System\Engines\LootEngine.lua
+# System\Engines\LootEngineFunctions.lua
 # System\Engines\ttdTable.lua
 # System\Engines\QuestTracker.lua
 # System\Engines\Tracker.lua
 
 # ## BadRotations UI
 
+# System\UI\Tooltips.lua
 # System\UI\SettingsManagement.lua
 # System\UI\ChatOverlay.lua
 # System\UI\MinimapButton.lua

Rotations/Druid/Feral/FeralCuteOne.lua

@@ -149,7 +149,7 @@ br.loader.rotations.support["PetCuteOne"] = {
         enemies.yards40r = enemies.rect.get(10, 40, false)
 
         -- Loot Count
-        lootCount = br.lootManager:lootCount()
+        lootCount = br.engines.lootEngine:lootCount()
 
         -- Pet Target Modes
         if br.petTarget == nil then br.petTarget = "target" end

Rotations/Hunter/Support/PetCuteOne.lua

@@ -70,6 +70,8 @@ local function createOptions()
             br.ui:createCheckbox(section, "Crackling Jade Lightning")
             br.ui:createSpinnerWithout(section, "Cancel CJL Range", 10, 5, 40, 5,
                 "|cffFFFFFFCancels Crackling Jade Lightning below this range in yards.")
+            -- Grapple Weapon
+            br.ui:createCheckbox(section, "Grapple Weapon", "|cffFFFFFFAutomatically disarms dangerous melee enemies in PvE.")
             -- Legacy of the Emperor
             br.ui:createCheckbox(section, "Legacy of the Emperor")
             -- Legacy of the White Tiger
@@ -99,10 +101,12 @@ local function createOptions()
                 { "|cff00FF00Player", "|cffFFFF00Target", "|cffFF0000Mouseover" }, 1, "|cffFFFFFFTarget to cast on")
             -- Disable
             br.ui:createCheckbox(section, "Disable", "|cffFFFFFFDisables all defensive abilities.")
-                -- Expel Harm
+            -- Expel Harm
             br.ui:createSpinner(section, "Expel Harm", 40, 0, 100, 5, "|cffFFFFFFHealth Percent to Cast At")
             -- Fortifying Brew
             br.ui:createSpinner(section, "Fortifying Brew", 30, 0, 100, 5, "|cffFFFFFFHealth Percent to Cast At")
+            -- Healing Sphere
+            br.ui:createSpinner(section, "Healing Sphere", 50, 0, 100, 5, "|cffFFFFFFHealth Percent to Cast At")
             -- Leg Sweep
             br.ui:createSpinner(section, "Leg Sweep - HP", 50, 0, 100, 5, "|cffFFFFFFHealth Percent to Cast At")
             br.ui:createSpinner(section, "Leg Sweep - AoE", 5, 0, 10, 1, "|cffFFFFFFNumber of Units in 5 Yards to Cast At")
@@ -175,6 +179,8 @@ local var = {}
 var.getFacingDistance = br.functions.range.getFacingDistance
 var.haltProfile = false
 var.profileStop = false
+var.grappleWeaponBlacklist = {} -- Stores NPC IDs that don't have weapons
+var.lastGrappleTarget = nil
 
 --------------------
 --- Action Lists ---
@@ -206,7 +212,7 @@ actionList.Extra = function()
         end
         -- Single / AOE follow-up on current target
         if unit.exists("target") then
-            if not ui.useAOE(8,2) then
+            if not ui.useAOE(8,3) then
                 if cast.able.jab("target") then
                     if cast.jab("target") then
                         ui.debug("Casting Jab [Death Monk]")
@@ -243,6 +249,26 @@ actionList.Extra = function()
             return true
         end
     end
+    -- * Grapple Weapon
+    if ui.checked("Grapple Weapon")then
+        for i = 1, #enemies.yards40 do
+            local thisUnit = enemies.yards40[i]
+            if cast.able.grappleWeapon(thisUnit) and unit.exists(thisUnit) and unit.distance(thisUnit) <= 40
+                and not debuff.grappleWeapon.exists(thisUnit)
+            then
+                -- Get NPC ID to check blacklist
+                local npcID = br.functions.unit:GetObjectID(thisUnit)
+                -- Skip if this NPC type is blacklisted (known to not have weapons)
+                if not var.grappleWeaponBlacklist[npcID] then
+                    var.lastGrappleTarget = thisUnit
+                    if cast.grappleWeapon(thisUnit) then
+                        ui.debug("Casting Grapple Weapon on " .. unit.name(thisUnit) .. " [Extra]")
+                        return true
+                    end
+                end
+            end
+        end
+    end
     -- * Legacy of the Emperor
     if ui.checked("Legacy of the Emperor") and cast.able.legacyOfTheEmperor() and not buff.legacyOfTheEmperor.exists() then
         if cast.legacyOfTheEmperor() then
@@ -331,7 +357,7 @@ actionList.Defensive = function()
             end
         end
         if ui.checked("Leg Sweep - AoE") and cast.able.legSweep()
-            and #enemies.yards5 >= ui.value("Leg Sweep - AoE [Defensive]")
+            and #enemies.yards5 >= ui.value("Leg Sweep - AoE")
         then
             if cast.legSweep() then
                 ui.debug("Casting Leg Sweep - AoE [Defensive]")
@@ -392,6 +418,15 @@ actionList.Defensive = function()
                 end
             end
         end
+        -- * Healing Sphere
+        if ui.checked("Healing Sphere") and cast.able.healingSphere("player","ground",0)
+            and unit.hp() <= ui.value("Healing Sphere") and energy() >= 40
+        then
+            if cast.healingSphere("player","ground",0) then
+                ui.debug("Casting Healing Sphere [Defensive]")
+                return true
+            end
+        end
     end
 end -- End Action List - Defensive
 
@@ -743,6 +778,25 @@ end -- End Action List - Combat
 ----------------
 --- ROTATION ---
 ----------------
+-- Event frame for error detection
+var.grappleWeaponErrorFrame = var.grappleWeaponErrorFrame or CreateFrame("Frame")
+
+var.grappleWeaponErrorFrame:RegisterEvent("UI_ERROR_MESSAGE")
+var.grappleWeaponErrorFrame:SetScript("OnEvent", function(self, event, errorType, message)
+    if message and var.lastGrappleTarget and var.grappleWeaponBlacklist then
+        -- Check for weapon-related errors (common messages: "Target has no weapons", "Can't do that")
+        local weaponError = message:lower():find("weapon") or message:lower():find("disarm")
+        if weaponError then
+            local npcID = br.functions.unit:GetObjectID(var.lastGrappleTarget)
+            if npcID and not var.grappleWeaponBlacklist[npcID] then
+                var.grappleWeaponBlacklist[npcID] = true
+                print("|cff8000FFBadRotations|r: Blacklisted " .. (UnitName(var.lastGrappleTarget) or "Unknown") .. " (ID: " .. npcID .. ") - No weapons to grapple")
+            end
+        end
+        var.lastGrappleTarget = nil
+    end
+end)
+
 local function runRotation()
     ---------------------
     --- Define Locals ---
@@ -765,13 +819,15 @@ local function runRotation()
     -- General Locals
     var.haltProfile = (unit.inCombat() and var.profileStop) or unit.mounted() or ui.pause() or ui.mode.rotation == 2
     -- Dynamic Units
-    -- Units (throttled)
+    -- Units
     units.get(5)
     units.get(40)
-    -- Enemies (throttled)
+    -- Enemies
     enemies.get(5)
     enemies.get(8)
+    -- enemies.get(8,"player",true) -- No Combat
     enemies.get(20)
+    enemies.get(40)
 
     -- Cancel Crackling Jade Lightning
     if cast.current.cracklingJadeLightning() and unit.distance("target") < ui.value("Cancel CJL Range") then
@@ -781,6 +837,8 @@ local function runRotation()
         end
     end
 
+    -- ui.chatOverlay("AOE: "..tostring(ui.useAOE(8,3)).." - C: "..#enemies.yards8.. " - NC: "..#enemies.yards8nc)
+
     ---------------------
     --- Begin Profile ---
     ---------------------

Rotations/Monk/Windwalker/WindwalkerCuteOne.lua

@@ -15,7 +15,7 @@ local function getSnapshotValue(dot)
     if br._G.C_SpecializationInfo.GetSpecializationInfo(br._G.C_SpecializationInfo.GetSpecialization()) == 103 then
         local multiplier     = 1.00
         local DreamOfCenarius    = 1.30
-        local SavageRoar     = 1.40
+        local SavageRoar     = 1.45
         local TigersFury     = 1.15
         local RakeMultiplier = 1
         -- * Tigers Fury
@@ -24,20 +24,29 @@ local function getSnapshotValue(dot)
         if br.player.buff.dreamOfCenarius.exists() then multiplier = multiplier * DreamOfCenarius end
         -- * Savage Roar
         if br.player.buff.savageRoar.exists() then multiplier = multiplier * SavageRoar end
+        
+        -- Get Attack Power for actual damage calculations
+        local UnitAttackPower = br._G["UnitAttackPower"]
+        local base, posBuff, negBuff = UnitAttackPower("player")
+        local ap = base + posBuff + negBuff
+        
         -- * Rip
         if dot == br.player.spells.debuffs.rip then
-            return 5 * multiplier
+            -- Rip: 768% AP over 16 seconds (8 ticks, one every 2 seconds)
+            local ripTickDamage = (7.68 * ap) / 8
+            return ripTickDamage * multiplier
         end
         -- * Rake
         if dot == br.player.spells.debuffs.rake then
+            -- Rake: 155% AP over 15 seconds (9 ticks, one every 3 seconds)
+            local rakeTickDamage = (0.155 * ap) / 9
             -- Incarnation/Prowl/Shadowmeld
-            if br.player.buff.incarnation.exists() or br.player.buff.prowl.exists()
-                or br.player.buff.shadowmeld.exists() --or br.player.buff.suddenAmbush.exists()
-            then
-                RakeMultiplier = 2.0
-            end
-            -- return rake
-            return multiplier * RakeMultiplier
+            -- if br.player.buff.incarnation.exists() or br.player.buff.prowl.exists()
+            --     or br.player.buff.shadowmeld.exists() --or br.player.buff.suddenAmbush.exists()
+            -- then
+            --     RakeMultiplier = 2.0
+            -- end
+            return rakeTickDamage * multiplier * RakeMultiplier
         end
     end
     -- Assassination Bleeds

System/API/Debuff.lua

@@ -97,7 +97,7 @@ br.api.module = function(self)
                                 local itemName, _, _, itemLevel, itemMinLevel, itemType, itemSubType, _, _, _, _, _, _, _, _, _, _ =
                                     C_Item.GetItemInfo(itemInfo.itemID)
                                 if itemType == "Consumable" and itemSubType == "Potions" then
-                                    if string.find(itemName, "Heal", 0, true) then
+                                    if string.find(itemName, "Heal", 1, true) then
                                         table.insert(Consumables, #Consumables + 1, {
                                             itemID = itemInfo.itemID,
                                             spellId = spellID,

System/API/Module.lua

@@ -92,7 +92,7 @@ br.api.ui = function(self)
         -- @function ui.fullBags
         -- @return boolean - Returns true if bags are full
         ui.fullBags = function()
-            return br.lootManager:emptySlots() == 0
+            return br.engines.lootEngine:emptySlots() == 0
         end
     end
 

System/API/UI.lua

@@ -673,4 +673,40 @@ br.api.unit = function(self)
         if not offHand and unit.weaponImbue.exists(imbueId) then return mainCharges end
         return 0
     end
+
+    ----------------------
+    --- Combat Stats API ---
+    ----------------------
+
+    --- Get player's attack power
+    -- @function unit.attackPower
+    -- @param thisUnit The unit to check, defaults to "player" if nil
+    -- @return number Total attack power (base + positive buffs + negative buffs)
+    unit.attackPower = function(thisUnit)
+        if thisUnit == nil then thisUnit = "player" end
+        local UnitAttackPower = br._G["UnitAttackPower"]
+        local base, posBuff, negBuff = UnitAttackPower(thisUnit)
+        return base + posBuff + negBuff
+    end
+
+    --- Get player's critical strike chance
+    -- @function unit.critChance
+    -- @param thisUnit The unit to check, defaults to "player" if nil
+    -- @return number Critical strike chance percentage
+    unit.critChance = function(thisUnit)
+        if thisUnit == nil then thisUnit = "player" end
+        local GetCritChance = br._G["GetCritChance"]
+        return GetCritChance()
+    end
+
+    --- Get player's average weapon damage
+    -- @function unit.weaponDamage
+    -- @param thisUnit The unit to check, defaults to "player" if nil
+    -- @return number Average weapon damage
+    unit.weaponDamage = function(thisUnit)
+        if thisUnit == nil then thisUnit = "player" end
+        local UnitDamage = br._G["UnitDamage"]
+        local minDmg, maxDmg = UnitDamage(thisUnit)
+        return (minDmg + maxDmg) / 2
+    end
 end

System/API/Unit.lua

@@ -225,7 +225,7 @@ function engines:Update(self)
                     br.engines.healingEngine.friend:Update()
                 end
                 -- Auto Loot
-                br.lootManager:autoLoot()
+                br.engines.lootEngine:autoLoot()
                 -- Close windows and swap br.loader.selectedSpec on Spec Change
                 local thisSpec = select(2, br._G.C_SpecializationInfo.GetSpecializationInfo(br._G.C_SpecializationInfo.GetSpecialization()))
                 if thisSpec ~= "" and thisSpec ~= br.loader.selectedSpec then