Add monk stuff, more bw stuff

scripts/brewmaster.lua

@@ -0,0 +1,49 @@
+local Tinkr, _Bastion = ...
+
+---@type Bastion
+local Bastion = _Bastion
+
+local BrewModule = Bastion.Module:New('brewmaster')
+local Player = Bastion.UnitManager:Get('player')
+local Target = Bastion.UnitManager:Get('target')
+local None = Bastion.UnitManager:Get('none')
+
+local AutoAttack = Bastion.SpellBook:GetSpell(6603)
+
+---@return boolean
+local function CombatRotation()
+    -- Attack the target is auto attack isnt active.
+    if AutoAttack:IsKnownAndUsable() and not IsCurrentSpell(AutoAttack:GetID()) and Player:InMelee(Target) and not Target:IsDead() then
+        AutoAttack:Cast(Target)
+    end
+
+    return false
+end
+
+---@return boolean
+local function OutOfCombatRotation()
+    return false
+end
+
+local isRunning = false
+
+BrewModule:Sync(function()
+    if not isRunning then
+        Bastion:Print('Brewmaster Started')
+        isRunning = true
+    end
+
+    if not Player:IsAlive() or Player:IsMounted() then
+        return false
+    end
+  
+    if Player:IsAffectingCombat() then
+        -- Combat Rotation
+        return CombatRotation()
+    else 
+        -- Out Of Combat Rotation
+        return OutOfCombatRotation()
+    end
+end)
+
+Bastion:Register(BrewModule)

src/MythicPlusUtils/MythicPlusUtils.lua

@@ -1,4 +1,4 @@
-local Tinkr, _Bastion, DBM = ...
+local Tinkr, _Bastion = ...
 
 ---@class Bastion
 local Bastion = _Bastion
@@ -9,8 +9,11 @@ local Bastion = _Bastion
 local MythicPlusUtils = {
     ---@type InterruptList
     interruptList = {},
+    ---@type TankBusterList
+    tankBusterList = {},
     ---@type BigWigsBars
-    bars = {}
+    bars = {},
+    isBigWigsEnabled = false
 }
 
 MythicPlusUtils.__index = MythicPlusUtils
@@ -20,6 +23,8 @@ local function BWEventCallBack(event, ...)
         local addon, spellId, text, duration, icon, isCD = ...
         local now = GetTime()
 
+        print('START BAR', text)
+
         MythicPlusUtils.bars[text] = MythicPlusUtils.bars[text] or {}
 
         MythicPlusUtils.bars[text].duration = duration
@@ -27,16 +32,25 @@ local function BWEventCallBack(event, ...)
         MythicPlusUtils.bars[text].spellId = spellId
     elseif event == "BigWigs_StopBar" then
         local addon, text = ...
+
+        print('STOP BAR', text)
+
         if MythicPlusUtils.bars[text] then
             MythicPlusUtils.bars[text] = nil
         end
     elseif event == "BigWigs_PauseBar" then
         local addon, text = ...
+
+        print('PAUSE BAR', text)
+
         if MythicPlusUtils.bars[text] then
             MythicPlusUtils.bars[text].pauseTime = GetTime()
         end
     elseif event == "BigWigs_ResumeBar" then
         local addon, text = ...
+
+        print('RESUME BAR', text)
+
         if MythicPlusUtils.bars[text] and MythicPlusUtils.bars[text].pauseTime then
             local pauseTime = MythicPlusUtils.bars[text].pauseTime
             local startTime = MythicPlusUtils.bars[text].startTime
@@ -55,14 +69,19 @@ end
 
 ---@type InterruptList
 local _interruptList = Tinkr:require("scripts/bastion/MythicPlusUtils/lists/interrupt-list", Bastion)
+---@type TankBusterList
+local _tankBusterList = Tinkr:require("scripts/bastion/MythicPlusUtils/lists/tank-buster-list", Bastion)
 
 ---@return MythicPlusUtils
 function MythicPlusUtils:New()
     local self = setmetatable({}, MythicPlusUtils)
 
     self.interruptList = _interruptList
+    self.tankBusterList = _tankBusterList
 
     if BigWigsLoader then
