wow/askmrrobot: CombatLog.lua comparison

comparison CombatLog.lua @ 91:b8e9664d3229 v43

option to disable equipment manager sets, minor artifact/talent bug fixes

author	yellowfive
date	Wed, 21 Sep 2016 00:14:22 -0700
parents	6bbe64d587b4
children	177391341e26

comparison

equal deleted inserted replaced

-:db63475ef5d4
+:b8e9664d3229
 	btnReload:SetHeight(26)
 	btnReload:SetPoint("TOPLEFT", _btnToggle.frame, "TOPRIGHT", 40, 0)
 	btnReload:SetCallback("OnClick", ReloadUI)
 	container:AddChild(btnReload)
+	--[[
 	local lbl = AceGUI:Create("AmrUiLabel")
 	lbl:SetText(L.LogReloadNote)
 	lbl:SetWidth(200)
 	lbl:SetFont(Amr.CreateFont("Italic", 14, Amr.Colors.TextTan))
 	lbl:SetJustifyH("MIDDLE")
 	btnWipe:SetWidth(200)
 	btnWipe:SetHeight(26)
 	btnWipe:SetPoint("TOPRIGHT", btnUndoWipe.frame, "TOPLEFT", -40, 0)
 	btnWipe:SetCallback("OnClick", function() Amr:Wipe() end)
 	container:AddChild(btnWipe)
 	lbl = AceGUI:Create("AmrUiLabel")
 	lbl:SetText(L.LogWipeNote)
 	lbl:SetWidth(200)
 	lbl:SetFont(Amr.CreateFont("Italic", 14, Amr.Colors.TextTan))
 	lbl:SetJustifyH("MIDDLE")
 	lbl2:SetWidth(200)
 	lbl2:SetFont(Amr.CreateFont("Italic", 14, Amr.Colors.TextTan))
 	lbl2:SetJustifyH("MIDDLE")
 	lbl2:SetPoint("TOP", lbl.frame, "BOTTOM", 0, -2)
 	container:AddChild(lbl2)
+	]]
 	-- auto-logging controls
-	lbl = AceGUI:Create("AmrUiLabel")
+	local lbl = AceGUI:Create("AmrUiLabel")
 	lbl:SetWidth(600)
 	lbl:SetText(L.LogAutoTitle)
 	lbl:SetFont(Amr.CreateFont("Bold", 24, Amr.Colors.TextHeaderActive))
-	lbl:SetPoint("TOPLEFT", lbl2.frame, "BOTTOMLEFT", 0, -40)
+	lbl:SetPoint("TOPLEFT", _btnToggle.frame, "BOTTOMLEFT", 0, -40)
 	container:AddChild(lbl)
 	_chkAutoAll = AceGUI:Create("AmrUiCheckBox")
 	_chkAutoAll:SetText(L.LogAutoAllText)
 	_chkAutoAll:SetPoint("TOPLEFT", lbl.frame, "BOTTOMLEFT", 1, -15)
 		table.insert(autoChks, autoChk)
 	end
 	autoSections = nil
 	-- instructions
+	--[[
 	lbl = AceGUI:Create("AmrUiLabel")
 	lbl:SetText(L.LogInstructionsTitle)
 	lbl:SetWidth(480)
 	lbl:SetFont(Amr.CreateFont("Italic", 24, Amr.Colors.Text))
 	lbl:SetPoint("TOPRIGHT", container.content, "TOPRIGHT", 0, -40)
 	lbl2:SetText(L.LogInstructions)
 	lbl2:SetWidth(480)
 	lbl2:SetFont(Amr.CreateFont("Italic", 14, Amr.Colors.Text))
 	lbl2:SetPoint("TOPLEFT", lbl.frame, "BOTTOMLEFT", 0, -10)
 	container:AddChild(lbl2)
+	]]
 	-- initialize state of controls
 	Amr:RefreshLogUi()
 end
 	end
 	Amr.db.char.Logging.LastZone = zone
 	Amr.db.char.Logging.LastDiff = difficultyId
+	if not Amr.db.profile.Logging.Auto[tonumber(instanceId)] then
+		Amr.db.profile.Logging.Auto[tonumber(instanceId)] = {}
+	end
 	if Amr.IsSupportedInstanceId(instanceId) and Amr.db.profile.Logging.Auto[tonumber(instanceId)][tonumber(difficultyId)] then
 		-- we are in a supported zone that we want to auto-log, turn logging on
 		-- (supported check is probably redundant, but just in case someone has old settings lying around)
 		if not Amr:IsLogging() then
 	end
 	_lblLogging:SetVisible(self:IsLogging())
 	-- hide/show undo wipe button based on whether a wipe has been called recently
