From 31a383268c65a00b479b0b45db7b70f453b2823d Mon Sep 17 00:00:00 2001
From: azuraji <72912613+azuraji@users.noreply.github.com>
Date: Sun, 27 Nov 2022 14:54:40 +0100
Subject: [PATCH] * Add an option to hide hidden quests * Remove leftovers from
 unused optional addons

---
 MonkeyBuddy/MonkeyBuddy.lua        |   5 +
 MonkeyBuddy/MonkeyBuddy.toc        |   2 +-
 MonkeyBuddy/MonkeyBuddy.xml        |   9 +-
 MonkeyBuddy/localization.lua       |   5 +-
 MonkeyLibrary/MonkeyLibrary.toc    |   2 +-
 MonkeyQuest/MonkeyQuest.lua        | 198 +++++++++++++++++------------
 MonkeyQuest/MonkeyQuest.toc        |   3 +-
 MonkeyQuest/MonkeyQuestDefs.lua    |   1 +
 MonkeyQuest/MonkeyQuestInit.lua    |  18 +--
 MonkeyQuest/MonkeyQuestSlash.lua   |  10 ++
 MonkeyQuest/MonkeyQuestTooltip.lua |  16 ---
 MonkeyQuestLog/MonkeyQuestLog.toc  |   2 +-
 12 files changed, 154 insertions(+), 117 deletions(-)

diff --git a/MonkeyBuddy/MonkeyBuddy.lua b/MonkeyBuddy/MonkeyBuddy.lua
index b068c5f..15950b1 100644
--- a/MonkeyBuddy/MonkeyBuddy.lua
+++ b/MonkeyBuddy/MonkeyBuddy.lua
@@ -145,6 +145,11 @@ MonkeyBuddyQuest_CheckButtons[MONKEYBUDDY_QUEST_WORKCOMPLETE] = {
     strVar = "m_bWorkComplete",
     pSlashCommand = MonkeyQuestSlash_CmdWorkComplete
 };
+MonkeyBuddyQuest_CheckButtons[MONKEYBUDDY_QUEST_HIDEHIDDENQUESTS] = {
+    id = 23,
+    strVar = "m_bHideHiddenQuests",
+    pSlashCommand = MonkeyQuestSlash_CmdHideHiddenQuests
+};
 
 
 -- this array is used to init the colour buttons
diff --git a/MonkeyBuddy/MonkeyBuddy.toc b/MonkeyBuddy/MonkeyBuddy.toc
index b8d32ea..1d035d0 100644
--- a/MonkeyBuddy/MonkeyBuddy.toc
+++ b/MonkeyBuddy/MonkeyBuddy.toc
@@ -1,5 +1,5 @@
 ## Interface: 100002
-## Title: MonkeyBuddy v10.0.2.2
+## Title: MonkeyBuddy v10.0.2.3
 ## Notes: Helps you configure your MonkeyMods. (http://www.toctastic.net/)
 ## Notes-deDE: Hilft Euch beim Einstellen Euer MonkeyMods. (http://www.toctastic.net/)
 ## Author: Trentin, Jim-Bim, azuraji
diff --git a/MonkeyBuddy/MonkeyBuddy.xml b/MonkeyBuddy/MonkeyBuddy.xml
index 9486c9a..8e4b737 100644
--- a/MonkeyBuddy/MonkeyBuddy.xml
+++ b/MonkeyBuddy/MonkeyBuddy.xml
@@ -127,7 +127,7 @@
 
   <Frame name="MonkeyBuddyFrame" toplevel="true" frameStrata="MEDIUM" movable="true" enableMouse="true" hidden="true" parent="UIParent" inherits="BackdropTemplate">
     <Size>
-      <AbsDimension x="700" y="625"/>
+      <AbsDimension x="700" y="700"/>
     </Size>
     <Anchors>
       <Anchor point="CENTER"/>
