Skip to content

Commit

Permalink
Version 2.12 by Kyoma
Browse files Browse the repository at this point in the history
  • Loading branch information
MysteryDragon committed Mar 24, 2021
1 parent aa018bd commit 999b3be
Show file tree
Hide file tree
Showing 28 changed files with 56 additions and 5,995 deletions.
28 changes: 19 additions & 9 deletions 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.11.11"
RaidNotifier.Version = "2.12"
RaidNotifier.Author = "|c009ad6Kyoma, Memus, Woeler, silentgecko|r"
RaidNotifier.SV_Name = "RNVars"
RaidNotifier.SV_Version = 4
Expand Down Expand Up @@ -262,8 +262,8 @@ do ----------------------

local window = nil

local LGS = LibStub:GetLibrary("LibGroupSocket")
local ultimateHandler = LGS:GetHandler(LGS.MESSAGE_TYPE_ULTIMATE)
local LGS = LibStub("LibGroupSocket", true)
local ultimateHandler = LGS and LGS:GetHandler(LGS.MESSAGE_TYPE_ULTIMATE)
RNUltimateHandler = ultimateHandler -- debug
local ultimateAbilityId = 40223 -- Aggressive Warhorn Rank IV
local ultimateGroupId = 29 -- hardcoded for now
Expand Down Expand Up @@ -316,6 +316,8 @@ do ----------------------
local settings = self.Vars.ultimate
if not settings.enabled then return end

if not ultimateHandler then return end

if listening then return end
listening = true
dbg("RegisterForUltimateChanges")
Expand Down Expand Up @@ -381,6 +383,8 @@ do ----------------------
end

function RaidNotifier:UnregisterForUltimateChanges()
if not ultimateHandler then return end

if not listening then return end
listening = false
dbg("UnregisterForUltimateChanges")
Expand Down Expand Up @@ -437,11 +441,17 @@ do ----------------------
self:UnregisterForUltimateChanges()
elseif (args[1] == "refresh") then
ultimates = {}
ultimateHandler:Refresh()
if ultimateHandler then
ultimateHandler:Refresh()
end
elseif (args[1] == "debug") then
ultimateHandler:SetDebug(tonumber(args[2]))
if ultimateHandler then
ultimateHandler:SetDebug(tonumber(args[2]))
end
elseif (args[1] == "clear") then
ultimateHandler:ResetResources()
if ultimateHandler then
ultimateHandler:ResetResources()
end
elseif (args[1] == "cost") then
if (#args == 2) then
if (tonumber(args[2]) ~= nil) then
Expand Down Expand Up @@ -861,7 +871,7 @@ end

do ---------------------------

local LUNIT = LibStub:GetLibrary("LibUnits")
local LUNIT = LibUnits2
local Util = RaidNotifier.Util

function RaidNotifier.UnitIdToString(id)
Expand All @@ -877,9 +887,9 @@ do ---------------------------
end

RaidNotifier.AA = RaidNotifier.AA or {}
RaidNotifier.HRC = RaidNotifier.HRC or {}
RaidNotifier.HRC = RaidNotifier.HRC or {}
RaidNotifier.SO = RaidNotifier.SO or {}
RaidNotifier.DSA = RaidNotifier.DSA or {}
RaidNotifier.DSA = RaidNotifier.DSA or {}
RaidNotifier.MOL = RaidNotifier.MOL or {}
RaidNotifier.MA = RaidNotifier.MA or {}
RaidNotifier.HOF = RaidNotifier.HOF or {}
Expand Down
25 changes: 4 additions & 21 deletions RaidNotifier.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
## Title: |cEFEBBERaidNotifier|r
## Description: Displays on-screen notifications on different events during trials.
## Author: |c009ad6Kyoma, Memus, Woeler, silentgecko|r
## Version: 2.11.11
## Version: 2.12
## APIVersion: 100030 100031
## SavedVariables: RNVars RN_DEBUG_LOG
## OptionalDependsOn: LibAddonMenu-2.0 LibMapPing LibGPS LibGroupSocket
## DependsOn: LibAddonMenu-2.0>=28
## OptionalDependsOn: LibGroupSocket

libs/LibStub/LibStub.lua
libs/LibCustomTitles/LibTitleLocale.lua
Expand All @@ -13,28 +14,10 @@ libs/LibCustomTitles/Titles/Kyoma.lua
libs/LibCustomTitles/Titles/Woeler.lua
libs/LibCustomTitles/Titles/Valve.lua
libs/LibCustomTitles/Titles/Memus.lua
libs/LibAddonMenu-2.0/LibAddonMenu-2.0.lua
libs/LibAddonMenu-2.0/controls/panel.lua
libs/LibAddonMenu-2.0/controls/submenu.lua
libs/LibAddonMenu-2.0/controls/button.lua
libs/LibAddonMenu-2.0/controls/checkbox.lua
libs/LibAddonMenu-2.0/controls/colorpicker.lua
libs/LibAddonMenu-2.0/controls/custom.lua
libs/LibAddonMenu-2.0/controls/description.lua
libs/LibAddonMenu-2.0/controls/divider.lua
libs/LibAddonMenu-2.0/controls/dropdown.lua
libs/LibAddonMenu-2.0/controls/editbox.lua
libs/LibAddonMenu-2.0/controls/header.lua
libs/LibAddonMenu-2.0/controls/slider.lua
libs/LibAddonMenu-2.0/controls/texture.lua

libs/LibMapPing/LibMapPing.lua
libs/LibGPS/LibGPS.lua
libs/LibGroupSocket/LibGroupSocket.lua
libs/LibGroupSocket/handlers/UltimateHandler.lua
libs/LibCSA/LibCSA.lua
libs/LibUnits/LibUnits.lua

UltimateHandler.lua
TrialAetherianArchive.lua
TrialAsylumSanctorium.lua
TrialDragonStarArena.lua
Expand Down
2 changes: 1 addition & 1 deletion Settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ function RaidNotifier:CreateSettingsMenu()

self:TryUpgradeSettings()

local LAM = LibStub:GetLibrary("LibAddonMenu-2.0")
local LAM = LibAddonMenu2
self.panelData = {
type = "panel",
name = self.DisplayName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
-- 1: isFullUpdate - the user is sending cost in addition to percentages in this packet
-- 2: requestsFullUpdate - the user does not have all the necessary data and wants to have a full update from everyone (e.g. after reloading the ui)

local LGS = LibStub("LibGroupSocket")
local LGS = LibStub("LibGroupSocket", true)
if not LGS then return end
LGS.MESSAGE_TYPE_ULTIMATE = 21 -- aka, the code for 'u'
local type, version = LGS.MESSAGE_TYPE_ULTIMATE, 2
local handler, saveData = LGS:RegisterHandler(type, version)
Expand Down
201 changes: 0 additions & 201 deletions libs/LibAddonMenu-2.0/LICENSE

This file was deleted.

Loading

0 comments on commit 999b3be

Please sign in to comment.