diff --git a/RaidNotifier.lua b/RaidNotifier.lua index 022e08b..af8d375 100644 --- a/RaidNotifier.lua +++ b/RaidNotifier.lua @@ -5,7 +5,7 @@ local RaidNotifier = RaidNotifier RaidNotifier.Name = "RaidNotifier" RaidNotifier.DisplayName = "Raid Notifier" -RaidNotifier.Version = "2.1.4" +RaidNotifier.Version = "2.2.0" RaidNotifier.Author = "|c009ad6Kyoma, Woeler, silentgecko|r" RaidNotifier.SV_Name = "RNVars" RaidNotifier.SV_Version = 4 diff --git a/RaidNotifier.txt b/RaidNotifier.txt index 8d2c5a9..1f83d59 100644 --- a/RaidNotifier.txt +++ b/RaidNotifier.txt @@ -1,8 +1,8 @@ ## Title: |cEFEBBERaidNotifier|r ## Description: Displays on-screen notifications on different events during trials. ## Author: |c009ad6Kyoma, Woeler, silentgecko|r -## Version: 2.1.4 -## APIVersion: 100019 +## Version: 2.2.0 +## APIVersion: 100020 ## SavedVariables: RNVars ## OptionalDependsOn: LibAddonMenu-2.0 LibMapPing LibGPS2 LibGroupSocket diff --git a/UI.lua b/UI.lua index 20fc07e..aa1c588 100644 --- a/UI.lua +++ b/UI.lua @@ -104,7 +104,9 @@ do -------------------- function RaidNotifier:UpdateUltimateWindow(sortedUlti, mode) if not window then return end - + + local settings = self.Vars.ultimate + if sortedUlti then local text = "Ultimates:" --TODO: grab text from abilityId?? for i, data in ipairs(sortedUlti) do @@ -464,12 +466,14 @@ do ------------------- if status == "scalded" then local stacks = math.random(1, 10) RaidNotifier:UpdateScaldedStacks(stacks, currentTime, currentTime + 15) - elseif status == "aspect" then - + --elseif status == "aspect" then + -- RaidNotifier:UpdateTwinAspect("tolunar") elseif status == "venom" then RaidNotifier:UpdateSphereVenom(true, currentTime, currentTime + 8.3) elseif status == "troll" then RaidNotifier:UpdateSpreadingPoison(true, currentTime, currentTime + 10) + else + RaidNotifier:UpdateTwinAspect(status) end end diff --git a/lang/en.lua b/lang/en.lua index a4ae3d9..1945d53 100644 --- a/lang/en.lua +++ b/lang/en.lua @@ -344,12 +344,33 @@ L.Settings_Debug_Tracker_MyEnemyOnly_TT = "When enabled this will limit ALL out ---INTERNAL-- +--TODO: get rid of this ugly, bulky localization method for k, v in pairs(L) do local string = "RAIDNOTIFIER_" .. string.upper(k) ZO_CreateStringId(string, v) end -function L:Get(string, suffix) - return L[string..tostring(suffix)] +function RaidNotifier:GetLocale() + return L end +function RaidNotifier:MissingLocale() + d("Obviously not missing any english strings....") +end + +--if (GetCVar('language.2') == 'de') then +-- local MissingL = {} +-- for k, v in pairs(RaidNotifier:GetLocale()) do +-- if (not L[k]) then +-- table.insert(MissingL, k) +-- L[k] = v +-- end +-- end +-- function RaidNotifier:GetLocale() +-- return L +-- end +-- -- for debugging +-- function RaidNotifier:MissingLocale() +-- df("Missing strings for '%s'", GetCVar('language.2')) +-- d(MissingL) +-- end +--end diff --git a/lang/fr.lua b/lang/fr.lua index fd5fdc5..ff5fb30 100644 --- a/lang/fr.lua +++ b/lang/fr.lua @@ -348,8 +348,4 @@ L.Settings_Debug_Tracker_MyEnemyOnly_TT = "Lorsque l'option est activée, elle for k, v in pairs(L) do local string = "RAIDNOTIFIER_" .. string.upper(k) ZO_CreateStringId(string, v) -end - -function L:Get(string, suffix) - return L[string..tostring(suffix)] -end +end \ No newline at end of file diff --git a/libs/LibCustomTitles/Titles/Valve.lua b/libs/LibCustomTitles/Titles/Valve.lua index 5122612..f32c313 100644 --- a/libs/LibCustomTitles/Titles/Valve.lua +++ b/libs/LibCustomTitles/Titles/Valve.lua @@ -1,5 +1,5 @@ local MY_MODULE_NAME = "Valve" -local MY_MODULE_VERSION = 5 +local MY_MODULE_VERSION = 6 local LCC = LibStub('LibCustomTitlesRN') if not LCC then return end @@ -18,3 +18,4 @@ MY_MODULE:RegisterTitle("@AsmaeI", nil, 494, {en = "The Fluffy Salmon MY_MODULE:RegisterTitle("@ItchyTheRat", nil, 494, {en = "Grand Master Angler", de = "Großmeisteranglerin", fr = "Grande maîtresse de pêche" }, {color = "#7FFF00"}) MY_MODULE:RegisterTitle("@ItchyTheRat", nil, true, {en = "The Rat", de = "Die Ratte", fr = "le Rat" }) MY_MODULE:RegisterTitle("@ItchyTheRat", "A Pink Panther", true, {en = "Tamriel's Most Wanted" }, {color = "#FF69B4"}) +MY_MODULE:RegisterTitle("@Eweroun", nil, 93, {en = "Iron Minion" })