@@ -353,6 +353,11 @@
               <Anchor point="TOPLEFT" relativeTo="MonkeyBuddyQuestCheck21" relativePoint="BOTTOMLEFT" />
             </Anchors>
           </CheckButton>
+          <CheckButton name="MonkeyBuddyQuestCheck23" inherits="MonkeyBuddyCheckButtonTemplate">
+            <Anchors>
+              <Anchor point="TOPLEFT" relativeTo="MonkeyBuddyQuestCheck22" relativePoint="BOTTOMLEFT" />
+            </Anchors>
+          </CheckButton>
 
           <Button name="MonkeyBuddyQuestColour1" inherits="MonkeyBuddyQuestColourButtonTemplate">
             <Anchors>
@@ -458,7 +463,7 @@
             <Anchors>
               <Anchor point="BOTTOM">
                 <Offset>
-                  <AbsDimension x="0" y="8" />
+                  <AbsDimension x="0" y="-70" />
                 </Offset>
               </Anchor>
             </Anchors>
diff --git a/MonkeyBuddy/localization.lua b/MonkeyBuddy/localization.lua
index 23be3dc..0fdd77c 100644
--- a/MonkeyBuddy/localization.lua
+++ b/MonkeyBuddy/localization.lua
@@ -48,6 +48,7 @@ MONKEYBUDDY_QUEST_SHOWNOOBTIPS				= "Show helpful tooltips for Noobs";
 MONKEYBUDDY_QUEST_SHOWZONEHIGHLIGHT			= "Show quest zone highlighting";
 MONKEYBUDDY_QUEST_SHOWQUESTLEVEL			= "Show the quest levels";
 MONKEYBUDDY_QUEST_WORKCOMPLETE				= "Enable >work complete< sound";
+MONKEYBUDDY_QUEST_HIDEHIDDENQUESTS = "Hide quests hidden in Blizzard's quest log";
 
 MONKEYBUDDY_QUEST_QUESTTITLECOLOUR			= "Quest Titles";
 MONKEYBUDDY_QUEST_HEADEROPENCOLOUR			= "Open Zone Headers";
@@ -227,7 +228,7 @@ MONKEYBUDDY_QUEST_QUESTTITLECOLOUR			= "Titre des Qu\195\170tes";
 MONKEYBUDDY_QUEST_HEADEROPENCOLOUR			= "Ouvrir le nom des zones";
 MONKEYBUDDY_QUEST_HEADERCLOSEDCOLOUR		= "Fermer le nom des zones";
 MONKEYBUDDY_QUEST_OVERVIEWCOLOUR			= "Vues d\'ensemble des Qu\195\170tes";
-MONKEYBUDDY_QUEST_SPECIALOBJECTIVECOLOUR	= "Objectifs Spéciaux";
+MONKEYBUDDY_QUEST_SPECIALOBJECTIVECOLOUR	= "Objectifs Sp�ciaux";
 MONKEYBUDDY_QUEST_INITIALOBJECTIVECOLOUR	= "Objectifs \195\160 0%";
 MONKEYBUDDY_QUEST_MIDOBJECTIVECOLOUR		= "Objectifs \195\160 50%";
 MONKEYBUDDY_QUEST_COMPLETEOBJECTIVECOLOUR	= "Objectifs \195\160 <100%";
@@ -268,4 +269,4 @@ MONKEYBUDDY_CLOCK_MINUTESLIDER				= "Réglage Minute";
 -- bindings
 BINDING_NAME_MONKEYBUDDY_OPEN				= "Ouvrir/Fermer la fenêtre de configuration";
 
-end
\ No newline at end of file
+end
diff --git a/MonkeyLibrary/MonkeyLibrary.toc b/MonkeyLibrary/MonkeyLibrary.toc
index e8f4d2b..791cf0b 100644
--- a/MonkeyLibrary/MonkeyLibrary.toc
+++ b/MonkeyLibrary/MonkeyLibrary.toc
@@ -1,5 +1,5 @@
 ## Interface: 100002
