From 05d9cb81870b046c408155efb1d15a76fc316935 Mon Sep 17 00:00:00 2001 From: Godot-Fye <47419231+Godot-Fye@users.noreply.github.com> Date: Fri, 28 May 2021 09:23:10 +0200 Subject: [PATCH] First update for coming Burning Crusade Release - Updated TOC File for Burning Crusade 2.5.1 - Updated German & Russian Localization for Burning Crusade Fishing Zones - Updated the code to work with Burning Crusade --- Fishbringer.toc | 4 +-- Localization.deDE.lua | 14 +++++++-- Localization.ruRU.lua | 14 +++++++-- fishy.lua | 66 +++++++++++++++++++++++++++++-------------- 4 files changed, 71 insertions(+), 27 deletions(-) diff --git a/Fishbringer.toc b/Fishbringer.toc index 1fa87fc..46e9eb3 100755 --- a/Fishbringer.toc +++ b/Fishbringer.toc @@ -1,4 +1,4 @@ -## Interface: 11303 +## Interface: 20501 ## Title: Fishbringer ## Title-deDE: Fishbringer ## Title-ruRU: Fishbringer @@ -7,7 +7,7 @@ ## Notes-ruRU: The legendary Fishbringer, Guide of the Scarlet Highlord! Nat Pagle would be proud of you! ## Author: Kalerath, Fye (Localization Code & Bugfixes), leafoe (Russian Localization) ## SavedVariables: FishbringerDB -## Version: 1.13-4 +## Version: 1.20 localization.core.lua Localization.deDE.lua diff --git a/Localization.deDE.lua b/Localization.deDE.lua index e4d884b..95bea10 100644 --- a/Localization.deDE.lua +++ b/Localization.deDE.lua @@ -68,7 +68,7 @@ if namespace.locale == "deDE" then L["Swamp of Sorrows"] = "Sümpfe des Elends" L["Thousand Needles"] = "Tausend Nadeln" L["Azshara"] = "Azshara" - L["Teufelswald"] = "Felwood" + L["Felwood"] = "Teufelswald" L["Feralas"] = "Feralas" L["The Hinterlands"] = "Hinterland" L["Maraudon"] = "Maraudon" @@ -78,7 +78,6 @@ if namespace.locale == "deDE" then L["Un'Goro Crater"] = "Un'Goro-Krater" L["Western Plaguelands"] = "Westliche Pestländer" L["Shadowmoon Valley"] = "Schattenmondtal" - L["Zangarmarsh"] = "Zangarmarschen" L["Burning Steppes"] = "Brennende Steppe" L["Deadwind Pass"] = "Gebirgspass der Todenwinde" L["Eastern Plaguelands"] = "Östliche Pestländer" @@ -87,9 +86,20 @@ if namespace.locale == "deDE" then L["Stratholme"] = "Stratholme" L["Winterspring"] = "Winterspring" L["Zul'Gurub"] = "Zul'Gurub" + --- Burning Crusade L["Terokkar Forest"] = "Wälder von Terokkar" L["Nagrand"] = "Nagrand" L["Netherstorm"] = "Nethersturm" + L["Zangarmarsh"] = "Zangarmarschen" + -- Burning Crusade Subzones + L["Lake Sunspring"] = "Lake Sunspring" -- Nagrand + L["Marshlight Lake"] = "Sumpflichtsee" -- Zangarmarschen + L["Sporewind Lake"] = "Sporenwindsee" -- Zangarmarschen + L["Serpent Lake"] = "Schlangensee" -- Zangarmarschen + L["Blackwind Lake"] = "Schattenwindsee" -- Wälder von Terokarr + L["Lake Ere'Noru"] = "See von Ere'Noru" -- Wälder von Terokarr + L["Lake Jorune"] = "Jorunsee" -- Wälder von Terokarr + --- WOTLK L["Borean Tundra"] = "Boreanische Tundra" L["Dragonblight"] = "Drachenöde" L["Howling Fjord"] = "Heulende Fjord" diff --git a/Localization.ruRU.lua b/Localization.ruRU.lua index a1845c7..684274f 100644 --- a/Localization.ruRU.lua +++ b/Localization.ruRU.lua @@ -77,7 +77,6 @@ if namespace.locale == "ruRU" then L["Un'Goro Crater"] = "Кратер Ун'Горо" L["Western Plaguelands"] = "Западные Чумные земли" L["Shadowmoon Valley"] = "Долина Призрачной Луны" - L["Zangarmarsh"] = "Зангартопь" L["Burning Steppes"] = "Пылающие степи" L["Deadwind Pass"] = "Перевал Мертвого Ветра" L["Eastern Plaguelands"] = "Восточные Чумные земли" @@ -86,16 +85,27 @@ if namespace.locale == "ruRU" then L["Stratholme"] = "Стратхольм" L["Winterspring"] = "Зимние Ключи" L["Zul'Gurub"] = "Зул'Гуруб" + -- The Burning Crusade L["Terokkar Forest"] = "Лес Тероккар" L["Nagrand"] = "Награнд" L["Netherstorm"] = "Пустоверть" + L["Zangarmarsh"] = "Зангартопь" + -- Burning Crusade Subzones + L["Lake Sunspring"] = "Озеро Солнечного Источника" -- Nagrand + L["Marshlight Lake"] = "Озеро Болотных Огоньков" -- Zangarmarschen + L["Sporewind Lake"] = "Озеро Спороветра" -- Zangarmarschen + L["Serpent Lake"] = "Змеиное озеро" -- Zangarmarschen + L["Blackwind Lake"] = "Озеро Черного Ветра" -- Wälder von Terokarr + L["Lake Ere'Noru"] = "Озеро Эре'Нору" -- Wälder von Terokarr + L["Lake Jorune"] = "Озеро Иорун" -- Wälder von Terokarr + -- Wrath of the Lich King L["Borean Tundra"] = "Борейская тундра" L["Dragonblight"] = "Драконий Погост" L["Howling Fjord"] = "Ревущий фьорд" L["Crystalsong Forest"] = "Лес Хрустальной Песни" L["Dalaran"] = "Даларан" L["Sholazar Basin"] = "Низина Шолазар" - L["The Frozen Sea"] = "The Frozen Sea" + L["The Frozen Sea"] = "Ледяное море" return end diff --git a/fishy.lua b/fishy.lua index adc8891..52a40f5 100755 --- a/fishy.lua +++ b/fishy.lua @@ -74,7 +74,7 @@ local zones = { [L["Un'Goro Crater"]] = 205, [L["Western Plaguelands"]] = 205, [L["Shadowmoon Valley"]] = 280, - [L["Zangarmarsh"]] = 305, + [L["Zangarmarsh"]] = 305, -- Burning Crusade [L["Burning Steppes"]] = 330, [L["Deadwind Pass"]] = 330, [L["Eastern Plaguelands"]] = 330, @@ -86,6 +86,7 @@ local zones = { [L["Terokkar Forest"]] = 355, [L["Nagrand"]] = 380, [L["Netherstorm"]] = 380, + -- Wrath of the Lich King [L["Borean Tundra"]] = 380, [L["Dragonblight"]] = 380, [L["Howling Fjord"]] = 380, @@ -100,14 +101,14 @@ local subzones = { ["Hetaera's Clutch"] = 330, ["Scalebeard's Cave"] = 330, ["Jademir Lake"] = 330, - ["Marshlight Lake"] = 355, - ["Sporewind Lake"] = 355, - ["Serpent Lake"] = 355, - ["Lake Sunspring"] = 395, - ["Skysong Lake"] = 395, - ["Blackwind Lake"] = 405, - ["Lake Ere'Noru"] = 405, - ["Lake Jorune"] = 405, + [L["Marshlight Lake"]] = 355, + [L["Sporewind Lake"]] = 355, + [L["Serpent Lake"]] = 355, + [L["Lake Sunspring"]] = 395, + [L["Skysong Lake"]] = 395, + [L["Blackwind Lake"]] = 405, + [L["Lake Ere'Noru"]] = 405, + [L["Lake Jorune"]] = 405, } local fishingpoles = { @@ -342,12 +343,12 @@ local function InitializeFrame() if Fishbringer then return end - Fishbringer = CreateFrame("Frame", "Fishbringer", UIParent) + local Fishbringer = CreateFrame("Frame", "Fishbringer", UIParent, "BackdropTemplate") Fishbringer:EnableMouse(true) Fishbringer:SetMovable(true) Fishbringer:SetUserPlaced(true) Fishbringer:SetHeight(150) - Fishbringer:SetWidth(185) + Fishbringer:SetWidth(250) Fishbringer:SetBackdrop({ bgFile = "Interface\\ChatFrame\\ChatFrameBackground", tile = true, @@ -467,17 +468,35 @@ local function ShowHelp() Print(L["- /fishbringer align - Cycles through text alignment."]) Print(L["- /fishbringer count - Toggles fish count visibility."]) Print(L["- /fishbringer reset - Resets the fish database."]) +end - --[[local FishbringerUI = {} +local function FishbringerMenu() + --[[ + if FishrbingerUI then + return + end + local FishbringerUI = CreateFrame("Frame", "FishbringerUI", UIParent, "BasicFrameTemplateWithInset") FishbringerUI:SetSize(300, 400); FishbringerUI:SetPoint("Center", UIParent, "Center"); FishbringerUI:EnableMouse(true); - FishbringerUI:SetMovable(true); + FishbringerUI:SetMovable(false); FishbringerUI:RegisterForDrag("LeftButton") FishbringerUI:SetScript("OnDragStart", FishbringerUI.StartMoving) FishbringerUI:SetScript("OnDragStop", FishbringerUI.StopMovingOrSizing) + FishbringerUI:SetBackdrop({ + bgFile = "Interface\\ChatFrame\\ChatFrameBackground", + tile = true, + tileSize = 16, + insets = { + left = 4, + right = 4, + top = 4, + bottom = 4 + }, + }) + FishbringerUI:SetBackdropColor(0, 0, 0, .6) FishbringerUI:Show(); FishbringerUI.title = FishbringerUI:CreateFontString(nil, "Overlay"); @@ -485,17 +504,23 @@ local function ShowHelp() FishbringerUI.title:SetPoint("Center", FishbringerUI.TitleBg, "Center", 5, 0); FishbringerUI.title:SetText("|cFF00FF00Fishbringer v1.13.4"); - MoveableWindowButton = CreateFrame("CheckButton", "MoveableWindowButton_GlobalName", FishbringerUI, "ChatConfigCheckButtonTemplate"); - MoveableWindowButton:SetPoint("TOPLEFT", 10, -60); - MoveableWindowButton_GlobalNameText:SetText("Window Moveable"); - MoveableWindowButton.tooltip = "Let's move the Window...or not?"; - MoveableWindowButton:SetScript("OnClick", + tinsert(UISpecialFrames, FishbringerUI:GetName()) + + local MoveButton = CreateFrame("CheckButton", "MoveButton_GlobalName", FishbringerUI, "ChatConfigCheckButtonTemplate"); + MoveButton:SetPoint("TOPLEFT", 10, -60); + MoveButton_GlobalNameText:SetText("Window Moveable"); + MoveButton.tooltip = "Let's move the Window...or not?"; + MoveButton:SetScript("OnClick", function() - --FishbringerUI:SetMovable(false) + if FishbringerUI:IsMovable == false then + FishbringerUI:SetMovable(true) + else + FishbringerUI:SetMovable(false) + end end ); - ToggleButton = CreateFrame("CheckButton", "ToggleButton_GlobalName", FishbringerUI, "ChatConfigCheckButtonTemplate"); + local ToggleButton = CreateFrame("CheckButton", "ToggleButton_GlobalName", FishbringerUI, "ChatConfigCheckButtonTemplate"); ToggleButton:SetPoint("TOPLEFT", 10, -30); ToggleButton_GlobalNameText:SetText("Show/Hide the Fishing Widget"); ToggleButton.tooltip = "Toggles the Widget visibility."; @@ -504,7 +529,6 @@ local function ShowHelp() Toggle(); end ); --]] - end SlashCmdList["FISHBRINGER"] = function(arg)