Seperate skill cooldown from trigger cooldown and fix multiple related issues. (#4599)

* FIX: Change the Kitava's Thirst trigger mod description to one that is used in game and add parsing for it.

* FIX/FEAT: Correct trigger calculations for Kitava's thirst and Craft trigger. Improve handling of skill cooldown overrride. Add handing for multipler triggers supporting one skill

* FIX: Readd a commit lost during rebase that fixes cooldown override.

* FIX: Handling of Focus triggers. Triggers assume perfect focus reuse as self casting the focus skill is the only way to obtain focus currently.

* FIX: Fix cooldown recovery not applying when using cooldownoverride.

* FIX: Fix crashing due to incorrect handling of minion trigger rate calculations.

* FIX: Correct calculations for cwdt. Account for possible issues resulting from skillData.cooldown working differently.

* FIX: Correct potentially wrong values for "SummonRigwaldsPack"

* FEAT: Improve source skill selection for Craft trigger

* FIX: Fixing typos and formatting

* FIX: Specific handling for Cast When Damage Taken

* FIX: Fix max duration not being displayed properly for cwdt

* FIX: Handle Cast on Melee kill

* FEAT: Add basic support for global triggers

* FEAT: Add basic support for spellslinger

* FEAT: Add support for Mark on hit

* FIX: Improve trigger source selection requirements for a variety of trigger skills

* FEAT: Add basic handling for counter attack skills with internal triggers

* FEAT: Add breakdown for arcanist brand casts per second calcualtion. Simplify arcanist brand related math. Remove redundant s_format calls

* FEAT: Some minor refactoring

* FEAT: Refactoring and add support for more unique triggers

* FIX: Change skill stat for cwdt

* FIX/FEAT: Add support for more uniques and hextouch. Minor refactoring. Fix crash when uniqueTriggerName is nil.

* FEAT: Add support for Tawhoa's_Chosen

* FIX: minor cleanup

* FEAT/FIX: Small improvements to error messages and breakdowns. Fix edge cases with in Tawhoa's Chosen implementation that caused crashes.

* FEAT/FIX: Implement Replica Maloney's mechanism. Add extra checks for minion trigger source selection.

* FIX: Cleanup and refactoring

* FIX: Restrict Tawhoa's Chosen to attack slams not just any slams

* FIX: fix trigger source location finding not working for global triggers

* FEAT: Add parsing for chance to trigger. Minor cleanup. Skill re export.

* FIX: fix multistrike crash caused by bad export

* FIX/FEAT: Add recently merged to dev handling for a new flag. Fix some uniques not working due to last skills export.

* FEAT: Improve breakdowns when SpellCastTimeAddedToCooldownIfTriggered is set

* FEAT: More improvements to breakdowns

* FIX: if cast time is added to trigger cooldown it should account for cast time modifiers

* FIX: disable  unseen strike when not phasing

* FEAT: Add proper support for CWC and make it work with lightning conduit

* FIX/FEAT: Add better support for addsCastTime to other triggers. Minor cleanup

* FIX: more consistent variable names.

* FIX: minor cleanup

* FIX: fix crash fix arakali's fang using old var

* FIX: fix unleash trigger source handling

* FIX: remove some redundant code.

* FIX: arcanist brand used cooldown for speed.

* FIX: arcanist brand breakdown

* FIX: Apply QuickStick's arcanist brand formula.

* FIX: handling of arcanist brand

Now should correctly calculate the impact of multiple linked skills

* FIX: minor breakdown formatting fix

* FIX: stop tawoah's chosen from using totems

* FIX: Use the modlist of the actual brand gem.

Arcanist brand has a hidden support gem that supports linked gems and
causes them to trigger but most the of important stats are in the mod
list of the actual main gem os use that instead.

* FIX: better support TriggerDamage mod.

Should properly handle TriggerDamage mods such as the ones on arcanist
brand. Also fixed arcanist brand config option requiring hit flag.

* FIX: trigger damage mods not working for cwc

* FIX: fix missing trigger name for holy relic

* WIP: major renaming.Changed order of operations.

* WIP: more work on reordering application of mods

* WIP: Minor fixes for self triggers

* WIP: fixes to Tawhoa's Chosen

* FIX: prevent the saviour from using totem skills

* FIX: icdr not being considered for alignment

* FIX: update Cwc/Focus to new format

* FIX: misspelled word

* FIX: fix kitava's thirst calcs

* FIX: add src rate is effective switch

Used for Atziri's rule

* FIX: breakdown ordering issue

* FIX: remove dead code

* FIX: self trigger calcs

* FIX: hextouch support

* FIX: minor fixes to unique various triggers

* FIX: spelling issues

* FIX: arcanist brand improvements

* WIP: implement faster skill rotation simulator

Based on:
#5428

* WIP: remove unnecessary for loop

* FIX: lower sim resolution, implement ceil func with base

* FIX: fix Tawhoa's Chosen

* FIX: off by one error due to different indexing

* FIX: fixed to new simulator

* FIX: minor formatting. Comments.

* FIX: remove helper func. Minor tweaks.

* FIX: spelling issues.

* FIX: change func name.Awaiting Dict update.

* FIX: adapt Cwc to work with new simulation.

* FIX: breakdown clarity. icdr fixes.

* FIX: use ceil_b and floor_b.

* FIX: crash due to no socketGroup

* FIX: hexes applied with hextouch have no mana cost

* FIX: hextouch should have no cost

* FIX: code formatting

* FEAT: implement vixens trigger.Minor fixes

* FIX:no sim for self triggers.Smarter breakdowns

* WIP: implement Impending doom.

Based on #5530

* FIX: fixes to impeding doom breakdown

* FIX: Tawhoa's Chosen simulation arguments

* FIX: triggered minion skills not using icdr.

If minions skills such as summon skeletons were triggered they would not
use player icdr mods due to using the wrong actor.

Additionally renamed some variables.

* WIP: initial work on CWDT loops support

* FIX: spelling

* FIX: global trigger not working as sources.

Use actor variable more often to improve minion skill support

* FIX: cd overrides should override trigger cd too.

* FIX: ignore dualwield impact if source is global

* FIX: limiting scope to self damage only.

CWDT loops while a really cool feature are hard to support correctly in
POB. Due the amount of assumptions the involved code has to make
regarding the state of the loop, the numbers aren't always accurate.
Staring with this commit the scope is being limited to only add support for
self hit damage as i think it'd be a waste to throw all that code away
and that part should work perfectly fine.

* FIX: arcanist brand being affected by tickrate

* FIX: uuid collision and remove confusing breakdown

* DOCS: add coomment.

* WIP: mixed group setups and two part skills fix

Currently there's an issue with two part skills (active and support)
such as Arcanist Brand where the support part will not be applied to
skills socketed into the same item but in different groups. An example
would be to two groups both socketed into Weapon 1. One having the
Arcane Brand skill gem and the other any other skill. The other skill
will not be supported by Arcane Surge even though they are socketed into
the same item and should be considered as linked.

* FIX: spelling

* FIX: add handling for shotgunning skills

* FIX: null skillpart and copy skill limit recursion

* FIX: hide trigger supports if not compatible

* FEAT: impl Battlemage's cry trigger

* FEAT: impl trigger rate for Combust

* FIX: skills from items not counting as sources

* FIX: remove unused flag

* FIX: unique triggers broken by wrong condition

* FEAT: basic support for skills with charges

* Add support for Prismatic Burst

* FEAT: hook up prismatic burst to trigger logic

* FIX: rename kitava's trigger and add threshold

* FEAT: comparer func + documenting comments

* FIX: spelling

* FEAT: hook up shockwave to trigger logic

* FIX: avoid scoping wierdness and remove debug log

* WIP: manaforged support

* FEAT: finish implementaion of manaforged

* FIX: red text on imepending doom

* FIX: merge issue

* FIX: minor issues with spellslinger

* FIX: mirager archer crash caused by merge

* FIX: small cleanup

* FIX:remove remenants of old handling for self trig

* FEAT: impl triggerbots

* FIX: better tooltip

* FIX: cleanup kitava's thirst cond

* FIX: spelling

* FIX: remove non trigger related changes

* WIP: inital work on moving trigger code

* WIP: fix arcanist brand crash

The defualt trigger handler still needs to be modified to work with the
new config format

* FIX: variety of new config compatibility issues

* FIX: trigger info issues

* FIX: variable names, refactoring

* FIX: missing variables

* FIX: mark mirage archer as a trigger

* FIX: missing actor variable

* FIX: CWC and added cast time breakdowns

* FIX: remove redundant limited processing check

* FIX: tweaks to Queen's Demand

* FIX: better feedback for COMK

* FIX: assumingEveryHitKills is not in config

* FIX: Awakened triggers not finding configs

* FIX: mark as not a triger when no config found

* FIX: ignoresTickRate being overwritten

* FIX: self trigger display name crash

* FIX/FEAT:impl vengance, use cap rate for self trig

* FIX: prevent battlemeage's cry self trigger

* FIX: hextouch shoulnd not be a global trigger

* FIX: misc fixes

---------

Co-authored-by: Wires77 <Wires77@users.noreply.github.com>

Author: Paliak

src/Classes/Item.lua

@@ -1571,6 +1571,7 @@ function ItemClass:BuildModList()
 				noSupports = skill.noSupports,
 				source = self.modSource,
 				triggered = skill.triggered,
+				triggerChance = skill.triggerChance
 			})
 		end
 	end