-## Title: MonkeyLibrary v10.0.2
+## Title: MonkeyLibrary v10.0.2.3
 ## Notes: Common files and functions for MonkeyMods. (http://www.toctastic.net/)
 ## Notes-deDE: Gemeinsame Dateien und Funktionen fuer MonkeyMods. (http://www.toctastic.net/)
 ## Author: Trentin (trentin@toctastic.net)
diff --git a/MonkeyQuest/MonkeyQuest.lua b/MonkeyQuest/MonkeyQuest.lua
index a32ac7e..6ebea49 100644
--- a/MonkeyQuest/MonkeyQuest.lua
+++ b/MonkeyQuest/MonkeyQuest.lua
@@ -60,10 +60,6 @@ function MonkeyQuest_OnLoad(self)
     MonkeyQuestSlash_Init();
     MonkeyQuestOptions();
 
-    -- overriding of tooltip functions
-	MonkeyQuest_OLD_aftt_setName = aftt_setName;
-	aftt_setName = MonkeyQuest_NEW_aftt_setName;
-    
     -- this will catch mobs needed for quests
 	self:RegisterEvent('UPDATE_MOUSEOVER_UNIT');
 end
@@ -525,14 +521,30 @@ function MonkeyQuest_Refresh(MBDaily)
 	local tmpQuestLogSelection = C_QuestLog.GetSelectedQuest();
 
 	local iNumEntries, iNumQuests = C_QuestLog.GetNumQuestLogEntries();
+
+	local visibleQuestsEffectiveCount = 0
+
+	for i = 1, iNumEntries, 1 do
+		local questInfo = C_QuestLog.GetInfo(i)
+		
+		if (questInfo.isHeader == false) then
+			if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideHiddenQuests == false or questInfo.isHidden == false) then
+				visibleQuestsEffectiveCount = visibleQuestsEffectiveCount + 1
+			end
+		end
+	end
+
+	iNumQuests = visibleQuestsEffectiveCount
 	
-	local DQCompleted = GetDailyQuestsCompleted();
+	-- local DQCompleted = GetDailyQuestsCompleted();
 	--local DQMax = GetMaxDailyQuests();
 
 	MonkeyQuestTitleText:SetTextHeight(MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_iFontHeight + 2);
 	-- set the title, with or without the number of quests
 
 		if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowNumQuests == true) then
+
+
 			if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideTitle == false) then
 				if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowDailyNumQuests == false) then
 					MonkeyQuestTitleText:SetText(MONKEYQUEST_TITLE .. " " .. iNumQuests .. "/" .. MAX_QUESTLOG_QUESTS);
@@ -560,12 +572,6 @@ function MonkeyQuest_Refresh(MBDaily)
 			end
 		end
 
-	
-	-- update the BIB text
-	if (BIB_MonkeyQuestButton_GetButtonText) then
-		BIB_MonkeyQuestButton_GetButtonText();
-	end
-
 
 	MonkeyQuest.m_iNumEntries = iNumEntries;
 
@@ -582,17 +588,42 @@ function MonkeyQuest_Refresh(MBDaily)
 
 	MonkeyQuest_RefreshQuestItemList();
 	
-	--local watchItemIndex = 0;
-
 	if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bMinimized == false) then
+		local questInfo, title
+		local visibleQuestsCount
+		local questHeaders = {}
 
