Merge pull request #662 from longtimegamer/fixes-laser-guided-bomb-force-fire-rpg

Xeno69 · web-flow · commit 4be382ee50fd · 2025-01-19T13:55:27.000+01:00
fixes for laser guided bomb, extra overwatch group, some faction fixes
diff --git a/co30_Domination.Altis/cfgfunctions.hpp b/co30_Domination.Altis/cfgfunctions.hpp
@@ -382,6 +382,7 @@ class cfgFunctions {
 			addc(moduleCAS_eachframeAI);
 			addc(moduleCASAI);
 			addc(moduleCAS_guidedmissile);
+			addc(moduleCAS_guidedmissile2);
 			addc(mando_chute);
 			addc(sandstorm);
 			addc(weather_winter);
diff --git a/co30_Domination.Altis/init/fn_preinit.sqf b/co30_Domination.Altis/init/fn_preinit.sqf
@@ -2908,85 +2908,83 @@ if (d_with_airdrop == 2) then {
 	
 	d_chem_objs_ar = [];
 
-	if (d_enable_civs == 1) then {
-		//
-		//civilian vehicles
-		//
-		d_civVehiclesWeightedCityWealthHigh = [
-			"C_Offroad_01_F", 1,
-			"C_Hatchback_01_F", 1,
-			"C_Truck_02_covered_F", 0.25,
-			"C_Van_01_box_F", 0.25,
-			"C_Van_02_transport_F", 0.25,
-			"C_Offroad_02_unarmed_F", 0.5,
-			"C_SUV_01_F", 0.5,
-			"C_IDAP_Van_medevac_02_F", 0.25
-		];
-
-		d_civVehiclesWeightedCityWealthLow = [
-			"C_Offroad_01_F", 1,
-			"C_Truck_02_covered_F", 0.25,
-			"C_Truck_02_transport_F", 0.25,
-			"C_Van_01_box_F", 0.25,
-			"C_Van_02_transport_F", 0.25,
-			"C_IDAP_Van_medevac_02_F", 0.25
-		];
-
-		d_civVehiclesWeightedRural = [
-			"C_Offroad_01_F", 1,
-			"C_Truck_02_covered_F", 0.25,
-			"C_Truck_02_transport_F", 0.25,
-			"C_Van_01_box_F", 0.10,
-			"C_Offroad_02_unarmed_F", 1,
-			"C_Tractor_01_F", 0.10,
-			"C_van_01_box_f", 0.10,
-			"C_Truck_02_fuel_f", 0.10,
-			"C_idap_truck_02_water_f", 0.10,
-			"C_van_01_transport_f", 0.25
-		];
-
-		d_civVehiclesWeightedRuralCup = [
-			"CUP_C_pickup_unarmed_civ", 1,
-			"CUP_C_Datsun", 1,
-			"CUP_C_V3S_Covered_TKC", 1,
-			"CUP_B_hilux_unarmed_blu_g_f", 1,
-			"CUP_I_suv_ion", 0.25,
-			"C_Tractor_01_F", 0.10,
-			"CUP_C_tractor_old_civ", 0.10
-		];
-
-		d_civVehiclesWeightedRuralCupRemote = [
-			"CUP_C_Datsun", 1,
-			"CUP_C_Datsun_4seat", 1,
-			"CUP_C_V3S_Covered_TKC", 0.5,
-			"C_Tractor_01_F", 0.25
-		];
-		
-		d_civVehiclesWeightedCityWealthLowCup =+ d_civVehiclesWeightedCityWealthLow;
-		d_civVehiclesWeightedCityWealthLowCup =+ [
-			"CUP_C_lada_white_civ", 1,
-			"CUP_C_lada_red_civ", 1,
-			"CUP_C_skoda_white_civ", 1,
-			"CUP_C_skoda_green_civ", 1,
-			"CUP_C_skoda_blue_civ", 1,
-			"CUP_C_skoda_red_civ", 1,
-			"CUP_C_ikarus_chernarus", 0.25,
-			"CUP_C_bus_city_crciv", 0.25,
-			"CUP_B_S1203_Ambulance_CR", 0.25
-		];
-		
-		d_civVehiclesWeightedCityWealthLowCFP =+ d_civVehiclesWeightedCityWealthLowCup;
-		d_civVehiclesWeightedCityWealthLowCFP =+ [
-			"CFP_c_me_datsun_pickup_covered_01", 1,
-			"CFP_C_datsun_plain", 1,
-			"CFP_C_afg_skoda_105_L_01", 1,
-			"CFP_C_asia_praga_v3s_01", 1,
-			"CFP_B_caf_ural_01", 1,
-			"CFP_I_ssarmy_skoda_1203_01", 1,
-			"CFP_B_afgpolice_offroad_01", 0.25,
-			"CFP_B_uaz_01", 1
-		];
-	};
+    //
+    //civilian vehicles
+    //
+    d_civVehiclesWeightedCityWealthHigh = [
+        "C_Offroad_01_F", 1,
+        "C_Hatchback_01_F", 1,
+        "C_Truck_02_covered_F", 0.25,
+        "C_Van_01_box_F", 0.25,
+        "C_Van_02_transport_F", 0.25,
+        "C_Offroad_02_unarmed_F", 0.5,
+        "C_SUV_01_F", 0.5,
+        "C_IDAP_Van_medevac_02_F", 0.25
+    ];
+
+    d_civVehiclesWeightedCityWealthLow = [
+        "C_Offroad_01_F", 1,
+        "C_Truck_02_covered_F", 0.25,
+        "C_Truck_02_transport_F", 0.25,
+        "C_Van_01_box_F", 0.25,
+        "C_Van_02_transport_F", 0.25,
+        "C_IDAP_Van_medevac_02_F", 0.25
+    ];
+
+    d_civVehiclesWeightedRural = [
+        "C_Offroad_01_F", 1,
+        "C_Truck_02_covered_F", 0.25,
+        "C_Truck_02_transport_F", 0.25,
+        "C_Van_01_box_F", 0.10,
+        "C_Offroad_02_unarmed_F", 1,
+        "C_Tractor_01_F", 0.10,
+        "C_van_01_box_f", 0.10,
+        "C_Truck_02_fuel_f", 0.10,
+        "C_idap_truck_02_water_f", 0.10,
+        "C_van_01_transport_f", 0.25
+    ];
+
+    d_civVehiclesWeightedRuralCup = [
+        "CUP_C_pickup_unarmed_civ", 1,
+        "CUP_C_Datsun", 1,
+        "CUP_C_V3S_Covered_TKC", 1,
+        "CUP_B_hilux_unarmed_blu_g_f", 1,
+        "CUP_I_suv_ion", 0.25,
+        "C_Tractor_01_F", 0.10,
+        "CUP_C_tractor_old_civ", 0.10
+    ];
+
+    d_civVehiclesWeightedRuralCupRemote = [
+        "CUP_C_Datsun", 1,
+        "CUP_C_Datsun_4seat", 1,
+        "CUP_C_V3S_Covered_TKC", 0.5,
+        "C_Tractor_01_F", 0.25
+    ];
+
+    d_civVehiclesWeightedCityWealthLowCup =+ d_civVehiclesWeightedCityWealthLow;
+    d_civVehiclesWeightedCityWealthLowCup =+ [
+        "CUP_C_lada_white_civ", 1,
+        "CUP_C_lada_red_civ", 1,
+        "CUP_C_skoda_white_civ", 1,
+        "CUP_C_skoda_green_civ", 1,
+        "CUP_C_skoda_blue_civ", 1,
+        "CUP_C_skoda_red_civ", 1,
+        "CUP_C_ikarus_chernarus", 0.25,
+        "CUP_C_bus_city_crciv", 0.25,
+        "CUP_B_S1203_Ambulance_CR", 0.25
+    ];
+
+    d_civVehiclesWeightedCityWealthLowCFP =+ d_civVehiclesWeightedCityWealthLowCup;
+    d_civVehiclesWeightedCityWealthLowCFP =+ [
+        "CFP_c_me_datsun_pickup_covered_01", 1,
+        "CFP_C_datsun_plain", 1,
+        "CFP_C_afg_skoda_105_L_01", 1,
+        "CFP_C_asia_praga_v3s_01", 1,
+        "CFP_B_caf_ural_01", 1,
+        "CFP_I_ssarmy_skoda_1203_01", 1,
+        "CFP_B_afgpolice_offroad_01", 0.25,
+        "CFP_B_uaz_01", 1
+    ];
 
 	private _civVehiclesWeightedRuralLivonia = [
 		"C_Offroad_01_F", 0.30,
@@ -3456,8 +3454,11 @@ if (d_with_airdrop == 2) then {
 		"CFP_C_ME_Civ_1_01", 1,
         "CFP_C_ME_Civ_2_01", 1
 	];
-	
-	
+
+
+	// default
+	d_civ_vehicles_weighted = d_civVehiclesWeightedCityWealthHigh;
+
 #ifdef __ALTIS__
 	d_civ_vehicles_weighted = d_civVehiclesWeightedCityWealthHigh;
 	d_civ_faces = _mixedFaces;
@@ -4067,7 +4068,7 @@ if (d_enemy_factions > 0) then {
 				["EAST","RWR_ru_winter","RWR_ru_infantry_winter","RWR_group_inf_teamat"] call d_fnc_GetConfigGroup
 			];
 			d_specops_E = [["EAST","RWR_ru_winter","RWR_ru_infantry_winter","RWR_group_inf_groupmg"] call d_fnc_GetConfigGroup];
-			d_sniper_E = [["EAST","RWR_ru_winter","RWR_ru_infantry_winter","RWR_group_inf_teamdm"] call d_fnc_GetConfigGroup];
+			// d_sniper_E = [["EAST","RWR_ru_winter","RWR_ru_infantry_winter","RWR_group_inf_teamdm"] call d_fnc_GetConfigGroup]; // RWR sniper team is mostly non-snipers... just use default snipers
 		};
 		case 8: {
 			// 3CB - African Desert Civilian Militia (ADG)
@@ -4291,20 +4292,22 @@ switch (d_guerrilla_factions) do {
 			["I_CUPARMYASIA_T72_01", "I_CUPARMYASIA_BTR_60PB_01"]
 		];
 	};
-	// ION PMC
+	// ION PMC and AT
 	case 5: {
 		d_faction_independent_array = [
 			[
-				["Indep","CUP_I_PMC_ION","Infantry","CUP_I_PMC_ION_Security_Detail"] call d_fnc_GetConfigGroup
+				["Indep","CUP_I_PMC_ION","Infantry","CUP_I_PMC_ION_Security_Detail"] call d_fnc_GetConfigGroup,
+				["Indep","IND_F","Infantry","HAF_InfTeam_AT"] call d_fnc_GetConfigGroup
 			],
 			["CUP_I_MATV_GMG_ION", "CUP_I_BTR80A_ION"]
 		];
 	};
-	// ION PMC Arctic
+	// ION PMC Arctic and AT
 	case 6: {
 		d_faction_independent_array = [
 			[
-				["Indep","CUP_I_PMC_ION","WinterInfantry","CUP_I_PMC_Winter_ION_Security_Detail"] call d_fnc_GetConfigGroup
+				["Indep","CUP_I_PMC_ION","WinterInfantry","CUP_I_PMC_Winter_ION_Security_Detail"] call d_fnc_GetConfigGroup,
+				["Indep","IND_F","Infantry","HAF_InfTeam_AT"] call d_fnc_GetConfigGroup
 			],
 			["CUP_I_MATV_GMG_ION", "CUP_I_nM1025_Mk19_ION_WIN"]
 		];
diff --git a/co30_Domination.Altis/scripts/fn_force_fire_rpg.sqf b/co30_Domination.Altis/scripts/fn_force_fire_rpg.sqf
@@ -3,7 +3,7 @@ params ["_u", "_target"];
 
 // in Arma 3, it isn't possible to reliably force a unit to fire a secondaryWeapon (RPG)
 // instead a) force the unit to use the weapon and point it at the target
-// and then b) use d_fnc_moduleCAS_guidedmissile to create the missile in flight
+// and then b) use d_fnc_moduleCAS_guidedmissile2 to create the missile in flight
 // note the greater randomPos deviation when further away from the target, just a messy first attempt and probably needs to be tuned
 
 _u setVariable ["d_is_force_shooting", true, true];
@@ -61,7 +61,7 @@ private _secWeaponMag = (secondaryWeaponMagazine _u) select 0;
 private _ammo = getText (configFile>>"CfgMagazines" >> _secWeaponMag >> "ammo");
 
 // fire the rocket
-[_targetpos, _missile_start_pos, _ammo, 0, _u, _projectileVelocity, 10, true] call d_fnc_moduleCAS_guidedmissile;
+[_targetpos, _missile_start_pos, _ammo, 0, _u, _projectileVelocity, 10, true] call d_fnc_moduleCAS_guidedmissile2;
 
 // restore the primary weapon and primary weapon magazines removed earlier, ignore handgun and grenades for now
 _u addMagazines [(_prim_weapon_ammo_mag_arr select 0), 5];
diff --git a/co30_Domination.Altis/scripts/fn_moduleCAS_guidedmissile.sqf b/co30_Domination.Altis/scripts/fn_moduleCAS_guidedmissile.sqf
@@ -10,76 +10,66 @@ nul=[laserTarget player, getPos startLocation, "M_Scalpel_AT", 500] execVM "guid
 */
 
 //initializing parameters
-params ["_target", "_startPos", "_missileType", "_missileHeight", "_instigator", ["_missileSpeed", 1300], ["_perSecondsChecks", 100], ["_minimalGuidance", false]];
+params ["_target", "_startPos", "_missileType", "_missileHeight", "_instigator"];
 __TRACE_1("","_this")
 
 //defining parameters
 //the faster the target, the more checks it will need 100 is good for fast moving targets such as aircrafts
-//private _perSecondsChecks = 100;
+private _perSecondsChecks = 100;
 //actual speed of a AIM-54 Phoenix AA missile // Hmmm I don't think so, appears to be ~4680 km/h which is ~1300 m/s  -Longtime
 //private _missileSpeed = 6174;
-//_minimalGuidance - launch along target vector but do not guide, self detonate if missile goes too far past the target or at 920m or at 3 seconds of flight
-
-private _guideTheShot = {
-	_shotHasBeenGuided = true;
-	_missile setDir (_missile getDir _targetPos);
-	if (_dirVer isEqualType 0) then {// asin can return something like -1.#IND if the value isn't correct (asin 2 for example)
-		_dirVer = _dirVer * -1;
-		__TRACE_2("","_missile","_dirVer")
-		[_missile, _dirVer, 0] call BIS_fnc_setPitchBank;
-	};
-	_missile setVelocity [_velocityX, _velocityY, _velocityZ];
-};
-
-private _targetPos = [];
-if (_target isEqualType []) then {
-	_targetPos = _target;
-} else {
-	_targetPos = getPosASL _target;
-};
+private _missileSpeed = 1300;
 
 //if no target is found -> exit
-if (_targetPos isEqualTo []) exitWith {hintSilent "No Target Found!"};
+if (_target isEqualTo []) exitWith {hintSilent "No Target Found!"};
 
-if (_missileHeight > 0) then {
-	//create missile and setting pos
-	_startPos set [2, _missileHeight];
-};
+//create missile and setting pos
+_startPos set [2, _missileHeight];
 
 //creating missile
 private _missile = _missileType createVehicle _startPos;
 _missile setShotParents [_instigator, _instigator];
-private _shotHasBeenGuided = false;
-private _startTime = time;
-private _initialDistanceToTarget = _missile distance _targetPos;
-private _distanceSelfDetonate = 700;
-__TRACE_3("","_missile","getPos _missile","_missile distance _targetPos")
+__TRACE_3("","_missile","getPos _missile","_missile distance _target")
+
+// todo - orient the missile to point toward the target?
 
+private _startTime = time;
+private _maxFlightTime = 10; // in seconds
 
-while { alive _missile && { _targetPos distance _missile > 9 }} do {
-	private _dirVer = asin ((((getPosASL _missile) # 2) - (_targetPos # 2)) / (_targetPos distance _missile));
-	__TRACE_1("","_dirVer")
-	_flyingTime = (_targetPos distance _missile) / _missileSpeed;
-	private "_velocityX";
-	private "_velocityY";
-	private "_velocityZ";
-	_velocityX = ((_targetPos select 0) - ((getPosASL _missile) select 0)) / _flyingTime;
-	_velocityY = ((_targetPos select 1) - ((getPosASL _missile) select 1)) / _flyingTime;
-	_velocityZ = ((_targetPos select 2) - ((getPosASL _missile) select 2)) / _flyingTime;
-	if (_minimalGuidance) then {
-		if (!_shotHasBeenGuided) then {
-			// minimal guidance, only guide once
-			[] call _guideTheShot;
+//ajusting missile pos while flying
+while {alive _missile && {_missile distance2D _target > 1 && { time - _startTime < _maxFlightTime }}} do {
+	//__TRACE_2("flying","_missile","_missile distance2D _target")
+	//if (_missile distance _target > (_missileSpeed / 10)) then {
+	if (_missile distance _target > 5) then {
+		_missile setDir (_missile getDir _target);
+		private _dirVer = if (_target isEqualType []) then {
+			asin ((((getPosASL _missile) # 2) - (_target # 2)) / (_target distance _missile));
+		} else {
+			asin ((((getPosASL _missile) # 2) - ((getPosASL _target) # 2)) / (_target distance _missile));
 		};
-		if (_missile distance _startPos > _distanceSelfDetonate || { time - _startTime > 3 }) then {
-			// self detonate
-			_missile setDamage 1;
+		__TRACE_1("","_dirVer")
+		if (_dirVer isEqualType 0) then {// asin can return something like -1.#IND if the value isn't correct (asin 2 for example)
+			_dirVer = _dirVer * -1;
+			__TRACE_2("","_missile","_dirVer")
+			[_missile, _dirVer, 0] call BIS_fnc_setPitchBank;
 		};
-	} else {
-		[] call _guideTheShot;
+		_flyingTime = (_target distance _missile) / _missileSpeed;
+		private "_velocityX";
+		private "_velocityY";
+		private "_velocityZ";
+		if (_target isEqualType []) then {
+			_velocityX = ((_target select 0) - ((getPosASL _missile) select 0)) / _flyingTime;
+			_velocityY = ((_target select 1) - ((getPosASL _missile) select 1)) / _flyingTime;
+			_velocityZ = ((_target select 2) - ((getPosASL _missile) select 2)) / _flyingTime;
+		} else {
+			_velocityX = (((getPosASL _target) select 0) - ((getPosASL _missile) select 0)) / _flyingTime;
+			_velocityY = (((getPosASL _target) select 1) - ((getPosASL _missile) select 1)) / _flyingTime;
+			_velocityZ = (((getPosASL _target) select 2) - ((getPosASL _missile) select 2)) / _flyingTime;
+		};
+		_missile setVelocity [_velocityX, _velocityY, _velocityZ];
+
+		sleep (1/ _perSecondsChecks);
 	};
-	
-	sleep (1/ _perSecondsChecks);
 };
 __TRACE_1("","alive _missile")
 if (!alive _missile) then {
diff --git a/co30_Domination.Altis/scripts/fn_moduleCAS_guidedmissile2.sqf b/co30_Domination.Altis/scripts/fn_moduleCAS_guidedmissile2.sqf
diff --git a/co30_Domination.Altis/server/fn_createmaintarget.sqf b/co30_Domination.Altis/server/fn_createmaintarget.sqf
