From 32d4ae6a5c67384a7bcd34244206448cab19e114 Mon Sep 17 00:00:00 2001
From: Sumsebrum <j.schaefer@xicon.de>
Date: Sun, 31 Jul 2022 21:46:38 +0200
Subject: [PATCH] castbar shield uniterruptable

---
 Images/castbar-shield.blp | Bin 0 -> 6660 bytes
 Modules/Castbar.lua       |  33 +++++++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 Images/castbar-shield.blp

diff --git a/Images/castbar-shield.blp b/Images/castbar-shield.blp
new file mode 100644
index 0000000000000000000000000000000000000000..c9b9d118ff140e6673a4098e8cf540e9e8dcc3e2
GIT binary patch
literal 6660
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
AKmY&$

literal 0
HcmV?d00001

diff --git a/Modules/Castbar.lua b/Modules/Castbar.lua
index 05ec33b..f5b2fdf 100644
--- a/Modules/Castbar.lua
+++ b/Modules/Castbar.lua
@@ -108,6 +108,12 @@ function Castbar:CreateFrame(unit)
     castBar.icon.texture.overlay:SetAllPoints(castBar.icon.texture)
     castBar.icon.texture.overlay:SetTexture(Gladdy.db.castBarIconStyle)
 
+    castBar.shield = castBar.icon:CreateTexture(nil, "OVERLAY")
+    castBar.shield:SetTexture("Interface\\AddOns\\Gladdy\\Images\\castbar-shield")
+    castBar.shield:SetHeight(80)
+    castBar.shield:SetWidth(80)
+    castBar.shield:SetPoint("CENTER", castBar.icon, "CENTER", 0, -1.5)
+
     castBar.icon:ClearAllPoints()
     if (Gladdy.db.castBarIconPos == "LEFT") then
         castBar.icon:SetPoint("RIGHT", castBar, "LEFT", -3, 0) -- Icon of castbar
@@ -121,7 +127,7 @@ function Castbar:CreateFrame(unit)
     castBar.spellText:SetShadowOffset(1, -1)
     castBar.spellText:SetShadowColor(0, 0, 0, 1)
     castBar.spellText:SetJustifyH("CENTER")
-    castBar.spellText:SetPoint("LEFT", 7, 0) -- Text of the spell
+    castBar.spellText:SetPoint("LEFT", 10, 0) -- Text of the spell
 
     castBar.timeText = castBar:CreateFontString(nil, "LOW")
     castBar.timeText:SetFont(Gladdy:SMFetch("font", "auraFont"), Gladdy.db.castBarFontSize, Gladdy.db.castBarFontOutline and "OUTLINE")
@@ -192,6 +198,9 @@ function Castbar:UpdateFrame(unit)
         castBar.icon:Hide()
     end
 
+    castBar.shield:SetWidth(Gladdy.db.castBarIconSize * 3.2)
+    castBar.shield:SetHeight(Gladdy.db.castBarIconSize * 3.2)
+
     local rightMargin = 0
     local leftMargin = 0
     if (Gladdy.db.castBarIconPos == "LEFT") then
@@ -280,7 +289,7 @@ end
 
 Castbar.CastEventsFunc = {}
 Castbar.CastEventsFunc["UNIT_SPELLCAST_START"] = function(castBar, event, ...)
-    local name, text, texture, startTime, endTime, isTradeSkill, castID = UnitCastingInfo(castBar.unit)
+    local name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible, spellId = UnitCastingInfo(castBar.unit)
     if ( not name or (not castBar.showTradeSkills and isTradeSkill)) then
         castBar:SetAlpha(0)
         return
@@ -376,7 +385,7 @@ Castbar.CastEventsFunc["UNIT_SPELLCAST_DELAYED"] = function(castBar, event, ...)
     end
 end
 Castbar.CastEventsFunc["UNIT_SPELLCAST_CHANNEL_START"] = function(castBar, event, ...)
-    local name, text, texture, startTime, endTime, isTradeSkill, spellID = UnitChannelInfo(castBar.unit)
+    local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellId = UnitChannelInfo(castBar.unit)
 
     if ( not name or (not castBar.showTradeSkills and isTradeSkill)) then
         castBar:SetAlpha(0)
@@ -414,7 +423,7 @@ function Castbar.OnEvent(self, event, ...)
     Castbar.CastEventsFunc[event](self, event, ...)
 end
 
-function Castbar:CAST_START(unit, spell, icon, value, maxValue, test)
+function Castbar:CAST_START(unit, spell, icon, value, maxValue, notInterruptible, test)
     local castBar = self.frames[unit]
     if (not castBar) then
         return
@@ -426,7 +435,12 @@ function Castbar:CAST_START(unit, spell, icon, value, maxValue, test)
         castBar.channeling = test == "channel"
     end
 
-    castBar.bar:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.castBarColor))
+    if notInterruptible then
+        castBar.bar:SetStatusBarColor(.8,.8,.8,1)
+    else
+        castBar.bar:SetStatusBarColor(Gladdy:SetColor(Gladdy.db.castBarColor))
+    end
+
     castBar.value = value
     castBar.maxValue = maxValue
     castBar.bar:SetMinMaxValues(0, maxValue)
@@ -440,6 +454,11 @@ function Castbar:CAST_START(unit, spell, icon, value, maxValue, test)
     if Gladdy.db.castBarSparkEnabled then
         castBar.spark:Show()
     end
+    if notInterruptible then
+        castBar.shield:Show()
+    else
+        castBar.shield:Hide()
+    end
     castBar:SetAlpha(1)
     if Gladdy.db.castBarIconEnabled then
         castBar.icon:Show()
@@ -467,6 +486,7 @@ function Castbar:CAST_STOP(unit, ...)
         castBar.backdrop:Hide()
         castBar.spark:Hide()
         castBar.icon:Hide()
+        castBar.shield:Hide()
     else
         castBar.bar:SetStatusBarColor(...)
     end
@@ -541,7 +561,8 @@ function Castbar:Test(unit)
         end
 
         if (spell) then
-            self:CAST_START(unit, spell, icon, value, maxValue, event)
+            local nonInterruptable = unit == "arena1" and Gladdy.expansion == "Wrath"
+            self:CAST_START(unit, spell, icon, value, maxValue, nonInterruptable, event)
         end
     else
         self:CAST_STOP(unit)