+		for i = 1, iNumEntries, 1 do
+			questInfo = C_QuestLog.GetInfo(i)
+			
+			if (questInfo.isHeader) then
+				if (visibleQuestsCount and visibleQuestsCount > 0) then
+					questHeaders[title] = visibleQuestsCount
+				end
+				
+				title = questInfo.title
+				visibleQuestsCount = 0
+			else
+				if (questInfo.isHidden == false) then
+					visibleQuestsCount = visibleQuestsCount + 1
+				end
+			end
+		end
+
+		-- last header group
+
+		if (visibleQuestsCount and visibleQuestsCount > 0) then
+			questHeaders[title] = visibleQuestsCount
+		end
+
+		
 		for i = 1, iNumEntries, 1 do
 			-- questInfo.title			the title text of the quest, may be a header (ex. Wetlands)
 			-- questInfo.level			the level of the quest
 			-- questTagInfo.tagName		the tag on the quest (ex. COMPLETED)
 			--local strQuestLogTitleText, strQuestLevel, strQuestTag, suggestedGroup, isHeader, isCollapsed, isComplete, isDaily = C_QuestLog.GetTitleForLogIndex(i);
 
-			local questInfo = C_QuestLog.GetInfo(i)
+			questInfo = C_QuestLog.GetInfo(i)
 			--print(questInfo.title, questInfo.isHeader, questInfo.questID)
 			local suggestedGroup = questInfo.suggestedGroup
 			local isComplete = C_QuestLog.IsComplete(questInfo.questID)
@@ -614,88 +645,85 @@ function MonkeyQuest_Refresh(MBDaily)
 					MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[questInfo.title] = {};
 					MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[questInfo.title].m_bChecked = true;
 				end
-					
-				if (questInfo.isHeader) then
-					
-					if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[questInfo.title].m_bChecked == true) then
-						if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bNoHeaders == false or
-							MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden == true or
-							MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bAlwaysHeaders == true) then
 
-							strMonkeyQuestBody = strMonkeyQuestBody .. 
-								format(MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_strHeaderOpenColour .. "%s|r",
-									"- " .. questInfo.title) .. "\n";
+				if (questInfo.isHeader) then
+					if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideHiddenQuests == false or questHeaders[questInfo.title]) then
+						if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[questInfo.title].m_bChecked == true) then
+							if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bNoHeaders == false or
+								MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden == true or
+								MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bAlwaysHeaders == true) then
 
-							_G["MonkeyQuestButton" .. iButtonId .. "Text"]:SetText(strMonkeyQuestBody);
-							_G["MonkeyQuestButton" .. iButtonId .. "Text"]:Show();
-							_G["MonkeyQuestButton" .. iButtonId]:Show();
+								strMonkeyQuestBody = strMonkeyQuestBody .. format(MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_strHeaderOpenColour .. "%s|r", "- " .. questInfo.title) .. "\n";
 
-							-- set the bg colour
-							_G["MonkeyQuestButton" .. iButtonId .. "Texture"]:SetVertexColor(0.0, 0.0, 0.0, 0.0);
-			
-							_G["MonkeyQuestButton" .. iButtonId].m_iQuestIndex = i;
-							_G["MonkeyQuestButton" .. iButtonId].id = iButtonId;
-			
-							_G["MonkeyQuestHideButton" .. iButtonId]:Hide();
-							_G["MonkeyQuestHideButton" .. iButtonId].m_strQuestLogTitleText = questInfo.title;
-							
-							iButtonId = iButtonId + 1;
-			
-							strMonkeyQuestBody = "";
-						end
-					else
-						if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden == true or
-							MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bAlwaysHeaders == true) then
+								_G["MonkeyQuestButton" .. iButtonId .. "Text"]:SetText(strMonkeyQuestBody);
+								_G["MonkeyQuestButton" .. iButtonId .. "Text"]:Show();
+								_G["MonkeyQuestButton" .. iButtonId]:Show();
 
-							strMonkeyQuestBody = strMonkeyQuestBody .. 
-								format(MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_strHeaderClosedColour .. "%s|r",
-									"+ " .. questInfo.title) .. "\n";
+								-- set the bg colour
+								_G["MonkeyQuestButton" .. iButtonId .. "Texture"]:SetVertexColor(0.0, 0.0, 0.0, 0.0);
+				
+								_G["MonkeyQuestButton" .. iButtonId].m_iQuestIndex = i;
+								_G["MonkeyQuestButton" .. iButtonId].id = iButtonId;
+				
+								_G["MonkeyQuestHideButton" .. iButtonId]:Hide();
+								_G["MonkeyQuestHideButton" .. iButtonId].m_strQuestLogTitleText = questInfo.title;
 								
