merge master

.luacheckrc

@@ -1493,6 +1493,7 @@ globals = {
 	"ContainerRefundItemPurchase",
 	"ConvertToParty",
 	"ConvertToRaid",
+	"CreateColor",
 	"CreateFont",
 	"CreateForbiddenFrame",
 	"CreateFrame",

.pkgmeta

-package-as: VuhDo
-manual-changelog: changelog.txt
-wowi-archive-previous: yes
-
-
-externals:
-    Libs/LibStub:
-        url: svn://svn.wowace.com/wow/libstub/mainline/trunk
-        tag: latest
-    Libs/CallbackHandler-1.0:
-        url: svn://svn.wowace.com/wow/callbackhandler/mainline/trunk/CallbackHandler-1.0
-        tag: latest
-    Libs/AceAddon-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceAddon-3.0
-    Libs/AceGUI-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0
-    Libs/AceConfig-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConfig-3.0
-    Libs/AceComm-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceComm-3.0
-    Libs/AceLocale-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0
-    Libs/AceTimer-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceTimer-3.0
-    Libs/AceSerializer-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceSerializer-3.0
-    Libs/LibSharedMedia-3.0: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk/LibSharedMedia-3.0
-    Libs/LibDataBroker-1.1: git://git.wowace.com/wow/libdatabroker-1-1/mainline.git
-    Libs/UTF8: svn://svn.wowace.com/wow/utf8/mainline/trunk
-    Libs/LibCompress: svn://svn.wowace.com/wow/libcompress/mainline/trunk
-    Libs/LibBase64-1.0: git://git.wowace.com/wow/libbase64-1-0/mainline.git
-    Libs/LibDBIcon-1.0: svn://svn.wowace.com/wow/libdbicon-1-0/mainline/trunk/LibDBIcon-1.0
-    Libs/LibCustomGlow-1.0: git://github.com/Stanzilla/LibCustomGlow.git
-
-    VuhDoOptions/Libs/ChatThrottleLib: svn://svn.wowace.com/wow/chatthrottlelib/mainline/trunk
-	
-	
-move-folders:
-    VuhDo/VuhDoOptions: VuhDoOptions
+package-as: VuhDo
+manual-changelog: changelog.txt
+wowi-archive-previous: yes
+
+
+externals:
+    Libs/LibStub:
+        url: svn://svn.wowace.com/wow/libstub/mainline/trunk
+        tag: latest
+    Libs/CallbackHandler-1.0:
+        url: svn://svn.wowace.com/wow/callbackhandler/mainline/trunk/CallbackHandler-1.0
+        tag: latest
+    Libs/AceAddon-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceAddon-3.0
+    Libs/AceGUI-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0
+    Libs/AceConfig-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConfig-3.0
+    Libs/AceComm-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceComm-3.0
+    Libs/AceLocale-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0
+    Libs/AceTimer-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceTimer-3.0
+    Libs/AceSerializer-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceSerializer-3.0
+    Libs/LibSharedMedia-3.0: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk/LibSharedMedia-3.0
+    Libs/LibDataBroker-1.1: git://git.wowace.com/wow/libdatabroker-1-1/mainline.git
+    Libs/UTF8: svn://svn.wowace.com/wow/utf8/mainline/trunk
+    Libs/LibCompress: svn://svn.wowace.com/wow/libcompress/mainline/trunk
+    Libs/LibBase64-1.0: git://git.wowace.com/wow/libbase64-1-0/mainline.git
+    Libs/LibDBIcon-1.0: svn://svn.wowace.com/wow/libdbicon-1-0/mainline/trunk/LibDBIcon-1.0
+    Libs/LibCustomGlow-1.0:
+        url: https://github.com/Stanzilla/LibCustomGlow
+
+    VuhDoOptions/Libs/ChatThrottleLib: svn://svn.wowace.com/wow/chatthrottlelib/mainline/trunk
+	
+	
+move-folders:
+    VuhDo/VuhDoOptions: VuhDoOptions
+

.release/release.sh

@@ -66,7 +66,7 @@ strtotime() {
 exit_code=0
 
 # Game versions for uploading
-game_version=
+game_version="9.0.2"
 game_version_id=
 toc_version=
 classic=

Libs/Libs.xml

@@ -20,6 +20,6 @@
 	<Include file="LibCompress\lib.xml"/>
 	<Script file="LibBase64-1.0\LibBase64-1.0.lua" />
 	<Include file="LibCustomGlow-1.0\LibCustomGlow-1.0.xml" />
-	<Include file="NickTag-1.0\NickTag-1.0.xml" />
+	<Include file="NickTag-1.0\NickTag-1.0.xml" /> 
 
 </Ui>

Libs/NickTag-1.0/NickTag-1.0.toc

-## Interface: 70200
-## Title: NickTag-1.0
-## Notes: Standalone version of the NickTag library.
-
-NickTag-1.0.xml
+## Interface: 80200
+## Title: NickTag-1.0
+## Notes: Standalone version of the NickTag library.
+
+NickTag-1.0.xml

Libs/NickTag-1.0/NickTag-1.0.xml

-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
-	<Script file="NickTag-1.0.lua"/>
-</Ui>
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
+	<Script file="NickTag-1.0.lua"/>
+</Ui>

README.md

-Get [VuhDo release v3.113](https://www.curseforge.com/wow/addons/vuhdo/download/2929575) now with support for patch 8.3.0 Visions of N'Zoth!
+Get [VuhDo release v3.117](https://www.curseforge.com/wow/addons/vuhdo/download/3114897) now with support for patch 9.0.2 Shadowlands Pre-Expansion Event!
 
 To get started read the updated [guide over at Icy-Veins](https://www.icy-veins.com/forums/topic/11805-vuhdo-a-comprehensive-guide/).
 

VuhDo.lua

@@ -47,6 +47,16 @@ VUHDO_PLAYER_NAME = nil;
 VUHDO_PLAYER_RAID_ID = nil;
 VUHDO_PLAYER_GROUP = nil;
 
+-- Backdrops
+BACKDROP_VUHDO_TOOLTIP = {
+	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", 
+	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
+	tile = true,
+	tileSize = 8,
+	edgeSize = 8,
+	insets = {  left = 3, right = 3, top = 3, bottom = 3 },
+};
+
 -- BURST CACHE ---------------------------------------------------
 local VUHDO_CONFIG;
 local VUHDO_PET_2_OWNER;

VuhDo.toc

-## Interface: 80300
+## Interface: 90002
 ## Title: VuhDo ['vu:du:]
 ## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
-## Version: 3.114
+## Version: 3.118
 ## Notes: Raid Frames providing click-heal functionality, buff and debuff control, main tank management and much more
 ## SavedVariablesPerCharacter: VUHDO_CONFIG, VUHDO_PANEL_SETUP, VUHDO_SPELL_ASSIGNMENTS, VUHDO_HOSTILE_SPELL_ASSIGNMENTS, VUHDO_MM_SETTINGS, VUHDO_PLAYER_TARGETS, VUHDO_MAINTANK_NAMES, VUHDO_BUFF_SETTINGS, VUHDO_POWER_TYPE_COLORS, VUHDO_SPELLS_KEYBOARD, VUHDO_SPELL_CONFIG, VUHDO_BUFF_ORDER, VUHDO_SPEC_LAYOUTS, VUHDO_GROUP_SIZE, VUHDO_RAID, VUHDO_INDICATOR_CONFIG
 ## SavedVariables: VUHDO_DEFAULT_LAYOUT, VUHDO_DEFAULT_PROFILE, VUHDO_PROFILES, VUHDO_MANUAL_ROLES, VUHDO_SPELL_LAYOUTS, VUHDO_USER_CLASS_COLORS, VUHDO_DEBUFF_BLACKLIST, VUHDO_BOUQUETS, VUHDO_COMBAT_LOG_TRACE, VUHDO_GLOBAL_CONFIG, VUHDO_DEBUG

VuhDo.xml

@@ -101,7 +101,10 @@
 		</Scripts>
 	</Frame>
 
-	 <Frame name="VuhDoTooltip" frameStrata="TOOLTIP" movable="true" parent="UIParent" hidden="true">
+	<Frame name="VuhDoTooltip" frameStrata="TOOLTIP" movable="true" parent="UIParent" hidden="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
+			<KeyValues>
+				<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_TOOLTIP" type="global" />
+			</KeyValues>
 			<Layers>
 				 <Layer level="ARTWORK">
 				 <FontString name="$parentTextL1" inherits="GameFontNormalSmall" hidden="true">
@@ -322,19 +325,6 @@
 				</FontString>
 			</Layer>
 			</Layers>
-		<Backdrop tile="true"
-			bgFile="Interface\Tooltips\UI-Tooltip-Background"
-			edgeFile="Interface\Tooltips\UI-Tooltip-Border">
-			<EdgeSize>
-				<AbsValue val="8"/>
-			</EdgeSize>
-			<TileSize>
-				<AbsValue val="8"/>
-			</TileSize>
-			<BackgroundInsets>
-				<AbsInset left="3" right="3" top="3" bottom="3"/>
-			</BackgroundInsets>
-		</Backdrop>
 		<Scripts>
 			<OnMouseDown>VuhDoTooltipOnMouseDown(self,arg1)</OnMouseDown>
 			<OnMouseUp>VuhDoTooltipOnMouseUp(self,arg1)</OnMouseUp>

VuhDoAoeAdvisor.lua

@@ -228,7 +228,13 @@ function VUHDO_aoeUpdateSpellAverages()
 			tSpellModi = tInfo["base"] / tInfo["divisor"];
 			tInfo["avg"] = floor((tInfo["base"] + tBonus * tSpellModi) + 0.5);
 		end
-		tInfo["thresh"] = VUHDO_CONFIG["AOE_ADVISOR"]["config"][tName]["thresh"];
+		
+		-- FIXME: as of 9.0.1 PLAYER_EQUIPMENT_CHANGED sometimes fires before VUHDO_CONFIG is loaded and available
+		if VUHDO_CONFIG then
+			tInfo["thresh"] = VUHDO_CONFIG["AOE_ADVISOR"]["config"][tName]["thresh"];
+		elseif not tInfo["thresh"] then
+			tInfo["thresh"] = 8000; -- FIXME: current lowest threshold
+		end
 		--print("VUHDO_aoeUpdateSpellAverages(): name = " .. tName .. ", avg = floor((base + bonus * spellMod) + 0.5) | " .. tInfo["avg"] .. " = floor((" .. tInfo["base"] .. " + " .. tBonus .. " * " .. tSpellModi .. ") + 0.5)");
 	end
 end

VuhDoBarCustomizerDebuffIcon.lua

@@ -2,6 +2,7 @@ VUHDO_MAY_DEBUFF_ANIM = true;
 
 local VUHDO_DEBUFF_ICONS = { };
 local sIsName;
+local sIsShowOnlyForFriendly;
 
 -- BURST CACHE ---------------------------------------------------
 
@@ -48,6 +49,7 @@ function VUHDO_customDebuffIconsInitLocalOverrides()
 		sMaxIcons = 1;
 	end
 	sIsName = VUHDO_CONFIG["CUSTOM_DEBUFF"]["isName"];
+	sIsShowOnlyForFriendly = VUHDO_CONFIG["CUSTOM_DEBUFF"]["isShowOnlyForFriendly"];
 
 	sStaticConfig = {
 		["isStaticConfig"] = true,
@@ -284,7 +286,7 @@ function VUHDO_updateDebuffIcon(aUnit, anIcon, aName, anExpiry, aStacks, aDurati
 		end
 	end
 
-	if not tFound then
+	if not tFound and (not sIsShowOnlyForFriendly or UnitIsFriend("player", aUnit)) then
 		VUHDO_addDebuffIcon(aUnit, anIcon, aName, anExpiry, aStacks, aDuration, anIsBuff, aSpellId, aCnt);
 	end
 

VuhDoBarCustomizerHots.lua

@@ -476,6 +476,7 @@ end
 local VUHDO_IGNORE_HOT_IDS = {
 	[67358] = true, -- "Rejuvenating" proc has same name in russian and spanish as rejuvenation
 	[126921] = true, -- "Weakened Soul" by Shao-Tien Soul-Render
+	[109964] = true, -- "Spirit Shell" ability aura has the same name as the absorb aura itself
 }
 
 
@@ -554,8 +555,8 @@ local function VUHDO_updateHots(aUnit, anInfo)
 			
 			tIsCastByPlayer = tCaster == "player" or tCaster == VUHDO_PLAYER_RAID_ID;
 
-			if sIsPlayerKnowsSwiftmend and not sIsSwiftmend then
-				if VUHDO_SPELL_ID.REGROWTH == tBuffName or VUHDO_SPELL_ID.REJUVENATION == tBuffName or VUHDO_SPELL_ID.GERMINATION == tBuffName then
+			if sIsPlayerKnowsSwiftmend and tIsCastByPlayer and not sIsSwiftmend then
+				if VUHDO_SPELL_ID.REGROWTH == tBuffName or VUHDO_SPELL_ID.WILD_GROWTH == tBuffName or VUHDO_SPELL_ID.REJUVENATION == tBuffName or VUHDO_SPELL_ID.GERMINATION == tBuffName then
 					tStart, tSmDuration, tEnabled = GetSpellCooldown(VUHDO_SPELL_ID.SWIFTMEND);
 					if tEnabled ~= 0 and (tStart == nil or tSmDuration == nil or tStart <= 0 or tSmDuration <= 1.6) then
 						sIsSwiftmend = true;

VuhDoBouquetValidators.lua

@@ -13,19 +13,6 @@ VUHDO_FORCE_RESET = false;
 local floor = floor;
 local select = select;
 local twipe = table.wipe;
-local GetRaidTargetIndex = GetRaidTargetIndex;
-local UnitPower = UnitPower;
-local UnitPowerMax = UnitPowerMax;
-local UnitIsFriend = UnitIsFriend;
-local UnitIsEnemy = UnitIsEnemy;
-local UnitIsDeadOrGhost = UnitIsDeadOrGhost;
-local UnitIsPlayer = UnitIsPlayer;
-local UnitIsTapped = UnitIsTapped;
-local UnitIsTappedByPlayer = UnitIsTappedByPlayer;
-local GetTexCoordsForRole = GetTexCoordsForRole;
-local UnitIsPVP = UnitIsPVP;
-local UnitFactionGroup = UnitFactionGroup;
-local UnitHasIncomingResurrection = UnitHasIncomingResurrection;
 local _;
 
 local VUHDO_RAID = { };
@@ -205,7 +192,7 @@ end
 
 --
 local function VUHDO_isPhasedValidator(anInfo, _)
-	if UnitIsWarModePhased(anInfo["unit"]) or not UnitInPhase(anInfo["unit"]) then
+	if UnitPhaseReason(anInfo["unit"]) then
 		return true, "Interface\\TargetingFrame\\UI-PhasingIcon", 
 			-1, -1, -1, nil, nil, 0.15625, 0.84375, 0.15625, 0.84375;
 	else
@@ -217,12 +204,16 @@ end
 
 --
 local function VUHDO_isWarModePhasedValidator(anInfo, _)
-	if UnitIsWarModePhased(anInfo["unit"]) then
+
+	local tPhaseReason = UnitPhaseReason(anInfo["unit"]);
+
+	if tPhaseReason and tPhaseReason == Enum.PhaseReason.WarMode then
 		return true, "Interface\\TargetingFrame\\UI-PhasingIcon", 
 			-1, -1, -1, nil, nil, 0.15625, 0.84375, 0.15625, 0.84375;
 	else
 		return false, nil, -1, -1, -1;
 	end
+
 end
 
 
@@ -1073,6 +1064,16 @@ local function VUHDO_pvpIconValidator(anInfo, _)
 	end
 end
 
+--
+local function VUHDO_friendValidator(anInfo, _)
+  return UnitIsFriend("player", anInfo["unit"]), nil, -1, -1, -1;
+end
+
+--
+local function VUHDO_foeValidator(anInfo, _)
+  return not UnitIsFriend("player", anInfo["unit"]), nil, -1, -1, -1;
+end
+
 
 
 --
@@ -1893,6 +1894,18 @@ VUHDO_BOUQUET_BUFFS_SPECIAL = {
 		["interests"] = { VUHDO_UPDATE_MINOR_FLAGS },
 	},
 
+	["FRIEND"] = {
+		["displayName"] = VUHDO_I18N_FRIEND_STATUS,
+		["validator"] = VUHDO_friendValidator,
+		["interests"] = { },
+	},
+
+	["FOE"] = {
+		["displayName"] = VUHDO_I18N_FOE_STATUS,
+		["validator"] = VUHDO_foeValidator,
+		["interests"] = { },
+	},
+
 	["OVERFLOW_COUNTER"] = {
 		["displayName"] = VUHDO_I18N_DEF_COUNTER_OVERFLOW_ABSORB,
 		["validator"] = VUHDO_overflowCountValidator,

VuhDoBuffConst.lua

@@ -123,6 +123,16 @@ VUHDO_CLASS_BUFFS = {
 		[VUHDO_SPELL_ID.BUFF_LIGHTNING_SHIELD] = {
 			{ VUHDO_SPELL_ID.BUFF_LIGHTNING_SHIELD, VUHDO_BUFF_TARGET_SELF },
 		},
+		[VUHDO_SPELL_ID.BUFF_WATER_SHIELD] = {
+			{ VUHDO_SPELL_ID.BUFF_WATER_SHIELD, VUHDO_BUFF_TARGET_SELF },
+		},
+		[VUHDO_I18N_BUFFC_WEAPON_ENCHANT] = {
+			{ VUHDO_SPELL_ID.WINDFURY_WEAPON, VUHDO_BUFF_TARGET_ENCHANT },
+			{ VUHDO_SPELL_ID.FLAMETONGUE_WEAPON, VUHDO_BUFF_TARGET_ENCHANT },
+		},
+		[VUHDO_I18N_BUFFC_WEAPON_ENCHANT_OFF] = {
+			{ VUHDO_SPELL_ID.FLAMETONGUE_WEAPON, VUHDO_BUFF_TARGET_ENCHANT_OFF },
+		},
 	},
 
 	["PALADIN"] = {
@@ -220,11 +230,12 @@ VUHDO_CLASS_BUFFS = {
 		},
 		[VUHDO_I18N_LETHAL_POISONS] = {
 			{ VUHDO_SPELL_ID.BUFF_DEADLY_POISON, VUHDO_BUFF_TARGET_SELF },
-			{ VUHDO_SPELL_ID.BUFF_WOUND_POISON, VUHDO_BUFF_TARGET_SELF },
+			{ VUHDO_SPELL_ID.BUFF_WOUND_POISON, VUHDO_BUFF_TARGET_SELF }, 
+			{ VUHDO_SPELL_ID.BUFF_INSTANT_POISON, VUHDO_BUFF_TARGET_SELF },
 		},
 		[VUHDO_I18N_NON_LETHAL_POISONS] = {
 			{ VUHDO_SPELL_ID.BUFF_CRIPPLING_POISON, VUHDO_BUFF_TARGET_SELF },
-			{ VUHDO_SPELL_ID.BUFF_LEECHING_POISON, VUHDO_BUFF_TARGET_SELF },
+			{ VUHDO_SPELL_ID.BUFF_NUMBING_POISON, VUHDO_BUFF_TARGET_SELF },
 		},
 	},
 

VuhDoBuffWatch.lua

@@ -29,6 +29,26 @@ VUHDO_BUFF_ORDER = { };
 local sEmpty = { };
 local sCooldownAliases = { };
 
+-- Backdrops
+BACKDROP_VUHDO_BUFF_SWATCH_PANEL_8_8_0000 = {
+	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", 
+	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
+	tile = true,
+	tileSize = 8,
+	edgeSize = 8,
+};
+
+BACKDROP_COLOR_VUHDO_BUFF_SWATCH_PANEL = CreateColor(0, 0, 0);
+
+BACKDROP_VUHDO_BUFF_WATCH_MAIN_FRAME_16_16_5555 = {
+	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", 
+	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
+	tile = true,
+	tileSize = 16,
+	edgeSize = 16,
+	insets = {  left = 5, right = 5, top = 5, bottom = 5 },
+};
+
 
 
 
@@ -663,7 +683,7 @@ local function VUHDO_getMissingBuffsForCode(aTargetCode, aBuffInfo, aCategSpec)
 			return VUHDO_PLAYER_GROUP, sEmpty, "player", 0, "player", sEmpty, sEmpty, 0;
 
 		elseif VUHDO_BUFF_TARGET_ENCHANT_OFF == tTargetType then
-			_, _, _, tHasEnchant, tEnchantDuration = GetWeaponEnchantInfo();
+			_, _, _, _, tHasEnchant, tEnchantDuration = GetWeaponEnchantInfo();
 
 			if tHasEnchant and (not sGermanOrEnglish or strfind(aBuffInfo[1], VUHDO_getWeaponEnchantName(17), 1, true)) then
 				return sEmpty, sEmpty, "player", tEnchantDuration * 0.001, "player", VUHDO_PLAYER_GROUP, sEmpty, 0;

VuhDoBuffWatch.xml

@@ -22,23 +22,14 @@
 		</Scripts>
 	</Button>
 
-	<Frame name="VuhDoBuffSwatchPanelTemplate" virtual="true">
+	<Frame name="VuhDoBuffSwatchPanelTemplate" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
+		<KeyValues>
+			<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_BUFF_SWATCH_PANEL_8_8_0000" type="global" />
+			<KeyValue key="backdropColor" value="BACKDROP_COLOR_VUHDO_BUFF_SWATCH_PANEL" type="global" />
+		</KeyValues>
 		<Size>
 			<AbsDimension x="75" y="24" />
 		</Size>
-		<Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
-			<Color r="0" g="0" b="0" />
-
-			<BackgroundInsets>
-				<AbsInset left="0" right="0" top="0" bottom="0" />
-			</BackgroundInsets>
-			<TileSize>
-				<AbsValue val="8" />
-			</TileSize>
-			<EdgeSize>
-				<AbsValue val="8" />
-			</EdgeSize>
-		</Backdrop>
 		<Frames>
 
 			<Button name="$parentGlassButton" setAllPoints="true" inherits="SecureUnitButtonTemplate,SecureHandlerEnterLeaveTemplate,SecureHandlerShowHideTemplate">
@@ -242,18 +233,10 @@
 	</Frame>
 
 	<Frame name="VuhDoBuffWatchMainFrameTemplate" virtual="true" toplevel="true" frameStrata="MEDIUM"
-			movable="true" parent="UIParent" enableMouse="true">
-		<Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
-				<BackgroundInsets>
-					<AbsInset left="5" right="5" top="5" bottom="5" />
-				</BackgroundInsets>
-				<TileSize>
-					<AbsValue val="16" />
-				</TileSize>
-				<EdgeSize>
-					<AbsValue val="16" />
-				</EdgeSize>
-		</Backdrop>
+			movable="true" parent="UIParent" enableMouse="true" inherit="BackdropTemplate" mixin="BackdropTemplateMixin">
+		<KeyValues>
+			<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_BUFF_WATCH_MAIN_FRAME_16_16_5555" type="global" />
+		</KeyValues>
 		<Frames>
 			<Frame name="$parentInfoLabel" hidden="true" inherits="VuhDoLabelFrameTemplate" >
 				<Size>

VuhDoConst.lua

@@ -364,8 +364,7 @@ VUHDO_HEALING_HOTS = {
 	[VUHDO_SPELL_ID.PAIN_SUPPRESSION] = true,
 	[VUHDO_SPELL_ID.ECHO_OF_LIGHT] = true,
 	[VUHDO_SPELL_ID.ATONEMENT] = true,
-	[VUHDO_SPELL_ID.CLARITY_OF_WILL] = true,
-	[VUHDO_SPELL_ID.LUMINOUS_BARRIER] = true,
+	[VUHDO_SPELL_ID.SPIRIT_SHELL] = true,
 -- Druid
 	[VUHDO_SPELL_ID.REJUVENATION] = true,
 	[VUHDO_SPELL_ID.REGROWTH] = true,
@@ -403,8 +402,7 @@ VUHDO_EXCLUSIVE_HOTS = {
 	[VUHDO_SPELL_ID.BUFF_EARTH_SHIELD] = true,
 	[VUHDO_SPELL_ID.GUARDIAN_SPIRIT] = true,
 	[VUHDO_SPELL_ID.PAIN_SUPPRESSION] = true,
-	[VUHDO_SPELL_ID.CLARITY_OF_WILL] = true,
-	[VUHDO_SPELL_ID.LUMINOUS_BARRIER] = true,
+	[VUHDO_SPELL_ID.SPIRIT_SHELL] = true,
 };
 
 

VuhDoConstSpells.lua

@@ -23,9 +23,9 @@ VUHDO_SPELL_ID.CALL_OF_THE_ELEMENTS = VUHDO_getSpellInfo(66842);
 VUHDO_SPELL_ID.CENARION_WARD = VUHDO_getSpellInfo(102352);
 VUHDO_SPELL_ID.CHAIN_HEAL = VUHDO_getSpellInfo(1064);
 VUHDO_SPELL_ID.CIRCLE_OF_HEALING = VUHDO_getSpellInfo(34861);
-VUHDO_SPELL_ID.CLARITY_OF_WILL = VUHDO_getSpellInfo(152118);
 VUHDO_SPELL_ID.CLEANSE_SPIRIT = VUHDO_getSpellInfo(51886);
 VUHDO_SPELL_ID.CLEANSE_TOXINS = VUHDO_getSpellInfo(213644);
+VUHDO_SPELL_ID.CONCUSSIVE_SHOT = VUHDO_getSpellInfo(5116);
 VUHDO_SPELL_ID.CYCLONE = VUHDO_getSpellInfo(33786);
 VUHDO_SPELL_ID.DESPERATE_PRAYER = VUHDO_getSpellInfo(19236);
 VUHDO_SPELL_ID.DISPEL_MAGIC = VUHDO_getSpellInfo(528);
@@ -57,10 +57,10 @@ VUHDO_SPELL_ID.INNERVATE = VUHDO_getSpellInfo(29166);
 VUHDO_SPELL_ID.LAY_ON_HANDS = VUHDO_getSpellInfo(633);
 VUHDO_SPELL_ID.LIFEBLOOM = VUHDO_getSpellInfo(33763);
 VUHDO_SPELL_ID.LIGHT_OF_DAWN = VUHDO_getSpellInfo(85222);
-VUHDO_SPELL_ID.LUMINOUS_BARRIER = VUHDO_getSpellInfo(271466);
 VUHDO_SPELL_ID.MANA_SHIELD = VUHDO_getSpellInfo(56778); -- MOP?
 VUHDO_SPELL_ID.MASS_RESURRECTION = VUHDO_getSpellInfo(212036);
 VUHDO_SPELL_ID.MEND_PET = VUHDO_getSpellInfo(136);
+VUHDO_SPELL_ID.MIND_BLAST = VUHDO_getSpellInfo(8092);
 VUHDO_SPELL_ID.MISDIRECTION = VUHDO_getSpellInfo(34477);
 VUHDO_SPELL_ID.MOONKIN_FORM = VUHDO_getSpellInfo(24858);
 VUHDO_SPELL_ID.NATURES_CURE = VUHDO_getSpellInfo(88423);
@@ -98,6 +98,7 @@ VUHDO_SPELL_ID.SHADOW_MEND = VUHDO_getSpellInfo(186263);
 VUHDO_SPELL_ID.SHADOW_WORD_PAIN = VUHDO_getSpellInfo(27605);
 VUHDO_SPELL_ID.SOULSTONE = VUHDO_getSpellInfo(20707);
 VUHDO_SPELL_ID.SPELLSTEAL = VUHDO_getSpellInfo(30449);
+VUHDO_SPELL_ID.SPIRIT_SHELL = VUHDO_getSpellInfo(109964);
 VUHDO_SPELL_ID.SPRING_BLOSSOMS = VUHDO_getSpellInfo(207386);
 VUHDO_SPELL_ID.SWIFTMEND = VUHDO_getSpellInfo(18562);
 VUHDO_SPELL_ID.TEMPORAL_SHIELD = VUHDO_getSpellInfo(198111);
@@ -106,6 +107,7 @@ VUHDO_SPELL_ID.TRAIL_OF_LIGHT = VUHDO_getSpellInfo(200128);
 VUHDO_SPELL_ID.TRANQUILITY = VUHDO_getSpellInfo(740);
 VUHDO_SPELL_ID.WILD_GROWTH = VUHDO_getSpellInfo(48438);
 VUHDO_SPELL_ID.WIND_SHEAR = VUHDO_getSpellInfo(57994);
+VUHDO_SPELL_ID.WING_CLIP = VUHDO_getSpellInfo(195645);
 VUHDO_SPELL_ID.WORD_OF_GLORY = VUHDO_getSpellInfo(85673);
 
 -- Monk
@@ -193,6 +195,9 @@ VUHDO_SPELL_ID.BUFF_HEROISM = VUHDO_getSpellInfo(32182);
 VUHDO_SPELL_ID.BUFF_BLOODLUST = VUHDO_getSpellInfo(2825);
 VUHDO_SPELL_ID.BUFF_EARTH_SHIELD = VUHDO_getSpellInfo(204288);
 VUHDO_SPELL_ID.BUFF_LIGHTNING_SHIELD = VUHDO_getSpellInfo(192106);
+VUHDO_SPELL_ID.BUFF_WATER_SHIELD = VUHDO_getSpellInfo(52127);
+VUHDO_SPELL_ID.WINDFURY_WEAPON = VUHDO_getSpellInfo(33757);
+VUHDO_SPELL_ID.FLAMETONGUE_WEAPON = VUHDO_getSpellInfo(318038);
 
 
 -- Paladin
@@ -242,9 +247,10 @@ VUHDO_SPELL_ID.BUFF_TRICKS_OF_THE_TRADE = VUHDO_getSpellInfo(57934);
 
 VUHDO_SPELL_ID.BUFF_DEADLY_POISON = VUHDO_getSpellInfo(2823);
 VUHDO_SPELL_ID.BUFF_WOUND_POISON = VUHDO_getSpellInfo(8679);
+VUHDO_SPELL_ID.BUFF_INSTANT_POISON = VUHDO_getSpellInfo(315584);
 
 VUHDO_SPELL_ID.BUFF_CRIPPLING_POISON = VUHDO_getSpellInfo(3408);
-VUHDO_SPELL_ID.BUFF_LEECHING_POISON = VUHDO_getSpellInfo(108211);
+VUHDO_SPELL_ID.BUFF_NUMBING_POISON = VUHDO_getSpellInfo(5761);
 
 
 -- Monk
@@ -312,6 +318,7 @@ VUHDO_SPELL_ID.DEBUFF_IMMUNOSUPPRESSION = VUHDO_getSpellInfo(265206);
 VUHDO_SPELL_ID.DEBUFF_DECAYING_MIND = VUHDO_getSpellInfo(278961);
 VUHDO_SPELL_ID.DEBUFF_UMBRAL_SHELL = VUHDO_getSpellInfo(284722);
 VUHDO_SPELL_ID.DEBUFF_UNLEASHED_VOID = VUHDO_getSpellInfo(306184);
+VUHDO_SPELL_ID.DEBUFF_CLOAK_OF_FLAMES = VUHDO_getSpellInfo(338600);
 
 
 
@@ -320,11 +327,12 @@ VUHDO_NAME_TO_SPELL = {
 	[VUHDO_SPELL_ID.ETERNAL_FLAME] = VUHDO_SPELL_ID.WORD_OF_GLORY,
 	[VUHDO_SPELL_ID.HOLY_WORD_SANCTUARY] = VUHDO_SPELL_ID.HOLY_WORD_CHASTISE,
 	[VUHDO_SPELL_ID.FAERIE_SWARM] = VUHDO_SPELL_ID.FAERIE_FIRE,
-	[VUHDO_SPELL_ID.POWERWORD_SOLACE] = VUHDO_SPELL_ID.HOLY_FIRE,
+	[VUHDO_SPELL_ID.HOLY_FIRE] = VUHDO_SPELL_ID.MIND_BLAST,
 	[VUHDO_SPELL_ID.PURGE_THE_WICKED] = VUHDO_SPELL_ID.SHADOW_WORD_PAIN,
 	[VUHDO_SPELL_ID.SHADOW_MEND] = VUHDO_SPELL_ID.FLASH_HEAL,
 	["Gurison de l'ombre"] = VUHDO_SPELL_ID.FLASH_HEAL, -- see: https://wow.curseforge.com/projects/vuhdo/issues/964
-	[VUHDO_SPELL_ID.ANCIENT_MISTWEAVER_ARTS] = VUHDO_SPELL_ID.SOOTHING_MIST_HONOR_TALENT,
+	[VUHDO_SPELL_ID.ANCIENT_MISTWEAVER_ARTS] = VUHDO_SPELL_ID.SOOTHING_MIST_HONOR_TALENT, 
+	[VUHDO_SPELL_ID.CONCUSSIVE_SHOT] = VUHDO_SPELL_ID.WING_CLIP, 
 };
 
 
@@ -332,10 +340,10 @@ VUHDO_NAME_TO_SPELL = {
 --
 VUHDO_REPLACE_SPELL_NAME = {
 	[VUHDO_SPELL_ID.HOLY_WORD_SANCTUARY] = VUHDO_SPELL_ID.HOLY_WORD_CHASTISE,
-	[VUHDO_SPELL_ID.POWERWORD_SOLACE] = VUHDO_SPELL_ID.HOLY_FIRE,
 	[VUHDO_SPELL_ID.PURGE_THE_WICKED] = VUHDO_SPELL_ID.SHADOW_WORD_PAIN,
 	[VUHDO_SPELL_ID.SHADOW_MEND] = VUHDO_SPELL_ID.FLASH_HEAL,
-	[VUHDO_SPELL_ID.ANCIENT_MISTWEAVER_ARTS] = VUHDO_SPELL_ID.SOOTHING_MIST_HONOR_TALENT,
+	[VUHDO_SPELL_ID.ANCIENT_MISTWEAVER_ARTS] = VUHDO_SPELL_ID.SOOTHING_MIST_HONOR_TALENT, 
+	[VUHDO_SPELL_ID.CONCUSSIVE_SHOT] = VUHDO_SPELL_ID.WING_CLIP, 
 };