Mercurial > wow > askmrrobot

changeset 93:177391341e26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added back in automatic combat logging feature, useful for upload to any log site
author yellowfive
date Wed, 21 Sep 2016 11:25:11 -0700
parents 18327cfec09f
children adec0972d4e1
files AskMrRobot-Serializer/AskMrRobot-Serializer.lua AskMrRobot.toc CombatLog.lua Constants.lua localization/enUS.lua localization/frFR.lua localization/itIT.lua localization/ruRU.lua ui/Ui.lua
diffstat 9 files changed, 17 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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
--- 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,
--- 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)
--- 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 = {
--- 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 = {
--- 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 = {
--- 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"}
 	})