fix: action bar spells progress bars ignoring group cooldowns #748
Conversation
| @@ -972,7 +972,7 @@ function onSpellGroupCooldown(groupId, duration) | |||
| end | |||
| end | |||
| if spell then | |||
| if table.contains(spell.group, groupId) then | |||
| if spell.group[groupId] ~= nil then | |||
There was a problem hiding this comment.
| if spell.group[groupId] ~= nil then | |
| if spell.group[groupId] then |
There was a problem hiding this comment.
This is cleaner and more idiomatic in Lua than explicitly comparing with nil.
There was a problem hiding this comment.
Agree with this being more idiomatic. But won't this return false when the spell has a group cooldown of 0s?
I admit it's a bit of an edge case, but it is technically a valid config value (the spell belongs to a spell group and cannot be cast while that group is on cooldown, but casting that spell does not actually cause that group to go on cooldown).
There was a problem hiding this comment.
From what I saw, group is an object, so it can only be a [table] or nil.
otclient/modules/gamelib/spells.lua
Line 65 in a189d58
There was a problem hiding this comment.
Yes, but spell.group[groupId] can either be nil or a number.
There was a problem hiding this comment.
Yes, but
spell.group[groupId]can either be nil or a number.
correct, sry, my mistake.
Description
Spell slots on the action bar only show progress bars for the spell's individual cooldown. The logic for doing so is there (& seems to work correctly), it's just the group check seems to be written for an older data structure of
spells.lua.Behavior
Actual
If you assign an attack spell to slot 1 (e.g. lightning strike) and another attack spell to slot 2 (e.g. fire wave), and then cast fire wave, no progress bar will be shown on spell slot 1.
Expected
Since fire wave causes spell group 1 to go into cooldown for 2s, I expect slot 1 to show a progress bar for 2s.
Type of change
Please delete options that are not relevant.
How Has This Been Tested
Test Configuration:
Checklist