Skip to content

Various gem fixes and improvements #2898

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
LocalIdentity merged 19 commits into from
Jul 21, 2021
Merged

Various gem fixes and improvements #2898

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
60eb12c
Add support for added damage multipliers
PJacek Jul 15, 2021
308b547
Add support for lucky damage chance
PJacek Jul 15, 2021
f6a8add
Add support for Anomalous Freezing Pulse
PJacek Jul 16, 2021
918046d
Add support for Divergent Immortal Call
PJacek Jul 16, 2021
afcaf03
Fix typo in Divergent Infernal Legion stat map
PJacek Jul 16, 2021
9372a76
Add support for Divergent Lancing Steel
PJacek Jul 16, 2021
85c6380
Fix typos in repeat frequency calculation
PJacek Jul 16, 2021
7a61c06
Fix Meat Shield
PJacek Jul 16, 2021
1c4f370
Add support for Anomalous Minion Damage
PJacek Jul 17, 2021
b9d2696
Fix ailments ignoring mods scaled by distance
PJacek Jul 17, 2021
8556ed8
Add support for Divergent Pierce
PJacek Jul 17, 2021
5d06318
Add support for Anomalous Poacher's Mark
PJacek Jul 17, 2021
d070b12
Fix Divergent Predator
PJacek Jul 17, 2021
78da000
Add support for Anomalous Trinity
PJacek Jul 17, 2021
9d3fada
Add support for Phantasmal Vortex
PJacek Jul 17, 2021
3f6df34
Add support for Anomalous Warlord's Mark
PJacek Jul 17, 2021
dd9b526
This mod is removed in 3.15
Jul 21, 2021
a60c59e
Changed format of added damage
Wires77 Jul 21, 2021
44c29f1
Merge branch 'gem-fixes' of https://github.com/PJacek/PathOfBuilding …
Wires77 Jul 21, 2021
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
Next Next commit
Add support for added damage multipliers
  • Loading branch information
@PJacek
PJacek committed Jul 17, 2021
commit 60eb12ccdde886246e1ece26e482efe07b648315
6 changes: 6 additions & 0 deletions src/Data/SkillStatMap.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,12 @@ return {
["global_maximum_added_chaos_damage"] = {
mod("ChaosMax", "BASE", nil),
},
["added_damage_+%_final"] = {
mod("AddedDamage", "MORE", nil),
},
["active_skill_added_damage_+%_final"] = {
mod("AddedDamage", "MORE", nil),
},
["shield_charge_damage_+%_maximum"] = {
mod("Damage", "MORE", nil, 0, 0, { type = "DistanceRamp", ramp = {{0,0},{60,1}} }),
},
Expand Down
12 changes: 0 additions & 12 deletions src/Data/Skills/act_dex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2678,18 +2678,6 @@ skills["DualStrike"] = {
["dual_strike_damage_+%_final_against_enemies_on_full_life"] = {
mod("Damage", "MORE", nil, 0, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment), { type = "ActorCondition", actor = "enemy", var = "FullLife" })
},
["active_skill_added_damage_+%_final"] = {
mod("PhysicalMax", "MORE", nil),
mod("FireMax", "MORE", nil),
mod("ColdMax", "MORE", nil),
mod("LightningMax", "MORE", nil),
mod("ChaosMax", "MORE", nil),
mod("PhysicalMin", "MORE", nil),
mod("FireMin", "MORE", nil),
mod("ColdMin", "MORE", nil),
mod("LightningMin", "MORE", nil),
mod("ChaosMin", "MORE", nil),
}
},
baseFlags = {
attack = true,
Expand Down
12 changes: 0 additions & 12 deletions src/Export/Skills/act_dex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,18 +490,6 @@ local skills, mod, flag, skill = ...
["dual_strike_damage_+%_final_against_enemies_on_full_life"] = {
mod("Damage", "MORE", nil, 0, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment), { type = "ActorCondition", actor = "enemy", var = "FullLife" })
},
["active_skill_added_damage_+%_final"] = {
mod("PhysicalMax", "MORE", nil),
mod("FireMax", "MORE", nil),
mod("ColdMax", "MORE", nil),
mod("LightningMax", "MORE", nil),
mod("ChaosMax", "MORE", nil),
mod("PhysicalMin", "MORE", nil),
mod("FireMin", "MORE", nil),
mod("ColdMin", "MORE", nil),
mod("LightningMin", "MORE", nil),
mod("ChaosMin", "MORE", nil),
}
},
#mods

Expand Down
25 changes: 15 additions & 10 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1850,28 +1850,33 @@ function calcs.offence(env, actor, activeSkill)
local damageEffectiveness = activeSkill.activeEffect.grantedEffectLevel.damageEffectiveness or skillData.damageEffectiveness or 1
local addedMin = skillModList:Sum("BASE", cfg, damageTypeMin) + enemyDB:Sum("BASE", cfg, "Self"..damageTypeMin)
local addedMax = skillModList:Sum("BASE", cfg, damageTypeMax) + enemyDB:Sum("BASE", cfg, "Self"..damageTypeMax)
local baseMin = ((source[damageTypeMin] or 0) + (source[damageType.."BonusMin"] or 0)) * baseMultiplier + addedMin * damageEffectiveness
local baseMax = ((source[damageTypeMax] or 0) + (source[damageType.."BonusMax"] or 0)) * baseMultiplier + addedMax * damageEffectiveness
local addedMult = calcLib.mod(skillModList, cfg, "Added"..damageType.."Damage", "AddedDamage")
local baseMin = ((source[damageTypeMin] or 0) + (source[damageType.."BonusMin"] or 0)) * baseMultiplier + addedMin * damageEffectiveness * addedMult
local baseMax = ((source[damageTypeMax] or 0) + (source[damageType.."BonusMax"] or 0)) * baseMultiplier + addedMax * damageEffectiveness * addedMult
output[damageTypeMin.."Base"] = baseMin
output[damageTypeMax.."Base"] = baseMax
if breakdown then
breakdown[damageType] = { damageTypes = { } }
if baseMin ~= 0 and baseMax ~= 0 then
t_insert(breakdown[damageType], "Base damage:")
local plus = ""
local plus = false
if (source[damageTypeMin] or 0) ~= 0 or (source[damageTypeMax] or 0) ~= 0 then
t_insert(breakdown[damageType], s_format("%d to %d ^8(base damage from %s)", source[damageTypeMin], source[damageTypeMax], source.type and "weapon" or "skill"))
if baseMultiplier ~= 1 then
t_insert(breakdown[damageType], s_format("(%d to %d) x %.2f ^8(base damage from %s multiplied by base damage multiplier)", source[damageTypeMin], source[damageTypeMax], baseMultiplier, source.type and "weapon" or "skill"))
else
t_insert(breakdown[damageType], s_format("%d to %d ^8(base damage from %s)", source[damageTypeMin], source[damageTypeMax], source.type and "weapon" or "skill"))
t_insert(breakdown[damageType], s_format("x %.2f ^8(base damage multiplier)", baseMultiplier))
end
plus = "+ "
plus = true
end
if addedMin ~= 0 or addedMax ~= 0 then
if plus then
t_insert(breakdown[damageType], "+")
end
t_insert(breakdown[damageType], s_format("%d to %d ^8(added damage)", addedMin, addedMax))
if damageEffectiveness ~= 1 then
t_insert(breakdown[damageType], s_format("%s(%d to %d) x %.2f ^8(added damage multiplied by damage effectiveness)", plus, addedMin, addedMax, damageEffectiveness))
else
t_insert(breakdown[damageType], s_format("%s%d to %d ^8(added damage)", plus, addedMin, addedMax))
t_insert(breakdown[damageType], s_format("x %.2f ^8(damage effectiveness)", damageEffectiveness))
end
if addedMult ~= 1 then
t_insert(breakdown[damageType], s_format("x %.2f ^8(added damage multiplier)", addedMult))
end
end
t_insert(breakdown[damageType], s_format("= %.1f to %.1f", baseMin, baseMax))
Expand Down