-							_G["MonkeyQuestButton" .. iButtonId .. "Text"]:SetText(strMonkeyQuestBody);
-							_G["MonkeyQuestButton" .. iButtonId .. "Text"]:Show();
-							_G["MonkeyQuestButton" .. iButtonId]:Show();
+								iButtonId = iButtonId + 1;
+				
+								strMonkeyQuestBody = "";
+							end
+						else
+							if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden == true or
+								MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bAlwaysHeaders == true) then
 
-							-- set the bg colour
-							_G["MonkeyQuestButton" .. iButtonId .. "Texture"]:SetVertexColor(0.0, 0.0, 0.0, 0.0);
-			
-							_G["MonkeyQuestButton" .. iButtonId].m_iQuestIndex = i;
-							_G["MonkeyQuestButton" .. iButtonId].id = iButtonId;
-							
-							_G["MonkeyQuestHideButton" .. iButtonId]:Hide();
-							_G["MonkeyQuestHideButton" .. iButtonId].m_strQuestLogTitleText = questInfo.title;
-			
-							iButtonId = iButtonId + 1;
-			
-							strMonkeyQuestBody = "";
+								strMonkeyQuestBody = strMonkeyQuestBody .. format(MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_strHeaderClosedColour .. "%s|r", "+ " .. questInfo.title) .. "\n";
+									
+								_G["MonkeyQuestButton" .. iButtonId .. "Text"]:SetText(strMonkeyQuestBody);
+								_G["MonkeyQuestButton" .. iButtonId .. "Text"]:Show();
+								_G["MonkeyQuestButton" .. iButtonId]:Show();
+
+								-- set the bg colour
+								_G["MonkeyQuestButton" .. iButtonId .. "Texture"]:SetVertexColor(0.0, 0.0, 0.0, 0.0);
+				
+								_G["MonkeyQuestButton" .. iButtonId].m_iQuestIndex = i;
+								_G["MonkeyQuestButton" .. iButtonId].id = iButtonId;
+								
+								_G["MonkeyQuestHideButton" .. iButtonId]:Hide();
+								_G["MonkeyQuestHideButton" .. iButtonId].m_strQuestLogTitleText = questInfo.title;
+				
+								iButtonId = iButtonId + 1;
+				
+								strMonkeyQuestBody = "";
+							end
+							-- keep looping through the list until we find the next header
+							bNextHeader = true;
 						end
-						-- keep looping through the list until we find the next header
-						bNextHeader = true;
 					end
 				else
 					-- check if the user even wants this displayed
-					if ((MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[questInfo.title].m_bChecked == true or 
-						MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden) and 
-						(MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideCompletedQuests == false or
-						(MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideCompletedQuests == true and not isComplete) or
-						MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden)) then
+					if ((MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[questInfo.title].m_bChecked == true or MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden)
+						and (	   MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideCompletedQuests == false
+								 or (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideCompletedQuests == true and not isComplete)
+								 or  MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden)
+						and (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideHiddenQuests == false or questInfo.isHidden == false)) then
 						
 						-- the user has this quest checked off or he's showing all quests anyways, so we show it (currently on :Hide)
 						--getglobal("MonkeyQuestHideButton" .. iButtonId):Hide();
 						
-						if ( MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden ) then
-							_G["MonkeyQuestHideButton" .. iButtonId]:Hide();
-						else
-							_G["MonkeyQuestHideButton" .. iButtonId]:Hide();
-						end
+						-- if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowHidden) then
+						-- 	_G["MonkeyQuestHideButton" .. iButtonId]:Hide();
+						-- else
+						-- 	_G["MonkeyQuestHideButton" .. iButtonId]:Hide();
+						-- end
 						
