Mercurial > wow > askmrrobot

changeset 67:932885bb1a6f v26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bug fix to gear swapping, fixed font issue with asian regions
author yellowfive
date Mon, 29 Jun 2015 17:05:47 -0700
parents d6e0fd0ce57f
children 6c523f147709
files AskMrRobot-Serializer/AskMrRobot-Serializer.lua AskMrRobot.toc Gear.lua ui/Ui.lua
diffstat 4 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Fri Jun 26 10:43:14 2015 -0700
+++ b/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Mon Jun 29 17:05:47 2015 -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", 25
+local MAJOR, MINOR = "AskMrRobot-Serializer", 26
 local Amr, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not Amr then return end -- already loaded by something else
--- a/AskMrRobot.toc	Fri Jun 26 10:43:14 2015 -0700
+++ b/AskMrRobot.toc	Mon Jun 29 17:05:47 2015 -0700
@@ -1,7 +1,7 @@
 ## Interface: 60200
 ## Title: Ask Mr. Robot
 ## Author: Team Robot, Inc.
-## Version: 25
+## Version: 26
 ## Notes: Gear import/export, combat logging, and more.
 ## URL: www.askmrrobot.com
 ## SavedVariables: AskMrRobotDb2
--- a/Gear.lua	Fri Jun 26 10:43:14 2015 -0700
+++ b/Gear.lua	Mon Jun 29 17:05:47 2015 -0700
@@ -532,9 +532,9 @@
 	end
 	
 	-- bank
-	bestItem, bestDiff = scanBagForItem(item, BANK_CONTAINER, bestItem, bestDiff, bestLink)
+	bestItem, bestDiff, bestLink = scanBagForItem(item, BANK_CONTAINER, bestItem, bestDiff, bestLink)
 	for bagId = NUM_BAG_SLOTS + 1, NUM_BAG_SLOTS + NUM_BANKBAGSLOTS do
-		bestItem, bestDiff = scanBagForItem(item, bagId, bestItem, bestDiff, bestLink)
+		bestItem, bestDiff, bestLink = scanBagForItem(item, bagId, bestItem, bestDiff, bestLink)
 	end
 	
 	ClearCursor()
--- a/ui/Ui.lua	Fri Jun 26 10:43:14 2015 -0700
+++ b/ui/Ui.lua	Mon Jun 29 17:05:47 2015 -0700
@@ -60,7 +60,12 @@
 end
 
 local function getFontPath(style)
-	return "Interface\\AddOns\\" .. Amr.ADDON_NAME .. "\\Media\\Ubuntu-" .. style .. ".ttf"
+	local region = Amr.RegionNames[GetCurrentRegion()]
+	if region == "KR" or region == "CN" or region == "TW" then
+		return "Fonts\\FRIZQT__.TTF"
+	else
+		return "Interface\\AddOns\\" .. Amr.ADDON_NAME .. "\\Media\\Ubuntu-" .. style .. ".ttf"
+	end
 end
 
 -- create a font with the specified style (Regular, Bold, Italic), size (pixels, max of 32), color (object with R, G, B), and alpha (if not specified, defaults to 1)