Fix WeaponUsedConditions (#5165)

Author: BMagnu

code/ai/aiturret.cpp

@@ -1889,7 +1889,7 @@ bool turret_fire_weapon(int weapon_num, ship_subsys *turret, int parent_objnum,
 				turret->last_fired_weapon_info_index = turret_weapon_class;
 
 				if (scripting::hooks::OnTurretFired->isActive()) {
-					scripting::hooks::OnTurretFired->run(scripting::hooks::WeaponUsedConditions{ parent_ship , turret_enemy_objp, turret_weapon_class, true },
+					scripting::hooks::OnTurretFired->run(scripting::hooks::WeaponUsedConditions{ parent_ship , turret_enemy_objp, SCP_vector<int>{ turret_weapon_class }, true },
 						scripting::hook_param_list(
 							scripting::hook_param("Ship", 'o', &Objects[parent_objnum]),
 							scripting::hook_param("Beam", 'o', objp),
@@ -2035,7 +2035,7 @@ bool turret_fire_weapon(int weapon_num, ship_subsys *turret, int parent_objnum,
 					wp->turret_subsys = turret;	
 
 					if (scripting::hooks::OnTurretFired->isActive()) {
-						scripting::hooks::OnTurretFired->run(scripting::hooks::WeaponUsedConditions{ parent_ship , turret_enemy_objp, turret_weapon_class, wip->subtype == WP_LASER },
+						scripting::hooks::OnTurretFired->run(scripting::hooks::WeaponUsedConditions{ parent_ship , turret_enemy_objp, SCP_vector<int>{ turret_weapon_class }, wip->subtype == WP_LASER },
 							scripting::hook_param_list(
 								scripting::hook_param("Ship", 'o', &Objects[parent_objnum]),
 								scripting::hook_param("Weapon", 'o', objp),
@@ -2160,7 +2160,7 @@ void turret_swarm_fire_from_turret(turret_swarm_info *tsi)
 			scripting::hooks::OnTurretFired->run(scripting::hooks::WeaponUsedConditions{
 				&Ships[Objects[tsi->parent_objnum].instance],
 				&Objects[tsi->turret->turret_enemy_objnum], 
-				tsi->weapon_class, Weapon_info[tsi->weapon_class].subtype == WP_LASER
+				SCP_vector<int>{ tsi->weapon_class }, Weapon_info[tsi->weapon_class].subtype == WP_LASER
 				},
 				scripting::hook_param_list(
 					scripting::hook_param("Ship", 'o', &Objects[tsi->parent_objnum]),

code/scripting/hook_conditions.cpp

@@ -249,7 +249,9 @@ HOOK_CONDITIONS_END
 
 HOOK_CONDITIONS_START(WeaponUsedConditions)
 	HOOK_CONDITION_SHIPP(WeaponUsedConditions, "that fired the weapon.", user_shipp);
-	HOOK_CONDITION(WeaponUsedConditions, "Weapon class", "Specifies the class of the weapon that was fired.", weaponclass, conditionParseWeaponClass, std::equal_to<int>());
+	HOOK_CONDITION(WeaponUsedConditions, "Weapon class", "Specifies the class of the weapon that was fired.", weaponclasses, conditionParseWeaponClass, [](const SCP_vector<int>& weaponclass_list, const int& weaponclass) -> bool {
+		return std::count(weaponclass_list.cbegin(), weaponclass_list.cend(), weaponclass) > 0;
+	});
 HOOK_CONDITIONS_END
 
 HOOK_CONDITIONS_START(WeaponSelectedConditions)

code/scripting/hook_conditions.h

@@ -105,7 +105,7 @@ struct WeaponUsedConditions {
 	HOOK_DEFINE_CONDITIONS;
 	const ship* user_shipp;
 	const object* target; // As of yet unused
-	int weaponclass;
+	SCP_vector<int> weaponclasses;
 	bool isPrimary; // As of yet unused
 };
 

code/ship/ship.cpp

@@ -12537,18 +12537,22 @@ int ship_fire_primary(object * obj, int force, bool rollback_shot)
 		if (objp == Player_obj && Player_ai->target_objnum != -1)
 			target = &Objects[Player_ai->target_objnum]; 
 
+		SCP_vector<int> firedWeapons;
+
 		for (int bank = 0; bank < MAX_SHIP_PRIMARY_BANKS; bank++) {
-			if(banks_fired & (1 << bank))
+			if (banks_fired & (1 << bank)) {
 				//Start Animation in Forced mode: Always restart it from its initial position rather than just flip it to FWD motion if it was still moving. This is to make it work best for uses like recoil.
 				sip->animations.getAll(model_get_instance(shipp->model_instance_num), animation::ModelAnimationTriggerType::PrimaryFired, bank).start(animation::ModelAnimationDirection::FWD, true);
+				firedWeapons.emplace_back(shipp->weapons.primary_bank_weapons[bank]);
+			}
 		}
 
 		if (scripting::hooks::OnWeaponFired->isActive() || scripting::hooks::OnPrimaryFired->isActive()) {
 			auto param_list = scripting::hook_param_list(
 				scripting::hook_param("User", 'o', objp),
 				scripting::hook_param("Target", 'o', target)
 			);
-			auto conditions = scripting::hooks::WeaponUsedConditions{ shipp, target, weapon_idx, true };
+			auto conditions = scripting::hooks::WeaponUsedConditions{ shipp, target, firedWeapons, true };
 			scripting::hooks::OnWeaponFired->run(conditions, param_list);
 			scripting::hooks::OnPrimaryFired->run(conditions, param_list);
 		}
@@ -13262,7 +13266,7 @@ int ship_fire_secondary( object *obj, int allow_swarm, bool rollback_shot )
 				scripting::hook_param("User", 'o', objp),
 				scripting::hook_param("Target", 'o', target)
 			);
-			auto conditions = scripting::hooks::WeaponUsedConditions{ shipp, target, weapon_idx, false };
+			auto conditions = scripting::hooks::WeaponUsedConditions{ shipp, target, SCP_vector<int>{ weapon_idx }, false };
 			scripting::hooks::OnWeaponFired->run(conditions, param_list);
 			scripting::hooks::OnSecondaryFired->run(conditions, param_list);
 		}

code/weapon/beam.cpp

@@ -2185,7 +2185,7 @@ int beam_start_firing(beam *b)
 		Ships[b->objp->instance].weapons.primary_bank_ammo[b->bank]--;
 
 	if (scripting::hooks::OnBeamFired->isActive()) {
-		scripting::hooks::OnBeamFired->run(scripting::hooks::WeaponUsedConditions{ &Ships[b->objp->instance], b->target, b->weapon_info_index, true },
+		scripting::hooks::OnBeamFired->run(scripting::hooks::WeaponUsedConditions{ &Ships[b->objp->instance], b->target, SCP_vector<int>{ b->weapon_info_index }, true },
 			scripting::hook_param_list(
 				scripting::hook_param("Beam", 'o', &Objects[b->objnum]),
 				scripting::hook_param("User", 'o', b->objp),