-						-- update hide quests buttons
-						if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[questInfo.title].m_bChecked == true) then
-							_G["MonkeyQuestHideButton" .. iButtonId]:SetChecked(1);
-						else
-							_G["MonkeyQuestHideButton" .. iButtonId]:SetChecked(0);
-						end
+						-- -- update hide quests buttons
+						-- if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[questInfo.title].m_bChecked == true) then
+						-- 	_G["MonkeyQuestHideButton" .. iButtonId]:SetChecked(1);
+						-- else
+						-- 	_G["MonkeyQuestHideButton" .. iButtonId]:SetChecked(0);
+						-- end
 						
-						_G["MonkeyQuestHideButton" .. iButtonId].m_strQuestLogTitleText = questInfo.title;
+						-- _G["MonkeyQuestHideButton" .. iButtonId].m_strQuestLogTitleText = questInfo.title;
 						
 						local color = GetQuestDifficultyColor(questInfo.level);
 						local strQuestLink = GetQuestLink(questInfo.questID);
@@ -747,6 +775,14 @@ function MonkeyQuest_Refresh(MBDaily)
 							-- Emissary world quest
 							elseif (questTagInfo and questTagInfo.tagID == 128) then
 								strMonkeyQuestBody = strMonkeyQuestBody .. format("%s%s|r", strTitleColor, "[" .. questInfo.level .. "E] ");
+
+							-- Island quest
+							elseif (questTagInfo and questTagInfo.tagID == 254) then
+								strMonkeyQuestBody = strMonkeyQuestBody .. format("%s%s|r", strTitleColor, "[" .. questInfo.level .. "I] ");
+
+							-- Island weekly quest
+							elseif (questTagInfo and questTagInfo.tagID == 261) then
+								strMonkeyQuestBody = strMonkeyQuestBody .. format("%s%s|r", strTitleColor, "[" .. questInfo.level .. "Iw] ");
 								
 							elseif (questTagInfo and questTagInfo.tagID == Enum.QuestTag.PvP) then
 								if (questInfo.frequency == Enum.QuestFrequency.Daily) then
@@ -773,7 +809,7 @@ function MonkeyQuest_Refresh(MBDaily)
 
 							-- Covenant Calling Quest
 							elseif (questTagInfo and questTagInfo.tagID == 271) then
-								strMonkeyQuestBody = strMonkeyQuestBody .. format("%s%s|r", strTitleColor, "[" .. questInfo.level .. "CQ] ");
+								strMonkeyQuestBody = strMonkeyQuestBody .. format("%s%s|r", strTitleColor, "[" .. questInfo.level .. "C] ");
 
 							else
 								strMonkeyQuestBody = strMonkeyQuestBody .. format("%s%s|r", strTitleColor, "[" .. questInfo.level .. "] ");
diff --git a/MonkeyQuest/MonkeyQuest.toc b/MonkeyQuest/MonkeyQuest.toc
index 371a553..0145a1c 100644
--- a/MonkeyQuest/MonkeyQuest.toc
+++ b/MonkeyQuest/MonkeyQuest.toc
@@ -1,9 +1,8 @@
 ## Interface: 100002
-## Title: MonkeyQuest v10.0.2.2
+## Title: MonkeyQuest v10.0.2.3
 ## Notes: Displays your quests for quick viewing. (http://www.toctastic.net/)
 ## Notes-deDE: Stellt Quests in einer kompakten Uebersicht dar. (http://www.toctastic.net/)
 ## Author: Trentin, Jim-Bim, azuraji
 ## SavedVariables: MonkeyQuestConfig
 ## Dependencies: MonkeyLibrary
-## OptionalDeps: aftt_extreme, BhaldieInfoBar
 MonkeyQuest.xml
