Skip to content

Commit 14e1b1e

Browse files
LocalIdentityLocalIdentity
andauthored
Add support for Ballista Nodes on the Tree (#1331)
Didn't parse quite a few nodes on the ballista specific clusters Correctly works with Mortar cannon which counts as a Ballista too Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent d8424a7 commit 14e1b1e

3 files changed

Lines changed: 13 additions & 11 deletions

File tree

src/Data/ModCache.lua

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,9 +1001,8 @@ c["10% increased Attack Damage"]={{[1]={flags=1,keywordFlags=0,name="Damage",typ
10011001
c["10% increased Attack Damage per Summoned Totem in your Presence"]={{[1]={[1]={stat="TotemsSummoned",type="PerStat"},flags=1,keywordFlags=0,name="Damage",type="INC",value=10}}," in your Presence "}
10021002
c["10% increased Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=10}},nil}
10031003
c["10% increased Attack Speed with Spears"]={{[1]={flags=268435461,keywordFlags=0,name="Speed",type="INC",value=10}},nil}
1004-
c["10% increased Ballista Critical Damage Bonus"]={{[1]={flags=0,keywordFlags=0,name="CritMultiplier",type="INC",value=10}}," Ballista "}
1005-
c["10% increased Ballista Critical Damage Bonus 10% increased Ballista Critical Hit Chance"]={{[1]={flags=0,keywordFlags=0,name="CritMultiplier",type="INC",value=10}}," Ballista 10% increased Ballista Critical Hit Chance "}
1006-
c["10% increased Ballista Critical Hit Chance"]={{[1]={flags=0,keywordFlags=0,name="CritChance",type="INC",value=10}}," Ballista "}
1004+
c["10% increased Ballista Critical Damage Bonus"]={{[1]={[1]={type="Condition",var="BallistaSkill"},flags=0,keywordFlags=16384,name="CritMultiplier",type="INC",value=10}},nil}
1005+
c["10% increased Ballista Critical Hit Chance"]={{[1]={[1]={type="Condition",var="BallistaSkill"},flags=0,keywordFlags=16384,name="CritChance",type="INC",value=10}},nil}
10071006
c["10% increased Bleeding Duration"]={{[1]={flags=0,keywordFlags=0,name="EnemyBleedDuration",type="INC",value=10}},nil}
10081007
c["10% increased Blind Effect"]={{[1]={flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="BlindEffect",type="INC",value=10}}}},nil}
10091008
c["10% increased Block chance"]={{[1]={flags=0,keywordFlags=0,name="BlockChance",type="INC",value=10}},nil}
@@ -1433,9 +1432,9 @@ c["15% increased Attack Critical Hit Chance while Dual Wielding"]={{[1]={[1]={ty
14331432
c["15% increased Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=15}},nil}
14341433
c["15% increased Attack Speed if you've been Hit Recently"]={{[1]={[1]={type="Condition",var="BeenHitRecently"},flags=1,keywordFlags=0,name="Speed",type="INC",value=15}},nil}
14351434
c["15% increased Attack Speed while not on Low Mana"]={{[1]={[1]={neg=true,type="Condition",var="LowMana"},flags=1,keywordFlags=0,name="Speed",type="INC",value=15}},nil}
1436-
c["15% increased Ballista Critical Damage Bonus"]={{[1]={flags=0,keywordFlags=0,name="CritMultiplier",type="INC",value=15}}," Ballista "}
1437-
c["15% increased Ballista Critical Hit Chance"]={{[1]={flags=0,keywordFlags=0,name="CritChance",type="INC",value=15}}," Ballista "}
1438-
c["15% increased Ballista damage"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="INC",value=15}}," Ballista "}
1435+
c["15% increased Ballista Critical Damage Bonus"]={{[1]={[1]={type="Condition",var="BallistaSkill"},flags=0,keywordFlags=16384,name="CritMultiplier",type="INC",value=15}},nil}
1436+
c["15% increased Ballista Critical Hit Chance"]={{[1]={[1]={type="Condition",var="BallistaSkill"},flags=0,keywordFlags=16384,name="CritChance",type="INC",value=15}},nil}
1437+
c["15% increased Ballista damage"]={{[1]={[1]={type="Condition",var="BallistaSkill"},flags=0,keywordFlags=16384,name="Damage",type="INC",value=15}},nil}
14391438
c["15% increased Block chance"]={{[1]={flags=0,keywordFlags=0,name="BlockChance",type="INC",value=15}},nil}
14401439
c["15% increased Cast Speed"]={{[1]={flags=16,keywordFlags=0,name="Speed",type="INC",value=15}},nil}
14411440
c["15% increased Charm Charges gained"]={{[1]={flags=0,keywordFlags=0,name="CharmChargesGained",type="INC",value=15}},nil}
@@ -1715,8 +1714,8 @@ c["20% increased Attack Damage while Surrounded"]={{[1]={[1]={type="Condition",v
17151714
c["20% increased Attack Damage while you have no Life Flask uses left"]={{[1]={flags=1,keywordFlags=0,name="Damage",type="INC",value=20}}," while you have no Life Flask uses left "}
17161715
c["20% increased Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=20}},nil}
17171716
c["20% increased Attack Speed while Surrounded"]={{[1]={[1]={type="Condition",var="Surrounded"},flags=1,keywordFlags=0,name="Speed",type="INC",value=20}},nil}
1718-
c["20% increased Ballista Critical Hit Chance"]={{[1]={flags=0,keywordFlags=0,name="CritChance",type="INC",value=20}}," Ballista "}
1719-
c["20% increased Ballista Immobilisation buildup"]={{}," Ballista Immobilisation buildup "}
1717+
c["20% increased Ballista Critical Hit Chance"]={{[1]={[1]={type="Condition",var="BallistaSkill"},flags=0,keywordFlags=16384,name="CritChance",type="INC",value=20}},nil}
1718+
c["20% increased Ballista Immobilisation buildup"]={{}," Immobilisation buildup "}
17201719
c["20% increased Blind Effect"]={{[1]={flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="BlindEffect",type="INC",value=20}}}},nil}
17211720
c["20% increased Block chance"]={{[1]={flags=0,keywordFlags=0,name="BlockChance",type="INC",value=20}},nil}
17221721
c["20% increased Cast Speed"]={{[1]={flags=16,keywordFlags=0,name="Speed",type="INC",value=20}},nil}
@@ -2002,8 +2001,7 @@ c["25% increased Attack Damage while you have no Life Flask uses left 25% increa
20022001
c["25% increased Attack Damage while you have no Life Flask uses left 25% increased Attack Damage while Surrounded 25% increased Attack Damage when on Low Life"]={{[1]={[1]={type="Condition",var="Surrounded"},[2]={type="Condition",var="LowLife"},flags=1,keywordFlags=0,name="Damage",type="INC",value=25}}," while you have no Life Flask uses left 25% increased Attack Damage 25% increased Attack Damage "}
20032002
c["25% increased Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=25}},nil}
20042003
c["25% increased Attack Speed while on Full Mana"]={{[1]={[1]={type="Condition",var="FullMana"},flags=1,keywordFlags=0,name="Speed",type="INC",value=25}},nil}
2005-
c["25% increased Ballista Critical Damage Bonus"]={{[1]={flags=0,keywordFlags=0,name="CritMultiplier",type="INC",value=25}}," Ballista "}
2006-
c["25% increased Ballista Critical Damage Bonus 20% increased Ballista Critical Hit Chance"]={{[1]={flags=0,keywordFlags=0,name="CritMultiplier",type="INC",value=25}}," Ballista 20% increased Ballista Critical Hit Chance "}
2004+
c["25% increased Ballista Critical Damage Bonus"]={{[1]={[1]={type="Condition",var="BallistaSkill"},flags=0,keywordFlags=16384,name="CritMultiplier",type="INC",value=25}},nil}
20072005
c["25% increased Blind duration"]={{[1]={flags=0,keywordFlags=0,name="Duration",type="INC",value=25}}," Blind "}
20082006
c["25% increased Blind duration 25% increased Damage with Hits against Blinded Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Blinded"},flags=0,keywordFlags=262144,name="Duration",type="INC",value=25}}," Blind 25% increased Damage "}
20092007
c["25% increased Block Recovery"]={{[1]={flags=0,keywordFlags=0,name="BlockRecovery",type="INC",value=25}},nil}
@@ -2746,7 +2744,7 @@ c["50% increased Attack Damage"]={{[1]={flags=1,keywordFlags=0,name="Damage",typ
27462744
c["50% increased Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=50}},nil}
27472745
c["50% increased Attack damage while moving"]={{[1]={[1]={type="Condition",var="Moving"},flags=1,keywordFlags=0,name="Damage",type="INC",value=50}},nil}
27482746
c["50% increased Attribute Requirements"]={{[1]={flags=0,keywordFlags=0,name="StrRequirement",type="INC",value=50},[2]={flags=0,keywordFlags=0,name="DexRequirement",type="INC",value=50},[3]={flags=0,keywordFlags=0,name="IntRequirement",type="INC",value=50}},nil}
2749-
c["50% increased Ballista Immobilisation buildup"]={{}," Ballista Immobilisation buildup "}
2747+
c["50% increased Ballista Immobilisation buildup"]={{}," Immobilisation buildup "}
27502748
c["50% increased Blind Effect"]={{[1]={flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="BlindEffect",type="INC",value=50}}}},nil}
27512749
c["50% increased Block chance"]={{[1]={flags=0,keywordFlags=0,name="BlockChance",type="INC",value=50}},nil}
27522750
c["50% increased Cooldown Recovery Rate"]={{[1]={flags=0,keywordFlags=0,name="CooldownRecovery",type="INC",value=50}},nil}

src/Data/SkillStatMap.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2164,6 +2164,9 @@ return {
21642164
["totem_chaos_resistance_%"] = {
21652165
mod("TotemChaosResist", "BASE", nil)
21662166
},
2167+
["base_skill_is_ballistified"] = {
2168+
flag("Condition:BallistaSkill"),
2169+
},
21672170
-- Minion
21682171
["minion_damage_+%"] = {
21692172
mod("MinionModifier", "LIST", { mod = mod("Damage", "INC", nil) }),

src/Modules/ModParser.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,7 @@ local modFlagList = {
988988
["hazard"] = { tag = { type = "SkillType", skillType = SkillType.Hazard } },
989989
["brand"] = { tag = { type = "SkillType", skillType = SkillType.Brand } },
990990
["totem"] = { keywordFlags = KeywordFlag.Totem },
991+
["ballista"] = { keywordFlags = KeywordFlag.Totem, tag = { type = "Condition", var = "BallistaSkill" } },
991992
["with totem skills"] = { keywordFlags = KeywordFlag.Totem },
992993
["for skills used by totems"] = { keywordFlags = KeywordFlag.Totem },
993994
["totem skills that cast an aura"] = { tag = { type = "SkillType", skillType = SkillType.Aura }, keywordFlags = KeywordFlag.Totem },

0 commit comments

Comments
 (0)