Update all library paths to current

Requested by Curseforge ticket 291

.pkgmeta

@@ -2,54 +2,58 @@ package-as: IceHUD
 
 externals:
     libs/LibStub:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/LibStub
+        url: https://repos.wowace.com/wow/libstub/trunk
         tag: latest
     libs/CallbackHandler-1.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/CallbackHandler-1.0
+        url: https://repos.wowace.com/wow/callbackhandler/trunk
         tag: latest
     libs/AceEvent-3.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceEvent-3.0
+        url: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
         tag: latest
     libs/AceTimer-3.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceTimer-3.0
+        url: https://repos.wowace.com/wow/ace3/trunk/AceTimer-3.0
         tag: latest
     libs/AceDB-3.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceDB-3.0
+        url: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
         tag: latest
     libs/AceDBOptions-3.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceDBOptions-3.0
+        url: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
         tag: latest
     libs/AceConfig-3.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConfig-3.0
+        url: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
         tag: latest
     libs/AceGUI-3.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0
+        url: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
         tag: latest
     libs/AceGUI-3.0-SharedMediaWidgets:
-        url: svn://svn.wowace.com/wow/ace-gui-3-0-shared-media-widgets/mainline/trunk/AceGUI-3.0-SharedMediaWidgets
+        url: https://repos.wowace.com/wow/ace-gui-3-0-shared-media-widgets/trunk
         tag: latest
     libs/AceAddon-3.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceAddon-3.0
+        url: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
         tag: latest
     libs/AceConsole-3.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConsole-3.0
+        url: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
         tag: latest
     libs/AceLocale-3.0:
-        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0
+        url: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
         tag: latest
     libs/LibRangeCheck-2.0:
-        url: svn://svn.wowace.com/wow/librangecheck-2-0/mainline/trunk/LibRangeCheck-2.0
+        url: https://repos.wowace.com/wow/librangecheck-2-0/trunk
     libs/LibSharedMedia-3.0:
-        url: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk
+        url: https://repos.wowace.com/wow/libsharedmedia-3-0/trunk
         tag: latest
     libs/LibDogTag-3.0:
-        url: git://git.wowace.com/wow/libdogtag-3-0/mainline.git
+        url: https://repos.wowace.com/wow/libdogtag-3-0
+        tag: latest
+        type: git
     libs/LibDogTag-Unit-3.0:
-        url: git://git.wowace.com/wow/libdogtag-unit-3-0/mainline.git
+        url: https://repos.wowace.com/wow/libdogtag-unit-3-0
+        tag: latest
+        type: git
     libs/LibDBIcon-1.0:
-        url: svn://svn.wowace.com/wow/libdbicon-1-0/mainline/trunk/LibDBIcon-1.0
+        url: https://repos.wowace.com/wow/libdbicon-1-0/trunk
     libs/LibDualSpec-1.0:
-        url: git://git.wowace.com/wow/libdualspec-1-0/mainline.git
+        url: https://repos.wowace.com/wow/libdualspec-1-0
 
 optional-dependencies:
     - libdogtag-3-0

IceHUD.toc

@@ -1,5 +1,5 @@
 #@retail@
-## Interface: 90001
+## Interface: 90002
 #@end-retail@
 #@non-retail@
 # ## Interface: 11305

IceHUD_Options/IceHUD_Options.toc

@@ -1,5 +1,5 @@
 #@retail@
-## Interface: 90001
+## Interface: 90002
 #@end-retail@
 #@non-retail@
 # ## Interface: 11305

changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+v1.13.2:
+
+- Fixed which version of LibDogTag was being packaged. The previous version did not have 9.0 compatibility and was generating errors (ticket #293).
+
+v1.13.1:
+
+- Added support for Anima-charged combo points for Kyrian covenant (ticket #291).
+- Updated TOC for 9.0.2
+
 v1.13.0:
 
 - Made compatible with 9.0

modules/ComboPoints.lua

@@ -12,12 +12,20 @@ if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
 	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 
+local GetUnitChargedPowerPoints = GetUnitChargedPowerPoints
+if not GetUnitChargedPowerPoints then
+	GetUnitChargedPowerPoints = function()
+		return nil
+	end
+end
+
 -- Constructor --
 function ComboPoints.prototype:init()
 	ComboPoints.super.prototype.init(self, "ComboPoints")
 
 	self:SetDefaultColor("ComboPoints", 1, 1, 0)
 	self:SetDefaultColor("AnticipationPoints", 1, 0, 1)
+	self:SetDefaultColor("KyrianAnimaComboPoint", 0.3137254901960784, 0.3725490196078432, 1)
 	self.scalingEnabled = true
 end
 
@@ -215,8 +223,29 @@ function ComboPoints.prototype:GetOptions()
 		disabled = function()
 			return not self.moduleSettings.enabled
 		end,
+		order = 35
 	}
 
+	if IceHUD.WowVer >= 90000 then
+		opts["bShowAnimaCharged"] = {
+			type = 'toggle',
+			width = 'double',
+			name = L["Show Anima-charged points"],
+			desc = L["Whether or not to color an anima-charged combo point a separate color. Set the KyrianAnimaComboPoint color to the color you would like it to be."],
+			get = function()
+				return self.moduleSettings.bShowAnimaCharged
+			end,
+			set = function(info, v)
+				self.moduleSettings.bShowAnimaCharged = v
+				self:UpdateChargedComboPoints()
+			end,
+			disabled = function()
+				return not self.moduleSettings.enabled
+			end,
+			order = 36
+		}
+	end
+
 	return opts
 end
 
@@ -235,6 +264,7 @@ function ComboPoints.prototype:GetDefaultSettings()
 	defaults["comboGap"] = 0
 	defaults["showAnticipation"] = true
 	defaults["bShowWithNoTarget"] = true
+	defaults["bShowAnimaCharged"] = true
 	return defaults
 end
 
@@ -274,11 +304,16 @@ function ComboPoints.prototype:Enable(core)
 		self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
 	end
 
+	if IceHUD.WowVer >= 90000 then
+		self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
+	end
+
 	if self.moduleSettings.comboMode == "Graphical" then
 		self.moduleSettings.comboMode = "Graphical Bar"
 	end
 
 	self:CreateComboFrame(true)
+	self:UpdateChargedComboPoints()
 end
 
 function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
@@ -291,6 +326,13 @@ function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
 	end
 end
 
+function ComboPoints.prototype:UpdateChargedComboPoints()
+	local chargedPowerPoints = GetUnitChargedPowerPoints("player")
+	self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
+	self:CreateComboFrame()
+	self:UpdateComboPoints()
+end
+
 -- 'Protected' methods --------------------------------------------------------
 
 -- OVERRIDE
@@ -399,7 +441,12 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 		if (self.moduleSettings.gradient) then
 			g = g - ((1 / maxComboPoints)*i)
 		end
-		self.frame.graphical[i].texture:SetVertexColor(r, g, b)
+
+		if i == self.chargedPowerPointIndex and self.moduleSettings.bShowAnimaCharged then
+			self.frame.graphical[i].texture:SetVertexColor(self:GetColor("KyrianAnimaComboPoint"))
+		else
+			self.frame.graphical[i].texture:SetVertexColor(r, g, b)
+		end
 
 		self.frame.graphical[i]:Hide()
 	end

modules/ComboPointsBar.lua

@@ -6,6 +6,13 @@ if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
 	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 
+local GetUnitChargedPowerPoints = GetUnitChargedPowerPoints
+if not GetUnitChargedPowerPoints then
+	GetUnitChargedPowerPoints = function()
+		return nil
+	end
+end
+
 function ComboPointsBar.prototype:init()
 	ComboPointsBar.super.prototype.init(self, "ComboPointsBar")
 
@@ -57,7 +64,6 @@ end
 
 function ComboPointsBar.prototype:GetDefaultSettings()
 	local defaults =  ComboPointsBar.super.prototype.GetDefaultSettings(self)
-	defaults.textVisible['lower'] = false
 	defaults.offset = 8
 	defaults.enabled = false
 	defaults.alwaysDisplay = false
@@ -83,6 +89,18 @@ function ComboPointsBar.prototype:Enable(core)
 	else
 		self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
 	end
+
+	if IceHUD.WowVer >= 90000 then
+		self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
+	end
+
+	self:UpdateChargedComboPoints()
+end
+
+function ComboPointsBar.prototype:UpdateChargedComboPoints()
+	local chargedPowerPoints = GetUnitChargedPowerPoints("player")
+	self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
+	self:UpdateComboPoints()
 end
 
 function ComboPointsBar.prototype:CreateFrame()
@@ -129,6 +147,7 @@ function ComboPointsBar.prototype:UpdateComboPoints(...)
 	end
 
 	self:SetBottomText1(points or "0")
+	self:SetBottomText2(self.chargedPowerPointIndex)
 end
 
 function ComboPointsBar.prototype:Update()

this_version.md

@@ -1,7 +1,5 @@
 # Changelog
 
-v1.13.0:
+v1.13.2:
 
-- Made compatible with 9.0
-- Improved frame naming/debuggability
-- Updated TOC for 9.0
+- Fixed which version of LibDogTag was being packaged. The previous version did not have 9.0 compatibility and was generating errors (ticket #293).