-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added sets: Mantle of Siroria, Domihaus, Winter's Respite #25
base: dev
Are you sure you want to change the base?
Conversation
Perfected/Normal Void Bash (Vatashran shield) Tremorscale Sentinel of Rkugamz Perfected Claw of Yolnakriin Added a new global option to disable all audio notifications.
… has run it's course. This is a work-around for an ESO bug with the stone-talker set where the timer ID 154786 was being reapplied whenever anyone performed a heavy attack on the affected enemy.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for this! Some notes, comments, and conflicts needing to be addressed. Appreciate it!
❤️
@@ -9,7 +9,7 @@ | |||
-- ----------------------------------------------------------------------------- | |||
Cool = Cool or {} | |||
Cool.name = "Cooldowns" | |||
Cool.version = "1.7.0" | |||
Cool.version = "1.8.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As v1.7.0 is still in dev, no need to bump the version yet.
@@ -51,11 +51,11 @@ local function OnCombatEvent(setKey, _, result, _, abilityName, _, _, _, _, _, _ | |||
|
|||
if result == ACTION_RESULT_ABILITY_ON_COOLDOWN then | |||
Cool:Trace(1, "<<1>> (<<2>>) on Cooldown", abilityName, abilityId) | |||
elseif result == set.result then | |||
elseif result == set.result and not set.onCooldown then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good addition. Makes me even more sad that ACTION_RESULT_ABILITY_ON_COOLDOWN
is no longer in the game.
@@ -160,7 +160,7 @@ function Cool.UI.Update(setKey) | |||
set.onCooldown = false | |||
label:SetText("") | |||
texture:SetColor(1, 1, 1, 1) | |||
Cool.UI.PlaySound(Cool.preferences.sets[setKey].sounds.onReady) | |||
if Cool.preferences.audioNotifications then Cool.UI.PlaySound(Cool.preferences.sets[setKey].sounds.onReady) end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think about moving the condition to check for audioNotifications
moving to inside Cool.UI.Playsound
?
e.g.
function Cool.UI.PlaySound(sound)
if sound.enabled and Cool.preferences.audioNotifications then
PlaySound(SOUNDS[sound.sound])
end
end
@@ -17,6 +17,7 @@ local defaults = { | |||
gridSize = 16, | |||
showOutsideCombat = true, | |||
lagCompensation = true, | |||
audioNotifications = true, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❤️
[577] = { | ||
procType = "set", | ||
event = EVENT_COMBAT_EVENT, | ||
description = "Displays when the Sentinel of Rkugamz proc is available or cooldown until it is ready again.", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this description text correct?
@@ -190,7 +300,7 @@ function Cool.GetSetData() | |||
description = "Displays when the heal proc is ready or when it will be available, but not the duration of the heal over time.", | |||
id = 97855, | |||
result = ACTION_RESULT_EFFECT_GAINED, | |||
cooldownDurationMs = 35000, | |||
cooldownDurationMs = 20000, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixes #15
No description provided.