Skip to content
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

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from

Conversation

Hacktank
Copy link

No description provided.

Jacob Tyndall added 6 commits December 26, 2020 13:42
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.
Copy link
Owner

@inimicus inimicus left a 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"
Copy link
Owner

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
Copy link
Owner

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
Copy link
Owner

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,
Copy link
Owner

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.",
Copy link
Owner

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,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes #15

@inimicus inimicus added bug Something isn't working enhancement New feature or request new set New set tracking planned Planned to be implemented in-progress Work has began on this issue labels Dec 27, 2023
@inimicus inimicus added this to the v1.7.0 milestone Dec 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working enhancement New feature or request in-progress Work has began on this issue new set New set tracking planned Planned to be implemented
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants