Skip to content

Fix dangling enemy radius config #5230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 8, 2022
Merged

Fix dangling enemy radius config #5230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Data/Skills/act_dex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7466,7 +7466,7 @@ skills["PhysCascadeTrap"] = {
-- -1 because of two assumptions: PoE coordinates are integers and damage is not registered if the two areas only share a point or vertex. If either is not correct, then -1 is not needed.
return math.min(damagingAreaRadius * damagingAreaRadius / (areaSpreadRadius * areaSpreadRadius), 1)
end
local enemyRadius = skillModList:Sum("BASE", skillCfg, "EnemyRadius")
local enemyRadius = skillModList:Override(skillCfg, "EnemyRadius") or skillModList:Sum("BASE", skillCfg, "EnemyRadius")
local waveRadius = output.AreaOfEffectRadiusSecondary
local fullRadius = output.AreaOfEffectRadius
local overlapChance = hitChance(enemyRadius, waveRadius, fullRadius)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Skills/act_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6469,7 +6469,7 @@ skills["LightningTowerTrap"] = {
-- -1 because of two assumptions: PoE coordinates are integers and damage is not registered if the two areas only share a point or vertex. If either is not correct, then -1 is not needed.
return math.min(damagingAreaRadius * damagingAreaRadius / (areaSpreadRadius * areaSpreadRadius), 1)
end
local enemyRadius = skillModList:Sum("BASE", skillCfg, "EnemyRadius")
local enemyRadius = skillModList:Override(skillCfg, "EnemyRadius") or skillModList:Sum("BASE", skillCfg, "EnemyRadius")
local waveRadius = output.AreaOfEffectRadiusSecondary
local fullRadius = output.AreaOfEffectRadius
local overlapChance = hitChance(enemyRadius, waveRadius, fullRadius)
Expand Down
2 changes: 1 addition & 1 deletion src/Export/Skills/act_dex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ local skills, mod, flag, skill = ...
-- -1 because of two assumptions: PoE coordinates are integers and damage is not registered if the two areas only share a point or vertex. If either is not correct, then -1 is not needed.
return math.min(damagingAreaRadius * damagingAreaRadius / (areaSpreadRadius * areaSpreadRadius), 1)
end
local enemyRadius = skillModList:Sum("BASE", skillCfg, "EnemyRadius")
local enemyRadius = skillModList:Override(skillCfg, "EnemyRadius") or skillModList:Sum("BASE", skillCfg, "EnemyRadius")
local waveRadius = output.AreaOfEffectRadiusSecondary
local fullRadius = output.AreaOfEffectRadius
local overlapChance = hitChance(enemyRadius, waveRadius, fullRadius)
Expand Down
2 changes: 1 addition & 1 deletion src/Export/Skills/act_int.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,7 @@ local skills, mod, flag, skill = ...
-- -1 because of two assumptions: PoE coordinates are integers and damage is not registered if the two areas only share a point or vertex. If either is not correct, then -1 is not needed.
return math.min(damagingAreaRadius * damagingAreaRadius / (areaSpreadRadius * areaSpreadRadius), 1)
end
local enemyRadius = skillModList:Sum("BASE", skillCfg, "EnemyRadius")
local enemyRadius = skillModList:Override(skillCfg, "EnemyRadius") or skillModList:Sum("BASE", skillCfg, "EnemyRadius")
local waveRadius = output.AreaOfEffectRadiusSecondary
local fullRadius = output.AreaOfEffectRadius
local overlapChance = hitChance(enemyRadius, waveRadius, fullRadius)
Expand Down
14 changes: 9 additions & 5 deletions src/Modules/ConfigOptions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,17 +445,21 @@ Large sets the radius to 5.
Huge sets the radius to 11.
This is the size of some of the largest bosses (i.e. Nucleus of the Maven; Tsoagoth, The Brine King)]], list = {{val="Small",label="Small"},{val="Medium",label="Medium"},{val="Large",label="Large"},{val="Huge",label="Huge"}}, apply = function(val, modList, enemyModList, build)
if val == "Small" then
build.configTab.varControls['enemyRadius']:SetPlaceholder(2, true)
build.configTab.varControls['enemyRadius']:SetPlaceholder(2, false)
modList:NewMod("EnemyRadius", "BASE", 2, "Config")
elseif val == "Medium" then
build.configTab.varControls['enemyRadius']:SetPlaceholder(3, true)
build.configTab.varControls['enemyRadius']:SetPlaceholder(3, false)
modList:NewMod("EnemyRadius", "BASE", 3, "Config")
elseif val == "Large" then
build.configTab.varControls['enemyRadius']:SetPlaceholder(5, true)
build.configTab.varControls['enemyRadius']:SetPlaceholder(5, false)
modList:NewMod("EnemyRadius", "BASE", 5, "Config")
elseif val == "Huge" then
build.configTab.varControls['enemyRadius']:SetPlaceholder(11, true)
build.configTab.varControls['enemyRadius']:SetPlaceholder(11, false)
modList:NewMod("EnemyRadius", "BASE", 11, "Config")
end
end },
{ var = "enemyRadius", type = "integer", label = "Enemy radius:", ifSkillList = { "Seismic Trap", "Lightning Spire Trap" }, tooltip = "Configure the radius of an enemy hitbox to calculate some area overlapping (shotgunning) effects.", apply = function(val, modList, enemyModList)
modList:NewMod("EnemyRadius", "BASE", m_max(val, 1), "Config")
modList:NewMod("EnemyRadius", "OVERRIDE", m_max(val, 1), "Config")
end },

-- Section: Map modifiers/curses
Expand Down