Skip to content
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

Add condition-setter method to ModStore #6825

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Add condition-setter method to ModStore #6825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
232847e
setting conditions now go through ModStore
mortentc Oct 8, 2023
1edb97c
fix varunastra call
mortentc Oct 17, 2023
2440d80
revert some function calls
mortentc Oct 18, 2023
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
4 changes: 4 additions & 0 deletions src/Classes/ModStore.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ function ModStoreClass:HasMod(modType, cfg, ...)
return self:HasModInternal(modType, flags, keywordFlags, source, ...)
end

function ModStoreClass:AddCondition(var, value)
if value then self.conditions[var] = true end
end

function ModStoreClass:GetCondition(var, cfg, noMod)
return self.conditions[var] or (self.parent and self.parent:GetCondition(var, cfg, true)) or (not noMod and self:Flag(cfg, conditionName[var]))
end
Expand Down
4 changes: 0 additions & 4 deletions src/Modules/CalcDefence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,6 @@ function calcs.defence(env, actor)
local output = actor.output
local breakdown = actor.breakdown

local condList = modDB.conditions

-- Action Speed
output.ActionSpeedMod = calcs.actionSpeedMod(actor)

Expand Down Expand Up @@ -1277,8 +1275,6 @@ function calcs.buildDefenceEstimations(env, actor)
local output = actor.output
local breakdown = actor.breakdown

local condList = modDB.conditions

local damageCategoryConfig = env.configInput.enemyDamageType or "Average"

-- chance to not be hit calculations
Expand Down
Loading