Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/Data/ModCache.lua

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/Data/SkillStatMap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,8 @@ return {
},
["skill_speed_+%"] = {
mod("Speed", "INC", nil),
mod("WarcrySpeed", "INC", nil),
mod("WarcrySpeed", "INC", nil, 0, KeywordFlag.Warcry),
mod("TotemPlacementSpeed", "INC", nil),
},
["cast_speed_+%_granted_from_skill"] = {
mod("Speed", "INC", nil, ModFlag.Cast),
Expand Down
6 changes: 5 additions & 1 deletion src/Data/Skills/act_int.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3084,6 +3084,8 @@ skills["ChargeRegulationPlayer"] = {
statMap = {
["charge_mastery_skill_speed_+%_final_with_frenzy_charges"] = {
mod("Speed", "MORE", nil, 0, 0, { type = "StatThreshold", stat = "FrenzyCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion" }),
mod("WarcrySpeed", "MORE", nil, 0, KeywordFlag.Warcry, { type = "StatThreshold", stat = "FrenzyCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion" }),
mod("TotemPlacementSpeed", "MORE", nil, 0, 0, { type = "StatThreshold", stat = "FrenzyCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion" }),
},
["charge_mastery_crit_chance_+%_final_with_power_charges"] = {
mod("CritChance", "MORE", nil, 0, 0, { type = "StatThreshold", stat = "PowerCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion" }),
Expand Down Expand Up @@ -21030,8 +21032,10 @@ skills["TrinityPlayer"] = {
["trinity_damage_+%_final_to_grant_per_50_resonance"] = {
mod("ElementalDamage", "MORE", nil, 0, 0, { type = "Multiplier", var = "ResonanceCount", div = 30 },{ type = "GlobalEffect", effectType = "Buff", effectName = "Trinity" }),
},
["trinity_attack_speed_+%_while_all_resonance_is_at_least_250_to_grant"] = {
["trinity_skill_speed_+%_while_all_resonance_is_at_least_250_to_grant"] = {
mod("Speed", "INC", nil, 0, 0, { type = "MultiplierThreshold", var = "ResonanceCount", threshold = 250 },{ type = "GlobalEffect", effectType = "Buff", effectName = "Trinity" }),
mod("WarcrySpeed", "INC", nil, 0, KeywordFlag.Warcry, { type = "MultiplierThreshold", var = "ResonanceCount", threshold = 250 },{ type = "GlobalEffect", effectType = "Buff", effectName = "Trinity" }),
mod("TotemPlacementSpeed", "INC", nil, 0, 0, { type = "MultiplierThreshold", var = "ResonanceCount", threshold = 250 },{ type = "GlobalEffect", effectType = "Buff", effectName = "Trinity" }),
},
["quality_display_trinity_is_gem"] = {
-- Display only
Expand Down
6 changes: 6 additions & 0 deletions src/Data/Skills/sup_dex.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2114,6 +2114,8 @@ skills["SupportFerocityPlayer"] = {
statMap = {
["skill_consume_frenzy_charge_to_gain_skill_speed_+%_final"] = {
mod("Speed", "MORE", nil, 0, 0, { type = "MultiplierThreshold", var = "RemovableFrenzyCharge", threshold = 1 }),
mod("WarcrySpeed", "MORE", nil, 0, KeywordFlag.Warcry, { type = "MultiplierThreshold", var = "RemovableFrenzyCharge", threshold = 1 }),
mod("TotemPlacementSpeed", "MORE", nil, 0, 0, { type = "MultiplierThreshold", var = "RemovableFrenzyCharge", threshold = 1 }),
},
},
baseFlags = {
Expand Down Expand Up @@ -3187,6 +3189,8 @@ skills["SupportMultishotPlayer"] = {
},
["support_scattershot_skill_speed_+%_final"] = {
mod("Speed", "MORE", nil),
mod("WarcrySpeed", "MORE", nil, 0, KeywordFlag.Warcry),
mod("TotemPlacementSpeed", "MORE", nil),
},
},
baseFlags = {
Expand Down Expand Up @@ -3228,6 +3232,8 @@ skills["SupportMultishotPlayerTwo"] = {
},
["support_scattershot_skill_speed_+%_final"] = {
mod("Speed", "MORE", nil),
mod("WarcrySpeed", "MORE", nil, 0, KeywordFlag.Warcry),
mod("TotemPlacementSpeed", "MORE", nil),
},
},
baseFlags = {
Expand Down
6 changes: 5 additions & 1 deletion src/Export/Skills/act_int.txt
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ statMap = {
statMap = {
["charge_mastery_skill_speed_+%_final_with_frenzy_charges"] = {
mod("Speed", "MORE", nil, 0, 0, { type = "StatThreshold", stat = "FrenzyCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion" }),
mod("WarcrySpeed", "MORE", nil, 0, KeywordFlag.Warcry, { type = "StatThreshold", stat = "FrenzyCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion" }),
mod("TotemPlacementSpeed", "MORE", nil, 0, 0, { type = "StatThreshold", stat = "FrenzyCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion" }),
},
["charge_mastery_crit_chance_+%_final_with_power_charges"] = {
mod("CritChance", "MORE", nil, 0, 0, { type = "StatThreshold", stat = "PowerCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion" }),
Expand Down Expand Up @@ -1301,8 +1303,10 @@ statMap = {
["trinity_damage_+%_final_to_grant_per_50_resonance"] = {
mod("ElementalDamage", "MORE", nil, 0, 0, { type = "Multiplier", var = "ResonanceCount", div = 30 },{ type = "GlobalEffect", effectType = "Buff", effectName = "Trinity" }),
},
["trinity_attack_speed_+%_while_all_resonance_is_at_least_250_to_grant"] = {
["trinity_skill_speed_+%_while_all_resonance_is_at_least_250_to_grant"] = {
mod("Speed", "INC", nil, 0, 0, { type = "MultiplierThreshold", var = "ResonanceCount", threshold = 250 },{ type = "GlobalEffect", effectType = "Buff", effectName = "Trinity" }),
mod("WarcrySpeed", "INC", nil, 0, KeywordFlag.Warcry, { type = "MultiplierThreshold", var = "ResonanceCount", threshold = 250 },{ type = "GlobalEffect", effectType = "Buff", effectName = "Trinity" }),
mod("TotemPlacementSpeed", "INC", nil, 0, 0, { type = "MultiplierThreshold", var = "ResonanceCount", threshold = 250 },{ type = "GlobalEffect", effectType = "Buff", effectName = "Trinity" }),
},
["quality_display_trinity_is_gem"] = {
-- Display only
Expand Down
6 changes: 6 additions & 0 deletions src/Export/Skills/sup_dex.txt
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,8 @@ statMap = {
statMap = {
["skill_consume_frenzy_charge_to_gain_skill_speed_+%_final"] = {
mod("Speed", "MORE", nil, 0, 0, { type = "MultiplierThreshold", var = "RemovableFrenzyCharge", threshold = 1 }),
mod("WarcrySpeed", "MORE", nil, 0, KeywordFlag.Warcry, { type = "MultiplierThreshold", var = "RemovableFrenzyCharge", threshold = 1 }),
mod("TotemPlacementSpeed", "MORE", nil, 0, 0, { type = "MultiplierThreshold", var = "RemovableFrenzyCharge", threshold = 1 }),
},
},
#mods
Expand Down Expand Up @@ -719,6 +721,8 @@ statMap = {
},
["support_scattershot_skill_speed_+%_final"] = {
mod("Speed", "MORE", nil),
mod("WarcrySpeed", "MORE", nil, 0, KeywordFlag.Warcry),
mod("TotemPlacementSpeed", "MORE", nil),
},
},
#mods
Expand All @@ -732,6 +736,8 @@ statMap = {
},
["support_scattershot_skill_speed_+%_final"] = {
mod("Speed", "MORE", nil),
mod("WarcrySpeed", "MORE", nil, 0, KeywordFlag.Warcry),
mod("TotemPlacementSpeed", "MORE", nil),
},
},
#mods
Expand Down
2 changes: 2 additions & 0 deletions src/Modules/CalcOffence.lua
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,8 @@ function calcs.offence(env, actor, activeSkill)
if skillModList:Flag(nil, "SkillSpeedIncreasedPerGreenSupport") then
modData = lookupModData("SkillSpeedIncreasedPerGreenSupport")
skillModList:NewMod("Speed", "INC", greenSupportCount * modData.value, modData.source)
skillModList:NewMod("WarcrySpeed", "INC", greenSupportCount * modData.value, modData.source)
skillModList:NewMod("TotemPlacementSpeed", "INC", greenSupportCount * modData.value, modData.source)
end
if skillModList:Flag(nil, "SkillCritChanceIncreasedPerBlueSupport") then
modData = lookupModData("SkillCritChanceIncreasedPerBlueSupport")
Expand Down
3 changes: 2 additions & 1 deletion src/Modules/ModParser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ local modNameList = {
["warcry speed"] = { "WarcrySpeed", keywordFlags = KeywordFlag.Warcry },
["attack and cast speed"] = "Speed",
["use speed"] = "Speed",
["skill speed"] = { "Speed", "WarcrySpeed" },
["skill speed"] = { "Speed", "WarcrySpeed", "TotemPlacementSpeed" },
["reload speed"] = { "ReloadSpeed", flags = ModFlag.Attack },
["dps"] = "DPS",
-- Elemental ailments
Expand Down Expand Up @@ -2232,6 +2232,7 @@ local specialModList = {
["(%d+)%% more skill speed while off hand is empty and you have a one%-handed martial weapon equipped in your main hand"] = function(num) return {
mod("Speed", "MORE", num, {type = "Condition", var = "UsingOneHandedWeapon"}, {type = "Condition", var = "OffHandIsEmpty"}),
mod("WarcrySpeed", "MORE", num, {type = "Condition", var = "UsingOneHandedWeapon"}, {type = "Condition", var = "OffHandIsEmpty"}),
mod("TotemPlacementSpeed", "MORE", num, {type = "Condition", var = "UsingOneHandedWeapon"}, {type = "Condition", var = "OffHandIsEmpty"}),
} end,
["(%d+) rage regenerated for every (%d+) mana regeneration per second"] = function(num, _, div) return {
mod("RageRegen", "BASE", num, {type = "PerStat", stat = "ManaRegen", div = tonumber(div) }) ,
Expand Down