Skip to content
Open
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
17 changes: 17 additions & 0 deletions spec/System/TestSkills_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,21 @@ describe("TestSkills", function()
local finalCost = build.calcsTab.mainOutput.ManaCost
assert.are.equals(16, round(finalCost))
end)

it("Test corrupted blood config", function()
build.skillsTab:PasteSocketGroup("Seismic Cry 20/0 1\nCorrupting Cry I 1/0 1")
runCallback("OnFrame")

local baseCorruptingCryDps = build.calcsTab.mainOutput.CorruptingBloodDPS -- placeholder/input is 10

build.configTab.input.conditionCorruptingCryStages = 5
build.configTab:BuildModList()
runCallback("OnFrame")
assert.True(baseCorruptingCryDps > build.calcsTab.mainOutput.CorruptingBloodDPS)

build.configTab.input.conditionCorruptingCryStages = 100 -- test limit
build.configTab:BuildModList()
runCallback("OnFrame")
assert.True(baseCorruptingCryDps == build.calcsTab.mainOutput.CorruptingBloodDPS)
end)
end)
14 changes: 13 additions & 1 deletion src/Classes/ConfigTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
if not self.toggleConfigs then
return false
end
if varData.ifOption or varData.ifSkill or varData.ifSkillData or varData.ifSkillFlag or varData.legacy then
if varData.ifOption or varData.ifSkill or varData.ifSkillData or varData.ifSkillFlag or varData.ifGemFamily or varData.legacy then
return false
end
for _, keyword in pairs(excludeKeywords) do
Expand Down Expand Up @@ -527,6 +527,18 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
return false
end))
end
if varData.ifGemFamily then
t_insert(shownFuncs, listOrSingleIfOption(varData.ifGemFamily, function(ifOption)
for _, activeSkill in ipairs(self.build.calcsTab.mainEnv.player.activeSkillList) do
for _, support in ipairs(activeSkill.supportList) do
if support.gemData and support.gemData.gemFamily == ifOption then
return true
end
end
end
return false
end))
end

if varData.tooltipFunc then
control.tooltipFunc = varData.tooltipFunc
Expand Down
6 changes: 3 additions & 3 deletions src/Data/Skills/sup_str.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1662,7 +1662,7 @@ skills["SupportCorruptingCryPlayer"] = {
skill("debuff", true),
flag("dotIsCorruptingBlood"),
mod("Multiplier:CorruptingCryMaxStages", "BASE", 10),
mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst"}),
mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst", limit = 9}),
},
constantStats = {
{ "support_corrupting_cry_warcry_applies_x_stacks_of_corrupted_blood", 1 },
Expand Down Expand Up @@ -1718,7 +1718,7 @@ skills["SupportCorruptingCryPlayerTwo"] = {
skill("debuff", true),
flag("dotIsCorruptingBlood"),
mod("Multiplier:CorruptingCryMaxStages", "BASE", 10),
mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst"}),
mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst", limit = 9}),
},
constantStats = {
{ "support_corrupting_cry_warcry_applies_x_stacks_of_corrupted_blood", 1 },
Expand Down Expand Up @@ -4968,7 +4968,7 @@ skills["SupportCorruptingCryPlayerThree"] = {
skill("debuff", true),
flag("dotIsCorruptingBlood"),
mod("Multiplier:CorruptingCryMaxStages", "BASE", 10),
mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst"}),
mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst", limit = 9}),
},
constantStats = {
{ "support_corrupting_cry_warcry_applies_x_stacks_of_corrupted_blood", 5 },
Expand Down
6 changes: 3 additions & 3 deletions src/Export/Skills/sup_str.txt
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ statMap = {
#baseMod skill("debuff", true)
#baseMod flag("dotIsCorruptingBlood")
#baseMod mod("Multiplier:CorruptingCryMaxStages", "BASE", 10)
#baseMod mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst"})
#baseMod mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst", limit = 9})
#mods
#skillEnd

Expand All @@ -394,7 +394,7 @@ statMap = {
#baseMod skill("debuff", true)
#baseMod flag("dotIsCorruptingBlood")
#baseMod mod("Multiplier:CorruptingCryMaxStages", "BASE", 10)
#baseMod mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst"})
#baseMod mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst", limit = 9})
#mods
#skillEnd

Expand Down Expand Up @@ -1160,7 +1160,7 @@ statMap = {
#baseMod skill("debuff", true)
#baseMod flag("dotIsCorruptingBlood")
#baseMod mod("Multiplier:CorruptingCryMaxStages", "BASE", 10)
#baseMod mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst"})
#baseMod mod("Damage", "MORE", 100, 0, KeywordFlag.PhysicalDot, { type = "Multiplier", var = "CorruptingCryStageAfterFirst", limit = 9})
#mods
#skillEnd

Expand Down
8 changes: 4 additions & 4 deletions src/Modules/ConfigOptions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -317,11 +317,11 @@ local configSettings = {
{ var = "conditionShockConsumed", type = "check", label = "Consumed Shock", ifSkill = "Elemental Discharge", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:ShockConsumed", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
end },
{ label = "Corrupting Cry:", ifSkill = "Corrupting Cry" },
{ var = "conditionCorruptingCryStages", type = "count", label = "# of Corrupting Cry stacks on enemy", ifSkill = "Corrupting Cry", defaultState = 1, apply = function(val, modList, enemyModList)
-- 10 is the maximum amount of Corrupting Blood Stages. modList does not contain skill base mods at this point so hard coding it here is the cleanest way to handle the cap.
{ label = "Corrupting Cry:", ifGemFamily = "Corrupting Cry" },
{ var = "conditionCorruptingCryStages", type = "count", label = "# of Corrupted Blood stacks:", ifGemFamily = "Corrupting Cry", defaultPlaceholderState = 10, apply = function(val, modList, enemyModList)
-- It's set to 9 here with val -1 to so that it defaults to 1 stage and has max 10 stages.
modList:NewMod("Multiplier:CorruptingCryStageAfterFirst", "BASE", m_min(val-1, 9), "Config", { type = "Condition", var = "Effective" })
-- set limit in skill multiplier for max stages
modList:NewMod("Multiplier:CorruptingCryStageAfterFirst", "BASE", val-1, "Config", { type = "Condition", var = "Effective" })
end },
{ label = "Cruelty:", ifSkill = "Cruelty" },
{ var = "overrideCruelty", type = "count", label = "Damage % (if not maximum):", ifSkill = "Cruelty", tooltip = "Cruelty is a buff provided by Cruelty Support which grants\nup to 40% more damage over time to the skills it supports.", apply = function(val, modList, enemyModList)
Expand Down
Loading