diff --git a/Bindings.xml b/Bindings.xml index 8cacc98..033b99a 100644 --- a/Bindings.xml +++ b/Bindings.xml @@ -1,9 +1,9 @@ - if not REFlex:IsVisible() then - REFlex:Show() + if not REFlexFrame:IsVisible() then + REFlexFrame:Show() else - REFlex:Hide() + REFlexFrame:Hide() end diff --git a/LICENSE.txt b/LICENSE.txt index dea2283..414e47c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,2 +1,2 @@ All Rights Reserved unless otherwise explicitly stated. -Copyright (c) 2013-2017 Paweł Jastrzębski +Copyright (c) 2013-2018 Paweł Jastrzębski diff --git a/Libs/LibBabble-Race-3.0/LibBabble-Race-3.0.lua b/Libs/LibBabble-Race-3.0/LibBabble-Race-3.0.lua index f47db0f..6b93125 100644 --- a/Libs/LibBabble-Race-3.0/LibBabble-Race-3.0.lua +++ b/Libs/LibBabble-Race-3.0/LibBabble-Race-3.0.lua @@ -1,6 +1,6 @@ --[[ Name: LibBabble-Race-3.0 -Revision: $Rev: 92 $ +Revision: $Rev: 96 $ Maintainers: ckknight, nevcairiel, Ackis Website: http://www.wowace.com/projects/libbabble-race-3-0/ Dependencies: None @@ -8,7 +8,7 @@ License: MIT ]] local MAJOR_VERSION = "LibBabble-Race-3.0" -local MINOR_VERSION = 90000 + tonumber(("$Rev: 92 $"):match("%d+")) +local MINOR_VERSION = 90000 + tonumber(("$Rev: 96 $"):match("%d+")) if not LibStub then error(MAJOR_VERSION .. " requires LibStub.") end local lib = LibStub("LibBabble-3.0"):New(MAJOR_VERSION, MINOR_VERSION) @@ -19,6 +19,8 @@ local GAME_LOCALE = GetLocale() lib:SetBaseTranslations { ["Blood Elf"] = "Blood Elf", ["Blood elves"] = "Blood elves", + ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "Draenei", ["Draenei_PL"] = "Draenei", ["Dwarf"] = "Dwarf", @@ -29,11 +31,17 @@ lib:SetBaseTranslations { ["Gnomes"] = "Gnomes", ["Goblin"] = "Goblin", ["Goblins"] = "Goblins", + ["Highmountain Tauren"] = "Highmountain Tauren", + ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "Human", ["Humans"] = "Humans", ["Imp"] = "Imp", + ["Lightforged Draenei"] = "Lightforged Draenei", + ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "Night Elf", ["Night elves"] = "Night elves", + ["Nightborne"] = "Nightborne", + ["Nightborne_PL"] = "Nightborne", ["Orc"] = "Orc", ["Orcs"] = "Orcs", ["Pandaren"] = "Pandaren", @@ -45,9 +53,13 @@ lib:SetBaseTranslations { ["Trolls"] = "Trolls", ["Undead"] = "Undead", ["Undead_PL"] = "Undead", + ["Void Elf"] = "Void Elf", + ["Void elves"] = "Void elves", ["Voidwalker"] = "Voidwalker", ["Worgen"] = "Worgen", - ["Worgen_PL"] = "Worgen" + ["Worgen_PL"] = "Worgen", + ["Zandalari Troll"] = "Zandalari Troll", + ["Zandalari Trolls"] = "Zandalari Trolls" } if GAME_LOCALE == "enUS" then @@ -57,6 +69,10 @@ elseif GAME_LOCALE == "deDE" then lib:SetCurrentTranslations { ["Blood Elf"] = "Blutelf", ["Blood elves"] = "Blutelfen", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "Draenei", ["Draenei_PL"] = "Draenei", ["Dwarf"] = "Zwerg", @@ -67,11 +83,23 @@ elseif GAME_LOCALE == "deDE" then ["Gnomes"] = "Gnome", ["Goblin"] = "Goblin", ["Goblins"] = "Goblins", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "Mensch", ["Humans"] = "Menschen", ["Imp"] = "Wichtel", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "Nachtelf", ["Night elves"] = "Nachtelfen", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "Orc", ["Orcs"] = "Orcs", ["Pandaren"] = "Pandaren", @@ -83,14 +111,26 @@ elseif GAME_LOCALE == "deDE" then ["Trolls"] = "Trolle", ["Undead"] = "Untoter", ["Undead_PL"] = "Untote", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "Leerwandler", ["Worgen"] = "Worgen", - ["Worgen_PL"] = "Worgen" + ["Worgen_PL"] = "Worgen", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } elseif GAME_LOCALE == "frFR" then lib:SetCurrentTranslations { ["Blood Elf"] = "Elfe de sang", ["Blood elves"] = "Elfes de sang", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "Draeneï", ["Draenei_PL"] = "Draeneï", ["Dwarf"] = "Nain", @@ -101,11 +141,23 @@ elseif GAME_LOCALE == "frFR" then ["Gnomes"] = "Gnomes", ["Goblin"] = "Gobelin", ["Goblins"] = "Gobelins", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "Humain", ["Humans"] = "Humains", ["Imp"] = "Diablotin", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "Elfe de la nuit", ["Night elves"] = "Elfes de la nuit", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "Orc", ["Orcs"] = "Orcs", ["Pandaren"] = "Pandaren", @@ -117,14 +169,26 @@ elseif GAME_LOCALE == "frFR" then ["Trolls"] = "Trolls", ["Undead"] = "Mort-vivant", ["Undead_PL"] = "Morts-vivants", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "Marcheur du Vide", ["Worgen"] = "Worgen", - ["Worgen_PL"] = "Worgens" + ["Worgen_PL"] = "Worgens", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } elseif GAME_LOCALE == "koKR" then lib:SetCurrentTranslations { ["Blood Elf"] = "블러드 엘프", ["Blood elves"] = "블러드 엘프", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "드레나이", ["Draenei_PL"] = "드레나이", ["Dwarf"] = "드워프", @@ -135,11 +199,23 @@ elseif GAME_LOCALE == "koKR" then ["Gnomes"] = "노움", ["Goblin"] = "고블린", ["Goblins"] = "고블린", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "인간", ["Humans"] = "인간", ["Imp"] = "임프", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "나이트 엘프", ["Night elves"] = "나이트 엘프", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "오크", ["Orcs"] = "오크", ["Pandaren"] = "판다렌", @@ -151,14 +227,26 @@ elseif GAME_LOCALE == "koKR" then ["Trolls"] = "트롤", ["Undead"] = "언데드", ["Undead_PL"] = "언데드", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "보이드워커", ["Worgen"] = "늑대인간", - ["Worgen_PL"] = "늑대인간" + ["Worgen_PL"] = "늑대인간", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } elseif GAME_LOCALE == "esES" then lib:SetCurrentTranslations { ["Blood Elf"] = "Elfo de sangre", ["Blood elves"] = "Elfos de sangre", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "Draenei", ["Draenei_PL"] = "Draenei", ["Dwarf"] = "Enano", @@ -169,11 +257,23 @@ elseif GAME_LOCALE == "esES" then ["Gnomes"] = "Gnomos", ["Goblin"] = "Goblin", ["Goblins"] = "Goblins", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "Humano", ["Humans"] = "Humanos", ["Imp"] = "Diablillo", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "Elfo de la noche", ["Night elves"] = "Elfos de la noche", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "Orco", ["Orcs"] = "Orcos", ["Pandaren"] = "Pandaren", @@ -185,14 +285,26 @@ elseif GAME_LOCALE == "esES" then ["Trolls"] = "Trols", ["Undead"] = "No-muerto", ["Undead_PL"] = "No-muertos", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "Abisario", ["Worgen"] = "Huargen", - ["Worgen_PL"] = "Huargen" + ["Worgen_PL"] = "Huargen", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } elseif GAME_LOCALE == "esMX" then lib:SetCurrentTranslations { ["Blood Elf"] = "Elfo de Sangre", ["Blood elves"] = "Elfos de sangre", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "Draenei", ["Draenei_PL"] = "Draenei", ["Dwarf"] = "Enano", @@ -203,11 +315,23 @@ elseif GAME_LOCALE == "esMX" then ["Gnomes"] = "Gnomos", ["Goblin"] = "Goblin", ["Goblins"] = "Goblins", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "Humano", ["Humans"] = "Humanos", ["Imp"] = "Diablillo", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "Elfo de la noche", ["Night elves"] = "Elfos de la noche", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "Orco", ["Orcs"] = "Orcos", ["Pandaren"] = "Pandaren", @@ -219,14 +343,26 @@ elseif GAME_LOCALE == "esMX" then ["Trolls"] = "Trols", ["Undead"] = "No-muerto", ["Undead_PL"] = "No-muertos", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "Abisario", ["Worgen"] = "Huargen", - ["Worgen_PL"] = "Huargen" + ["Worgen_PL"] = "Huargen", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } elseif GAME_LOCALE == "ptBR" then lib:SetCurrentTranslations { ["Blood Elf"] = "Elfo Sangrento", ["Blood elves"] = "Elfos Sangrentos", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "Draenei", ["Draenei_PL"] = "Draeneis", ["Dwarf"] = "Anão", @@ -237,11 +373,23 @@ elseif GAME_LOCALE == "ptBR" then ["Gnomes"] = "Gnomos", ["Goblin"] = "Goblin", ["Goblins"] = "Goblins", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "Humano", ["Humans"] = "Humanos", ["Imp"] = "Diabrete", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "Elfo Noturno", ["Night elves"] = "Elfos Noturnos", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "Orc", ["Orcs"] = "Orcs", ["Pandaren"] = "Pandaren", @@ -253,14 +401,26 @@ elseif GAME_LOCALE == "ptBR" then ["Trolls"] = "Trolls", ["Undead"] = "Renegado", ["Undead_PL"] = "Renegados", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "Emissário do Caos", ["Worgen"] = "Worgen", - ["Worgen_PL"] = "Worgens" + ["Worgen_PL"] = "Worgens", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } elseif GAME_LOCALE == "itIT" then lib:SetCurrentTranslations { ["Blood Elf"] = "Elfo del Sangue", ["Blood elves"] = "Elfi del Sangue", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "Draenei", ["Draenei_PL"] = "Draenei", ["Dwarf"] = "Nano", @@ -271,11 +431,23 @@ elseif GAME_LOCALE == "itIT" then ["Gnomes"] = "Gnomi", ["Goblin"] = "Goblin", ["Goblins"] = "Goblins", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "Umano", ["Humans"] = "Umani", ["Imp"] = "Folletto", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "Elfo della Notte", ["Night elves"] = "Elfi della Notte", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "Orco", ["Orcs"] = "Orchi", ["Pandaren"] = "Pandaren", @@ -287,14 +459,26 @@ elseif GAME_LOCALE == "itIT" then ["Trolls"] = "Trolls", ["Undead"] = "Non Morto", ["Undead_PL"] = "Non Morti", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "Ombra del Vuoto", ["Worgen"] = "Worgen", - ["Worgen_PL"] = "Worgens" + ["Worgen_PL"] = "Worgens", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } elseif GAME_LOCALE == "ruRU" then lib:SetCurrentTranslations { ["Blood Elf"] = "Эльф крови", ["Blood elves"] = "Эльфы крови", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "Дреней", ["Draenei_PL"] = "Дренеи", ["Dwarf"] = "Дворф", @@ -305,11 +489,23 @@ elseif GAME_LOCALE == "ruRU" then ["Gnomes"] = "Гномы", ["Goblin"] = "Гоблин", ["Goblins"] = "Гоблины", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "Человек", ["Humans"] = "Люди", ["Imp"] = "Бес", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "Ночной эльф", ["Night elves"] = "Ночные эльфы", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "Орк", ["Orcs"] = "Орки", ["Pandaren"] = "Пандарен", @@ -321,14 +517,26 @@ elseif GAME_LOCALE == "ruRU" then ["Trolls"] = "Тролли", ["Undead"] = "Нежить", ["Undead_PL"] = "Нежить", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "Демон Бездны", ["Worgen"] = "Ворген", - ["Worgen_PL"] = "Воргены" + ["Worgen_PL"] = "Воргены", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } elseif GAME_LOCALE == "zhCN" then lib:SetCurrentTranslations { ["Blood Elf"] = "血精灵", ["Blood elves"] = "血精灵", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "德莱尼", ["Draenei_PL"] = "德莱尼", ["Dwarf"] = "矮人", @@ -339,11 +547,23 @@ elseif GAME_LOCALE == "zhCN" then ["Gnomes"] = "侏儒", ["Goblin"] = "地精", ["Goblins"] = "地精", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "人类", ["Humans"] = "人类", ["Imp"] = "小鬼", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "暗夜精灵", ["Night elves"] = "暗夜精灵", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "兽人", ["Orcs"] = "兽人", ["Pandaren"] = "熊猫人", @@ -355,14 +575,26 @@ elseif GAME_LOCALE == "zhCN" then ["Trolls"] = "巨魔", ["Undead"] = "亡灵", ["Undead_PL"] = "亡灵", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "虚空行者", ["Worgen"] = "狼人", - ["Worgen_PL"] = "狼人" + ["Worgen_PL"] = "狼人", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } elseif GAME_LOCALE == "zhTW" then lib:SetCurrentTranslations { ["Blood Elf"] = "血精靈", ["Blood elves"] = "血精靈", + --Translation missing + -- ["Dark Iron Dwarf"] = "Dark Iron Dwarf", + --Translation missing + -- ["Dark Iron Dwarves"] = "Dark Iron Dwarves", ["Draenei"] = "德萊尼", ["Draenei_PL"] = "德萊尼", ["Dwarf"] = "矮人", @@ -373,11 +605,23 @@ elseif GAME_LOCALE == "zhTW" then ["Gnomes"] = "地精", ["Goblin"] = "哥布林", ["Goblins"] = "哥布林", + --Translation missing + -- ["Highmountain Tauren"] = "Highmountain Tauren", + --Translation missing + -- ["Highmountain Tauren_PL"] = "Highmountain Tauren", ["Human"] = "人類", ["Humans"] = "人類", ["Imp"] = "小鬼", + --Translation missing + -- ["Lightforged Draenei"] = "Lightforged Draenei", + --Translation missing + -- ["Lightforged Draenei_PL"] = "Lightforged Draenei", ["Night Elf"] = "夜精靈", ["Night elves"] = "夜精靈", + --Translation missing + -- ["Nightborne"] = "Nightborne", + --Translation missing + -- ["Nightborne_PL"] = "Nightborne", ["Orc"] = "獸人", ["Orcs"] = "獸人", ["Pandaren"] = "熊貓人", @@ -389,9 +633,17 @@ elseif GAME_LOCALE == "zhTW" then ["Trolls"] = "食人妖", ["Undead"] = "不死族", ["Undead_PL"] = "不死族", + --Translation missing + -- ["Void Elf"] = "Void Elf", + --Translation missing + -- ["Void elves"] = "Void elves", ["Voidwalker"] = "虛無行者", ["Worgen"] = "狼人", - ["Worgen_PL"] = "狼人" + ["Worgen_PL"] = "狼人", + --Translation missing + -- ["Zandalari Troll"] = "Zandalari Troll", + --Translation missing + -- ["Zandalari Trolls"] = "Zandalari Trolls" } else error(("%s: Locale %q not supported"):format(MAJOR_VERSION, GAME_LOCALE)) diff --git a/README.md b/README.md index bd7c3d1..e239e3b 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,4 @@ All Rights Reserved unless otherwise explicitly stated. -Copyright (c) 2013-2017 Paweł Jastrzębski +Copyright (c) 2013-2018 Paweł Jastrzębski diff --git a/REFlex.lua b/REFlex.lua index abceaa6..b7aba6d 100644 --- a/REFlex.lua +++ b/REFlex.lua @@ -1,7 +1,5 @@ local _G = _G -_G.REFlexNamespace = {["Settings"] = {}, ["Database"] = {}} - -local RE = REFlexNamespace +local _, RE = ... local L = LibStub("AceLocale-3.0"):GetLocale("REFlex") local ST = LibStub("ScrollingTable") local GUI = LibStub("AceGUI-3.0") @@ -10,6 +8,7 @@ local LDBI = LibStub("LibDBIcon-1.0") local TOAST = LibStub("LibToast-1.0") local QTIP = LibStub("LibQTip-1.0") local DUMP = LibStub("LibTextDump-1.0") +_G.REFlex = RE local tinsert = _G.table.insert local mfloor = _G.math.floor @@ -51,7 +50,7 @@ local RequestRatedInfo = _G.RequestRatedInfo local InterfaceOptionsFrame_OpenToCategory = _G.InterfaceOptionsFrame_OpenToCategory local TimerAfter = _G.C_Timer.After -RE.Version = 236 +RE.Version = 237 RE.FoundNewVersion = false RE.DataSaved = false @@ -75,27 +74,27 @@ function RE:OnLoad(self) self:RegisterEvent("CHAT_MSG_ADDON") self:RegisterEvent("PVP_RATED_STATS_UPDATE") self:RegisterForDrag("LeftButton") - tinsert(_G.UISpecialFrames,"REFlex") + tinsert(_G.UISpecialFrames,"REFlexFrame") - _G.REFlexTab1:SetText(_G.ALL) - _G.REFlexTab2:SetText(_G.PVP_TAB_HONOR) - _G.REFlexTab3:SetText(_G.PVP_TAB_CONQUEST) - _G.REFlexTab4:SetText(_G.ALL) - _G.REFlexTab5:SetText(_G.PVP_TAB_HONOR) - _G.REFlexTab6:SetText(_G.PVP_TAB_CONQUEST) + _G.REFlexFrameTab1:SetText(_G.ALL) + _G.REFlexFrameTab2:SetText(_G.PVP_TAB_HONOR) + _G.REFlexFrameTab3:SetText(_G.PVP_TAB_CONQUEST) + _G.REFlexFrameTab4:SetText(_G.ALL) + _G.REFlexFrameTab5:SetText(_G.PVP_TAB_HONOR) + _G.REFlexFrameTab6:SetText(_G.PVP_TAB_CONQUEST) - _G.REFlex_Title:SetText("REFlex "..tostring(RE.Version):gsub(".", "%1."):sub(1,-2)) - _G.REFlex_HKBar_I:SetStatusBarTexture("Interface\\TargetingFrame\\UI-StatusBar") - _G.REFlex_HKBar_I:SetStatusBarColor(0, 0.9, 0) + _G.REFlexFrame_Title:SetText("REFlex "..tostring(RE.Version):gsub(".", "%1."):sub(1,-2)) + _G.REFlexFrame_HKBar_I:SetStatusBarTexture("Interface\\TargetingFrame\\UI-StatusBar") + _G.REFlexFrame_HKBar_I:SetStatusBarColor(0, 0.9, 0) - RE.TableBG = ST:CreateST(RE.BGStructure, 30, nil, nil, _G.REFlex) + RE.TableBG = ST:CreateST(RE.BGStructure, 30, nil, nil, _G.REFlexFrame) RE.TableBG.head:SetHeight(25) for _, i in pairs({1,3,5,7,9}) do - local _, parent = _G.REFlexNamespace.TableBG.frame["col"..i.."bg"]:GetPoint(1) - _G.REFlexNamespace.TableBG.frame["col"..i.."bg"]:SetPoint("TOPLEFT", parent, "BOTTOMLEFT", 0, -9) - _G.REFlexNamespace.TableBG.frame["col"..i.."bg"]:SetPoint("TOPRIGHT", parent, "BOTTOMRIGHT", 0, -9) + local _, parent = RE.TableBG.frame["col"..i.."bg"]:GetPoint(1) + RE.TableBG.frame["col"..i.."bg"]:SetPoint("TOPLEFT", parent, "BOTTOMLEFT", 0, -9) + RE.TableBG.frame["col"..i.."bg"]:SetPoint("TOPRIGHT", parent, "BOTTOMRIGHT", 0, -9) end - RE.TableBG.frame:SetPoint("TOP", _G.REFlex_ScoreHolder, "BOTTOM", 0, -15) + RE.TableBG.frame:SetPoint("TOP", _G.REFlexFrame_ScoreHolder, "BOTTOM", 0, -15) RE.TableBG.frame:Hide() RE.TableBG:RegisterEvents({ ["OnClick"] = function (_, _, data, _, _, realRow, _, _, button, _) @@ -115,8 +114,8 @@ function RE:OnLoad(self) end end, }) - RE.TableArena = ST:CreateST(RE.ArenaStructure, 18, 25, nil, _G.REFlex) - RE.TableArena.frame:SetPoint("TOP", _G.REFlex_ScoreHolder, "BOTTOM", 0, -15) + RE.TableArena = ST:CreateST(RE.ArenaStructure, 18, 25, nil, _G.REFlexFrame) + RE.TableArena.frame:SetPoint("TOP", _G.REFlexFrame_ScoreHolder, "BOTTOM", 0, -15) RE.TableArena.frame:Hide() RE.TableArena:RegisterEvents({ ["OnClick"] = function (_, _, data, _, _, realRow, _, _, button, _) @@ -138,24 +137,24 @@ function RE:OnLoad(self) }) RE.SpecDropDown = GUI:Create("Dropdown") - RE.SpecDropDown.frame:SetParent(_G.REFlex) - RE.SpecDropDown.frame:SetPoint("BOTTOMLEFT", _G.REFlex, "BOTTOMLEFT", 15, 18) + RE.SpecDropDown.frame:SetParent(_G.REFlexFrame) + RE.SpecDropDown.frame:SetPoint("BOTTOMLEFT", _G.REFlexFrame, "BOTTOMLEFT", 15, 18) RE.SpecDropDown:SetWidth(150) RE.SpecDropDown:SetList({[_G.ALL] = _G.ALL}) RE.SpecDropDown:SetCallback("OnValueChanged", RE.OnSpecChange) RE.BracketDropDown = GUI:Create("Dropdown") - RE.BracketDropDown.frame:SetParent(_G.REFlex) + RE.BracketDropDown.frame:SetParent(_G.REFlexFrame) RE.BracketDropDown.frame:SetPoint("LEFT", RE.SpecDropDown.frame, "RIGHT", 5, 0) RE.BracketDropDown:SetWidth(100) RE.BracketDropDown:SetCallback("OnValueChanged", RE.OnBracketChange) RE.BracketDropDown:SetList({[1] = _G.ALL, [4] = "2v2", [6] = "3v3"}) RE.MapDropDown = GUI:Create("Dropdown") - RE.MapDropDown.frame:SetParent(_G.REFlex) - RE.MapDropDown.frame:SetPoint("BOTTOMRIGHT", _G.REFlex, "BOTTOMRIGHT", -19, 18) + RE.MapDropDown.frame:SetParent(_G.REFlexFrame) + RE.MapDropDown.frame:SetPoint("BOTTOMRIGHT", _G.REFlexFrame, "BOTTOMRIGHT", -19, 18) RE.MapDropDown:SetWidth(150) RE.MapDropDown:SetCallback("OnValueChanged", RE.OnMapChange) RE.DateDropDown = GUI:Create("Dropdown") - RE.DateDropDown.frame:SetParent(_G.REFlex) + RE.DateDropDown.frame:SetParent(_G.REFlexFrame) RE.DateDropDown.frame:SetPoint("RIGHT", RE.MapDropDown.frame, "LEFT", -5, 0) RE.DateDropDown:SetWidth(100) RE.DateDropDown:SetCallback("OnValueChanged", RE.OnDateChange) @@ -176,8 +175,8 @@ function RE:OnEvent(_, event, ...) RE:UpdateDatabase() RE:HiddenPurge() - PanelTemplates_SetNumTabs(_G.REFlex, 6) - PanelTemplates_SetTab(_G.REFlex, RE.Settings.CurrentTab) + PanelTemplates_SetNumTabs(_G.REFlexFrame, 6) + PanelTemplates_SetTab(_G.REFlexFrame, RE.Settings.CurrentTab) _G.LibStub("AceConfigRegistry-3.0"):RegisterOptionsTable("REFlex", RE.AceConfig) RE.OptionsMenu = _G.LibStub("AceConfigDialog-3.0"):AddToBlizOptions("REFlex", "REFlex") @@ -211,16 +210,17 @@ function RE:OnEvent(_, event, ...) icon = "Interface\\PvPRankBadges\\PvPRank09", OnClick = function(_, button, _) if button == "LeftButton" then - if not _G.REFlex:IsVisible() then - _G.REFlex:Show() + if not _G.REFlexFrame:IsVisible() then + _G.REFlexFrame:Show() else - _G.REFlex:Hide() + _G.REFlexFrame:Hide() end elseif button == "RightButton" then _G.InterfaceOptionsFrame:Show() - InterfaceOptionsFrame_OpenToCategory(_G.REFlexNamespace.OptionsMenu) + InterfaceOptionsFrame_OpenToCategory(RE.OptionsMenu) end - end}) + end + }) LDBI:Register("REFlex", RE.LDB, RE.Settings.MiniMapButtonSettings) _G.StaticPopupDialogs["REFLEX_FIRSTTIME"] = { @@ -494,7 +494,7 @@ function RE:UpdateGUI() RE.BracketDropDown:SetValue(RE.Settings.Filters.Bracket) RE.DateDropDown:SetValue(RE.Settings.Filters.DateMode) end - if PanelTemplates_GetSelectedTab(_G.REFlex) < 4 then + if PanelTemplates_GetSelectedTab(_G.REFlexFrame) < 4 then RE.TableBG.frame:Show() RE.TableArena.frame:Hide() RE.BracketDropDown:SetDisabled(true) @@ -512,34 +512,34 @@ function RE:UpdateGUI() RE.TableBG.cols[1].sort = "asc" end RE.TableBG:SetData(RE.BGData, true) - if PanelTemplates_GetSelectedTab(_G.REFlex) == 1 then + if PanelTemplates_GetSelectedTab(_G.REFlexFrame) == 1 then RE.TableBG:SetFilter(RE.FilterDefault) - _G.REFlex_ScoreHolder_RBG:SetText("|cFFFFD100".._G.RATING..":|r "..select(1, GetPersonalRatedInfo(4))) - elseif PanelTemplates_GetSelectedTab(_G.REFlex) == 2 then + _G.REFlexFrame_ScoreHolder_RBG:SetText("|cFFFFD100".._G.RATING..":|r "..select(1, GetPersonalRatedInfo(4))) + elseif PanelTemplates_GetSelectedTab(_G.REFlexFrame) == 2 then RE.TableBG:SetFilter(RE.FilterCasual) - _G.REFlex_ScoreHolder_RBG:SetText("") - elseif PanelTemplates_GetSelectedTab(_G.REFlex) == 3 then + _G.REFlexFrame_ScoreHolder_RBG:SetText("") + elseif PanelTemplates_GetSelectedTab(_G.REFlexFrame) == 3 then RE.TableBG:SetFilter(RE.FilterRated) - _G.REFlex_ScoreHolder_RBG:SetText("|cFFFFD100".._G.RATING..":|r "..select(1, GetPersonalRatedInfo(4))) + _G.REFlexFrame_ScoreHolder_RBG:SetText("|cFFFFD100".._G.RATING..":|r "..select(1, GetPersonalRatedInfo(4))) end - local won, lost = RE:GetWinNumber(PanelTemplates_GetSelectedTab(_G.REFlex), false) - local kb, topKB, hk, topHK, _, _, damage, topDamage, healing, topHealing = RE:GetStats(PanelTemplates_GetSelectedTab(_G.REFlex), false, false) - _G.REFlex_ScoreHolder_HK1:SetText("|cFFFFD100HK|r") - _G.REFlex_ScoreHolder_KB1:SetText("|cFFFFD100KB|r") - _G.REFlex_ScoreHolder_Damage1:SetText("|cFFFFD100".._G.DAMAGE.."|r") - _G.REFlex_ScoreHolder_Healing1:SetText("|cFFFFD100".._G.SHOW_COMBAT_HEALING.."|r") - _G.REFlex_ScoreHolder_Wins:SetText(won) - _G.REFlex_ScoreHolder_Lose:SetText(lost) - _G.REFlex_ScoreHolder_HK2:SetText(_G.BEST..": "..topHK) - _G.REFlex_ScoreHolder_HK3:SetText(_G.TOTAL..": "..hk) - _G.REFlex_ScoreHolder_KB2:SetText(_G.BEST..": "..topKB) - _G.REFlex_ScoreHolder_KB3:SetText(_G.TOTAL..": "..kb) - _G.REFlex_ScoreHolder_Damage2:SetText(_G.BEST..": "..RE:AbbreviateNumbers(topDamage)) - _G.REFlex_ScoreHolder_Damage3:SetText(_G.TOTAL..": "..RE:AbbreviateNumbers(damage)) - _G.REFlex_ScoreHolder_Healing2:SetText(_G.BEST..": "..RE:AbbreviateNumbers(topHealing)) - _G.REFlex_ScoreHolder_Healing3:SetText(_G.TOTAL..": "..RE:AbbreviateNumbers(healing)) + local won, lost = RE:GetWinNumber(PanelTemplates_GetSelectedTab(_G.REFlexFrame), false) + local kb, topKB, hk, topHK, _, _, damage, topDamage, healing, topHealing = RE:GetStats(PanelTemplates_GetSelectedTab(_G.REFlexFrame), false, false) + _G.REFlexFrame_ScoreHolder_HK1:SetText("|cFFFFD100HK|r") + _G.REFlexFrame_ScoreHolder_KB1:SetText("|cFFFFD100KB|r") + _G.REFlexFrame_ScoreHolder_Damage1:SetText("|cFFFFD100".._G.DAMAGE.."|r") + _G.REFlexFrame_ScoreHolder_Healing1:SetText("|cFFFFD100".._G.SHOW_COMBAT_HEALING.."|r") + _G.REFlexFrame_ScoreHolder_Wins:SetText(won) + _G.REFlexFrame_ScoreHolder_Lose:SetText(lost) + _G.REFlexFrame_ScoreHolder_HK2:SetText(_G.BEST..": "..topHK) + _G.REFlexFrame_ScoreHolder_HK3:SetText(_G.TOTAL..": "..hk) + _G.REFlexFrame_ScoreHolder_KB2:SetText(_G.BEST..": "..topKB) + _G.REFlexFrame_ScoreHolder_KB3:SetText(_G.TOTAL..": "..kb) + _G.REFlexFrame_ScoreHolder_Damage2:SetText(_G.BEST..": "..RE:AbbreviateNumbers(topDamage)) + _G.REFlexFrame_ScoreHolder_Damage3:SetText(_G.TOTAL..": "..RE:AbbreviateNumbers(damage)) + _G.REFlexFrame_ScoreHolder_Healing2:SetText(_G.BEST..": "..RE:AbbreviateNumbers(topHealing)) + _G.REFlexFrame_ScoreHolder_Healing3:SetText(_G.TOTAL..": "..RE:AbbreviateNumbers(healing)) RE:HKBarUpdate() - elseif PanelTemplates_GetSelectedTab(_G.REFlex) > 3 then + elseif PanelTemplates_GetSelectedTab(_G.REFlexFrame) > 3 then RE.TableArena.frame:Show() RE.TableBG.frame:Hide() RE.BracketDropDown:SetDisabled(false) @@ -557,34 +557,34 @@ function RE:UpdateGUI() RE.TableArena.cols[1].sort = "asc" end RE.TableArena:SetData(RE.ArenaData, true) - if PanelTemplates_GetSelectedTab(_G.REFlex) == 4 then + if PanelTemplates_GetSelectedTab(_G.REFlexFrame) == 4 then RE.TableArena:SetFilter(RE.FilterDefault) - _G.REFlex_ScoreHolder_RBG:SetText("|cFFFFD100".._G.RATING..":|r "..select(1, GetPersonalRatedInfo(1)).." |cFFFFD100/|r "..select(1, GetPersonalRatedInfo(2))) - elseif PanelTemplates_GetSelectedTab(_G.REFlex) == 5 then + _G.REFlexFrame_ScoreHolder_RBG:SetText("|cFFFFD100".._G.RATING..":|r "..select(1, GetPersonalRatedInfo(1)).." |cFFFFD100/|r "..select(1, GetPersonalRatedInfo(2))) + elseif PanelTemplates_GetSelectedTab(_G.REFlexFrame) == 5 then RE.TableArena:SetFilter(RE.FilterCasual) - _G.REFlex_ScoreHolder_RBG:SetText("") - elseif PanelTemplates_GetSelectedTab(_G.REFlex) == 6 then + _G.REFlexFrame_ScoreHolder_RBG:SetText("") + elseif PanelTemplates_GetSelectedTab(_G.REFlexFrame) == 6 then RE.TableArena:SetFilter(RE.FilterRated) - _G.REFlex_ScoreHolder_RBG:SetText("|cFFFFD100".._G.RATING..":|r "..select(1, GetPersonalRatedInfo(1)).." |cFFFFD100/|r "..select(1, GetPersonalRatedInfo(2))) + _G.REFlexFrame_ScoreHolder_RBG:SetText("|cFFFFD100".._G.RATING..":|r "..select(1, GetPersonalRatedInfo(1)).." |cFFFFD100/|r "..select(1, GetPersonalRatedInfo(2))) end - local won, lost = RE:GetWinNumber(PanelTemplates_GetSelectedTab(_G.REFlex) - 3, true) - local _, _, _, _, _, _, damage, topDamage, healing, topHealing = RE:GetStats(PanelTemplates_GetSelectedTab(_G.REFlex) - 3, true, false) - _G.REFlex_ScoreHolder_HK1:SetText("|cFFFFD100".._G.SHOW_COMBAT_HEALING.."|r") - _G.REFlex_ScoreHolder_KB1:SetText("|cFFFFD100".._G.DAMAGE.."|r") - _G.REFlex_ScoreHolder_Damage1:SetText("") - _G.REFlex_ScoreHolder_Healing1:SetText("") - _G.REFlex_ScoreHolder_Wins:SetText(won) - _G.REFlex_ScoreHolder_Lose:SetText(lost) - _G.REFlex_ScoreHolder_HK2:SetText(_G.BEST..": "..RE:AbbreviateNumbers(topHealing)) - _G.REFlex_ScoreHolder_HK3:SetText(_G.TOTAL..": "..RE:AbbreviateNumbers(healing)) - _G.REFlex_ScoreHolder_KB2:SetText(_G.BEST..": "..RE:AbbreviateNumbers(topDamage)) - _G.REFlex_ScoreHolder_KB3:SetText(_G.TOTAL..": "..RE:AbbreviateNumbers(damage)) - _G.REFlex_ScoreHolder_Damage2:SetText("") - _G.REFlex_ScoreHolder_Damage3:SetText("") - _G.REFlex_ScoreHolder_Healing2:SetText("") - _G.REFlex_ScoreHolder_Healing3:SetText("") + local won, lost = RE:GetWinNumber(PanelTemplates_GetSelectedTab(_G.REFlexFrame) - 3, true) + local _, _, _, _, _, _, damage, topDamage, healing, topHealing = RE:GetStats(PanelTemplates_GetSelectedTab(_G.REFlexFrame) - 3, true, false) + _G.REFlexFrame_ScoreHolder_HK1:SetText("|cFFFFD100".._G.SHOW_COMBAT_HEALING.."|r") + _G.REFlexFrame_ScoreHolder_KB1:SetText("|cFFFFD100".._G.DAMAGE.."|r") + _G.REFlexFrame_ScoreHolder_Damage1:SetText("") + _G.REFlexFrame_ScoreHolder_Healing1:SetText("") + _G.REFlexFrame_ScoreHolder_Wins:SetText(won) + _G.REFlexFrame_ScoreHolder_Lose:SetText(lost) + _G.REFlexFrame_ScoreHolder_HK2:SetText(_G.BEST..": "..RE:AbbreviateNumbers(topHealing)) + _G.REFlexFrame_ScoreHolder_HK3:SetText(_G.TOTAL..": "..RE:AbbreviateNumbers(healing)) + _G.REFlexFrame_ScoreHolder_KB2:SetText(_G.BEST..": "..RE:AbbreviateNumbers(topDamage)) + _G.REFlexFrame_ScoreHolder_KB3:SetText(_G.TOTAL..": "..RE:AbbreviateNumbers(damage)) + _G.REFlexFrame_ScoreHolder_Damage2:SetText("") + _G.REFlexFrame_ScoreHolder_Damage3:SetText("") + _G.REFlexFrame_ScoreHolder_Healing2:SetText("") + _G.REFlexFrame_ScoreHolder_Healing3:SetText("") end - RE.Settings.CurrentTab = PanelTemplates_GetSelectedTab(_G.REFlex) + RE.Settings.CurrentTab = PanelTemplates_GetSelectedTab(_G.REFlexFrame) end function RE:UpdateBGData(all) diff --git a/REFlex.toc b/REFlex.toc index 453cbc1..79601ad 100644 --- a/REFlex.toc +++ b/REFlex.toc @@ -1,7 +1,7 @@ ## Interface: 70300 ## Title: |cFF74D06CRE|rFlex ## Notes: Collect statistics of played arena matches and battlegrounds. -## Version: 2.3.6 +## Version: 2.3.7 ## Author: AcidWeb ## SavedVariablesPerCharacter: REFlexSettings, REFlexDatabase diff --git a/REFlex.xml b/REFlex.xml index b9565a5..85945f5 100644 --- a/REFlex.xml +++ b/REFlex.xml @@ -5,11 +5,11 @@