Compact parsing of weapon types for multistrike

PathOfBuildingCommunity · Aug 13, 2022 · 1fa9ab4 · 1fa9ab4
1 parent c1903af
commit 1fa9ab4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/src/Data/Skills/sup_str.lua b/src/Data/Skills/sup_str.lua
@@ -3207,17 +3207,15 @@ skills["SupportMultistrike"] = {
 	statDescriptionScope = "gem_stat_descriptions",
 	statMap = {
 		["multistrike_damage_+%_final_on_first_repeat"] = {
-			mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
-			mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack,ModFlag.Unarmed)),
+			mod("Damage", "MORE", nil, ModFlag.Attack, nil, { type = "ModFlagOr", modFlags = bit.bor(ModFlag.WeaponMelee, ModFlag.Unarmed) }),
 		},
 		["multistrike_damage_+%_final_on_second_repeat"] = {
 		},
 		["support_multiple_attack_damage_+%_final"] = {
 			mod("Damage", "MORE", nil, ModFlag.Attack),
 		},
 		["support_multiple_attacks_melee_attack_speed_+%_final"] = {
-			mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
-			mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
+			mod("Speed", "MORE", nil, ModFlag.Attack, nil, { type = "ModFlagOr", modFlags = bit.bor(ModFlag.WeaponMelee, ModFlag.Unarmed) }),
 		},
 		["multistrike_area_of_effect_+%_per_repeat"] = {
 			mod("AreaOfEffect", "INC", nil)
@@ -3307,16 +3305,14 @@ skills["SupportMultistrikePlus"] = {
 		["multistrike_damage_+%_final_on_second_repeat"] = {
 		},
 		["multistrike_damage_+%_final_on_third_repeat"] = {
-			mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
-			mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
+			mod("Damage", "MORE", nil, ModFlag.Attack, nil, { type = "ModFlagOr", modFlags = bit.bor(ModFlag.WeaponMelee, ModFlag.Unarmed) }),
 			div = 2,
 		},
 		["support_multiple_attack_damage_+%_final"] = {
 			mod("Damage", "MORE", nil, ModFlag.Attack),
 		},
 		["support_multiple_attacks_melee_attack_speed_+%_final"] = {
-			mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
-			mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
+			mod("Speed", "MORE", nil, ModFlag.Attack, nil, { type = "ModFlagOr", modFlags = bit.bor(ModFlag.WeaponMelee, ModFlag.Unarmed) }),
 		},
 	},
 	qualityStats = {

diff --git a/src/Export/Skills/sup_str.txt b/src/Export/Skills/sup_str.txt
@@ -368,17 +368,15 @@ local skills, mod, flag, skill = ...
 #skill SupportMultistrike
 	statMap = {
 		["multistrike_damage_+%_final_on_first_repeat"] = {
-			mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
-			mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack,ModFlag.Unarmed)),
+			mod("Damage", "MORE", ModFlag.Attack, nil, { type = "ModFlagOr", modFlags = bit.bor(ModFlag.WeaponMelee, ModFlag.Unarmed) }),
 		},
 		["multistrike_damage_+%_final_on_second_repeat"] = {
 		},
 		["support_multiple_attack_damage_+%_final"] = {
 			mod("Damage", "MORE", nil, ModFlag.Attack),
 		},
 		["support_multiple_attacks_melee_attack_speed_+%_final"] = {
-			mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
-			mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
+			mod("Speed", "MORE", nil, ModFlag.Attack, nil, { type = "ModFlagOr", modFlags = bit.bor(ModFlag.WeaponMelee, ModFlag.Unarmed) }),
 		},
 		["multistrike_area_of_effect_+%_per_repeat"] = {
 			mod("AreaOfEffect", "INC", nil)
@@ -394,16 +392,14 @@ local skills, mod, flag, skill = ...
 		["multistrike_damage_+%_final_on_second_repeat"] = {
 		},
 		["multistrike_damage_+%_final_on_third_repeat"] = {
-			mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
-			mod("Damage", "MORE", nil, bit.bor(ModFlag.Attack,ModFlag.Unarmed)),
+			mod("Damage", "MORE", nil, ModFlag.Attack, nil, { type = "ModFlagOr", modFlags = bit.bor(ModFlag.WeaponMelee, ModFlag.Unarmed) }),
 			div = 2,
 		},
 		["support_multiple_attack_damage_+%_final"] = {
 			mod("Damage", "MORE", nil, ModFlag.Attack),
 		},
 		["support_multiple_attacks_melee_attack_speed_+%_final"] = {
-			mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.WeaponMelee)),
-			mod("Speed", "MORE", nil, bit.bor(ModFlag.Attack, ModFlag.Unarmed)),
+			mod("Speed", "MORE", nil, ModFlag.Attack, nil, { type = "ModFlagOr", modFlags = bit.bor(ModFlag.WeaponMelee, ModFlag.Unarmed) }),
 		},
 	},
 #mods