src/Data/SkillStatMap.lua

@@ -185,7 +185,10 @@ return {
 	skill("triggeredByCraft", nil, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),
 },
 ["support_cast_on_mana_spent"] = {
-	skill("triggeredByManaSpent", true, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),
+	skill("triggeredByKitavaThirst", true, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),
+},
+["cast_when_cast_curse_%"] = {
+	skill("triggeredByCurseOnCurse", true, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Hex }),
 },
 ["display_mirage_warriors_no_spirit_strikes"] = {
 	skill("triggeredBySaviour", true, { type = "SkillType", skillType = SkillType.Attack } ),
@@ -197,7 +200,7 @@ return {
 	skill("chanceToTriggerOnCrit", nil, { type = "SkillType", skillType = SkillType.Attack }),
 },
 ["cast_spell_on_linked_melee_kill"] = {
-	skill("triggeredByMeleeKill", true, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),
+	skill("triggeredByMeleeKill", true, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }, { type = "Condition", var = "KilledRecently" }),
 },
 ["cast_linked_spells_on_melee_kill_%"] = {
 	skill("chanceToTriggerOnMeleeKill", nil , { type = "SkillType", skillType = SkillType.Attack }, { type = "SkillType", skillType = SkillType.Melee })
@@ -211,6 +214,21 @@ return {
 ["triggered_by_spiritual_cry"] = {
 	skill("triggeredByGeneralsCry", true, { type = "SkillType", skillType = SkillType.Melee }, { type = "SkillType", skillType = SkillType.Attack }),
 },
+["cast_on_damage_taken_threshold"] = {
+	skill("triggeredByDamageTaken", nil, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),
+},
+["cast_on_stunned_%"] = {
+	skill("triggeredByStunned", nil, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),
+},
+["trigger_on_attack_hit_against_rare_or_unique"] = {
+	skill("triggerMarkOnRareOrUnique", true, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Mark }),
+},
+["melee_counterattack_trigger_on_block_%"] = {
+	skill("triggerCounterAttack", nil, { type = "SkillType", skillType = SkillType.Attack }, { type = "SkillType", skillType = SkillType.Triggerable }),
+},
+["melee_counterattack_trigger_on_hit_%"] = {
+	skill("triggerCounterAttack", nil, { type = "SkillType", skillType = SkillType.Attack }, { type = "SkillType", skillType = SkillType.Triggerable }),
+},
 ["holy_relic_trigger_on_parent_attack_%"] = {
 	skill("triggeredByParentAttack", true, { type = "SkillType", skillType = SkillType.Triggerable }),
 },
@@ -1640,9 +1658,8 @@ return {
 	mod("MaxDoom", "BASE", nil),
 },
 ["triggered_vicious_hex_explosion"] = {
-	skill("triggeredWhenHexEnds", true, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),
+	skill("triggeredWhenHexEnds", nil, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),
 },
-
 -- Aura
 ["non_curse_aura_effect_+%"] = {
 	mod("AuraEffect", "INC", nil, 0, 0, { type = "SkillType", skillType = SkillType.AppliesCurse, neg = true }),

src/Data/Skills/act_dex.lua

@@ -10882,6 +10882,7 @@ skills["ChannelledSnipeSupport"] = {
 	requireSkillTypes = { SkillType.RangedAttack, SkillType.ThresholdJewelRangedAttack, SkillType.OR, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.SummonsTotem, SkillType.Trapped, SkillType.RemoteMined, SkillType.HasReservation, SkillType.Vaal, SkillType.Instant, SkillType.Channel, },
+	isTrigger = true,
 	ignoreMinionTypes = true,
 	weaponTypes = {
 		["Bow"] = true,

src/Data/Skills/act_int.lua

@@ -914,6 +914,7 @@ skills["SupportDarkRitual"] = {
 	requireSkillTypes = { SkillType.AppliesCurse, SkillType.Hex, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.AuraAffectsEnemies, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	statMap = {
 		["apply_linked_curses_with_dark_ritual"] = {
@@ -4475,9 +4476,10 @@ skills["ForbiddenRite"] = {
 		if activeSkill.skillPart == 2 then
 			activeSkill.skillData.dpsMultiplier = (activeSkill.skillData.dpsMultiplier or 1) * (output.ProjectileCount + 1)
 		end
+		output.FRDamageTaken = SelfDamageTakenLife + SelfDamageTakenES + chaosFlat
 		if breakdown then
 			local FRDamageTaken = {}
-			t_insert(FRDamageTaken, "Damage Taken per Cast")
+			t_insert(FRDamageTaken, s_format("Damage Taken per cast from Forbidden Rite: %d", output.FRDamageTaken))
 			t_insert(FRDamageTaken, s_format("^8=^7 %d^8 (Life) *^7 %d%%^8 (of Life taken as Chaos Damage)", life, activeSkill.skillData.SelfDamageTakenLife * 100))
 			if energyShield ~= 0 then
 				t_insert(FRDamageTaken, s_format("^8+^7 %d^8 (ES) *^7 %d%%^8 (of ES taken as Chaos Damage)", energyShield, activeSkill.skillData.SelfDamageTakenES * 100))
@@ -4489,10 +4491,8 @@ skills["ForbiddenRite"] = {
 			if chaosDamageTaken ~= 1 then
 				t_insert(FRDamageTaken, s_format("^8 *^7 %.2f^8 (Damage taken Multiplier)", chaosDamageTaken))
 			end
-			t_insert(FRDamageTaken, s_format("^8=^7 %d^8 (Damage taken)", SelfDamageTakenLife + SelfDamageTakenES + chaosFlat))
 			breakdown.FRDamageTaken = FRDamageTaken
 		end
-		output.FRDamageTaken = SelfDamageTakenLife + SelfDamageTakenES + chaosFlat
 	end,
 	statMap = {
 		["skill_base_chaos_damage_%_maximum_life"] = {
@@ -9520,6 +9520,7 @@ skills["SupportSpellslinger"] = {
 	requireSkillTypes = { SkillType.Triggerable, SkillType.Spell, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.HasReservation, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.HasReservation, SkillType.Triggered, SkillType.NOT, SkillType.AND, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	supportGemsOnly = true,
 	ignoreMinionTypes = true,
 	statDescriptionScope = "gem_stat_descriptions",
@@ -9531,6 +9532,7 @@ skills["SupportSpellslinger"] = {
 			mod("Damage", "MORE", nil, 0, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment)),
 		},
 		["spellslinger_trigger_on_wand_attack_%"] = {
+			skill("triggeredBySpellSlinger", nil, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),
 		},
 	},
 	baseMods = {
@@ -9690,6 +9692,7 @@ skills["SupportBrandSupport"] = {
 	requireSkillTypes = { SkillType.Triggerable, SkillType.Spell, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.HasReservation, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	ignoreMinionTypes = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	addFlags = {
@@ -9703,7 +9706,7 @@ skills["SupportBrandSupport"] = {
 			mod("AreaOfEffect", "MORE", nil),
 		},
 		["trigger_brand_support_hit_damage_+%_final_vs_branded_enemy"] = {
-			mod("TriggeredDamage", "MORE", nil, ModFlag.Hit, 0, { type = "Condition", var = "TargetingBrandedEnemy"}),
+			mod("TriggeredDamage", "MORE", nil, 0, 0, { type = "Condition", var = "TargetingBrandedEnemy"}),
 		},
 	},
 	addSkillTypes = { SkillType.Brand, },
@@ -11480,6 +11483,7 @@ skills["TempestShield"] = {
 		chaining = true,
 	},
 	baseMods = {
+		skill("triggerCounterAttack", 100, { type = "SkillType", skillType = SkillType.Spell }),
 		mod("AvoidShock", "BASE", 100, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true }),
 	},
 	qualityStats = {

src/Data/Skills/act_str.lua

@@ -206,6 +206,9 @@ skills["AbyssalCry"] = {
 		["infernal_cry_covered_in_ash_fire_damage_taken_%_per_5_monster_power"] = {
 			mod("InfernalFireTakenPer5MP", "BASE", nil),
 		},
+		["infernal_cry_empowered_attacks_trigger_combust_display"] = {
+			-- Display only
+		},
 	},
 	baseFlags = {
 		warcry = true,
@@ -309,6 +312,11 @@ skills["InfernalCryOnHitExplosion"] = {
 	},
 	statDescriptionScope = "skill_stat_descriptions",
 	castTime = 1,
+	statMap = {
+		["triggered_by_infernal_cry"] = {
+			-- Display only
+		},
+	},
 	baseFlags = {
 		attack = true,
 		melee = true,
@@ -1024,6 +1032,9 @@ skills["BattlemagesCry"] = {
 		["divine_cry_critical_strike_chance_+%_per_5_power_up_to_cap%"] = {
 			mod("BattlemageCritChancePer5MP", "BASE", nil),
 		},
+		["display_battlemage_cry_exerted_attacks_trigger_supported_spell"] ={
+			-- Display only
+		},
 	},
 	baseFlags = {
 		area = true,
@@ -1108,8 +1119,17 @@ skills["BattlemagesCrySupport"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.HasReservation, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	ignoreMinionTypes = true,
 	statDescriptionScope = "gem_stat_descriptions",
+	statMap = {
+		["support_divine_cry_damage_+%_final"] = {
+			mod("Damage", "MORE", nil),
+		},
+		["triggered_by_divine_cry"] = {
+			skill("triggeredByBattleMageCry", true),
+		},
+	},
 	qualityStats = {
 		Default = {
 			{ "dummy_stat_display_nothing", 0 },
@@ -1569,7 +1589,7 @@ skills["Boneshatter"] = {
 		end
 
 		if breakdown then
-			t_insert(BSDamageTaken, "Total damage taken: "..round(totalDamageTaken))
+			t_insert(BSDamageTaken, s_format("Total damage taken from Boneshatter per attack: %d", totalDamageTaken))
 			breakdown.BSDamageTaken = BSDamageTaken
 			output.BSDamageTaken = totalDamageTaken
 		end

src/Data/Skills/other.lua

@@ -119,6 +119,7 @@ skills["SupportTriggerSpellOnBowAttack"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.Aura, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	fromItem = true,
 	stats = {
@@ -646,6 +647,7 @@ skills["SupportUniqueCosprisMaliceColdSpellsCastOnMeleeCriticalStrike"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Cold, SkillType.Triggerable, SkillType.AND, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.Aura, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	fromItem = true,
 	stats = {
@@ -1391,6 +1393,7 @@ skills["SupportTriggerSpellFromHelmet"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.Aura, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	fromItem = true,
 	constantStats = {
@@ -1474,9 +1477,6 @@ skills["GoreShockwave"] = {
 	statDescriptionScope = "skill_stat_descriptions",
 	castTime = 1,
 	fromItem = true,
-	preDamageFunc = function(activeSkill, output)
-		activeSkill.skillData.timeOverride = output.Cooldown
-	end,
 	baseFlags = {
 		attack = true,
 		area = true,
@@ -1673,6 +1673,7 @@ skills["SupportCastOnManaSpent"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.Aura, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	fromItem = true,
 	stats = {
@@ -1782,6 +1783,7 @@ skills["SupportTriggerBowSkillOnBowAttack"] = {
 	requireSkillTypes = { SkillType.RangedAttack, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.SummonsTotem, SkillType.Trapped, SkillType.RemoteMined, SkillType.Vaal, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	fromItem = true,
 	stats = {
@@ -1846,6 +1848,7 @@ skills["SupportUniqueMjolnerLightningSpellsCastOnHit"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Lightning, SkillType.Triggerable, SkillType.AND, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.Aura, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	fromItem = true,
 	stats = {
@@ -1925,6 +1928,7 @@ skills["SupportTriggerSpellOnAttack"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.Aura, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	fromItem = true,
 	stats = {
@@ -3078,6 +3082,11 @@ skills["SummonMirageChieftain"] = {
 	statDescriptionScope = "skill_stat_descriptions",
 	castTime = 0,
 	fromTree = true,
+	statMap = {
+		["skill_used_by_mirage_chieftain_damage_+%_final"] = {
+			mod("ChieftainMirageChieftainMoreDamage", "BASE", nil),
+		},
+	},
 	baseFlags = {
 		spell = true,
 		duration = true,
@@ -3162,6 +3171,7 @@ skills["SupportTriggerSpellOnSkillUse"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.Aura, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	fromItem = true,
 	constantStats = {
@@ -3356,6 +3366,27 @@ skills["VoidShot"] = {
 		[20] = { damageEffectiveness = 0.65, PvPDamageMultiplier = -80, baseMultiplier = 0.65, levelRequirement = 70, },
 	},
 }
+skills["SupportUniqueCastCurseOnCurse"] = {
+	name = "Vixen's Entrapment",
+	hidden = true,
+	color = 4,
+	support = true,
+	requireSkillTypes = { SkillType.AppliesCurse, },
+	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
+	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.AuraAffectsEnemies, SkillType.InbuiltTrigger, },
+	isTrigger = true,
+	statDescriptionScope = "gem_stat_descriptions",
+	fromItem = true,
+	constantStats = {
+		{ "cast_when_cast_curse_%", 100 },
+	},
+	stats = {
+		"cannot_cast_curses",
+	},
+	levels = {
+		[1] = { storedUses = 1, levelRequirement = 0, cooldown = 0.25, },
+	},
+}
 skills["EnemyExplode"] = {
 	name = "On Kill Monster Explosion",
 	hidden = true,

src/Data/Skills/sup_dex.lua

@@ -654,6 +654,7 @@ skills["SupportCastOnCritTriggered"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.HasReservation, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	ignoreMinionTypes = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	statMap = {
@@ -777,6 +778,7 @@ skills["SupportCastOnCritTriggeredPlus"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.HasReservation, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	ignoreMinionTypes = true,
 	plusVersionOf = "SupportCastOnCritTriggered",
 	statDescriptionScope = "gem_stat_descriptions",
@@ -828,6 +830,7 @@ skills["SupportCastOnDeath"] = {
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, },
 	excludeSkillTypes = { SkillType.Minion, SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.Aura, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	statMap = {
 		["area_of_effect_+%_while_dead"] = {
@@ -2751,6 +2754,7 @@ skills["SupportMarkOnHit"] = {
 	requireSkillTypes = { SkillType.AppliesCurse, SkillType.Mark, SkillType.AND, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.HasReservation, SkillType.InbuiltTrigger, },
+	isTrigger = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	statMap = {
 		["mark_skills_curse_effect_+%"] = {
@@ -2828,6 +2832,7 @@ skills["SupportGemMirageArcher"] = {
 	excludeSkillTypes = { SkillType.Vaal, SkillType.SummonsTotem, SkillType.Trapped, SkillType.RemoteMined, SkillType.Minion, },
 	ignoreMinionTypes = true,
 	statDescriptionScope = "gem_stat_descriptions",
+	isTrigger = true,
 	statMap = {
 		["support_mirage_archer_base_duration"] = {
 			mod("MirageArcherDuration", "BASE", nil),
@@ -4374,6 +4379,7 @@ skills["SupportManaforgedArrows"] = {
 	requireSkillTypes = { SkillType.Triggerable, SkillType.Attack, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
 	excludeSkillTypes = { SkillType.Trapped, SkillType.RemoteMined, SkillType.SummonsTotem, SkillType.HasReservation, },
+	isTrigger = true,
 	ignoreMinionTypes = true,
 	weaponTypes = {
 		["Bow"] = true,
@@ -4387,8 +4393,8 @@ skills["SupportManaforgedArrows"] = {
 			mod("Damage", "MORE", nil, 0, 0, { type = "PerStat", stat = "ManaCost" }),
 		},
 		["support_manaforged_arrows_mana_cost_%_threshold"] = {
-			skill("triggeredByManaPercentSpent", true, { type = "SkillType", skillType = SkillType.Triggerable }),
-			skill("TriggerSkillManaSpentMultiRequirement", nil),
+			skill("triggeredByManaforged", true, { type = "SkillType", skillType = SkillType.Triggerable }),
+			skill("ManaForgedArrowsPercentThreshold", nil),
 			div = 100,
 		},
 	},