Skip to content

Commit 8286c2d

Browse files
author
LocalIdentity
committed
Fix parsing for proj pin + remove pin damage type
1 parent 619ec06 commit 8286c2d

4 files changed

Lines changed: 7 additions & 20 deletions

File tree

src/Data/ModCache.lua

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,8 +1514,7 @@ c["15% increased Spell Damage"]={{[1]={flags=2,keywordFlags=0,name="Damage",type
15141514
c["15% increased Spell Damage if you've dealt a Critical Hit Recently"]={{[1]={[1]={type="Condition",var="CritRecently"},flags=2,keywordFlags=0,name="Damage",type="INC",value=15}},nil}
15151515
c["15% increased Strength"]={{[1]={flags=0,keywordFlags=0,name="Str",type="INC",value=15}},nil}
15161516
c["15% increased Stun Buildup"]={{[1]={flags=0,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=15}},nil}
1517-
c["15% increased Stun Buildup with Melee Damage"]={{[1]={flags=256,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=15}}," with Damage "}
1518-
c["15% increased Stun Buildup with Melee Damage +15 to Strength"]={{[1]={flags=256,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=15}}," with Damage +15 to Strength "}
1517+
c["15% increased Stun Buildup with Melee Damage"]={{[1]={flags=256,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=15}},nil}
15191518
c["15% increased Stun Duration"]={{[1]={flags=0,keywordFlags=0,name="EnemyStunDuration",type="INC",value=15}},nil}
15201519
c["15% increased Stun Threshold"]={{[1]={flags=0,keywordFlags=0,name="StunThreshold",type="INC",value=15}},nil}
15211520
c["15% increased Totem Damage"]={{[1]={flags=0,keywordFlags=16384,name="Damage",type="INC",value=15}},nil}
@@ -1619,7 +1618,7 @@ c["18% increased Projectile Stun Buildup"]={{[1]={flags=0,keywordFlags=0,name="P
16191618
c["18% increased Skill Effect Duration"]={{[1]={flags=0,keywordFlags=0,name="Duration",type="INC",value=18}},nil}
16201619
c["18% increased Stun Buildup"]={{[1]={flags=0,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=18}},nil}
16211620
c["18% increased Stun Buildup with Maces"]={{[1]={flags=1048580,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=18}},nil}
1622-
c["18% increased Stun Buildup with Melee Damage"]={{[1]={flags=256,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=18}}," with Damage "}
1621+
c["18% increased Stun Buildup with Melee Damage"]={{[1]={flags=256,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=18}},nil}
16231622
c["18% increased Warcry Cooldown Recovery Rate"]={{[1]={flags=0,keywordFlags=4,name="CooldownRecovery",type="INC",value=18}},nil}
16241623
c["18% increased maximum Energy Shield"]={{[1]={[1]={type="Global"},flags=0,keywordFlags=0,name="EnergyShield",type="INC",value=18}},nil}
16251624
c["18% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=18}},nil}
@@ -2296,8 +2295,7 @@ c["30% increased Stun Buildup"]={{[1]={flags=0,keywordFlags=0,name="EnemyStunBui
22962295
c["30% increased Stun Buildup against Enemies that are on Low Life"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="LowLife"},flags=0,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=30}},nil}
22972296
c["30% increased Stun Buildup against enemies within 2 metres"]={{[1]={flags=0,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=30}}," against enemies within 2 metres "}
22982297
c["30% increased Stun Buildup against enemies within 2 metres +5 to Strength and Dexterity"]={{[1]={flags=0,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=30}}," against enemies within 2 metres +5 to Strength and Dexterity "}
2299-
c["30% increased Stun Buildup with Melee Damage"]={{[1]={flags=256,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=30}}," with Damage "}
2300-
c["30% increased Stun Buildup with Melee Damage Projectiles deal 75% increased Damage against Heavy Stunned Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="HeavyStunned"},flags=256,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=30}}," with Damage Projectiles deal 75% increased Damage "}
2298+
c["30% increased Stun Buildup with Melee Damage"]={{[1]={flags=256,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=30}},nil}
23012299
c["30% increased Stun Buildup with Quarterstaves"]={{[1]={flags=2097156,keywordFlags=0,name="EnemyStunBuildup",type="INC",value=30}},nil}
23022300
c["30% increased Stun Recovery"]={{[1]={flags=0,keywordFlags=0,name="StunRecovery",type="INC",value=30}},nil}
23032301
c["30% increased Stun Threshold"]={{[1]={flags=0,keywordFlags=0,name="StunThreshold",type="INC",value=30}},nil}
@@ -5314,8 +5312,7 @@ c["Prevent +15% of Damage from Deflected Critical Hits"]={nil,"Prevent +15% of D
53145312
c["Prevent +3% of Damage from Deflected Hits"]={{[1]={flags=0,keywordFlags=0,name="DeflectEffect",type="BASE",value=3}},nil}
53155313
c["Prevent +6% of Damage from Deflected Hits"]={{[1]={flags=0,keywordFlags=0,name="DeflectEffect",type="BASE",value=6}},nil}
53165314
c["Projectile Attacks have a 12% chance to fire two additional Projectiles while moving"]={nil,"Projectile Attacks have a 12% chance to fire two additional Projectiles while moving "}
5317-
c["Projectile Damage builds Pin"]={nil,"Projectile Damage builds Pin "}
5318-
c["Projectile Damage builds Pin Pinned enemies cannot perform actions"]={nil,"Projectile Damage builds Pin Pinned enemies cannot perform actions "}
5315+
c["Projectile Damage builds Pin"]={{[1]={flags=1024,keywordFlags=0,name="CanPin",type="FLAG",value=true}},nil}
53195316
c["Projectiles Pierce all Ignited enemies"]={nil,"Projectiles Pierce all Ignited enemies "}
53205317
c["Projectiles Pierce all Ignited enemies Attacks Gain 10% of Damage as Extra Fire Damage"]={nil,"Projectiles Pierce all Ignited enemies Attacks Gain 10% of Damage as Extra Fire Damage "}
53215318
c["Projectiles Pierce enemies with Fully Broken Armour"]={{[1]={[1]={type="Condition",var="ArmourFullyBroken"},flags=0,keywordFlags=0,name="PierceCount",type="BASE",value=1}},nil}

src/Modules/CalcOffence.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4920,7 +4920,7 @@ function calcs.offence(env, actor, activeSkill)
49204920
if breakdown then
49214921
local displayedAilment = ailment
49224922
globalBreakdown[ailment .. "Buildup"] = {
4923-
"Enemy level: " .. env.enemyLevel .. (env.configInput.enemyLevel and " ^8(overridden from the Configuration tab" or " ^8(can be overridden in the Configuration tab)"),
4923+
"Enemy level: " .. env.enemyLevel .. (env.configInput.enemyLevel and " ^8(overridden from the Configuration tab" or " ^8(can be overridden in the Configuration tab)"),
49244924
"Enemy poise: " .. enemyPoiseThreshold,
49254925
"",
49264926
}

src/Modules/Data.lua

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,6 @@ data.buildupTypes = {
364364
},
365365
["Pin"] = {
366366
["ScalesFrom"] = {
367-
["Physical"] = true,
368367
}
369368
},
370369
}
@@ -401,16 +400,6 @@ data.defaultAilmentDamageTypes = {
401400
["Cold"] = true,
402401
}
403402
},
404-
["Freeze"] = {
405-
["ScalesFrom"] = {
406-
["Cold"] = true,
407-
}
408-
},
409-
["Electrocute"] = {
410-
["ScalesFrom"] = {
411-
["Lightning"] = true,
412-
}
413-
},
414403
}
415404

416405
-- Used in ModStoreClass:ScaleAddMod(...) to identify high precision modifiers

src/Modules/ModParser.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,7 @@ local modFlagList = {
10171017
["crossbow"] = { flags = ModFlag.Crossbow },
10181018
["for crossbow attacks"] = { flags = ModFlag.Crossbow, tag = { type = "SkillType", skillType = SkillType.CrossbowSkill } },
10191019
["with melee attacks"] = { flags = ModFlag.Melee },
1020+
["with melee damage"] = { flags = ModFlag.Melee },
10201021
["with melee critical hits"] = { flags = ModFlag.Melee, tag = { type = "Condition", var = "CriticalStrike" } },
10211022
["with melee skills"] = { tag = { type = "SkillType", skillType = SkillType.Melee } },
10221023
["with bow skills"] = { keywordFlags = KeywordFlag.Bow },
@@ -3129,7 +3130,7 @@ local specialModList = {
31293130
mod("ExtraAura", "LIST", { onlyAllies = true, mod = flag("GainMainHandDmgFromParent") }),
31303131
mod("Multiplier:MainHandDamageToAllies", "BASE", num),
31313132
} end,
3132-
["projectile damage can pin"] = flag("CanPin", nil, ModFlag.Projectile),
3133+
["projectile damage builds pin"] = { flag("CanPin", nil, ModFlag.Projectile) },
31333134
-- Warrior - Smith of Kitava
31343135
["body armour grants armour also applies to (%a+) damage taken from hits"] = function(_, dmgType) return {
31353136
mod("ArmourAppliesTo"..firstToUpper(dmgType).."DamageTaken", "BASE", 100, { type = "ItemCondition", itemSlot = "Body Armour", rarityCond = "NORMAL" })

0 commit comments

Comments
 (0)