Add support Garukhan's Resolve and Oisín's Oath

src/Data/SkillStatMap.lua

@@ -281,6 +281,9 @@ return {
 ["support_spell_echo_number_of_echo_cascades"] = {
 	mod("RepeatCount", "BASE", nil, 0, 0, {type = "SkillType", skillType = SkillType.Cascadable }),
 },
+["support_spell_echo_area_of_effect_+%"] = {
+	mod("RepeatAreaOfEffect", "INC", nil),
+},
 ["base_melee_attack_repeat_count"] = {
 	mod("RepeatCount", "BASE", nil, 0, 0, { type = "ModFlagOr", modFlags = bit.bor(ModFlag.WeaponMelee, ModFlag.Unarmed) }),
 	mod("RepeatCount", "BASE", nil, 0, 0, { type = "SkillType", skillType = SkillType.RequiresShield }),
@@ -401,6 +404,10 @@ return {
 	mod("ManaCost", "MORE", nil),
 	value = -100,
 },
+["no_cost"] = {
+	mod("Cost", "MORE", nil),
+	value = -100,
+},
 ["base_mana_cost_efficiency_"] = {
 	mod("ManaCostEfficiency", "INC", nil),
 },
@@ -958,6 +965,9 @@ return {
 ["attack_damage_is_lucky_if_surrounded"] = {
 	flag("LuckyHits", { type = "Condition", var = "Surrounded" })
 },
+["attacks_roll_crits_twice"] = {
+	flag("BifurcateCrit", { type = "SkillType", skillType = SkillType.Attack } )
+},
 ["damage_vs_enemies_on_low_life_+%"] = {
 	mod("Damage", "INC", nil, ModFlag.Hit, 0, { type = "ActorCondition", actor = "enemy", var = "LowLife"})
 },

src/Data/Skills/sup_dex.lua

@@ -2401,6 +2401,11 @@ skills["SupportGarukhansResolvePlayer"] = {
 			label = "Garukhan's Resolve",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["maximum_critical_strike_chance_is_%_from_support_garukhans_resolve"] = {
+					mod("CritChanceCap", "OVERRIDE", nil),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {

src/Data/Skills/sup_int.lua

@@ -5121,10 +5121,10 @@ skills["SupportInevitableCriticalsPlayerTwo"] = {
 				["support_inevitable_criticals_critical_strike_chance_+%_cap"] = {
 					mod("Multiplier:InevitableCritCap", "BASE", nil),
 				},
-				["support_inevitable_criticals_critical_strike_chance_+%_per_second"] = {
-					mod("CritChance", "INC", nil, 0, 0, { type = "Multiplier", var = "SecondsSinceInevitableCrit", limitVar = "InevitableCritMultCap", limitTotal = true }),
+				["support_inevitable_criticals_critical_strike_multiplier_+%_final_per_second"] = {
+					mod("CritChance", "MORE", nil, 0, 0, { type = "Multiplier", var = "SecondsSinceInevitableCrit", limitVar = "InevitableCritMultCap", limitTotal = true }),
 				},
-				["support_inevitable_criticals_critical_strike_chance_+%_cap"] = {
+				["support_inevitable_criticals_critical_strike_multiplier_+%_final_cap"] = {
 					mod("Multiplier:InevitableCritMultCap", "BASE", nil),
 				},
 			},
@@ -6288,6 +6288,12 @@ skills["SupportOisinsOathPlayer"] = {
 			label = "Oisín's Oath",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["mana_leech_from_elemental_instead"] = {
+					flag("ManaLeechBasedOnElementalDamage"),
+					flag("Condition:NoManaLeechFromPhysicalDamage"),
+				},
+			},
 			baseFlags = {
 			},
 			stats = {
@@ -7089,9 +7095,6 @@ skills["SupportSpellEchoPlayer"] = {
 				["support_multicast_cast_speed_+%_final"] = {
 					mod("Speed", "MORE", nil, ModFlag.Cast),
 				},
-				["support_spell_echo_area_of_effect_+%"] = {
-					mod("AreaOfEffect", "INC", nil),
-				},
 			},
 			baseFlags = {
 			},

src/Export/Skills/sup_dex.txt

@@ -528,6 +528,11 @@ statMap = {
 
 #skill SupportGarukhansResolvePlayer
 #set SupportGarukhansResolvePlayer
+statMap = {
+	["maximum_critical_strike_chance_is_%_from_support_garukhans_resolve"] = {
+		mod("CritChanceCap", "OVERRIDE", nil),
+	},
+},
 #mods
 #skillEnd
 

src/Export/Skills/sup_int.txt

@@ -926,10 +926,10 @@ statMap = {
 	["support_inevitable_criticals_critical_strike_chance_+%_cap"] = {
 		mod("Multiplier:InevitableCritCap", "BASE", nil),
 	},
-	["support_inevitable_criticals_critical_strike_chance_+%_per_second"] = {
-		mod("CritChance", "INC", nil, 0, 0, { type = "Multiplier", var = "SecondsSinceInevitableCrit", limitVar = "InevitableCritMultCap", limitTotal = true }),
+	["support_inevitable_criticals_critical_strike_multiplier_+%_final_per_second"] = {
+		mod("CritChance", "MORE", nil, 0, 0, { type = "Multiplier", var = "SecondsSinceInevitableCrit", limitVar = "InevitableCritMultCap", limitTotal = true }),
 	},
-	["support_inevitable_criticals_critical_strike_chance_+%_cap"] = {
+	["support_inevitable_criticals_critical_strike_multiplier_+%_final_cap"] = {
 		mod("Multiplier:InevitableCritMultCap", "BASE", nil),
 	},
 },
@@ -1174,6 +1174,12 @@ statMap = {
 
 #skill SupportOisinsOathPlayer
 #set SupportOisinsOathPlayer
+statMap = {
+	["mana_leech_from_elemental_instead"] = {
+		flag("ManaLeechBasedOnElementalDamage"),
+		flag("Condition:NoManaLeechFromPhysicalDamage"),
+	},
+},
 #mods
 #skillEnd
 
@@ -1342,9 +1348,6 @@ statMap = {
 	["support_multicast_cast_speed_+%_final"] = {
 		mod("Speed", "MORE", nil, ModFlag.Cast),
 	},
-	["support_spell_echo_area_of_effect_+%"] = {
-		mod("AreaOfEffect", "INC", nil),
-	},
 },
 #mods
 #skillEnd

src/Modules/CalcOffence.lua

@@ -924,6 +924,14 @@ function calcs.offence(env, actor, activeSkill)
 		output.RepeatCount = output.Repeats
 		-- handle all the multipliers from Repeats
 		if env.configInput.repeatMode ~= "NONE" then
+			for i, value in ipairs(skillModList:Tabulate("INC", skillCfg, "RepeatAreaOfEffect")) do
+				local mod = value.mod
+				local modValue = mod.value
+				if env.configInput.repeatMode == "AVERAGE" then
+					modValue = modValue * (output.Repeats - 1) / output.Repeats
+				end
+				skillModList:NewMod("AreaOfEffect", "INC", modValue, mod.source, mod.flags, mod.keywordFlags, unpack(mod))
+			end
 			for i, value in ipairs(skillModList:Tabulate("INC", skillCfg, "RepeatFinalAreaOfEffect")) do
 				local mod = value.mod
 				local modValue = mod.value