Skip to content
Merged
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: 16 additions & 1 deletion src/Classes/ModStore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,28 @@ function ModStoreClass:GetStat(stat, cfg)
-- currently only checks main statSet for skill flags. rework if required
if (activeSkill.skillTypes[SkillType.Aura] and not activeSkill.activeEffect.statSet.skillFlags.disable and activeSkill.buffList and activeSkill.buffList[1] and activeSkill.buffList[1].name == cfg.skillName) then
local manaBase = activeSkill.skillData["ManaReservedBase"] or 0
reservedPercentMana = manaBase / totalMana * 100
reservedPercentMana = m_floor(manaBase / totalMana * 100)
break
end
end
return m_min(reservedPercentMana, 100) --Don't let people get more than 100% reservation for aura effect.
end
end
if stat == "LifeReservedPercent" then
local reservedPercentLife = 0
local totalLife = self.actor.output["Life"]
if totalLife == 0 then return 0 else
for _, activeSkill in ipairs(self.actor.activeSkillList) do
if (activeSkill.skillTypes[SkillType.HasReservation] and not activeSkill.skillFlags.disable and activeSkill.buffList and activeSkill.buffList[1] and cfg and (isNameInBuffList(activeSkill.buffList, cfg.skillName) or isNameInBuffList(activeSkill.buffList, cfg.summonSkillName)) ) then
local lifeBase = activeSkill.skillData["LifeReservedBase"] or 0
reservedPercentLife = lifeBase / totalLife * 100
reservedPercentLife = m_floor(lifeBase / totalLife * 100)
break
end
end
return m_min(reservedPercentLife, 100) --Don't let people get more than 100% reservation for aura effect.
end
end
-- if ReservationEfficiency is -100, ManaUnreserved is nan which breaks everything if Arcane Cloak is enabled
if stat == "ManaUnreserved" and self.actor.output[stat] ~= self.actor.output[stat] then
-- 0% reserved = total mana
Expand Down
3 changes: 3 additions & 0 deletions src/Modules/CalcOffence.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4632,6 +4632,7 @@ function calcs.offence(env, actor, activeSkill)
skillName = skillCfg.skillName,
skillPart = skillCfg.skillPart,
skillTypes = skillCfg.skillTypes,
summonSkillName = skillCfg.summonSkillName,
slotName = skillCfg.slotName,
flags = bor(ModFlag.Dot, ModFlag.Ailment, band(cfg.flags, ModFlag.WeaponMask), band(cfg.flags, ModFlag.Melee) ~= 0 and ModFlag.MeleeHit or 0),
keywordFlags = bor(band(cfg.keywordFlags, bnot(KeywordFlag.Hit)), KeywordFlag[ailment], KeywordFlag.Ailment, KeywordFlag[ailmentDamageType .. "Dot"]),
Expand Down Expand Up @@ -5374,6 +5375,7 @@ function calcs.offence(env, actor, activeSkill)
skillName = skillCfg.skillName,
skillPart = skillCfg.skillPart,
skillTypes = skillCfg.skillTypes,
summonSkillName = skillCfg.summonSkillName,
slotName = skillCfg.slotName,
flags = ModFlag.Dot,
keywordFlags = bor(band(skillCfg.keywordFlags, bnot(KeywordFlag.Hit)), KeywordFlag.ChaosDot),
Expand Down Expand Up @@ -5444,6 +5446,7 @@ function calcs.offence(env, actor, activeSkill)
skillName = skillCfg.skillName,
skillPart = skillCfg.skillPart,
skillTypes = skillCfg.skillTypes,
summonSkillName = skillCfg.summonSkillName,
slotName = skillCfg.slotName,
flags = bor(ModFlag.Dot, skillCfg.flags),
keywordFlags = band(skillCfg.keywordFlags, bnot(KeywordFlag.Hit)),
Expand Down
Loading