From 229a23c6293acda51b6e53b2113ac4bb4aed5c8b Mon Sep 17 00:00:00 2001
From: Ivaria <ivaria@vuhdo.io>
Date: Mon, 13 Jan 2020 00:39:05 -0800
Subject: [PATCH] Merge branch 'master' into classic

---
 VuhDoDebuffs.lua | 8 ++++++--
 changelog.txt    | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/VuhDoDebuffs.lua b/VuhDoDebuffs.lua
index 2ec3d6e..edbd9b9 100644
--- a/VuhDoDebuffs.lua
+++ b/VuhDoDebuffs.lua
@@ -298,8 +298,11 @@ local tCurChosenStoredName;
 function VUHDO_determineDebuff(aUnit)
 	tInfo = (VUHDO_RAID or sEmpty)[aUnit];
 
-	if not tInfo then	return 0, ""; -- VUHDO_DEBUFF_TYPE_NONE
-	elseif VUHDO_CONFIG_SHOW_RAID then return tInfo["debuff"], tInfo["debuffName"]; end
+	if not tInfo then 
+		return 0, ""; -- VUHDO_DEBUFF_TYPE_NONE
+	elseif VUHDO_CONFIG_SHOW_RAID then 
+		return tInfo["debuff"], tInfo["debuffName"]; 
+	end
 
 	tUnitDebuffInfo = VUHDO_initDebuffInfos(aUnit);
 
@@ -378,6 +381,7 @@ function VUHDO_determineDebuff(aUnit)
 				end
 
 				-- Entweder Fähigkeit vorhanden ODER noch keiner gewählt UND auch nicht entfernbare
+				-- Either ability available OR none selected AND not removable (DETECT_DEBUFFS_REMOVABLE_ONLY_ICONS)
 				if tType and (tAbility or (sCurChosenType == 0 and sIsNotRemovableOnly)) then -- VUHDO_DEBUFF_TYPE_NONE
 					sCurChosenType = tType;
 					tUnitDebuffInfo["CHOSEN"][1], tUnitDebuffInfo["CHOSEN"][2] = tIcon, tStacks;
diff --git a/changelog.txt b/changelog.txt
index 9b0ea2d..2ec999b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -42,6 +42,7 @@ Bugfixes:
   
 Improvements:  
 -- Added Paladin 'Glimmer of Light' as default HoT icon option  
+-- Added default custom debuffs for Ny'alotha raid encounters  
   
   
 --------------------------------------------------------------  
-- 
GitLab