More Passive Tree Nodes Mods support (#162)

* Triggered Spells deal increased, gain rage on and inc damage pe chance block was added

* Stun Threshold Passive Nodes was added, LowestOfArmourAndEvasionOn was added

* Fix PerStat type in Stun Threshold

* Fix Stun Threshold per Strength mod

* Calcs information regarding Stun Threshold was improved

* Fix formatting

---------

Co-authored-by: justjuangui <servicios@juacarvajal.com>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: 3 people

src/Modules/CalcDefence.lua

@@ -575,6 +575,7 @@ function calcs.defence(env, actor)
 				end
 				output["EvasionOn"..slot] = evasionBase
 			end
+			output["LowestOfArmourAndEvasionOn"..slot] = m_min(armourBase, evasionBase)
 		end
 	end
 
@@ -2116,7 +2117,8 @@ function calcs.buildDefenceEstimations(env, actor)
 		end
 		local StunThresholdInc = 1 + modDB:Sum("INC", nil, "StunThreshold") / 100
 		local StunThresholdMore = modDB:More("INC", nil, "StunThreshold")
-		output.StunThreshold = stunThresholdBase * StunThresholdInc * StunThresholdMore
+		local StunThresholdModBase = modDB:Sum("BASE", nil, "StunThreshold")
+		output.StunThreshold = (stunThresholdBase + StunThresholdModBase) * StunThresholdInc * StunThresholdMore
 
 		local notAvoidChance = modDB:Flag(nil, "StunImmune") and 0 or 100 - m_min(modDB:Sum("BASE", nil, "AvoidStun"), 100)
 		if output.EnergyShield > output["totalTakenHit"] and not env.modDB:Flag(nil, "EnergyShieldProtectsMana") then
@@ -2126,6 +2128,12 @@ function calcs.buildDefenceEstimations(env, actor)
 
 		if breakdown then
 			breakdown.StunThreshold = { s_format("%d ^8(base from %s)", stunThresholdBase, stunThresholdSource) }
+			for _, source in ipairs({"Tree", "Item", "Skill"}) do
+				local sourceVal = modDB:Sum("BASE", { source = source }, "StunThreshold")
+				if sourceVal > 0 then
+					t_insert(breakdown.StunThreshold, s_format("+ %d ^8(base from %s)", sourceVal, source))
+				end
+			end
 			if StunThresholdInc ~= 1 then
 				t_insert(breakdown.StunThreshold, s_format("* %.2f ^8(increased threshold)", StunThresholdInc))
 			end

src/Modules/ModParser.lua

@@ -1151,6 +1151,7 @@ local preFlagList = {
 	["^non%-channelling skills have "] = { tag = { type = "SkillType", skillType = SkillType.Channel, neg = true } },
 	["^non%-vaal skills deal "] = { tag = { type = "SkillType", skillType = SkillType.Vaal, neg = true } },
 	["^skills [hgdf][aei][vari][eln] "] = { },
+	["^triggered spells [hd][ae][va][el] "] = { keywordFlags = KeywordFlag.Spell, tag = { type = "SkillType", skillType = SkillType.Triggered  } },
 	-- Slot specific
 	["^left ring slot: "] = { tag = { type = "SlotNumber", num = 1 } },
 	["^right ring slot: "] = { tag = { type = "SlotNumber", num = 2 } },
@@ -1357,6 +1358,7 @@ local modTagList = {
 	["per tailwind"] = { tag = { type = "Multiplier", var = "Tailwind" } },
 	-- Per stat
 	["per (%d+)%% of maximum mana they reserve"] = function(num) return { tag = { type = "PerStat", stat = "ManaReservedPercent", div = num } } end,
+	["per strength"] = { tag = { type = "PerStat", stat = "Str"} },
 	["per (%d+) strength"] = function(num) return { tag = { type = "PerStat", stat = "Str", div = num } } end,
 	["per (%d+) dexterity"] = function(num) return { tag = { type = "PerStat", stat = "Dex", div = num } } end,
 	["per (%d+) intelligence"] = function(num) return { tag = { type = "PerStat", stat = "Int", div = num } } end,
@@ -1378,6 +1380,7 @@ local modTagList = {
 	["per (%d+) maximum mana, up to a maximum of (%d+)%%"] = function(num, _, limit) return { tag = { type = "PerStat", stat = "Mana", div = num, limit = tonumber(limit), limitTotal = true } } end,
 	["per (%d+) accuracy rating"] = function(num) return { tag = { type = "PerStat", stat = "Accuracy", div = num } } end,
 	["per (%d+)%% block chance"] = function(num) return { tag = { type = "PerStat", stat = "BlockChance", div = num } } end,
+	["per (%d+)%% chance to block"] = function(num) return { tag = { type = "PerStat", stat = "BlockChance", div = num } } end,
 	["per (%d+)%% chance to block on equipped shield"] = function(num) return { tag = { type = "PerStat", stat = "ShieldBlockChance", div = num } } end,
 	["per (%d+)%% chance to block attack damage"] = function(num) return { tag = { type = "PerStat", stat = "BlockChance", div = num } } end,
 	["per (%d+)%% chance to block spell damage"] = function(num) return { tag = { type = "PerStat", stat = "SpellBlockChance", div = num } } end,
@@ -1622,6 +1625,8 @@ local modTagList = {
 	["while not cursed"] = { tag = { type = "Condition", var = "Cursed", neg = true } },
 	["while there is only one nearby enemy"] = { tagList = { { type = "Multiplier", var = "NearbyEnemies", limit = 1 }, { type = "Condition", var = "OnlyOneNearbyEnemy" } } },
 	["while t?h?e?r?e? ?i?s? ?a rare or unique enemy i?s? ?nearby"] = { tag = { type = "ActorCondition", actor = "enemy", varList = { "NearbyRareOrUniqueEnemy", "RareOrUnique" } } },
+	["if you have been stunned recently"] = { tag = { type = "Condition", var = "StunnedRecently" } },
+	["if you haven't been stunned recently"] = { tag = { type = "Condition", var = "StunnedRecently", neg = true } },
 	["if you[' ]h?a?ve hit recently"] = { tag = { type = "Condition", var = "HitRecently" } },
 	["if you[' ]h?a?ve hit an enemy recently"] = { tag = { type = "Condition", var = "HitRecently" } },
 	["if you[' ]h?a?ve hit with your main hand weapon recently"] = { tag = { type = "Condition", var = "HitRecentlyWithWeapon" } },
@@ -2316,6 +2321,9 @@ local specialModList = {
 	["gain %d+ rage on melee weapon hit"] = {
 		flag("Condition:CanGainRage"),
 	},
+	["gain %d+ rage on ([%D]+)"] = {
+		flag("Condition:CanGainRage"),
+	},
 	["gain %d+ rage on hit with axes"] = {
 		flag("Condition:CanGainRage"),
 	},
@@ -4300,6 +4308,26 @@ local specialModList = {
 		flag("CurseImmune", { type = "Condition", var = "UsingFlask" }),
 		flag("StunImmune", { type = "Condition", var = "UsingFlask" }),
 	},
+	["gain (%d+)%% of maximum energy shield as additional (%a+) threshold"] = function(num, _, statType)
+		return { mod(firstToUpper(statType) .. "Threshold", "BASE", 1, { type = "PercentStat", stat = "EnergyShield", percent = num }) }
+	end,
+	["(%d+)%% increased maximum life, mana and energy shield"] = function(num) return {
+		mod("Life", "INC", num),
+		mod("Mana", "INC", num),
+		mod("EnergyShield", "INC", num),
+	} end,
+	["gain stun threshold equal to the lowest of evasion and armour on your helmet"] = {
+		mod("StunThreshold", "BASE", 1, { type = "PerStat", stat = "LowestOfArmourAndEvasionOnHelmet" }),
+	},
+	["your stun threshold is doubled"] = {
+		mod("StunThreshold", "MORE", 100),
+	},
+	["(%d+)%% of base armour from equipment also added to stun threshold"] = function(num) return {
+		mod("StunThreshold", "BASE", 1, { type = "PerStat", stat = "ArmourOnHelmet", percent = num }),
+		mod("StunThreshold", "BASE", 1, { type = "PerStat", stat = "ArmourOnGloves", percent = num }),
+		mod("StunThreshold", "BASE", 1, { type = "PerStat", stat = "ArmourOnBoots", percent = num }),
+		mod("StunThreshold", "BASE", 1, { type = "PerStat", stat = "ArmourOnBody Armour", percent = num }),
+	} end,
 	-- This mod doesn't work the way it should. It prevents self-chill among other issues.
 	--Since we don't currently really do anything with enemy ailment infliction, this should probably be removed
 	--["cursed enemies cannot inflict elemental ailments on you"] = {