From c3615088383a90433bb883c2080289344810ef6f Mon Sep 17 00:00:00 2001 From: Godot-Fye <47419231+Godot-Fye@users.noreply.github.com> Date: Fri, 27 Dec 2019 08:44:03 +0100 Subject: [PATCH] Updated Catchrate Info, Bugfix German Localization * The catch rate will now update correctly if your Fishing Skill level up * Fixed a bug in the german localization (catch rate didn't show up correctly in Alterac Mountains) * Little updates inside the toc file --- Fishbringer.toc | 4 ++-- Localization.deDE.lua | 2 +- fishy.lua | 43 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/Fishbringer.toc b/Fishbringer.toc index 4244c5e..1fa87fc 100755 --- a/Fishbringer.toc +++ b/Fishbringer.toc @@ -5,9 +5,9 @@ ## Notes: The legendary Fishbringer, Guide of the Scarlet Highlord! Nat Pagle would be proud of you! ## Notes-deDE: Das legendäre Fishbringer, Leitfaden des Scharlachroten Hochlords! Nat Pagle wäre stolz auf dich! ## Notes-ruRU: The legendary Fishbringer, Guide of the Scarlet Highlord! Nat Pagle would be proud of you! -## Author: Kalerath, Fye (German Localization), leafoe (Russian Localization) +## Author: Kalerath, Fye (Localization Code & Bugfixes), leafoe (Russian Localization) ## SavedVariables: FishbringerDB -## Version: 1.13-3 +## Version: 1.13-4 localization.core.lua Localization.deDE.lua diff --git a/Localization.deDE.lua b/Localization.deDE.lua index 26a0c3c..e4d884b 100644 --- a/Localization.deDE.lua +++ b/Localization.deDE.lua @@ -59,7 +59,7 @@ if namespace.locale == "deDE" then L["Redridge Mountains"] = "Rotkammgebirge" L["Stonetalon Mountains"] = "Steinkrallengebirge" L["Wetlands"] = "Sumpfland" - L["Alterac Mountains"] = "Alteractal" + L["Alterac Mountains"] = "Alteracgebirge" L["Arathi Highlands"] = "Arathihochland" L["Desolace"] = "Desolace" L["Dustwallow Marsh"] = "Marschen von Dustwallow" diff --git a/fishy.lua b/fishy.lua index 51a75df..adc8891 100755 --- a/fishy.lua +++ b/fishy.lua @@ -252,6 +252,7 @@ local function UpdateSkill(forceResetFishCounter) if forceResetFishCounter or db[char].fishingSkill ~= skillRank then db[char].fishingSkill = skillRank ResetFishCounter(fishNeeded) + UpdateCatchInfo() end if db[char].fishingBuff ~= skillModifier then @@ -466,6 +467,44 @@ 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."]) + + --[[local FishbringerUI = {} + + local FishbringerUI = CreateFrame("Frame", "FishbringerUI", UIParent, "BasicFrameTemplateWithInset") + FishbringerUI:SetSize(300, 400); + FishbringerUI:SetPoint("Center", UIParent, "Center"); + FishbringerUI:EnableMouse(true); + FishbringerUI:SetMovable(true); + FishbringerUI:RegisterForDrag("LeftButton") + FishbringerUI:SetScript("OnDragStart", FishbringerUI.StartMoving) + FishbringerUI:SetScript("OnDragStop", FishbringerUI.StopMovingOrSizing) + FishbringerUI:Show(); + + FishbringerUI.title = FishbringerUI:CreateFontString(nil, "Overlay"); + FishbringerUI.title:SetFontObject("GameFontHighlight"); + 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", + function() + --FishbringerUI:SetMovable(false) + end + ); + + 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."; + ToggleButton:SetScript("OnClick", + function() + Toggle(); + end + ); --]] + end SlashCmdList["FISHBRINGER"] = function(arg) @@ -483,9 +522,11 @@ SlashCmdList["FISHBRINGER"] = function(arg) end return ShowHelp() end + SLASH_FISHBRINGER1 = "/fishbringer" -- Hail to Fishing Buddy! -if not select(4, GetAddOnInfo"Fishing Buddy") then +if not select(4, GetAddOnInfo"FishingBuddy") then SLASH_FISHBRINGER2 = "/fb" end + Print(L["Pack yer bags, we be leavin' fer fishin'!"])