overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3112 from PathOfBuildingCommunity/fix_combat-focus

Browse Source 
Fix Combat Jewel parsing
This commit is contained in:
Wires77
2021-08-08 18:42:47 -05:00
committed by GitHub
parent c4038f5759 acd214db35
commit eb44d86bbf
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Data/Uniques/jewel.lua
View File

@@ -998,24 +998,24 @@ Crimson Jewel
Limited to: 2
Radius: Medium
(10-15)% increased Elemental Damage with Attack Skills
With 40 total Strength and Intelligence in Radius, Elemental Hit and Wild Strike cannot choose Cold
With 40 total Strength and Intelligence in Radius, Elemental Hit and Wild Strike deal 50% less Cold Damage
With 40 total Strength and Intelligence in Radius, Prismatic Skills cannot choose Cold
With 40 total Strength and Intelligence in Radius, Prismatic Skills deal 50% less Cold Damage
]],[[
Combat Focus
Cobalt Jewel
Limited to: 2
Radius: Medium
(10-15)% increased Elemental Damage with Attack Skills
With 40 total Intelligence and Dexterity in Radius, Elemental Hit and Wild Strike cannot choose Fire
With 40 total Intelligence and Dexterity in Radius, Elemental Hit and Wild Strike deal 50% less Fire Damage
With 40 total Intelligence and Dexterity in Radius, Prismatic Skills cannot choose Fire
With 40 total Intelligence and Dexterity in Radius, Prismatic Skills deal 50% less Fire Damage
]],[[
Combat Focus
Viridian Jewel
Limited to: 2
Radius: Medium
(10-15)% increased Elemental Damage with Attack Skills
With 40 total Dexterity and Strength in Radius, Elemental Hit and Wild Strike cannot choose Lightning
With 40 total Dexterity and Strength in Radius, Elemental Hit and Wild Strike deal 50% less Lightning Damage
With 40 total Dexterity and Strength in Radius, Prismatic Skills Strike cannot choose Lightning
With 40 total Dexterity and Strength in Radius, Prismatic Skills deal 50% less Lightning Damage
]],[[
Collateral Damage
Viridian Jewel

4
src/Modules/ModParser.lua
View File

@@ -855,6 +855,7 @@ local preFlagList = {
["^guard skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.GuardSkill } },
["^nova spells [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.NovaSpell } },
["^area skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.Area } },
["^prismatic skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.Prismatic } },
["^warcry skills have "] = { tag = { type = "SkillType", skillType = SkillType.Warcry } },
["^non%-curse aura skills have "] = { tag = { type = "SkillType", skillType = SkillType.Aura } },
["^non%-channelling skills have "] = { tag = { type = "SkillType", skillType = SkillType.Channelled, neg = true } },
@@ -3357,6 +3358,9 @@ local jewelThresholdFuncs = {
["With 40 total Intelligence and Dexterity in Radius, Elemental Hit and Wild Strike deal 50% less Fire Damage"] = getThreshold({ "Int","Dex" }, "FireDamage", "MORE", -50, { type = "SkillName", skillNameList = { "Elemental Hit", "Wild Strike" } }),
["With 40 total Strength and Intelligence in Radius, Elemental Hit and Wild Strike deal 50% less Cold Damage"] = getThreshold({ "Str","Int" }, "ColdDamage", "MORE", -50, { type = "SkillName", skillNameList = { "Elemental Hit", "Wild Strike" } }),
["With 40 total Dexterity and Strength in Radius, Elemental Hit and Wild Strike deal 50% less Lightning Damage"] = getThreshold({ "Dex","Str" }, "LightningDamage", "MORE", -50, { type = "SkillName", skillNameList = { "Elemental Hit", "Wild Strike" } }),
["With 40 total Intelligence and Dexterity in Radius, Prismatic Skills deal 50% less Fire Damage"] = getThreshold({ "Int","Dex" }, "FireDamage", "MORE", -50, { type = "SkillType", skillType = SkillType.Prismatic }),
["With 40 total Strength and Intelligence in Radius, Prismatic Skills deal 50% less Cold Damage"] = getThreshold({ "Str","Int" }, "ColdDamage", "MORE", -50, { type = "SkillType", skillType = SkillType.Prismatic }),
["With 40 total Dexterity and Strength in Radius, Prismatic Skills deal 50% less Lightning Damage"] = getThreshold({ "Dex","Str" }, "LightningDamage", "MORE", -50, { type = "SkillType", skillType = SkillType.Prismatic }),
["With 40 total Dexterity and Strength in Radius, Spectral Shield Throw Chains +4 times"] = getThreshold({ "Dex","Str" }, "ChainCountMax", "BASE", 4, { type = "SkillName", skillName = "Spectral Shield Throw" }),
["With 40 total Dexterity and Strength in Radius, Spectral Shield Throw fires 75% less Shard Projectiles"] = getThreshold({ "Dex","Str" }, "ProjectileCount", "MORE", -75, { type = "SkillName", skillName = "Spectral Shield Throw" }),
["With at least 40 Intelligence in Radius, Blight inflicts Withered for 2 seconds"] = getThreshold("Int", "ExtraSkillMod", "LIST", { mod = mod("Condition:CanWither", "FLAG", true) }, { type = "SkillName", skillName = "Blight" }),