diff --git a/MonkeyQuest/MonkeyQuestDefs.lua b/MonkeyQuest/MonkeyQuestDefs.lua
index a408b24..6a9ef31 100644
--- a/MonkeyQuest/MonkeyQuestDefs.lua
+++ b/MonkeyQuest/MonkeyQuestDefs.lua
@@ -40,6 +40,7 @@ MONKEYQUEST_DEFAULT_COLOURTITLE				= false;
 MONKEYQUEST_DEFAULT_FONTHEIGHT				= 12;
 MONKEYQUEST_DEFAULT_FONT					= 0;
 MONKEYQUEST_DEFAULT_CRASHFONT				= false;
+MONKEYQUEST_DEFAULT_HIDEHIDDENQUESTS				= false;
 MONKEYQUEST_DEFAULT_CRASHBORDER				= false;
 MONKEYQUEST_DEFAULT_LOCKBIB					= false;
 MONKEYQUEST_DEFAULT_QUESTTITLECOLOUR		= "|cFFFFFFFF";
diff --git a/MonkeyQuest/MonkeyQuestInit.lua b/MonkeyQuest/MonkeyQuestInit.lua
index 5d46903..8d58fb2 100644
--- a/MonkeyQuest/MonkeyQuestInit.lua
+++ b/MonkeyQuest/MonkeyQuestInit.lua
@@ -143,6 +143,11 @@ function MonkeyQuestInit_LoadConfig()
 		MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bCrashFont = MONKEYQUEST_DEFAULT_CRASHFONT;
 	end
 
+	-- Hide hidden quests
+	if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideHiddenQuests == nil) then
+		MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideHiddenQuests = MONKEYQUEST_DEFAULT_HIDEHIDDENQUESTS;
+	end
+
 	-- Golden border
 	if (MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bCrashBorder == nil) then
 		MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bCrashBorder = MONKEYQUEST_DEFAULT_CRASHBORDER;
@@ -173,12 +178,6 @@ function MonkeyQuestInit_LoadConfig()
 		MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bLockBIB = MONKEYQUEST_DEFAULT_LOCKBIB;
 	end
 	
-	-- force unlocked from bib if there is no bib
-	if (not IsAddOnLoaded("BhaldieInfoBar") and MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bLockBIB == true) then
-		MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bLockBIB = false;
-		MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_strAnchor = "ANCHOR_TOPLEFT";
-	end
-
 	-- All variables are loaded now
 	MonkeyQuest.m_bLoaded = true;
 	
@@ -215,8 +214,7 @@ function MonkeyQuestInit_CleanQuestList()
 			MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[strQuestLogTitleText].m_bChecked = true;
 		end
 			
-		MonkeyQuest.m_aQuestList[strQuestLogTitleText].m_bChecked = 
-			MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[strQuestLogTitleText].m_bChecked;
+		MonkeyQuest.m_aQuestList[strQuestLogTitleText].m_bChecked = MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_aQuestList[strQuestLogTitleText].m_bChecked;
 	end
 	
 	-- clean up the config hidden list
@@ -294,6 +292,7 @@ function MonkeyQuestInit_ResetConfig()
 	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowTooltipObjectives = MONKEYQUEST_DEFAULT_SHOWTOOLTIPOBJECTIVES;
 	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideTitleButtons = MONKEYQUEST_DEFAULT_HIDETITLEBUTTONS;
 	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideTitle = MONKEYQUEST_DEFAULT_HIDETITLE;
+	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideHiddenQuests = MONKEYQUEST_DEFAULT_HIDEHIDDENQUESTS;
 	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bWorkComplete = MONKEYQUEST_DEFAULT_WORKCOMPLETE;
 	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bColourTitle = MONKEYQUEST_DEFAULT_COLOURTITLE;
 
@@ -304,9 +303,6 @@ function MonkeyQuestInit_ResetConfig()
 	-- noob tips
 	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bShowNoobTips = MONKEYQUEST_DEFAULT_SHOWNOOBTIPS;
 	
