From d4a77880db1ce5c1b929baf1655ed7747cee56c2 Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Sun, 21 Jun 2026 00:22:11 -0500 Subject: [PATCH] Clean up some shapeshift code --- src/Modules/CalcPerform.lua | 4 ---- src/Modules/ConfigOptions.lua | 20 +++++++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua index c903d6b35b..c978acae46 100644 --- a/src/Modules/CalcPerform.lua +++ b/src/Modules/CalcPerform.lua @@ -345,10 +345,6 @@ local function doActorAttribsConditions(env, actor) end end - if env.configInput.conditionShapeshifted then - condList["Shapeshifted"] = true - end - if actor.mainSkill.skillTypes[SkillType.Bear] then condList["Shapeshifted"] = true condList["BearForm"] = true diff --git a/src/Modules/ConfigOptions.lua b/src/Modules/ConfigOptions.lua index ffabe09e16..3c9ad99310 100644 --- a/src/Modules/ConfigOptions.lua +++ b/src/Modules/ConfigOptions.lua @@ -1265,9 +1265,7 @@ Huge sets the radius to 11. modList:NewMod("Multiplier:StunnedRecently", "BASE", m_min(val, 100), "Config", { type = "Condition", var = "Combat" }, { type = "Condition", var = "StunnedRecently" } ) end }, { var = "conditionShapeshifted", type = "check", label = "Currently Shapeshifted?", apply = function(val, modList, enemyModList) - if val then - modList:NewMod("Condition:Shapeshifted", "FLAG", true, "Config") - end + modList:NewMod("Condition:Shapeshifted", "FLAG", true, "Config") end }, { var = "conditionShapeshiftToAnimal", type = "check", label = "Shapeshifted to animal recently?", ifSkillType = { SkillType.Bear, SkillType.Wolf, SkillType.Wyvern }, apply = function(val, modList, enemyModList) modList:NewMod("Condition:ShapeshiftToAnimal", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) @@ -1574,7 +1572,7 @@ Huge sets the radius to 11. { var = "conditionHaveArborix", type = "check", label = "Do you have Iron Reflexes?", ifFlag = "Condition:HaveArborix", tooltip = "This option is specific to Arborix.",apply = function(val, modList, enemyModList) modList:NewMod("Condition:HaveIronReflexes", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) modList:NewMod("Keystone", "LIST", "Iron Reflexes", "Config") - end }, + end }, { var = "conditionHaveAugyre", type = "list", label = "Augyre rotating buff:", ifFlag = "Condition:HaveAugyre", list = {{val="EleOverload",label="Elemental Overload"},{val="ResTechnique",label="Resolute Technique"}}, tooltip = "This option is specific to Augyre.", apply = function(val, modList, enemyModList) if val == "EleOverload" then modList:NewMod("Condition:HaveElementalOverload", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) @@ -1583,7 +1581,7 @@ Huge sets the radius to 11. modList:NewMod("Condition:HaveResoluteTechnique", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) modList:NewMod("Keystone", "LIST", "Resolute Technique", "Config") end - end }, + end }, { var = "conditionHaveVulconus", type = "check", label = "Do you have Avatar Of Fire?", ifFlag = "Condition:HaveVulconus", tooltip = "This option is specific to Vulconus.", apply = function(val, modList, enemyModList) modList:NewMod("Condition:HaveAvatarOfFire", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) modList:NewMod("Keystone", "LIST", "Avatar of Fire", "Config") @@ -2183,7 +2181,7 @@ Huge sets the radius to 11. build.configTab.varControls['enemyColdDamage']:SetPlaceholder(defaultDamage, true) build.configTab.varControls['enemyFireDamage']:SetPlaceholder(defaultDamage, true) build.configTab.varControls['enemyChaosDamage']:SetPlaceholder(defaultDamage, true) - + local rollRangeMult = m_min(m_max(build.configTab.input['enemyDamageRollRange'] or build.configTab.varControls['enemyDamageRollRange'].placeholder, 0), 100) for damageType, damageMult in pairs(bossData.DamageMultipliers) do if isUber and bossData.UberDamageMultiplier then @@ -2198,7 +2196,7 @@ Huge sets the radius to 11. build.configTab.varControls['enemyLightningPen']:SetPlaceholder(defaultPen, true) build.configTab.varControls['enemyColdPen']:SetPlaceholder(defaultPen, true) build.configTab.varControls['enemyFirePen']:SetPlaceholder(defaultPen, true) - + if bossData.DamagePenetrations then for penType, pen in pairs(bossData.DamagePenetrations) do if isUber and bossData.UberDamagePenetrations and bossData.UberDamagePenetrations[penType] then @@ -2208,13 +2206,13 @@ Huge sets the radius to 11. end end end - + if bossData.DamageType then build.configTab.varControls['enemyDamageType']:SelByValue(bossData.DamageType, "val") build.configTab.input['enemyDamageType'] = bossData.DamageType end build.configTab.varControls['enemyDamageType'].enabled = false - + if isUber and bossData.UberSpeed then build.configTab.varControls['enemySpeed']:SetPlaceholder(bossData.UberSpeed, true) elseif bossData.speed then @@ -2223,7 +2221,7 @@ Huge sets the radius to 11. if bossData.critChance then build.configTab.varControls['enemyCritChance']:SetPlaceholder(bossData.critChance, true) end - + modList:NewMod("BossSkillActive", "FLAG", true, "Config") -- boss specific mods @@ -2275,7 +2273,7 @@ Huge sets the radius to 11. { var = "enemyFireDamage", type = "countAllowZero", label = "Enemy Skill ^xB97123Fire Damage:"}, { var = "enemyFirePen", type = "countAllowZero", label = "Enemy Skill ^xB97123Fire Pen:"}, { var = "enemyChaosDamage", type = "countAllowZero", label = "Enemy Skill ^xD02090Chaos Damage:"}, - + -- Section: Custom mods { section = "Custom Modifiers", col = 1 }, { var = "customMods", type = "text", label = "", doNotHighlight = true, resizable = true,