Skip to content

Fixed issue #846 #862

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

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

Fixed issue #846 #862

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
7e9d1f4
Fixed issue #846
dragbone Mar 1, 2018
fd1eeb4
Revert manual changes to skills
dragbone Mar 2, 2018
6a0981b
Added cannotPierce to BlastRain, RainOfArrows, MoltenStrike and Magma…
dragbone Mar 2, 2018
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 Data/2_6/ModCache.lua
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Data/3_0/ModCache.lua
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Data/3_0/Skills/act_dex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,7 @@ skills["BlastRain"] = {
--"is_area_damage" = ?
skill("radius", 24),
skill("dpsMultiplier", 4, { type = "SkillPart", skillPart = 2 }),
skill("cannotPierce", true),
},
qualityMods = {
mod("AreaOfEffect", "INC", 0.5), --"base_skill_area_of_effect_+%" = 0.5
Expand Down Expand Up @@ -3993,6 +3994,7 @@ skills["RainOfArrows"] = {
--"base_is_projectile" = ?
--"is_area_damage" = ?
skill("radius", 24),
skill("cannotPierce", true),
},
qualityMods = {
mod("AreaOfEffect", "INC", 0.5), --"base_skill_area_of_effect_+%" = 0.5
Expand Down
1 change: 1 addition & 0 deletions Data/3_0/Skills/act_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3925,6 +3925,7 @@ skills["MagmaOrb"] = {
skill("CritChance", 5),
--"is_area_damage" = ?
--"base_is_projectile" = ?
skill("cannotPierce", true),
},
qualityMods = {
mod("Damage", "INC", 1, 0, 0, nil), --"damage_+%" = 1
Expand Down
1 change: 1 addition & 0 deletions Data/3_0/Skills/act_str.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,6 +2136,7 @@ skills["MoltenStrike"] = {
mod("Damage", "MORE", -40, ModFlag.Projectile), --"active_skill_projectile_damage_+%_final" = -40
mod("Damage", "MORE", -40, ModFlag.Dot, 0, { type = "SkillPart", skillPart = 2 }), --"active_skill_damage_over_time_from_projectile_hits_+%_final" = -40
--"show_number_of_projectiles" = ?
skill("cannotPierce", true),
},
qualityMods = {
mod("FireDamage", "INC", 1), --"fire_damage_+%" = 1
Expand Down
2 changes: 2 additions & 0 deletions Export/Skills/act_dex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ local skills, mod, flag, skill = ...
},
#baseMod skill("radius", 24)
#baseMod skill("dpsMultiplier", 4, { type = "SkillPart", skillPart = 2 })
#baseMod skill("cannotPierce", true)
#mods

#skill BlinkArrow
Expand Down Expand Up @@ -426,6 +427,7 @@ local skills, mod, flag, skill = ...
#skill RainOfArrows
#flags attack projectile area
#baseMod skill("radius", 24)
#baseMod skill("cannotPierce", true)
#mods

#skill VaalRainOfArrows
Expand Down
1 change: 1 addition & 0 deletions Export/Skills/act_int.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ local skills, mod, flag, skill = ...

#skill MagmaOrb
#flags spell projectile area chaining fire
#baseMod skill("cannotPierce", true)
#mods

#skill OrbOfStorms
Expand Down
1 change: 1 addition & 0 deletions Export/Skills/act_str.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ local skills, mod, flag, skill = ...
},
},
#setMod active_skill_damage_over_time_from_projectile_hits_+%_final==mod("Damage", "MORE", {val}, ModFlag.Dot, 0, { type = "SkillPart", skillPart = 2 })
#baseMod skill("cannotPierce", true)
#mods

#skill Punishment
Expand Down
5 changes: 4 additions & 1 deletion Modules/CalcOffence-3_0.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,10 @@ function calcs.offence(env, actor)
modDB:NewMod("Damage", "MORE", 50, "Point Blank", bor(ModFlag.Attack, ModFlag.Projectile), { type = "DistanceRamp", ramp = {{10,1},{35,0},{150,-1}} })
end
output.ProjectileCount = modDB:Sum("BASE", skillCfg, "ProjectileCount")
if modDB:Sum("FLAG", skillCfg, "PierceAllTargets") or enemyDB:Sum("FLAG", nil, "AlwaysPierceSelf") then
if skillData.cannotPierce then
output.PierceCount = 0
output.PierceCountString = "Cannot Pierce"
elseif modDB:Sum("FLAG", skillCfg, "PierceAllTargets") or enemyDB:Sum("FLAG", nil, "AlwaysPierceSelf") then
output.PierceCount = 100
output.PierceCountString = "All targets"
else
Expand Down
2 changes: 1 addition & 1 deletion Modules/CalcSections-3_0.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ return {
{ label = "Skill Duration", flag = "duration", haveOutput = "Duration", { format = "{2:output:Duration}s", { breakdown = "Duration" }, }, },
{ label = "Secondary Duration", flag = "duration", haveOutput = "DurationSecondary", { format = "{2:output:DurationSecondary}s", { breakdown = "DurationSecondary" }, }, },
{ label = "Projectile Count", flag = "projectile", { format = "{0:output:ProjectileCount}", { modName = "ProjectileCount", cfg = "skill" }, }, },
{ label = "Pierce Count", flag = "projectile", { format = "{output:PierceCountString}", { modName = { "PierceCount", "PierceAllTargets" }, cfg = "skill" }, }, },
{ label = "Pierce Count", flag = "projectile", { format = "{output:PierceCountString}", { modName = { "PierceCount", "PierceAllTargets", "CannotPierce" }, cfg = "skill" }, }, },
{ label = "Proj. Speed Mod", flag = "projectile", { format = "x {2:output:ProjectileSpeedMod}",
{ breakdown = "ProjectileSpeedMod" },
{ modName = "ProjectileSpeed", cfg = "skill" },
Expand Down