-	-- BhaldieInfoBar
-	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bLockBIB = MONKEYQUEST_DEFAULT_LOCKBIB;
-
 	-- colours
 	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_strQuestTitleColour = MONKEYQUEST_DEFAULT_QUESTTITLECOLOUR;
 	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_strHeaderOpenColour = MONKEYQUEST_DEFAULT_HEADEROPENCOLOUR;
diff --git a/MonkeyQuest/MonkeyQuestSlash.lua b/MonkeyQuest/MonkeyQuestSlash.lua
index ae1b3fa..3db1734 100644
--- a/MonkeyQuest/MonkeyQuestSlash.lua
+++ b/MonkeyQuest/MonkeyQuestSlash.lua
@@ -660,6 +660,16 @@ function MonkeyQuestSlash_CmdWorkComplete(bWork)
 	end
 end
 
+function MonkeyQuestSlash_CmdHideHiddenQuests(bHide)
+	MonkeyQuestConfig[MonkeyQuest.m_strPlayer].m_bHideHiddenQuests = bHide;
+	MonkeyQuest_Refresh();
+
+	-- check for MonkeyBuddy
+	if (MonkeyBuddyQuestFrame_Refresh ~= nil) then
+		MonkeyBuddyQuestFrame_Refresh();
+	end
+end
+
 function MonkeyQuestSlash_ToggleDisplay()
 	-- if not loaded yet then get out
 	if (MonkeyQuest.m_bLoaded == false) then
diff --git a/MonkeyQuest/MonkeyQuestTooltip.lua b/MonkeyQuest/MonkeyQuestTooltip.lua
index f49f6cc..f9fa009 100644
--- a/MonkeyQuest/MonkeyQuestTooltip.lua
+++ b/MonkeyQuest/MonkeyQuestTooltip.lua
@@ -1,13 +1,3 @@
--- this function catches the aftooltip extreme function for setting the mouse over unit's name
-function MonkeyQuest_NEW_aftt_setName(unit)
-	--return false;
-
-    -- call the original aftt setName function
-    --MonkeyQuest_OLD_aftt_setName(unit);
-
-    -- Overwrite the aftt text with the quest objective completeness, if needed
-   -- MonkeyQuest_SearchTooltip();
-end
 
 -- this function catches the bag mouse over tooltip event
 function YourSetBagItem(self, bag, slot)
@@ -116,12 +106,6 @@ function MonkeyQuest_SearchQuestListItem(strSearch)
             -- found it!
             --DEFAULT_CHAT_FRAME:AddMessage(key .. " == " .. strSearch .. " i= " .. i .. " j= " .. j);
 
-            if (aftt_textline1 ~= nil) then
-                -- aftootip is loaded, set the text for it
-                aftt_textline1:SetText(strSearch .. " " .. MONKEYQUEST_TOOLTIP_QUESTITEM .. " " .. value.m_iNumItems .. "/" .. value.m_iNumNeeded);
-                --DEFAULT_CHAT_FRAME:AddMessage("aftt hack");
-            end
-
             -- TODO: calculate the completeness colour
             local colourTip = {a = 1.0, r = 1.0, g = 1.0, b = 1.0};
             
diff --git a/MonkeyQuestLog/MonkeyQuestLog.toc b/MonkeyQuestLog/MonkeyQuestLog.toc
index f0fa2ff..b5e6c08 100644
--- a/MonkeyQuestLog/MonkeyQuestLog.toc
+++ b/MonkeyQuestLog/MonkeyQuestLog.toc
@@ -1,5 +1,5 @@
 ## Interface: 100002
-## Title: MonkeyQuestLog v10.0.2.1
+## Title: MonkeyQuestLog v10.0.2.3
 ## Notes: Replacement Quest Log. (http://www.toctastic.net/)
 ## Notes-deDE: Ersetzt den Questlog. (http://www.toctastic.net/)
 ## Author: Trentin, Jim-Bim, azuraji