+        print("BigWigs Enabled!")
+        self.isBigWigsEnabled = true
         BigWigsLoader.RegisterMessage({}, 'BigWigs_StartBar', BWEventCallBack)
         BigWigsLoader.RegisterMessage({}, 'BigWigs_StopBar', BWEventCallBack)
         BigWigsLoader.RegisterMessage({}, 'BigWigs_PauseBar', BWEventCallBack)
@@ -101,6 +120,39 @@ function MythicPlusUtils:CastingCriticalStop(unit, percent)
     return nil
 end
 
+function MythicPlusUtils:RefreshBars()
+    if self.isBigWigsEnabled then
+        for key, value in pairs(self.bars) do
+            local expireTime = value.duration + value.startTime
+
+            if expireTime < GetTime() then
+                self.bars[key] = nil
+            end
+        end
+    end
+end
+
+---@param spellId number
+---@param timeUntilCast number
+---@return boolean
+function MythicPlusUtils:IsSpellCastSoon(spellId, timeUntilCast)
+    if self.isBigWigsEnabled then
+        self:RefreshBars()
+        for key, value in pairs(self.bars) do
+            if value.spellId == spellId then
+                local expireTime = value.duration + value.startTime
+
+                local timeUntilSpell = expireTime - GetTime()
+    
+                if timeUntilSpell > 0 and timeUntilSpell <= timeUntilCast then
+                    return true
+                end
+            end
+        end
+    end
+    return false
+end
+
 ---@param unit Unit
 ---@param timeUntilCast? number
 ---@return boolean

src/MythicPlusUtils/lists/tank-buster-list.lua

@@ -1,129 +1,417 @@
 
