Skip to content

Commit 230b424

Browse files
committed
Implement actual mod parsing for full wording
1 parent 4b5fa5b commit 230b424

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

src/Data/ModCache.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3568,7 +3568,11 @@ c["Breaks Armour equal to 40% of damage from Hits with this weapon"]={nil,"Break
35683568
c["Breaks Armour equal to 40% of damage from Hits with this weapon Fully Armour Broken enemies you kill with Hits Shatter"]={nil,"Breaks Armour equal to 40% of damage from Hits with this weapon Fully Armour Broken enemies you kill with Hits Shatter "}
35693569
c["Buffs on you expire 10% slower"]={{[1]={[1]={skillType=5,type="SkillType"},flags=0,keywordFlags=0,name="Duration",type="INC",value=10}},nil}
35703570
c["Burning Enemies you kill have a 5% chance to Explode, dealing a tenth of their maximum Life as Fire Damage"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Burning"},flags=0,keywordFlags=0,name="ExplodeMod",type="LIST",value={amount=5,chance=1,keyOfScaledMod="chance",type="Tenth"}},[2]={flags=0,keywordFlags=0,name="CanExplode",type="FLAG",value=true}},nil}
3571-
c["Can Block Damage from all Hits while Shield is not Raised"]={nil,"Can Block Damage from all Hits while Shield is not Raised "}
3571+
c["Can Attack as though using a Quarterstaff while both of your hand slots are empty"]={nil,"Can Attack as though using a Quarterstaff while both of your hand slots are empty "}
3572+
c["Can Attack as though using a Quarterstaff while both of your hand slots are empty Unarmed Attacks that would use your Quarterstaff's damage gain:"]={nil,"Can Attack as though using a Quarterstaff while both of your hand slots are empty Unarmed Attacks that would use your Quarterstaff's damage gain: "}
3573+
c["Can Attack as though using a Quarterstaff while both of your hand slots are empty Unarmed Attacks that would use your Quarterstaff's damage gain: • Physical damage based on their Skill Level"]={nil,"Can Attack as though using a Quarterstaff while both of your hand slots are empty Unarmed Attacks that would use your Quarterstaff's damage gain: • Physical damage based on their Skill Level "}
3574+
c["Can Attack as though using a Quarterstaff while both of your hand slots are empty Unarmed Attacks that would use your Quarterstaff's damage gain: • Physical damage based on their Skill Level • 1% more Attack Speed per 25 Item Evasion Rating on Equipped Armour Items"]={nil,"Can Attack as though using a Quarterstaff while both of your hand slots are empty Unarmed Attacks that would use your Quarterstaff's damage gain: • Physical damage based on their Skill Level • 1% more Attack Speed per 25 Item Evasion Rating on Equipped Armour Items "}
3575+
c["Can Attack as though using a Quarterstaff while both of your hand slots are empty Unarmed Attacks that would use your Quarterstaff's damage gain: • Physical damage based on their Skill Level • 1% more Attack Speed per 25 Item Evasion Rating on Equipped Armour Items • +0.1% to Critical Hit Chance per 10 Item Energy Shield on Equipped Armour Items"]={{[1]={[1]={type="Condition",var="HollowPalm"},[2]={div=25,stat="EvasionOnAllArmourItems",type="PerStat"},flags=1,keywordFlags=0,name="Speed",type="MORE",value=1},[2]={[1]={type="Condition",var="HollowPalm"},[2]={div="10",stat="EnergyShieldOnAllArmourItems",type="PerStat"},flags=1,keywordFlags=0,name="CritChance",type="BASE",value=0.1}},nil}
35723576
c["Can Block damage from all Hits"]={nil,"Can Block damage from all Hits "}
35733577
c["Can Block damage from all Hits Cannot use Shield Skills"]={nil,"Can Block damage from all Hits Cannot use Shield Skills "}
35743578
c["Can Evade all Hits"]={nil,"Can Evade all Hits "}

src/Modules/CalcActiveSkill.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,6 @@ function calcs.buildActiveSkillModList(env, activeSkill)
691691
activeEffect.srcInstance.skillStageCount = nil
692692
end
693693

694-
-- TODO If the table stats are present on each gem, this can be handled via SkillStatMap instead
695694
-- Hollow Palm Technique added phys for skills that would use Quarterstaff
696695
if activeSkill.actor.modDB.conditions.HollowPalm and activeEffect.grantedEffect.weaponTypes and activeEffect.grantedEffect.weaponTypes.Staff then
697696
local gemLevel = activeEffect.level

src/Modules/ModParser.lua

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5332,12 +5332,11 @@ local specialModList = {
53325332
flag("Condition:OnConsecratedGround", { type = "Condition", var = "StrHighestAttribute" }, { type = "Condition", var = "Stationary" }),
53335333
},
53345334
["you count as dual wielding while you are unencumbered"] = { flag("Condition:DualWielding", { type = "Condition", var = "Unencumbered" }) },
5335-
-- New Hollow Palm Technique
5336-
-- TODO Update with actual wording and mods
5337-
["can attack as though using a quarterstaff while both of your hands are empty"] = {
5338-
-- PLACEHOLDER for additionally required mods
5339-
},
5340-
5335+
["can attack as though using a quarterstaff while both of your hand slots are empty unarmed attacks that would use your quarterstaff's damage gain: • physical damage based on their skill level • (%d+)%% more attack speed per (%d+) item evasion rating on equipped armour items • %+(%d+%.?%d*)%% to critical hit chance per (%d+) item energy shield on equipped armour items"] = function(asNum, _, evNum, critNum, esNum) return
5336+
{ -- New Hollow Palm Technique
5337+
mod("Speed", "MORE", tonumber(asNum), nil, ModFlag.Attack, { type = "Condition", var = "HollowPalm" }, { type = "PerStat", stat = "EvasionOnAllArmourItems", div = tonumber(evNum) }),
5338+
mod("CritChance", "BASE", tonumber(critNum), nil, ModFlag.Attack, { type = "Condition", var = "HollowPalm" }, { type = "PerStat", stat = "EnergyShieldOnAllArmourItems", div = (esNum) }),
5339+
} end,
53415340
["dual wielding does not inherently grant chance to block attack damage"] = { flag("Condition:NoInherentBlock") },
53425341
["inherent attack speed bonus from dual wielding is doubled while wielding two claws"] = {
53435342
flag("Condition:DoubledInherentDualWieldingSpeed", { type = "Condition", var = "DualWieldingClaws" })

0 commit comments

Comments
 (0)