Skip to content

Commit

Permalink
Merge pull request #3926 from Lothrik/split-ele-hit-attack-and-aoe
Browse files Browse the repository at this point in the history 
Add separate calculations for Elemental Hit area component
  • Loading branch information
@Wires77
Wires77 committed Jan 25, 2022
2 parents 878e429 + 13c5aa1 commit bf06e44
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 26 deletions.
41 changes: 28 additions & 13 deletions src/Data/Skills/act_dex.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2911,13 +2911,28 @@ skills["ElementalHit"] = {
castTime = 1,
parts = {
{
name = "Fire",
name = "Fire Attack",
area = false,
},
{
name = "Cold",
name = "Fire AoE",
area = true,
},
{
name = "Lightning",
name = "Cold Attack",
area = false,
},
{
name = "Cold AoE",
area = true,
},
{
name = "Lightning Attack",
area = false,
},
{
name = "Lightning AoE",
area = true,
},
},
baseFlags = {
Expand All @@ -2928,15 +2943,15 @@ skills["ElementalHit"] = {
baseMods = {
flag("DealNoPhysical"),
flag("DealNoChaos"),
flag("DealNoFire", { type = "SkillPart", skillPart = 2 }),
flag("DealNoFire", { type = "SkillPart", skillPart = 3 }),
flag("DealNoCold", { type = "SkillPart", skillPart = 1 }),
flag("DealNoCold", { type = "SkillPart", skillPart = 3 }),
flag("DealNoLightning", { type = "SkillPart", skillPart = 1 }),
flag("DealNoLightning", { type = "SkillPart", skillPart = 2 }),
mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Ignited", "Scorched" } }, { type = "SkillPart", skillPart = 1 }),
mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Chilled", "Frozen", "Brittle" } }, { type = "SkillPart", skillPart = 2 }),
mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Shocked", "Sapped" } }, { type = "SkillPart", skillPart = 3 }),
flag("DealNoFire", { type = "SkillPart", skillPartList = { 3, 4 } }),
flag("DealNoFire", { type = "SkillPart", skillPartList = { 5, 6 } }),
flag("DealNoCold", { type = "SkillPart", skillPartList = { 1, 2 } }),
flag("DealNoCold", { type = "SkillPart", skillPartList = { 5, 6 } }),
flag("DealNoLightning", { type = "SkillPart", skillPartList = { 1, 2 } }),
flag("DealNoLightning", { type = "SkillPart", skillPartList = { 3, 4 } }),
mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Ignited", "Scorched" } }, { type = "SkillPart", skillPart = 2 }),
mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Chilled", "Frozen", "Brittle" } }, { type = "SkillPart", skillPart = 4 }),
mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Shocked", "Sapped" } }, { type = "SkillPart", skillPart = 6 }),
mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited" }),
mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Chilled" }),
mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Frozen" }),
Expand All @@ -2945,7 +2960,7 @@ skills["ElementalHit"] = {
mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Brittle" }),
mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Sapped" }),
mod("Damage", "MORE", 10, 0, 0, { type = "Multiplier", var = "ElementalHitAilmentOnEnemy" }),
skill("radius", 10),
skill("radius", 10, { type = "SkillPart", skillPartList = { 2, 4, 6 } }),
},
qualityStats = {
Default = {
Expand Down
41 changes: 28 additions & 13 deletions src/Export/Skills/act_dex.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,26 +497,41 @@ local skills, mod, flag, skill = ...
#flags attack melee projectile
parts = {
{
name = "Fire",
name = "Fire Attack",
area = false,
},
{
name = "Cold",
name = "Fire AoE",
area = true,
},
{
name = "Lightning",
name = "Cold Attack",
area = false,
},
{
name = "Cold AoE",
area = true,
},
{
name = "Lightning Attack",
area = false,
},
{
name = "Lightning AoE",
area = true,
},
},
#baseMod flag("DealNoPhysical")
#baseMod flag("DealNoChaos")
#baseMod flag("DealNoFire", { type = "SkillPart", skillPart = 2 })
#baseMod flag("DealNoFire", { type = "SkillPart", skillPart = 3 })
#baseMod flag("DealNoCold", { type = "SkillPart", skillPart = 1 })
#baseMod flag("DealNoCold", { type = "SkillPart", skillPart = 3 })
#baseMod flag("DealNoLightning", { type = "SkillPart", skillPart = 1 })
#baseMod flag("DealNoLightning", { type = "SkillPart", skillPart = 2 })
#baseMod mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Ignited", "Scorched" } }, { type = "SkillPart", skillPart = 1 })
#baseMod mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Chilled", "Frozen", "Brittle" } }, { type = "SkillPart", skillPart = 2 })
#baseMod mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Shocked", "Sapped" } }, { type = "SkillPart", skillPart = 3 })
#baseMod flag("DealNoFire", { type = "SkillPart", skillPartList = { 3, 4 } })
#baseMod flag("DealNoFire", { type = "SkillPart", skillPartList = { 5, 6 } })
#baseMod flag("DealNoCold", { type = "SkillPart", skillPartList = { 1, 2 } })
#baseMod flag("DealNoCold", { type = "SkillPart", skillPartList = { 5, 6 } })
#baseMod flag("DealNoLightning", { type = "SkillPart", skillPartList = { 1, 2 } })
#baseMod flag("DealNoLightning", { type = "SkillPart", skillPartList = { 3, 4 } })
#baseMod mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Ignited", "Scorched" } }, { type = "SkillPart", skillPart = 2 })
#baseMod mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Chilled", "Frozen", "Brittle" } }, { type = "SkillPart", skillPart = 4 })
#baseMod mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", varList = { "Shocked", "Sapped" } }, { type = "SkillPart", skillPart = 6 })
#baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited" })
#baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Chilled" })
#baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Frozen" })
Expand All @@ -525,7 +540,7 @@ local skills, mod, flag, skill = ...
#baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Brittle" })
#baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Sapped" })
#baseMod mod("Damage", "MORE", 10, 0, 0, { type = "Multiplier", var = "ElementalHitAilmentOnEnemy" })
#baseMod skill("radius", 10)
#baseMod skill("radius", 10, { type = "SkillPart", skillPartList = { 2, 4, 6 } })
#mods

#skill EnsnaringArrow
Expand Down

0 comments on commit bf06e44

Please sign in to comment.