diff --git a/Fishbringer-Classic.toc b/Fishbringer-Classic.toc deleted file mode 100644 index 8d850ed..0000000 --- a/Fishbringer-Classic.toc +++ /dev/null @@ -1,24 +0,0 @@ -## Interface: 11403 -## Title: Fishbringer -## Title-deDE: Fishbringer -## Title-ruRU: Fishbringer -## 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: Легендарный Рыболов, проводник Повелителя Алого ордена! Нат Пэгл гордился бы тобой! -## Notes-esES: ¡El legendario Fishbringer, guía del Scarlet Highlord! ¡Nat Pagle estaría orgulloso de ti! -## Notes-frFR: Le légendaire Fishbringer, guide du seigneur écarlate ! Nat Pagle serait fier de vous ! -## Notes-ptBR: O lendário Fishbringer, Guia do Highlord Escarlate! Nat Pagle ficaria orgulhoso de você! -## Author: Kalerath, Fye (Localization Code & Bugfixes), Zilom (Bugfixes & Localization Redesigned + Added), leafoe (Russian Localization) -## SavedVariables: FishbringerDB -## Version: 3.0.3 - -# main: -localization.core.lua -fishy.lua - -# localizations: -Localization.deDE.lua -Localization.ruRU.lua -Localization.esES.lua -Localization.frFR.lua -Localization.ptBR.lua diff --git a/Fishbringer-BCC.toc b/Fishbringer-Vanilla.toc similarity index 93% rename from Fishbringer-BCC.toc rename to Fishbringer-Vanilla.toc index 3ab49b5..df01d65 100644 --- a/Fishbringer-BCC.toc +++ b/Fishbringer-Vanilla.toc @@ -1,24 +1,24 @@ -## Interface: 20504 -## Title: Fishbringer -## Title-deDE: Fishbringer -## Title-ruRU: Fishbringer -## 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: Легендарный Рыболов, проводник Повелителя Алого ордена! Нат Пэгл гордился бы тобой! -## Notes-esES: ¡El legendario Fishbringer, guía del Scarlet Highlord! ¡Nat Pagle estaría orgulloso de ti! -## Notes-frFR: Le légendaire Fishbringer, guide du seigneur écarlate ! Nat Pagle serait fier de vous ! -## Notes-ptBR: O lendário Fishbringer, Guia do Highlord Escarlate! Nat Pagle ficaria orgulhoso de você! -## Author: Kalerath, Fye (Localization Code & Bugfixes), Zilom (Bugfixes & Localization Redesigned + Added), leafoe (Russian Localization) -## SavedVariables: FishbringerDB -## Version: 3.0.3 - -# main: -localization.core.lua -fishy.lua - -# localizations: -Localization.deDE.lua -Localization.ruRU.lua -Localization.esES.lua -Localization.frFR.lua -Localization.ptBR.lua +## Interface: 11502 +## Title: Fishbringer +## Title-deDE: Fishbringer +## Title-ruRU: Fishbringer +## 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: Легендарный Рыболов, проводник Повелителя Алого ордена! Нат Пэгл гордился бы тобой! +## Notes-esES: ¡El legendario Fishbringer, guía del Scarlet Highlord! ¡Nat Pagle estaría orgulloso de ti! +## Notes-frFR: Le légendaire Fishbringer, guide du seigneur écarlate ! Nat Pagle serait fier de vous ! +## Notes-ptBR: O lendário Fishbringer, Guia do Highlord Escarlate! Nat Pagle ficaria orgulhoso de você! +## Author: Kalerath, Fye (Localization Code & Bugfixes), Zilom (Bugfixes & Localization Redesigned + Added), leafoe (Russian Localization) +## SavedVariables: FishbringerDB +## Version: 3.1.2 + +# localizations: +localization.core.lua +Localization.deDE.lua +Localization.ruRU.lua +Localization.esES.lua +Localization.frFR.lua +Localization.ptBR.lua + +# main: +fishy.lua \ No newline at end of file diff --git a/Fishbringer-Wrath.toc b/Fishbringer-Wrath.toc deleted file mode 100644 index 6cd7e09..0000000 --- a/Fishbringer-Wrath.toc +++ /dev/null @@ -1,24 +0,0 @@ -## Interface: 30400 -## Title: Fishbringer -## Title-deDE: Fishbringer -## Title-ruRU: Fishbringer -## 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: Легендарный Рыболов, проводник Повелителя Алого ордена! Нат Пэгл гордился бы тобой! -## Notes-esES: ¡El legendario Fishbringer, guía del Scarlet Highlord! ¡Nat Pagle estaría orgulloso de ti! -## Notes-frFR: Le légendaire Fishbringer, guide du seigneur écarlate ! Nat Pagle serait fier de vous ! -## Notes-ptBR: O lendário Fishbringer, Guia do Highlord Escarlate! Nat Pagle ficaria orgulhoso de você! -## Author: Kalerath, Fye (Localization Code & Bugfixes), Zilom (Bugfixes & Localization Redesigned + Added), leafoe (Russian Localization) -## SavedVariables: FishbringerDB -## Version: 3.0.3 - -# main: -localization.core.lua -fishy.lua - -# localizations: -Localization.deDE.lua -Localization.ruRU.lua -Localization.esES.lua -Localization.frFR.lua -Localization.ptBR.lua diff --git a/Fishbringer.toc b/Fishbringer.toc index 4967ac9..c6f0d0b 100644 --- a/Fishbringer.toc +++ b/Fishbringer.toc @@ -1,10 +1,24 @@ -## Interface: 20503 -## Title: Fishbringer -## Notes: The legendary Fishbringer, Guide of the Scarlet Highlord! Nat Pagle would be proud of you! -## Author: Kalerath, Fye (Localization Code & Bugfixes), Zilom (Bugfixes & Localization Redesigned + Added), leafoe (Russian Localization) -## Version: 2.5.4 - -# main: -localization.core.lua - -# This file is here for compatibility with CurseForge only. it has no function whatsoever \ No newline at end of file +## Interface: 40400 +## Title: Fishbringer +## Title-deDE: Fishbringer +## Title-ruRU: Fishbringer +## 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: Легендарный Рыболов, проводник Повелителя Алого ордена! Нат Пэгл гордился бы тобой! +## Notes-esES: ¡El legendario Fishbringer, guía del Scarlet Highlord! ¡Nat Pagle estaría orgulloso de ti! +## Notes-frFR: Le légendaire Fishbringer, guide du seigneur écarlate ! Nat Pagle serait fier de vous ! +## Notes-ptBR: O lendário Fishbringer, Guia do Highlord Escarlate! Nat Pagle ficaria orgulhoso de você! +## Author: Kalerath, Fye (Localization Code & Bugfixes), Zilom (Bugfixes & Localization Redesigned + Added), leafoe (Russian Localization) +## SavedVariables: FishbringerDB +## Version: 3.1.2 + +# localizations: +localization.core.lua +Localization.deDE.lua +Localization.ruRU.lua +Localization.esES.lua +Localization.frFR.lua +Localization.ptBR.lua + +# main: +fishy.lua \ No newline at end of file diff --git a/Localization.deDE.lua b/Localization.deDE.lua index cbba643..2a145be 100644 --- a/Localization.deDE.lua +++ b/Localization.deDE.lua @@ -3,25 +3,27 @@ local L = namespace.L if namespace.locale == "deDE" then - --ShowHelp Funktion - L["Nat Pagle would be proud of you."] = "Nat Pagle wäre stolz auf dich!" - L["- /fishbringer show - Toggles visibility."] = "- /fishbringer show - Fishbringer Bildschirmanzeige an/aus." + --ShowHelp Funktion + L["Nat Pagle would be proud of you."] = "Nat Pagle wäre stolz auf dich!" + L["- /fishbringer show - Toggles visibility."] = "- /fishbringer show - Fishbringer Bildschirmanzeige an/aus." L["- /fishbringer align - Cycles through text alignment."] = "- /fishbringer align - Textausrichtung ändern." L["- /fishbringer count - Toggles fish count visibility."] = "- /fishbringer count - Gefangene Fische auf dem Level anzeigen an/aus." - L["- /fishbringer reset - Resets the fish database."] = "- /fishbringer reset - Fishbringer Datenbank zurücksetzen." + L["- /fishbringer reset - Resets the fish database."] = "- /fishbringer reset - Fishbringer Datenbank zurücksetzen." - --Anzeige auf Bildschirm - L["\124c%s%s\124r\nNo fish in this zone"] = "\124c%s%s\124r\nKein fisch in dieser zone" - L["\124c%s%s\124r\n%d skill needed to fish\n(%d needed for 100%% catch rate)"] = "\124c%s%s\124r\n%d Angelskill benötigt zum Angeln\n(%d benötigt für 100%% Fangchance)" - L["%d%% catch rate"] = "%d%% Fangchance" - L["%s%s fishing skill%s"] = "%s%s Angelskill%s" - L["\n%d fish needed to skill up"] = "\n%d Fische benötigt für Skillpunkt" - L["%d fish caught at this level"] = "%d Fische auf diesem Level gefangen" + --Anzeige auf Bildschirm + L["No fish in this zone"] = "Kein fisch in dieser zone" + L["%d skill needed to fish:"] = "%d Angelskill benötigt zum Angeln" + L["%d needed for 100%% catch rate"] = "%d benötigt für 100%% Fangchance" + L["%d%% catch rate"] = "%d%% Fangchance" +-- L["%d%% junk rate"] = "%d%% junk rate" + L["%s%s fishing skill%s"] = "%s%s Angelskill%s" + L["\n%d fish needed to skill up"] = "\n%d Fische benötigt für Skillpunkt" + L["%d fish caught at this level"] = "%d Fische auf diesem Level gefangen" -- Name des Angelperks / Name of the Fishingperk - L["Fishing"] = "Angeln" + L["Fishing"] = "Angeln" -- Login Message - L["Pack yer bags, we be leavin' fer fishin'!"] = "Pack deine Taschen, wir gehen angeln!" + L["Pack yer bags, we be leavin' fer fishin'!"] = "Pack deine Taschen, wir gehen angeln!" return end \ No newline at end of file diff --git a/Localization.esES.lua b/Localization.esES.lua index 31ddbca..a00937b 100644 --- a/Localization.esES.lua +++ b/Localization.esES.lua @@ -1,27 +1,29 @@ -local ADDON_NAME, namespace = ... -local L = namespace.L - -if namespace.locale == "esES" then - - --ShowHelp Function - L["Nat Pagle would be proud of you."] = "Nat Pagle estaría orgulloso de ti." - L["- /fishbringer show - Toggles visibility."] = "- /fishbringer show - Alterna la visibilidad." - L["- /fishbringer align - Cycles through text alignment."] = "- /fishbringer align - Recorre la alineación del texto." - L["- /fishbringer count - Toggles fish count visibility."] = "- /fishbringer count - Alterna la visibilidad del recuento de peces." - L["- /fishbringer reset - Resets the fish database."] = "- /fishbringer reset - Restablece la base de datos de peces." - - --Fishbringer Overlay/Display Widget - L["\124c%s%s\124r\nNo fish in this zone"] = "\124c%s%s\124r\nNo hay peces en esta zona" - L["\124c%s%s\124r\n%d skill needed to fish\n(%d needed for 100%% catch rate)"] = "\124c%s%s\124r\n%d habilidad necesaria para pescar\n(%d necesario para una tasa de captura del 100%%)" - L["%d%% catch rate"] = "%d%% tasa de captura" - L["%s%s fishing skill%s"] = "%s%s habilidad de pesca" - L["\n%d fish needed to skill up"] = "\n%d peces necesarios para mejorar" - L["%d fish caught at this level"] = "%d pescado capturado a este nivel" - - -- Angeln/Fishing - Name of the Fishing Perk - L["Fishing"] = "Pescar" - - -- Welcome Message on Login - L["Pack yer bags, we be leavin' fer fishin'!"] = "¡Prepara tus maletas, nos vamos 'a pescar'!" - -return end +local ADDON_NAME, namespace = ... +local L = namespace.L + +if namespace.locale == "esES" then + + --ShowHelp Function + L["Nat Pagle would be proud of you."] = "Nat Pagle estaría orgulloso de ti." + L["- /fishbringer show - Toggles visibility."] = "- /fishbringer show - Alterna la visibilidad." + L["- /fishbringer align - Cycles through text alignment."] = "- /fishbringer align - Recorre la alineación del texto." + L["- /fishbringer count - Toggles fish count visibility."] = "- /fishbringer count - Alterna la visibilidad del recuento de peces." + L["- /fishbringer reset - Resets the fish database."] = "- /fishbringer reset - Restablece la base de datos de peces." + + --Fishbringer Overlay/Display Widget + L["No fish in this zone"] = "No hay peces en esta zona" + L["%d skill needed to fish:"] = "%d habilidad necesaria para pescar" + L["%d needed for 100%% catch rate"] = "%d necesario para una tasa de captura del 100%%" + L["%d%% catch rate"] = "%d%% tasa de captura" +-- L["%d%% junk rate"] = "%d%% junk rate" + L["%s%s fishing skill%s"] = "%s%s habilidad de pesca" + L["\n%d fish needed to skill up"] = "\n%d peces necesarios para mejorar" + L["%d fish caught at this level"] = "%d pescado capturado a este nivel" + + -- Angeln/Fishing - Name of the Fishing Perk + L["Fishing"] = "taux indésirable" + + -- Welcome Message on Login + L["Pack yer bags, we be leavin' fer fishin'!"] = "¡Prepara tus maletas, nos vamos 'a pescar'!" + +return end diff --git a/Localization.frFR.lua b/Localization.frFR.lua index 58eb134..b5d72bd 100644 --- a/Localization.frFR.lua +++ b/Localization.frFR.lua @@ -1,27 +1,29 @@ -local ADDON_NAME, namespace = ... -local L = namespace.L - -if namespace.locale == "frFR" then - - --ShowHelp Function - L["Nat Pagle would be proud of you."] = "Nat Pagle serait fier de vous." - L["- /fishbringer show - Toggles visibility."] = "- /fishbringer show - Bascule la visibilité." - L["- /fishbringer align - Cycles through text alignment."] = "- /fishbringer align - Fait défiler l'alignement du texte." - L["- /fishbringer count - Toggles fish count visibility."] = "- /fishbringer count - Bascule la visibilité du nombre de poissons." - L["- /fishbringer reset - Resets the fish database."] = "- /fishbringer reset - Réinitialise la base de données des poissons." - - --Fishbringer Overlay/Display Widget - L["\124c%s%s\124r\nNo fish in this zone"] = "\124c%s%s\124r\nPas de poisson dans cette zone" - L["\124c%s%s\124r\n%d skill needed to fish\n(%d needed for 100%% catch rate)"] = "\124c%s%s\124r\n%d compétence nécessaire pour pêcher\n(%d nécessaire pour un taux de capture de 100%%)" - L["%d%% catch rate"] = "%d%% taux de capture" - L["%s%s fishing skill%s"] = "%s%s compétence de pêche" - L["\n%d fish needed to skill up"] = "\n%d рыб poisson nécessaire pour se perfectionner" - L["%d fish caught at this level"] = "%d poisson pêché à ce niveau" - - -- Angeln/Fishing - Name of the Fishing Perk - L["Fishing"] = "Pêche" - - -- Welcome Message on Login - L["Pack yer bags, we be leavin' fer fishin'!"] = "Faites vos valises, nous partons « à la pêche » !" - -return end +local ADDON_NAME, namespace = ... +local L = namespace.L + +if namespace.locale == "frFR" then + + --ShowHelp Function + L["Nat Pagle would be proud of you."] = "Nat Pagle serait fier de vous." + L["- /fishbringer show - Toggles visibility."] = "- /fishbringer show - Bascule la visibilité." + L["- /fishbringer align - Cycles through text alignment."] = "- /fishbringer align - Fait défiler l'alignement du texte." + L["- /fishbringer count - Toggles fish count visibility."] = "- /fishbringer count - Bascule la visibilité du nombre de poissons." + L["- /fishbringer reset - Resets the fish database."] = "- /fishbringer reset - Réinitialise la base de données des poissons." + + --Fishbringer Overlay/Display Widget + L["No fish in this zone"] = "Pas de poisson dans cette zone" + L["%d skill needed to fish:"] = "%d compétence nécessaire pour pêcher" + L["%d needed for 100%% catch rate"] = "%d nécessaire pour un taux de capture de 100%%" + L["%d%% catch rate"] = "%d%% taux de capture" +-- L["%d%% junk rate"] = "%d%% junk rate" + L["%s%s fishing skill%s"] = "%s%s compétence de pêche" + L["\n%d fish needed to skill up"] = "\n%d рыб poisson nécessaire pour se perfectionner" + L["%d fish caught at this level"] = "%d poisson pêché à ce niveau" + + -- Angeln/Fishing - Name of the Fishing Perk + L["Fishing"] = "Pêche" + + -- Welcome Message on Login + L["Pack yer bags, we be leavin' fer fishin'!"] = "Faites vos valises, nous partons « à la pêche » !" + +return end diff --git a/Localization.ptBR.lua b/Localization.ptBR.lua index f43d92d..41bc7a8 100644 --- a/Localization.ptBR.lua +++ b/Localization.ptBR.lua @@ -1,27 +1,29 @@ -local ADDON_NAME, namespace = ... -local L = namespace.L - -if namespace.locale == "ptBR" then - - --ShowHelp Function - L["Nat Pagle would be proud of you."] = "Nat Pagle ficaria orgulhoso de você." - L["- /fishbringer show - Toggles visibility."] = "- /fishbringer show - Alterna a visibilidade." - L["- /fishbringer align - Cycles through text alignment."] = "- /fishbringer align - Percorre o alinhamento do texto." - L["- /fishbringer count - Toggles fish count visibility."] = "- /fishbringer count - Alterna a visibilidade da contagem de peixes." - L["- /fishbringer reset - Resets the fish database."] = "- /fishbringer reset - Reinicia o banco de dados de peixes." - - --Fishbringer Overlay/Display Widget - L["\124c%s%s\124r\nNo fish in this zone"] = "\124c%s%s\124r\nNenhum peixe nesta zona" - L["\124c%s%s\124r\n%d skill needed to fish\n(%d needed for 100%% catch rate)"] = "\124c%s%s\124r\n%d habilidade necessária para pescar\n(%d necessário para 100%% de taxa de captura)" - L["%d%% catch rate"] = "%d%% taxa de captura" - L["%s%s fishing skill%s"] = "%s%s habilidade de pesca" - L["\n%d fish needed to skill up"] = "\n%d peixes precisavam de habilidade" - L["%d fish caught at this level"] = "%d peixes capturados neste nível" - - -- Angeln/Fishing - Name of the Fishing Perk - L["Fishing"] = "pescaria" - - -- Welcome Message on Login - L["Pack yer bags, we be leavin' fer fishin'!"] = "Faça as malas, vamos partir 'para pescar'!" - -return end +local ADDON_NAME, namespace = ... +local L = namespace.L + +if namespace.locale == "ptBR" then + + --ShowHelp Function + L["Nat Pagle would be proud of you."] = "Nat Pagle ficaria orgulhoso de você." + L["- /fishbringer show - Toggles visibility."] = "- /fishbringer show - Alterna a visibilidade." + L["- /fishbringer align - Cycles through text alignment."] = "- /fishbringer align - Percorre o alinhamento do texto." + L["- /fishbringer count - Toggles fish count visibility."] = "- /fishbringer count - Alterna a visibilidade da contagem de peixes." + L["- /fishbringer reset - Resets the fish database."] = "- /fishbringer reset - Reinicia o banco de dados de peixes." + + --Fishbringer Overlay/Display Widget + L["No fish in this zone"] = "Nenhum peixe nesta zona" + L["%d skill needed to fish:"] = "%d habilidade necessária para pescar" + L["%d needed for 100%% catch rate"] = "%d necessário para 100%% de taxa de captura" + L["%d%% catch rate"] = "%d%% taxa de captura" +-- L["%d%% junk rate"] = "%d%% junk rate" + L["%s%s fishing skill%s"] = "%s%s habilidade de pesca" + L["\n%d fish needed to skill up"] = "\n%d peixes precisavam de habilidade" + L["%d fish caught at this level"] = "%d peixes capturados neste nível" + + -- Angeln/Fishing - Name of the Fishing Perk + L["Fishing"] = "pescaria" + + -- Welcome Message on Login + L["Pack yer bags, we be leavin' fer fishin'!"] = "Faça as malas, vamos partir 'para pescar'!" + +return end diff --git a/Localization.ruRU.lua b/Localization.ruRU.lua index 96e3a73..b3b2e20 100644 --- a/Localization.ruRU.lua +++ b/Localization.ruRU.lua @@ -11,9 +11,11 @@ if namespace.locale == "ruRU" then L["- /fishbringer reset - Resets the fish database."] = "- /fishbringer reset - Сбросить данные." --Fishbringer Overlay/Display Widget - L["\124c%s%s\124r\nNo fish in this zone"] = "\124c%s%s\124r\nВ этой зоне нет рыбы" - L["\124c%s%s\124r\n%d skill needed to fish\n(%d needed for 100%% catch rate)"] = "\124c%s%s\124r\n%d навыка требуется для рыбалки\n(%d требуется для 100%% успеха)" + L["No fish in this zone"] = "В этой зоне нет рыбы" + L["%d skill needed to fish:"] = "%d навыка требуется для рыбалки" + L["%d needed for 100%% catch rate"] = "%d требуется для 100%% успеха" L["%d%% catch rate"] = "%d%% шанс поймать" +-- L["%d%% junk rate"] = "%d%% junk rate" L["%s%s fishing skill%s"] = "%s%s навык рыбной ловли" L["\n%d fish needed to skill up"] = "\n%d рыб осталось до повышения навыка" L["%d fish caught at this level"] = "%d рыб поймано на этом уровне" diff --git a/fishy.lua b/fishy.lua index 735e86b..2990336 100755 --- a/fishy.lua +++ b/fishy.lua @@ -10,6 +10,7 @@ local _,_,_,interface = GetBuildInfo() local classicEra = (interface>10000 and interface<12000) local classicTBC = (interface>20000 and interface<30000) local classicWrath = (interface>30000 and interface<40000) +local classicCata = (interface>40000 and interface<50000) local areaTable = {} @@ -39,6 +40,12 @@ local zones = { [126] = 430, [127] = 405, [170] = 480, + [198] = 555, -- Mount Hyjal + [204] = 555, -- Abyssal Depths + [205] = 555, -- Shimmering Expanse + [207] = 555, -- Deepholm + [241] = 555, -- Twilight Highlands + [249] = 555, -- Uldum [1411] = -70, [1412] = -70, [1413] = -20, @@ -257,14 +264,15 @@ local function UpdateCatchInfo() maxZoneSkill = zoneSkill + 95 end - FishbringerDB.chance = ( - db[char].fishingSkill + db[char].fishingBuff - zoneSkill - ) * 0.01 + 0.05 + FishbringerDB.chance = (classicCata or classicWrath) and + ((db[char].fishingSkill + db[char].fishingBuff) / maxZoneSkill)^2 or + (db[char].fishingSkill + db[char].fishingBuff - zoneSkill) * 0.01 + 0.05 + FishbringerDB.chance = FishbringerDB.chance > 1 and 1 or FishbringerDB.chance if zoneSkill < 0 then zoneSkill = 1 end - + if FishbringerDB.chance > 1 then FishbringerDB.chance = 1 elseif FishbringerDB.chance < 0 then @@ -283,16 +291,18 @@ local function UpdateCatchInfo() end if zoneSkill == 0 then Fishbringer.zoneInfo:SetFormattedText( - L["\124c%s%s\124r\nNo fish in this zone"], - color, zoneText, zoneSkill, maxZoneSkill, FishbringerDB.chance * 100 + "|c%s%s|r\n" .. L["No fish in this zone"], + color, zoneText ) Fishbringer.catchRate:SetText("") else + local areaSkillText = classicWrath and "" or format(L["%d skill needed to fish"] .. "\n", zoneSkill) Fishbringer.zoneInfo:SetFormattedText( - L["\124c%s%s\124r\n%d skill needed to fish\n(%d needed for 100%% catch rate)"], - color, zoneText, zoneSkill, maxZoneSkill, FishbringerDB.chance * 100 + "|c%s%s|r\n" .. areaSkillText .. L["%d skill needed for 100%% catch rate"], + color, zoneText, maxZoneSkill ) - Fishbringer.catchRate:SetFormattedText(L["%d%% catch rate"], FishbringerDB.chance * 100) + local chance = floor(FishbringerDB.chance * 100) + Fishbringer.catchRate:SetFormattedText(L["%d%% catch rate"] .. " (" .. L["%d%% junk rate"] .. ")", chance, 100 - chance) end end