Updated FFE

1.14 to 1.16

Author: Freddo3000

FFE 1.14.pdf

@@ -1,9 +1,8 @@
 params ["_source0", "_target0", "_rnd0"];
-private ["_dX0","_dY0","_angleAzimuth0"];
 
-_dX0 = (_target0 select 0) - (_source0 select 0);
-_dY0 = (_target0 select 1) - (_source0 select 1);
+private _dX0 = (_target0 select 0) - (_source0 select 0);
+private _dY0 = (_target0 select 1) - (_source0 select 1);
 
-_angleAzimuth0 = (_dX0 atan2 _dY0) + (random (2 * _rnd0)) - _rnd0;
+private _angleAzimuth0 = (_dX0 atan2 _dY0) + (random (2 * _rnd0)) - _rnd0;
 
 _angleAzimuth0

FFE 1.16.pdf

@@ -1,18 +1,18 @@
 //_bArr = [_tgtPos,RydFFE_ArtG,"SADARM",6,leaderHQ] call RYD_fnc_ArtyMission;
 params ["_pos","_arty","_ammoG","_amount","_FO"];
-private ["_pos","_arty","_ammoG","_amount","_FO","_ammo","_possible","_battery","_agp","_artyAv","_vehs","_gp","_hasAmmo","_checked","_vh","_tp","_inRange","_pX","_pY","_pZ","_ammoArr","_allAmmo"];
+private ["_pos","_arty","_ammoG","_amount","_FO","_gp","_checked","_vh","_tp","_inRange","_pX","_pY","_pZ"];
 
-_ammo = "";
-_ammoArr = [];
+private _ammo = "";
+private _ammoArr = [];
 
-_hasAmmo = 0;
-_possible = false;
-_battery = [];
-_agp = [];
+private _hasAmmo = 0;
+private _possible = false;
+private _battery = [];
+private _agp = [];
 
-_artyAv = [];
-_vehs = 0;
-_allAmmo = 0;
+private _artyAv = [];
+private _vehs = 0;
+private _allAmmo = 0;
 
 {
 	_gp = _x; 
@@ -47,14 +47,29 @@ _allAmmo = 0;
 
 						case (_tp in RydFFE_SPMortar) : 
 						{
-							switch (_ammoG) do
+							_side = configfile >> "CfgVehicles" >> _tp >> "side";
+							if ((not (isNumber _side)) or {not ((getNumber _side) == 0)}) then
 							{
-								case ("HE") : {_ammo = "32Rnd_155mm_Mo_shells"};
-								case ("SPECIAL") : {_ammo = "2Rnd_155mm_Mo_Cluster"};
-								case ("SECONDARY") : {_ammo = "2Rnd_155mm_Mo_guided"};
-								case ("SMOKE") : {_ammo = "6Rnd_155mm_Mo_smoke"};
-								case ("ILLUM") : {_ammo = ""};
-							};
+								switch (_ammoG) do
+								{
+									case ("HE") : {_ammo = "32Rnd_155mm_Mo_shells"};
+									case ("SPECIAL") : {_ammo = "2Rnd_155mm_Mo_Cluster"};
+									case ("SECONDARY") : {_ammo = "2Rnd_155mm_Mo_guided"};
+									case ("SMOKE") : {_ammo = "6Rnd_155mm_Mo_smoke"};
+									case ("ILLUM") : {_ammo = ""};
+								};
+							}
+							else
+							{
+								switch (_ammoG) do
+								{
+									case ("HE") : {_ammo = "32Rnd_155mm_Mo_shells_O"};
+									case ("SPECIAL") : {_ammo = "2Rnd_155mm_Mo_Cluster_O"};
+									case ("SECONDARY") : {_ammo = "2Rnd_155mm_Mo_guided_O"};
+									case ("SMOKE") : {_ammo = "6Rnd_155mm_Mo_smoke_O"};
+									case ("ILLUM") : {_ammo = ""};
+								};
+							}
 						};
 
 						case (_tp in RydFFE_Rocket) :

Vcom/Functions/FFE_Functions/fn_AngTowards.sqf

@@ -115,9 +115,9 @@ params ["_allArty"];
 						_ammoC = configfile >> "CfgAmmo" >> _ammo;
 						_subAmmo = _ammoC >> "subMunitionAmmo";
 
-						if not (_subAmmo isEqualTo "") then
+						if ((isText _subAmmo) and {not ((getText _subAmmo) isEqualTo "")}) then
 						{
-							_ammoC = configfile >> "CfgAmmo" >> _subAmmo
+							_ammoC = configfile >> "CfgAmmo" >> (getText _subAmmo);
 						};
 
 						_actHit = getNumber (_ammoC >> "indirectHit");

Vcom/Functions/FFE_Functions/fn_ArtyMission.sqf

@@ -1,12 +1,11 @@
 params ["_source", "_angle", "_distT"];
-private ["_dXb","_dYb","_px","_py","_pz"];
 
-_dXb = _distT * (sin _angle);
-_dYb = _distT * (cos _angle);
+private _dXb = _distT * (sin _angle);
+private _dYb = _distT * (cos _angle);
 
-_px = (_source select 0) + _dXb;
-_py = (_source select 1) + _dYb;
+private _px = (_source select 0) + _dXb;
+private _py = (_source select 1) + _dYb;
 
-_pz = getTerrainHeightASL [_px,_py];
+private _pz = getTerrainHeightASL [_px,_py];
 
 [_px,_py,_pz]

Vcom/Functions/FFE_Functions/fn_AutoConfig.sqf

@@ -61,6 +61,11 @@ RydFFE_Other = [] + RydFFE_Add_Other;
 
 _allArty = RydFFE_SPMortar + RydFFE_Mortar + RydFFE_Rocket;
 
+{
+	_allArty = _allArty + (_x select 0)
+}
+foreach RydFFE_Other;
+
 _allArty = [_allArty] call RYD_fnc_AutoConfig;
 
 _civF = ["civ_f","civ","civ_ru","bis_tk_civ","bis_civ_special"];