Skip to content

Commit

Permalink
Version 2.2.0
Browse files Browse the repository at this point in the history
- API Bump
- Updated Libs
- Fixed bug with ultimate window trying to access its settings.
  • Loading branch information
kyoma committed Aug 15, 2017
1 parent 3e12f89 commit ad94591
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 15 deletions.
2 changes: 1 addition & 1 deletion RaidNotifier.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions RaidNotifier.txt
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 7 additions & 3 deletions UI.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
27 changes: 24 additions & 3 deletions lang/en.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 1 addition & 5 deletions lang/fr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion libs/LibCustomTitles/Titles/Valve.lua
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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" })

0 comments on commit ad94591

Please sign in to comment.