Skip to content

Commit 2a6456a

Browse files
Add support for skill uses (#5537)
* Add stored uses * lower case and add tooltip * Make implementations generic. * Add proper parsing * typo * Add breakdown and make extracooldown from second wind for non instant skills. * Fix accidently missing readding warcry * Fix forgetting to update .txt
1 parent 705ac04 commit 2a6456a

19 files changed

+5137
-5104
lines changed

src/Classes/GemSelectControl.lua

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,11 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
556556
self.tooltip:AddLine(16, "^x7F7F7FReservation Override: ^7"..reservation)
557557
end
558558
if grantedEffectLevel.cooldown then
559-
self.tooltip:AddLine(16, string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown))
559+
local string = string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown)
560+
if grantedEffectLevel.storedUses and grantedEffectLevel.storedUses > 1 then
561+
string = string .. string.format(" (%d uses)", grantedEffectLevel.storedUses)
562+
end
563+
self.tooltip:AddLine(16, string)
560564
end
561565
else
562566
local reservation
@@ -587,7 +591,11 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
587591
self.tooltip:AddLine(16, string.format("^x7F7F7FSoul Gain Prevention: ^7%d sec", grantedEffectLevel.soulPreventionDuration))
588592
end
589593
if grantedEffectLevel.cooldown then
590-
self.tooltip:AddLine(16, string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown))
594+
local string = string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown)
595+
if grantedEffectLevel.storedUses and grantedEffectLevel.storedUses > 1 then
596+
string = string .. string.format(" (%d uses)", grantedEffectLevel.storedUses)
597+
end
598+
self.tooltip:AddLine(16, string)
591599
end
592600
if gemInstance.gemData.tags.attack then
593601
if grantedEffectLevel.attackSpeedMultiplier then

src/Data/SkillStatMap.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1705,7 +1705,7 @@ return {
17051705
mod("Damage", "INC", nil, 0, 0, { type = "Multiplier", var = "RemovableEnduranceCharge", limit = 1 }, { type = "Multiplier", var = "RemovableFrenzyCharge", limit = 1 }, { type = "Multiplier", var = "RemovablePowerCharge", limit = 1 }),
17061706
},
17071707
["support_added_cooldown_count_if_not_instant"] = {
1708-
mod("AdditionalCooldownUses", "BASE", nil)
1708+
mod("AdditionalCooldownUses", "BASE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Instant, neg = true })
17091709
},
17101710
["kill_enemy_on_hit_if_under_10%_life"] = {
17111711
mod("CullPercent", "MAX", nil),

src/Data/Skills/act_dex.lua

Lines changed: 1120 additions & 1120 deletions
Large diffs are not rendered by default.

src/Data/Skills/act_int.lua

Lines changed: 1586 additions & 1586 deletions
Large diffs are not rendered by default.

src/Data/Skills/act_str.lua

Lines changed: 1427 additions & 1430 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)