CL

Mortalknight · Dec 8, 2023 · 6b45a4e · 6b45a4e
1 parent 5b78933
commit 6b45a4e
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 46 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,21 @@
+6.12.0
+NEW
+    - Added new paladin classpower texture and animation
+    - Added new arms warrior classpower
+    - Update GW2 boss frames, they are now unitframes
+    - Added options to toggle grid rol icons, tank icons and leader icons
+
+FIXES
+    - Fix PP mode get saved correctly
+    - Fix move HUD grid
+    - Fix immersive Questing taint issue
+    - Fix arena frame lua errors
+    - Fix classpower error in combat
+
+MISC
+    - Adjust grid out of range alpha value
+    - Update grid to work again with OmniCD
+
 6.11.1
 FIXES
     - Correct LEMO integration which was causing an lua error during installation process

diff --git a/CHANGELOG_NEW_VERSION.txt b/CHANGELOG_NEW_VERSION.txt
@@ -1,40 +1,17 @@
-6.11.1
-FIXES
-    - Correct LEMO integration which was causing an lua error during installation process
-    - Tweak Event Timer height
-
-6.11.0
+6.12.0
 NEW
-    - Redo all grids: Party, Raid, Raid Pet
-    - Grids are now secure and can update during combat
-    - Added new grids:
-        - Maintank
-        - Raid 10
-        - Raid 25
-        - Raid 40
-    - Raid grids switch automaticly between the 3 raid grids, based on the number of players at the raid
-    - Added new grouping and sorting settings to all grids:
-        - Group by: Role, Class, Group, Name, Index
-        - Sort direction
-        - Sortmethode: Name, Index
-        - Raidwaid sorting: If disabled the grouping and sorting settings are applyed per raid group
-    - All grids have there individual settings (Raid 10, Raid 25, Raid 40, Maintank, Raid Pet, Group)
-    - Added Superbloom event timer to worldmap
-    - Added options to change the worldmap coordinats lable
-    - Added option to hide classpower bar outside of combat
+    - Added new paladin classpower texture and animation
+    - Added new arms warrior classpower
+    - Update GW2 boss frames, they are now unitframes
+    - Added options to toggle grid rol icons, tank icons and leader icons
 
 FIXES
-    - Fix ready check skin
-    - Fix blurr on raid warning font
-    - Fix Pet Tracker and WQT Anchor points
-    - Fix travler log header stucking after tracking activity is completed
-    - Fix some taints
+    - Fix PP mode get saved correctly
+    - Fix move HUD grid
+    - Fix immersive Questing taint issue
+    - Fix arena frame lua errors
+    - Fix classpower error in combat
 
 MISC
-    - Update for 10.2.0
-    - Update RAF skin
-    - Update Time Manager skin
-    - Added back right click option on bags
-    - Added S3 raid debuffs
-    - Adjust damage text animations
-    - Update TaintLess
+    - Adjust grid out of range alpha value
+    - Update grid to work again with OmniCD
diff --git a/changelog.lua b/changelog.lua
@@ -15,6 +15,22 @@ AddChange(string addonVersion, table changeList)
   }
 ]]
 
+addChange("6.12.0",{
+    {ct.feature, [=[Added new paladin classpower texture and animation]=]},
+    {ct.feature, [=[Added new arms warrior classpower]=]},
+    {ct.feature, [=[Update GW2 boss frames, they are now unitframes]=]},
+    {ct.feature, [=[Added options to toggle grid rol icons, tank icons and leader icons]=]},
+
+    {ct.change, [=[Adjust grid out of range alpha value]=]},
+    {ct.change, [=[Update grid to work again with OmniCD]=]},
+
+    {ct.bug, [=[Fix PP mode get saved correctly]=]},
+    {ct.bug, [=[Fix move HUD grid]=]},
+    {ct.bug, [=[Fix immersive Questing taint issue]=]},
+    {ct.bug, [=[Fix arena frame lua errors]=]},
+    {ct.bug, [=[Fix classpower error in combat]=]},
+})
+
 addChange("6.11.1",{
     {ct.bug,[=[Correct LEMO integration which was causing an lua error during installation process]=]},
     {ct.bug,[=[Tweak Event Timer height]=]},

diff --git a/mainbar/classpowers.lua b/mainbar/classpowers.lua
@@ -9,7 +9,15 @@ local GetSetting = GW.GetSetting
 local CPWR_FRAME
 local CPF_HOOKED_TO_TARGETFRAME = false
 
-local function updateVisibilitySetting(self)
+local function UpdateVisibility(self, inCombat)
+    if self.onlyShowInCombat then
+       self:SetShown(inCombat and self.shouldShowBar)
+    else
+        self:SetShown(self.shouldShowBar)
+    end
+end
+
+local function updateVisibilitySetting(self, updateVis)
     self.onlyShowInCombat = GetSetting("CLASSPOWER_ONLY_SHOW_IN_COMBAT")
     if self.onlyShowInCombat then
         self.decay:RegisterEvent("PLAYER_REGEN_ENABLED")
@@ -18,16 +26,11 @@ local function updateVisibilitySetting(self)
         self.decay:UnregisterEvent("PLAYER_REGEN_ENABLED")
         self.decay:UnregisterEvent("PLAYER_REGEN_DISABLED")
     end
-end
-GW.UpdateClassPowerVisibilitySetting = updateVisibilitySetting
-
-local function UpdateVisibility(self)
-    if self.onlyShowInCombat then
-       self:SetShown(InCombatLockdown() and self.shouldShowBar)
-    else
-        self:SetShown(self.shouldShowBar)
+    if updateVis then
+        UpdateVisibility(self, false)
     end
 end
+GW.UpdateClassPowerVisibilitySetting = updateVisibilitySetting
 
 local function AnimationStagger(self)
     local fill = self:GetFillAmount()
@@ -1659,7 +1662,7 @@ local function barChange_OnEvent(self, event)
         GW.CheckRole()
         selectType(f)
     elseif event == "PLAYER_REGEN_ENABLED" or event == "PLAYER_REGEN_DISABLED" then
-        UpdateVisibility(f)
+        UpdateVisibility(f, event == "PLAYER_REGEN_DISABLED")
     end
 end
 
@@ -1820,6 +1823,7 @@ local function LoadClassPowers()
 
     cpf.gwPlayerForm = GetShapeshiftFormID()
 
+    updateVisibilitySetting(cpf, false)
     selectType(cpf)
 
     if (GW.myClassID == 4 or GW.myClassID == 11) and cpf.ourTarget and cpf.comboPointsOnTarget then

diff --git a/settings/panel_player.lua b/settings/panel_player.lua
@@ -65,7 +65,7 @@ local function LoadPlayerPanel(sWindow)
     addOption(p_player.scroll.scrollchild, L["Show spell queue window on castingbar"], nil, "PLAYER_CASTBAR_SHOW_SPELL_QUEUEWINDOW", nil, nil, {["CASTINGBAR_ENABLED"] = true, ["CASTINGBAR_DATA"] = true})
     addOption(p_player.scroll.scrollchild, L["Show character item info"], L["Display gems and enchants on the GW2 character panel"], "SHOW_CHARACTER_ITEM_INFO", function() GW.UpdateHeroPanelItemInfoSettings(); GW.ToggleCharacterItemInfo() end, nil, {["USE_CHARACTER_WINDOW"] = true, ["CASTINGBAR_DATA"] = true})
     addOption(p_player.scroll.scrollchild, L["Hide Blizzard dragon riding vigor"], nil, "HIDE_BLIZZARD_VIGOR_BAR", GW.UpdateDoddgeBarSettings, nil, {["HEALTHGLOBE_ENABLED"] = true})
-    addOption(p_player.scroll.scrollchild, L["Show classpower bar only in combat"], nil, "CLASSPOWER_ONLY_SHOW_IN_COMBAT", function() GW.UpdateClassPowerVisibilitySetting(GwPlayerClassPower) end, nil, {["CLASS_POWER"] = true})
+    addOption(p_player.scroll.scrollchild, L["Show classpower bar only in combat"], nil, "CLASSPOWER_ONLY_SHOW_IN_COMBAT", function() GW.UpdateClassPowerVisibilitySetting(GwPlayerClassPower, true) end, nil, {["CLASS_POWER"] = true})
     addOption(p_player.scroll.scrollchild, PET .. ": " .. L["Display Portrait Damage"], L["Display Portrait Damage on this frame"], "PET_FLOATING_COMBAT_TEXT", function() GW.ShowRlPopup = true end, nil, {["PETBAR_ENABLED"] = true})
     addOption(p_player.scroll.scrollchild, PET .. ": " .. L["Show auras below"], nil, "PET_AURAS_UNDER", function() GW.UpdatePetbarSettings(); GW.TogglePetAuraPosition() end, nil, {["PETBAR_ENABLED"] = true})
     addOptionDropdown(