Implement actual mod parsing for full wording

Author: majochem

src/Data/ModCache.lua

@@ -4079,7 +4079,7 @@ c["Can Attack as though using a Quarterstaff while both of your hand slots are e
 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: "}
 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 "}
 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 "}
-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"]={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 • +0.1% to Critical Hit Chance per 10 Item Energy Shield on Equipped Armour Items "}
+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}
 c["Can Block damage from all Hits"]={nil,"Can Block damage from all Hits "}
 c["Can Block damage from all Hits Cannot use Shield Skills"]={nil,"Can Block damage from all Hits Cannot use Shield Skills "}
 c["Can Evade all Hits if you have not been Hit Recently"]={nil,"Can Evade all Hits if you have not been Hit Recently "}
@@ -5344,10 +5344,6 @@ c["Triggered Spells deal 40% increased Spell Damage"]={{[1]={[1]={skillType=37,t
 c["Triple Attribute requirements of Martial Weapons"]={{[1]={flags=0,keywordFlags=0,name="GlobalWeaponAttributeRequirements",type="MORE",value=200}},nil}
 c["Unaffected by Chill during Dodge Roll"]={nil,"Unaffected by Chill during Dodge Roll "}
 c["Unaffected by Chill while Leeching Mana"]={{[1]={[1]={type="Condition",var="LeechingMana"},flags=0,keywordFlags=0,name="SelfChillEffect",type="MORE",value=-100}},nil}
-c["Unarmed Attacks that would use your Quarterstaff's damage gain:"]={nil,"Unarmed Attacks that would use your Quarterstaff's damage gain: "}
-c["Unarmed Attacks that would use your Quarterstaff's damage gain: • Physical damage based on their Skill Level"]={nil,"Unarmed Attacks that would use your Quarterstaff's damage gain: • Physical damage based on their Skill Level "}
-c["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,"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 "}
-c["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"]={nil,"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 "}
 c["Undead Minions have 20% reduced Reservation"]={{[1]={[1]={skillType=127,type="SkillType"},flags=0,keywordFlags=0,name="Reserved",type="INC",value=-20}},nil}
 c["Unlimited number of Summoned Totems"]={nil,"Unlimited number of Summoned Totems "}
 c["Unlimited number of Summoned Totems Totems reserve 75 Spirit each"]={nil,"Unlimited number of Summoned Totems Totems reserve 75 Spirit each "}
@@ -5488,12 +5484,6 @@ c["your Ailments on them"]={nil,"your Ailments on them "}
 c["your Ailments on them 30% reduced Duration of Ignite, Shock and Chill on Enemies"]={nil,"your Ailments on them 30% reduced Duration of Ignite, Shock and Chill on Enemies "}
 c["your Ailments on them your Ailments on them"]={nil,"your Ailments on them your Ailments on them "}
 c["your maximum Life as Physical damage per second"]={nil,"your maximum Life as Physical damage per second "}
-c["• +0.1% to Critical Hit Chance per 10 Item Energy Shield on Equipped Armour Items"]={nil,"• +0.1% to Critical Hit Chance per 10 Item Energy Shield on Equipped Armour Items "}
-c["• 1% more Attack Speed per 25 Item Evasion Rating on Equipped Armour Items"]={nil,"• 1% more Attack Speed per 25 Item Evasion Rating on Equipped Armour Items "}
-c["• 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"]={nil,"• 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 "}
-c["• Physical damage based on their Skill Level"]={nil,"• Physical damage based on their Skill Level "}
-c["• Physical damage based on their Skill Level • 1% more Attack Speed per 25 Item Evasion Rating on Equipped Armour Items"]={nil,"• Physical damage based on their Skill Level • 1% more Attack Speed per 25 Item Evasion Rating on Equipped Armour Items "}
-c["• 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"]={nil,"• 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 "}
 c["•Blue: Skills have 30% less cost"]={nil,"•Blue: Skills have 30% less cost "}
 c["•Blue: Skills have 30% less cost •Green: 40% less Movement Speed Penalty from using Skills while Moving"]={nil,"•Blue: Skills have 30% less cost •Green: 40% less Movement Speed Penalty from using Skills while Moving "}
 c["•Green: 40% less Movement Speed Penalty from using Skills while Moving"]={nil,"•Green: 40% less Movement Speed Penalty from using Skills while Moving "}

src/Modules/CalcActiveSkill.lua

@@ -691,7 +691,6 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 		activeEffect.srcInstance.skillStageCount = nil
 	end
 
-	-- TODO If the table stats are present on each gem, this can be handled via SkillStatMap instead
 	-- Hollow Palm Technique added phys for skills that would use Quarterstaff
 	if activeSkill.actor.modDB.conditions.HollowPalm and activeEffect.grantedEffect.weaponTypes and activeEffect.grantedEffect.weaponTypes.Staff then
 		local gemLevel = activeEffect.level

src/Modules/ModParser.lua

@@ -5332,12 +5332,11 @@ local specialModList = {
 		flag("Condition:OnConsecratedGround", { type = "Condition", var = "StrHighestAttribute" }, { type = "Condition", var = "Stationary" }),
 	},
 	["you count as dual wielding while you are unencumbered"] = { flag("Condition:DualWielding", { type = "Condition", var = "Unencumbered" }) },
-	-- New Hollow Palm Technique
-	-- TODO Update with actual wording and mods
-	["can attack as though using a quarterstaff while both of your hands are empty"] = { 
-		-- PLACEHOLDER for additionally required mods
-	},
-	
+	["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
+	{	-- New Hollow Palm Technique
+		mod("Speed", "MORE", tonumber(asNum), nil, ModFlag.Attack, { type = "Condition", var = "HollowPalm" }, { type = "PerStat", stat = "EvasionOnAllArmourItems", div = tonumber(evNum) }),
+		mod("CritChance", "BASE", tonumber(critNum), nil, ModFlag.Attack, { type = "Condition", var = "HollowPalm" }, { type = "PerStat", stat = "EnergyShieldOnAllArmourItems", div = (esNum) }),
+	} end,
 	["dual wielding does not inherently grant chance to block attack damage"] = { flag("Condition:NoInherentBlock") },
 	["inherent attack speed bonus from dual wielding is doubled while wielding two claws"] = {
 	    flag("Condition:DoubledInherentDualWieldingSpeed", { type = "Condition", var = "DualWieldingClaws" })