-	_panelUndoWipe:SetVisible(Amr.db.char.Logging.LastWipe and true or false)
+	if _panelUndoWipe then
+		_panelUndoWipe:SetVisible(Amr.db.char.Logging.LastWipe and true or false)
+	end
 	local all = isAllAutoLoggingEnabled()
 	_chkAutoAll:SetChecked(all)
 	for i, instanceId in ipairs(Amr.InstanceIdsOrdered) do
+		if not Amr.db.profile.Logging.Auto[instanceId] then
+			Amr.db.profile.Logging.Auto[instanceId] = {}
+		end
 		for k, difficultyId in pairs(Amr.Difficulties) do
 			_autoChecks[instanceId][difficultyId]:SetChecked(Amr.db.profile.Logging.Auto[instanceId][difficultyId])
 		end
 	end
 end
 	end
 end
 function Amr:StartLogging()
+	--[[
 	local now = time()
 	local oldDuration = 60 * 60 * 24 * 10
 	-- prune out entries in log data that are more than 10 days old
 	-- delete the last wipe date if it is more than 10 days old
 	if Amr.db.char.Logging.LastWipe and difftime(now, Amr.db.char.Logging.LastWipe) > oldDuration then
 		Amr.db.char.Logging.LastWipe = nil
 	end
+	]]
 	-- enable game log file
 	updateGameLogging(true)
 	Amr.db.char.Logging.Enabled = true
 	self:Print(L.LogChatStart)
 	self:UpdateMinimap()
 	self:RefreshLogUi()
 end
 function Amr:Wipe()
+	--[[
 	local t = time()
 	table.insert(Amr.db.global.Logging.Wipes, t)
 	Amr.db.char.Logging.LastWipe = t
 	self:Print(L.LogChatWipe(date('%I:%M %p', t)))
 	self:RefreshLogUi()
+	]]
 end
 function Amr:UndoWipe()
+	--[[
 	local t = Amr.db.char.Logging.LastWipe
 	local wipes = Amr.db.global.Logging.Wipes
 	if not t then
 		self:Print(L.LogChatNoWipes)
 		Amr.db.char.Logging.LastWipe = nil
 		self:Print(L.LogChatUndoWipe(date('%I:%M %p', t)))
 	end
 	self:RefreshLogUi()
+	]]
 end
 function Amr:ToggleAutoLog(instanceId, difficultyId)
 	local byDiff = Amr.db.profile.Logging.Auto[instanceId]
 	-- see if we should turn logging on right now
 	updateAutoLogging(true)
 end
 function Amr:ProcessPlayerSnapshot(msg)
+	--[[
 	if not self:IsLogging() then return end
 -- message will be of format: timestamp\nregion\nrealm\nname\n[stuff]
 local parts = {}
 	for part in string.gmatch(msg, "([^\n]+)") do
 	-- we only need to keep this setup if it is different than the previous
 	if setup ~= previousSetup then
 		playerList[timestamp] = setup
 	end
+	]]
 end
 -- read auras and pet mapping info (pet may not be necessary anymore... but doesn't hurt)
 local function getPlayerExtraData(data, unitId, petId)
+	--[[
 	local guid = UnitGUID(unitId)
 	if guid == nil then return end
 	local fields = {}
 realm = string.sub(name, splitPos + 1)
 name = string.sub(name, 1, splitPos - 1)
 end
 	data[region .. ":" .. realm .. ":" .. name] = table.concat(fields, ";")
+	]]
 end
 local function logPlayerExtraData()
+	--[[
 	if not Amr:IsLogging() or not Amr:IsSupportedInstance() then return end
 	local timestamp = time()
 local units = {}
 local petUnits = {}
 		if Amr.db.global.Logging.PlayerExtras[name] == nil then
 			Amr.db.global.Logging.PlayerExtras[name] = {}
 		end
 		Amr.db.global.Logging.PlayerExtras[name][timestamp] = val
 	end
+	]]
 end
 function Amr:InitializeCombatLog()
 	--updateAutoLogging()
 end
 --[[
 Amr:AddEventHandler("UPDATE_INSTANCE_INFO", updateAutoLogging)
 Amr:AddEventHandler("PLAYER_DIFFICULTY_CHANGED", updateAutoLogging)
 Amr:AddEventHandler("ENCOUNTER_START", updateAutoLogging)
-Amr:AddEventHandler("PLAYER_REGEN_DISABLED", logPlayerExtraData)
+--Amr:AddEventHandler("PLAYER_REGEN_DISABLED", logPlayerExtraData)
 ]]

Mercurial > wow > askmrrobot

comparison CombatLog.lua @ 91:b8e9664d3229 v43