Quantcast

5.0.71

Steven Jackson [10-20-14 - 01:06]
5.0.71
Filename
Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
Interface/AddOns/SVUI/packages/dock/SVDock.lua
Interface/AddOns/SVUI/packages/unit/frames.lua
Interface/AddOns/SVUI/scripts/mounts.lua
diff --git a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
index 77e3a1d..b653c98 100644
--- a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
+++ b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
@@ -363,7 +363,7 @@ local function LiveProfileChange()
             CoreObject.db      = db

             local cache        = setmetatable({}, meta_database)
-            cache.data         = PROFILE_SV.STORED[SOURCE_KEY]
+            cache.data         = CACHE_SV.STORED[SOURCE_KEY]
             wipe(CoreObject.cache)
             CoreObject.cache   = cache

diff --git a/Interface/AddOns/SVUI/packages/dock/SVDock.lua b/Interface/AddOns/SVUI/packages/dock/SVDock.lua
index 767c479..870a325 100644
--- a/Interface/AddOns/SVUI/packages/dock/SVDock.lua
+++ b/Interface/AddOns/SVUI/packages/dock/SVDock.lua
@@ -599,17 +599,20 @@ function MOD:CreateDockPanels()
 	local topanchor = CreateFrame("Frame", "SuperDockTopDataAnchor", SV.UIParent)
 	topanchor:Size(topWidth - 2, buttonsize - 8)
 	topanchor:Point("LEFT", toolbarTop, "RIGHT", spacing, 0)
+
 	SV:AddToDisplayAudit(topanchor)

 	local topleftdata = CreateFrame("Frame", "TopLeftDataPanel", topanchor)
 	topleftdata:Size((topWidth * 0.5) - 1, buttonsize - 8)
 	topleftdata:Point("LEFT", topanchor, "LEFT", 0, 0)
 	STATS:NewAnchor(topleftdata, 3, "ANCHOR_CURSOR", true)
+	SV.Mentalo:Add(topleftdata, L["Stats Dock 1"])

 	local toprightdata = CreateFrame("Frame", "TopRightDataPanel", topanchor)
 	toprightdata:Size((topWidth * 0.5) - 1, buttonsize - 8)
 	toprightdata:Point("RIGHT", topanchor, "RIGHT", 0, 0)
 	STATS:NewAnchor(toprightdata, 3, "ANCHOR_CURSOR", true)
+	SV.Mentalo:Add(toprightdata, L["Stats Dock 2"])

 	--BOTTOM STAT HOLDERS
 	local bottomanchor = CreateFrame("Frame", "SuperDockBottomDataAnchor", SV.UIParent)
@@ -621,11 +624,13 @@ function MOD:CreateDockPanels()
 	bottomleftdata:Size((statBarWidth * 0.5) - 1, buttonsize - 8)
 	bottomleftdata:Point("LEFT", bottomanchor, "LEFT", 0, 0)
 	STATS:NewAnchor(bottomleftdata, 3, "ANCHOR_CURSOR")
+	SV.Mentalo:Add(bottomleftdata, L["Stats Dock 3"])

 	local bottomrightdata = CreateFrame("Frame", "BottomRightDataPanel", bottomanchor)
 	bottomrightdata:Size((statBarWidth * 0.5) - 1, buttonsize - 8)
 	bottomrightdata:Point("RIGHT", bottomanchor, "RIGHT", 0, 0)
 	STATS:NewAnchor(bottomrightdata, 3, "ANCHOR_CURSOR")
+	SV.Mentalo:Add(bottomrightdata, L["Stats Dock 4"])

 	--RIGHT CLICK MENU
 	DockletMenu:SetParent(SV.UIParent)
diff --git a/Interface/AddOns/SVUI/packages/unit/frames.lua b/Interface/AddOns/SVUI/packages/unit/frames.lua
index aaefd68..2413c7d 100644
--- a/Interface/AddOns/SVUI/packages/unit/frames.lua
+++ b/Interface/AddOns/SVUI/packages/unit/frames.lua
@@ -1122,14 +1122,14 @@ local Raid10Visibility = function(self, event)
     if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end

     local instance, instanceType = IsInInstance()
-    local _, _, _, raidType, _, _, isDynamic, _, maxPlayers = GetInstanceInfo()
+    local _, _, _, raidType, maxPlayers, _, isDynamic, _, activePlayers = GetInstanceInfo()
     if(event == "PLAYER_REGEN_ENABLED") then
         self:UnregisterEvent("PLAYER_REGEN_ENABLED")
     end
     if not InCombatLockdown() then
         if(instance and (instanceType == "raid")) then
             UnregisterStateDriver(self, "visibility")
-            if(maxPlayers == 10) then
+            if((maxPlayers and maxPlayers == 10) or (activePlayers and activePlayers < 11)) then
                 self:Show()
             else
                 self:Hide()
@@ -1148,14 +1148,14 @@ local Raid25Visibility = function(self, event)
     if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end

     local instance, instanceType = IsInInstance()
-    local _, _, _, raidType, _, _, isDynamic, _, maxPlayers = GetInstanceInfo()
+    local _, _, _, raidType, maxPlayers, _, isDynamic, _, activePlayers = GetInstanceInfo()
     if event == "PLAYER_REGEN_ENABLED"then
         self:UnregisterEvent("PLAYER_REGEN_ENABLED")
     end
     if not InCombatLockdown()then
         if(instance and (instanceType == "raid")) then
             UnregisterStateDriver(self, "visibility")
-            if(maxPlayers > 10 and maxPlayers < 40) then
+            if((maxPlayers and (maxPlayers > 10 and maxPlayers < 26)) or (activePlayers and (activePlayers > 10 and activePlayers < 26))) then
                 self:Show()
             else
                 self:Hide()
@@ -1174,14 +1174,14 @@ local Raid40Visibility = function(self, event)
     if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end

     local instance, instanceType = IsInInstance()
-    local _, _, _, raidType, _, _, isDynamic, _, maxPlayers = GetInstanceInfo()
+    local _, _, _, raidType, maxPlayers, _, isDynamic, _, activePlayers = GetInstanceInfo()
     if event == "PLAYER_REGEN_ENABLED"then
         self:UnregisterEvent("PLAYER_REGEN_ENABLED")
     end
     if not InCombatLockdown()then
         if(instance and (instanceType == "raid")) then
             UnregisterStateDriver(self, "visibility")
-            if(maxPlayers == 40) then
+            if((maxPlayers and maxPlayers > 25) or (activePlayers and activePlayers > 25)) then
                 self:Show()
             else
                 self:Hide()
diff --git a/Interface/AddOns/SVUI/scripts/mounts.lua b/Interface/AddOns/SVUI/scripts/mounts.lua
index b51b4cc..d1f0278 100644
--- a/Interface/AddOns/SVUI/scripts/mounts.lua
+++ b/Interface/AddOns/SVUI/scripts/mounts.lua
@@ -385,6 +385,16 @@ _G.SVUILetsRide = function()
 		return
 	end

+	SV.cache.Mounts = SV.cache.Mounts or {}
+	if not SV.cache.Mounts.types then
+		SV.cache.Mounts.types = {
+			["GROUND"] = false,
+			["FLYING"] = false,
+			["SWIMMING"] = false,
+			["SPECIAL"] = false
+		}
+	end
+
 	local checkList = SV.cache.Mounts.types
 	local letsFly = IsFlyableArea()
 	local letsSwim = IsSwimming()