Mercurial > wow > askmrrobot

changeset 118:5cb881417bbf v55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added Antorus to auto-logging.
author yellowfive
date Fri, 24 Nov 2017 19:46:27 -0800
parents 35fec08d69b9
children cd521552e277
files AskMrRobot-Serializer/AskMrRobot-Serializer.lua AskMrRobot.toc Constants.lua Export.lua localization/enUS.lua localization/frFR.lua localization/itIT.lua localization/ruRU.lua
diffstat 8 files changed, 22 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Wed Oct 04 11:18:33 2017 -0700
+++ b/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Fri Nov 24 19:46:27 2017 -0800
@@ -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", 54
+local MAJOR, MINOR = "AskMrRobot-Serializer", 55
 local Amr, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not Amr then return end -- already loaded by something else
@@ -150,7 +150,8 @@
 	EmeraldNightmare = 1520,
 	Nighthold = 1530,
 	TrialOfValor = 1648,
-	TombOfSargeras = 1676
+	TombOfSargeras = 1676,
+	Antorus = 1712
 }
 
 -- instances that AskMrRobot currently supports logging for
@@ -158,7 +159,8 @@
 	[1520] = true,
 	[1530] = true,
 	[1648] = true,
-	[1676] = true
+	[1676] = true,
+	[1712] = true
 }
 
 -- just to make life easier, maps ID of each artifact weapon to the spec number (1-4)
--- a/AskMrRobot.toc	Wed Oct 04 11:18:33 2017 -0700
+++ b/AskMrRobot.toc	Fri Nov 24 19:46:27 2017 -0800
@@ -1,7 +1,7 @@
 ## Interface: 70300
 ## Title: Ask Mr. Robot
 ## Author: Team Robot, Inc.
-## Version: 54
+## Version: 55
 ## Notes: Gear import/export, combat logging, and more.
 ## URL: www.askmrrobot.com
 ## SavedVariables: AskMrRobotDb3
--- a/Constants.lua	Wed Oct 04 11:18:33 2017 -0700
+++ b/Constants.lua	Fri Nov 24 19:46:27 2017 -0800
@@ -107,7 +107,7 @@
 }
 
 -- instance IDs ordered in preferred display order
-Amr.InstanceIdsOrdered = { 1520, 1530, 1676, 1648 }
+Amr.InstanceIdsOrdered = { 1520, 1530, 1648, 1676, 1712 }
 
 Amr.Difficulties = {
 	Lfr = 17,
--- a/Export.lua	Wed Oct 04 11:18:33 2017 -0700
+++ b/Export.lua	Fri Nov 24 19:46:27 2017 -0800
@@ -351,11 +351,12 @@
 	if spec then
 	
 		-- sometimes this event can fire when no crucible data is available, don't overwrite non-blank crucible data with blank crucible data
+		local badEquipped = false
 		if Amr.db.char.Artifacts[spec] then
 			local oldCrucible = Amr.db.char.Artifacts[spec].Crucible
 			if oldCrucible then
 				if #oldCrucible.Equipped > 0 and oldCrucible.Equipped[1] and not equipped[1] then
-					return
+					badEquipped = true
 				end
 			end
 		end
@@ -374,7 +375,11 @@
 		end		
 		
 		local crucible = dataz.Crucible		
-		crucible.Equipped = equipped
+		
+		if not badEquipped then
+			crucible.Equipped = equipped
+		end
+		
 		if preview then
 			local previewKey = {}
 			table.insert(previewKey, preview.ItemLink)
--- a/localization/enUS.lua	Wed Oct 04 11:18:33 2017 -0700
+++ b/localization/enUS.lua	Fri Nov 24 19:46:27 2017 -0800
@@ -88,7 +88,8 @@
 	[1520] = "Emerald Nightmare",
 	[1530] = "Nighthold",
 	[1648] = "Trial of Valor",
-	[1676] = "Tomb of Sargeras"
+	[1676] = "Tomb of Sargeras",
+	[1712] = "Antorus"
 }
 
 L.DifficultyNames = {
--- a/localization/frFR.lua	Wed Oct 04 11:18:33 2017 -0700
+++ b/localization/frFR.lua	Fri Nov 24 19:46:27 2017 -0800
@@ -88,7 +88,8 @@
 	[1520] = "Emerald Nightmare",
 	[1530] = "Nighthold",
 	[1648] = "Trial of Valor",
-	[1676] = "Tomb of Sargeras"
+	[1676] = "Tomb of Sargeras",
+	[1712] = "Antorus"
 }
 
 L.DifficultyNames = {
--- a/localization/itIT.lua	Wed Oct 04 11:18:33 2017 -0700
+++ b/localization/itIT.lua	Fri Nov 24 19:46:27 2017 -0800
@@ -88,7 +88,8 @@
 	[1520] = "Emerald Nightmare",
 	[1530] = "Nighthold",
 	[1648] = "Trial of Valor",
-	[1676] = "Tomb of Sargeras"
+	[1676] = "Tomb of Sargeras",
+	[1712] = "Antorus"
 }
 
 L.DifficultyNames = {
--- a/localization/ruRU.lua	Wed Oct 04 11:18:33 2017 -0700
+++ b/localization/ruRU.lua	Fri Nov 24 19:46:27 2017 -0800
@@ -88,7 +88,8 @@
 	[1520] = "Emerald Nightmare",
 	[1530] = "Nighthold",
 	[1648] = "Trial of Valor",
-	[1676] = "Tomb of Sargeras"
+	[1676] = "Tomb of Sargeras",
+	[1712] = "Antorus"
 }
 
 L.DifficultyNames = {