# HG changeset patch # User yellowfive # Date 1435622747 25200 # Node ID 932885bb1a6f218153ccf3b0c6b154ff100c99d7 # Parent d6e0fd0ce57feb0efb7d239afbe75380a3eb3e36 bug fix to gear swapping, fixed font issue with asian regions diff -r d6e0fd0ce57f -r 932885bb1a6f AskMrRobot-Serializer/AskMrRobot-Serializer.lua --- 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 diff -r d6e0fd0ce57f -r 932885bb1a6f AskMrRobot.toc --- 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 diff -r d6e0fd0ce57f -r 932885bb1a6f Gear.lua --- 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() diff -r d6e0fd0ce57f -r 932885bb1a6f ui/Ui.lua --- 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)