diff --git a/src/Modules/Build.lua b/src/Modules/Build.lua index 1fc6bed13f..29b781087b 100644 --- a/src/Modules/Build.lua +++ b/src/Modules/Build.lua @@ -1578,6 +1578,17 @@ function buildMode:AddDisplayStatList(statList, actor) if actor.output.VixenModeNoVixenGlovesWarn then InsertIfNew(self.controls.warnings.lines, "Vixen's calculation mode for Doom Blast is selected but you do not have Vixen's Entrapment Embroidered Gloves equipped") end + + do + local aspectCount = 0 + aspectCount = aspectCount + (actor.output.CrabBarriersMax > 0 and actor.output.CrabBarriers > 0 and 1 or 0) + aspectCount = aspectCount + (aspectCount < 2 and actor.modDB:Flag(nil, "Condition:AspectOfTheSpiderActive") and 1 or 0) + aspectCount = aspectCount + (aspectCount < 2 and (actor.modDB:Flag(nil, "Condition:CatsAgilityActive") or actor.modDB:Flag(nil, "Condition:CatsStealthActive")) and 1 or 0) + aspectCount = aspectCount + (aspectCount < 2 and (actor.modDB:Flag(nil, "Condition:AviansFlightActive") or actor.modDB:Flag(nil, "Condition:AviansMightActive")) and 1 or 0) + if aspectCount > 1 then + InsertIfNew(self.controls.warnings.lines, "You have more than one Aspect skill active") + end + end end function buildMode:InsertItemWarnings() diff --git a/src/Modules/ConfigOptions.lua b/src/Modules/ConfigOptions.lua index e732a359fb..fdb4bf38ed 100644 --- a/src/Modules/ConfigOptions.lua +++ b/src/Modules/ConfigOptions.lua @@ -268,6 +268,9 @@ return { { label = "Aspect of the Spider:", ifSkill = "Aspect of the Spider" }, { var = "aspectOfTheSpiderWebStacks", type = "count", label = "# of Spider's Web Stacks:", ifSkill = "Aspect of the Spider", apply = function(val, modList, enemyModList) modList:NewMod("ExtraSkillMod", "LIST", { mod = modLib.createMod("Multiplier:SpiderWebApplyStack", "BASE", val) }, "Config", { type = "SkillName", skillName = "Aspect of the Spider" }) + if val > 0 then + modList:NewMod("Condition:AspectOfTheSpiderActive", "FLAG", true, "Config") + end end }, { label = "Banner Skills:", ifSkill = { "Dread Banner", "War Banner", "Defiance Banner" } }, { var = "bannerPlanted", type = "check", label = "Is Banner Planted?", ifSkill = { "Dread Banner", "War Banner", "Defiance Banner" }, apply = function(val, modList, enemyModList)