# HG changeset patch
# User yellowfive
# Date 1474482311 25200
# Node ID 177391341e268f88da86713964b8494632bdc0e8
# Parent  18327cfec09f29597a8b3250c7fda2a6285f2e24
added back in automatic combat logging feature, useful for upload to any log site

diff -r 18327cfec09f -r 177391341e26 AskMrRobot-Serializer/AskMrRobot-Serializer.lua
--- a/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Wed Sep 21 00:14:34 2016 -0700
+++ b/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Wed Sep 21 11:25:11 2016 -0700
@@ -1,7 +1,7 @@
 -- AskMrRobot-Serializer will serialize and communicate character data between users.
 -- This is used primarily to associate character information to logs uploaded to askmrrobot.com.
 
-local MAJOR, MINOR = "AskMrRobot-Serializer", 43
+local MAJOR, MINOR = "AskMrRobot-Serializer", 44
 local Amr, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not Amr then return end -- already loaded by something else
@@ -147,14 +147,14 @@
 }
 
 Amr.InstanceIds = {
-	EmeraldNightmare = 1094,
+	EmeraldNightmare = 1520,
 	Nighthold = 1530
 }
 
 -- instances that AskMrRobot currently supports logging for
 Amr.SupportedInstanceIds = {
-	[1094] = true,
-	[1088] = true
+	[1520] = true,
+	[1530] = true
 }
 
 -- just to make life easier, maps ID of each artifact weapon to the spec number (1-4)
@@ -729,20 +729,11 @@
 
 -- returns true if this is an instance that AskMrRobot supports for logging
 function Amr.IsSupportedInstanceId(instanceMapID)
-	for k,v in pairs(Amr.SupportedInstanceIds) do
-		local instanceId = GetAreaMapInfo(k)
-		if instanceId == tonumber(instanceMapID) then
-			return true
-		end
-	end
-	return false
-	--[[
 	if Amr.SupportedInstanceIds[tonumber(instanceMapID)] then
 		return true
 	else
 		return false
 	end
-	]]
 end
 
 -- returns true if currently in a supported instance for logging
diff -r 18327cfec09f -r 177391341e26 AskMrRobot.toc
--- a/AskMrRobot.toc	Wed Sep 21 00:14:34 2016 -0700
+++ b/AskMrRobot.toc	Wed Sep 21 11:25:11 2016 -0700
@@ -1,7 +1,7 @@
 ## Interface: 70000
 ## Title: Ask Mr. Robot
 ## Author: Team Robot, Inc.
-## Version: 43
+## Version: 44
 ## Notes: Gear import/export, combat logging, and more.
 ## URL: www.askmrrobot.com
 ## SavedVariables: AskMrRobotDb3
diff -r 18327cfec09f -r 177391341e26 CombatLog.lua
--- a/CombatLog.lua	Wed Sep 21 00:14:34 2016 -0700
+++ b/CombatLog.lua	Wed Sep 21 11:25:11 2016 -0700
@@ -626,9 +626,7 @@
 	--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)
-]]
\ No newline at end of file
+--Amr:AddEventHandler("PLAYER_REGEN_DISABLED", logPlayerExtraData)
\ No newline at end of file
diff -r 18327cfec09f -r 177391341e26 Constants.lua
--- a/Constants.lua	Wed Sep 21 00:14:34 2016 -0700
+++ b/Constants.lua	Wed Sep 21 11:25:11 2016 -0700
@@ -107,7 +107,7 @@
 }
 
 -- instance IDs ordered in preferred display order
-Amr.InstanceIdsOrdered = { 1094, 1088 }
+Amr.InstanceIdsOrdered = { 1520, 1530 }
 
 Amr.Difficulties = {
 	Lfr = 17,
diff -r 18327cfec09f -r 177391341e26 localization/enUS.lua
--- a/localization/enUS.lua	Wed Sep 21 00:14:34 2016 -0700
+++ b/localization/enUS.lua	Wed Sep 21 11:25:11 2016 -0700
@@ -85,8 +85,8 @@
 }
 
 L.InstanceNames = {
-	[1094] = "Emerald Nightmare",
-	[1088] = "Nighthold"
+	[1520] = "Emerald Nightmare",
+	[1530] = "Nighthold"
 }
 
 L.DifficultyNames = {
@@ -258,7 +258,7 @@
 L.LogButtonWipeText = "Wipe!"
 L.LogButtonUndoWipeText = "Undo Wipe"
 
-L.LogNote = "You are currently logging combat and gear data."
+L.LogNote = "You are currently logging combat data."
 L.LogReloadNote = "Either exit WoW entirely, or reload your UI just before uploading a log file."
 L.LogWipeNote = "The person uploading the log must be the one to use this wipe command."
 L.LogWipeNote2 = function(cmd)
diff -r 18327cfec09f -r 177391341e26 localization/frFR.lua
--- a/localization/frFR.lua	Wed Sep 21 00:14:34 2016 -0700
+++ b/localization/frFR.lua	Wed Sep 21 11:25:11 2016 -0700
@@ -85,8 +85,8 @@
 }
 
 L.InstanceNames = {
-	[1094] = "Emerald Nightmare",
-	[1088] = "Nighthold"
+	[1520] = "Emerald Nightmare",
+	[1530] = "Nighthold"
 }
 
 L.DifficultyNames = {
diff -r 18327cfec09f -r 177391341e26 localization/itIT.lua
--- a/localization/itIT.lua	Wed Sep 21 00:14:34 2016 -0700
+++ b/localization/itIT.lua	Wed Sep 21 11:25:11 2016 -0700
@@ -85,8 +85,8 @@
 }
 
 L.InstanceNames = {
-	[1094] = "Emerald Nightmare",
-	[1088] = "Nighthold"
+	[1520] = "Emerald Nightmare",
+	[1530] = "Nighthold"
 }
 
 L.DifficultyNames = {
diff -r 18327cfec09f -r 177391341e26 localization/ruRU.lua
--- a/localization/ruRU.lua	Wed Sep 21 00:14:34 2016 -0700
+++ b/localization/ruRU.lua	Wed Sep 21 11:25:11 2016 -0700
@@ -85,8 +85,8 @@
 }
 
 L.InstanceNames = {
-	[1094] = "Emerald Nightmare",
-	[1088] = "Nighthold"
+	[1520] = "Emerald Nightmare",
+	[1530] = "Nighthold"
 }
 
 L.DifficultyNames = {
diff -r 18327cfec09f -r 177391341e26 ui/Ui.lua
--- a/ui/Ui.lua	Wed Sep 21 00:14:34 2016 -0700
+++ b/ui/Ui.lua	Wed Sep 21 11:25:11 2016 -0700
@@ -190,7 +190,7 @@
 	t:SetTabs({
 		{text=L.TabExportText, value="Export"}, 
 		{text=L.TabGearText, value="Gear"}, 
-		--{text=L.TabLogText, value="Log"}, 
+		{text=L.TabLogText, value="Log"}, 
 		{text=L.TabTeamText, value="Team"},
 		{text=L.TabOptionsText, value="Options"}
 	})