----@alias TankBusterList table<number, table<number, { shouldDampen: boolean, shouldDiffuse: boolean, shouldFort: boolean }>>
+---@alias TankBusterList table<number, table<number, { shouldDampen: boolean, shouldDiffuse: boolean, shouldFort: boolean, shouldBubble: boolean }>>
 
 ---@type TankBusterList
 local _TankBusterList  = {
-  -- isPhysical, isMagical
   --
   -- RLP
   --
     -- Primal Juggernaut
-  -- [188244] = {
+  [188244] = {
-  --   -- Crushing Smash
+    -- Crushing Smash
-  --   [372730] = {
+    [372730] = {
-  --     true, false
+      shouldBubble = false,
-  --   }
+      shouldDampen = true,
-  -- },
+      shouldDiffuse = false,
-  --   -- Defier Draghar
+      shouldFort = false
-  -- [187897] = {
+    }
-  --   -- Steel Barrage
+  },
-  --   [372047] = {
+    -- Defier Draghar
-  --     true, false
+  [187897] = {
-  --   }
+    -- Steel Barrage
-  -- },
+    [372047] = {
-  --   -- Thunderhead
+      shouldBubble = false,
-  -- [197698] = {
+      shouldDampen = true,
-  --   -- Thunder Jaw
+      shouldDiffuse = false,
-  --   [392395] = {
+      shouldFort = false
-  --     true, true
+    }
-  --   }
+  },
-  -- },
+    -- Thunderhead
-  --   -- Flamegullet
+  [197698] = {
-  -- [197697] = {
+    -- Thunder Jaw
-  --   -- Fire Maw
+    [392395] = {
-  --   [392394] = {
+      shouldBubble = true,
-  --     true, true
+      shouldDampen = true,
-  --   }
+      shouldDiffuse = true,
-  -- },
+      shouldFort = false
-  --   -- Kokia
+    }
-  -- [189232] = {
+  },
-  --   -- Searing Blows
+    -- Flamegullet
-  --   [372858] = {
+  [197697] = {
-  --     true, false
+    -- Fire Maw
-  --   },
+    [392394] = {
-  -- },
+      shouldBubble = true,
-  --   -- Erkhart
+      shouldDampen = true,
-  -- [190485] = {
+      shouldDiffuse = true,
-  --   -- Stormslam
+      shouldFort = false
-  --   [381512] = {
+    }
-  --     true, true
+  },
-  --   }
+    -- Kokia
-  -- },
+  [189232] = {
-  -- --
+    -- Searing Blows
-  -- -- NO
+    [372858] = {
-  -- --
+      shouldBubble = true,
-  --   -- Raging Tempest
+      shouldDampen = true,
-  -- [186615] = {
+      shouldDiffuse = false,
-  --   -- Energy Surge
+      shouldFort = true
-  --   [384686] = {
+    },
-  --     true, false
+  },
-  --   }
+    -- Erkhart
-  -- },
+  [190485] = {
-  --   -- Beastcaller
+    -- Stormslam
-  -- [195878] = {
+    [381512] = {
-  --   -- Heavy Slash
+      shouldBubble = false,
-  --   [387826] = {
+      shouldDampen = true,
-  --     true, false
+      shouldDiffuse = true,
-  --   }
+      shouldFort = true
-  -- },
+    }
-  --   -- Maruuk
+  },
-  -- [186338] = {
+  --
-  --   -- Brutalize
+  -- NO
-  --   [382836] = {
+  --
-  --     true, false
+    -- Raging Tempest
-  --   }
+  [186615] = {
-  -- },
+    -- Energy Surge
-  -- [186151] = {
+    [384686] = {
-  --   [375937] = {
+      shouldBubble = false,
-  --     true, false
+      shouldDampen = true,
-  --   }
+      shouldDiffuse = false,
-  -- },
+      shouldFort = true
-  -- --
+    }
-  -- -- AV
+  },
-  -- --
+    -- Beastcaller
-  --   -- Leymore
+  [195878] = {
-  -- [186644] = {
+    -- Heavy Slash
-  --   -- Infused Strike
+    [387826] = {
-  --   [374789] = {
+      shouldBubble = true,
-  --     false, true
+      shouldDampen = true,
-  --   }
+      shouldDiffuse = false,
-  -- },
+      shouldFort = false
-  --   -- Vault Guard 
+    }
-  -- [190510] = {
+  },
-  --   -- Ice Cutter
+    -- Maruuk
-  --   [377105] = {
+  [186338] = {
-  --     false, true
+    -- Brutalize
-  --   }
+    [382836] = {
-  -- },
+      shouldBubble = false,
-  --   -- Scalebane
+      shouldDampen = true,
-  -- [191739] = {
+      shouldDiffuse = false,
-  --   -- Ice Cutter
+      shouldFort = false
-  --   [377105] = {
+    }
-  --     false, true
+  },
-  --   },
+    -- Balakar
-  --   -- Spellfrost Breath
+  [186151] = {
-  --   [391120] = {
+    -- Rending Strike
-  --     false, true
+    [375937] = {
-  --   }
+      shouldBubble = true,
-  -- },
+      shouldDampen = true,
-  --   -- Azureblade
+      shouldDiffuse = false,
-  -- [186739] = {
+      shouldFort = true
-  --   -- Arcane Cleave
+    }
-  --   [372222] = {
+  },
-  --     false, true
+  --
-  --   }
+  -- AV
-  -- },
+  --
-  --   -- Umbreskul
+    -- Leymore
-  -- [186738] = {
+  [186644] = {
-  --   -- Dragon Strike
+    -- Infused Strike
-  --   [384978] = {
+    [374789] = {
-  --     false, true
+      shouldBubble = true,
-  --   }
+      shouldDampen = true,
-  -- },
+      shouldDiffuse = true,
-  -- --
+      shouldFort = true
-  -- -- AA
+    }
-  -- --
+  },
-  
+    -- Vault Guard 
+  [190510] = {
+    -- Ice Cutter
+    [377105] = {
+      shouldBubble = false,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = false
+    }
+  },
+    -- Scalebane
+  [191739] = {
+    -- Ice Cutter
+    [377105] = {
+      shouldBubble = false,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = false
+    },
+    -- Spellfrost Breath
+    [391120] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = true
+    }
+  },
+    -- Azureblade
+  [186739] = {
+    -- Arcane Cleave
+    [372222] = {
+      shouldBubble = false,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = false
+    }
+  },
+    -- Umbreskul
+  [186738] = {
+    -- Dragon Strike
+    [384978] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = true
+    }
+  },
+  --
+  -- AA
+  --
+    -- Battleaxe
+  [196577] = {
+    -- Severing Slash
+    [388911] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- Crawth
+  [191736] = {
+    -- Savage Peck
+    [376997] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = true
+    }
+  },
+    -- Overgrown Ancient
+  [196482] = {
+    -- Barkbreaker
+    [388544] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = true
+    }
+  },
+  --
+  -- HOV
+  --
+    -- Storm Drake
+  [97068] = {
+    -- Lightning Breath
+    [198888] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = false
+    }
+  },
+    -- Hymdall
+  [94960] = {
+    -- Bloodletting Sweep
+    [193092] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = true
+    }
+  },
+    -- Hyrja
+  [95833] = {
+    [192018] = {
+      shouldBubble = false,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = true
+    }
+  },
+    -- Storm Drake
+  [99891] = {
+    -- Lightning Breath
+    [198888] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = false
+    }
+  },
+    -- Angerhoof Bull
+  [96611] = {
+    -- Piercing Horns
+    [199151] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- Steeljaw Grizzly
+  [96677] = {
+    -- Rending Claws
+    [185425] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = true
+    }
+  },
+    -- King Ranulf
+  [97083] = {
+    -- Sever
+    [199652] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- King Haldor
+  [95843] = {
+    -- Sever
+    [199652] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- King Bjorn
+  [97081] = {
+    -- Sever
+    [199652] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- King Tor
+  [97084] = {
+    -- Sever
+    [199652] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- God-King Skovald
+  [95675] = {
+    -- Savaga Slash
+    [193668] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+  --
+  -- CoS
+  --
+    -- Sentry
+  [104270] = {
+    -- Charged Smash
+    [209495] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- Gereth the Vile
+  [108151] = {
+    -- Vampiric Claws
+    [373364] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = false
+    }
+  },
+  --
+  -- SMBG
+  --
+    -- Reanimated Ritual Bones
+  [75715] = {
+    -- Shadow Slash
+    [75715] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = true
+    }
+  },
+  --
+  -- TJS
+  --
+    -- Haunting Sha
+  [59555] = {
+    -- Haunting Gaze
+    [114646] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = true
+    }
+  },
+    -- Songbird
+  [59553] = {
+    -- Vicious Peck
+    [396007] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- The Golden Beetle
+  [59545] = {
+    [396019] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- Sha-Touched Guardian
+  [200131] = {
+    -- Setting Sun Kick
+    [397094] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = false,
+      shouldFort = false
+    }
+  },
+    -- Minion of Doubt
+  [57109] = {
+    -- Dark Claw
+    [397931] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = false
+    }
+  },
+    -- Liu Flameheart
+  [56732] = {
+    -- Jade Serpent Strike
+    [106841] = {
+      shouldBubble = true,
+      shouldDampen = true,
+      shouldDiffuse = true,
+      shouldFort = true
+    }
+  }
 }
 
 return _TankBusterList

src/_bastion.lua

@@ -252,26 +252,6 @@ Command:Register('module', 'Toggle a module on/off', function(args)
     end
 end)
 
-Command:Register('mplus', 'Toggle m+ module on/off', function(args)
-    local cmd = args[2]
-    if cmd == 'debuffs' then
-        Bastion.MythicPlusUtils:ToggleDebuffLogging()
-        Bastion:Print("Debuff logging", Bastion.MythicPlusUtils.debuffLogging and "enabled" or "disabled")
-        return
-    end
-
-    if cmd == 'casts' then
-        Bastion.MythicPlusUtils:ToggleCastLogging()
-        Bastion:Print("Cast logging", Bastion.MythicPlusUtils.castLogging and "enabled" or "disabled")
-        return
-    end
-
-    Bastion:Print("[MythicPlusUtils] Unknown command")
-    Bastion:Print("Available commands:")
-    Bastion:Print("debuffs")
-    Bastion:Print("casts")
-end)
-
 Command:Register('pause', 'Pause a module for X seconds', function (args)
     if Bastion.Enabled then
         local duration = args[3]
@@ -295,7 +275,7 @@ Command:Register('missed', 'Dump the list of immune kidney shot spells', functio
     end
 end)
 
-if UnitClass('player') == 'Paladin' and GetSpecialization() == 2 then
+if UnitClass('player') == 'Monk' and GetSpecialization() == 1 then
-    Tinkr:require("scripts/bastion/scripts/paladin/paladin_protection", Bastion)
+    Tinkr:require("scripts/bastion/scripts/brewmaster", Bastion)
-    Eval('RunMacroText("/bastion module paladin_protection")', 'bastion')
+    Eval('RunMacroText("/bastion module brewmaster")', 'bastion')
 end