Merge branch 'add-dispenser-units-to-zeus' of https://github.com/Zatama/Aux-Mod-501st into add-dispenser-units-to-zeus

addons - Copy/RD501_Droid_Dispenser/functions/fnc_droidDispenserInit.sqf

@@ -3,9 +3,9 @@ params ["_target"];
 
 if(!isServer) exitWith
 {	
-	LOG_ERROR("Not Server, Exiting PFH"); 
+	LOG("Not Server, Exiting Dispenser Init"); 
 };
-
+LOG("Server, continuing on");
 LOGF_1("Initialising spawner %1",_target);
 // TODO: Read these vars from config, maybe CfgVehicles to allow placement of vehicles, although may be better to use static object with HP and destroyed mesh rather
 _target setVariable [QGVAR(group), createGroup [opfor, true]]; // group that units will be spawned into

addons - Copy/RD501_Droid_Dispenser/functions/fnc_moduleOrbitalDroidDispenser.sqf

@@ -1,13 +1,192 @@
 #include "function_macros.hpp"
 
-LOG("Triggered Orbital Drop Droid Dispenser");
-//wait for projectile to land and then spawn vehicle
-params["_logic"];
+LOG("Spawned Orbital Drop Droid Dispenser Logic");
 
-if !(local _logic) exitWith {};
+_logic = _this select 0;
+_units = _this select 1;
+_activated = _this seelct 2;
 
-_position = position _logic;
+if ({local _x} count (objectcurators _logic) > 0) then {
+    //--- Reveal the circle to curators
+    _logic hideobject false;
+    _logic setpos position _logic;
+};
+if !(isserver) exitwith {};
 
-[_position] remoteExecCall [QUOTE(FUNC(moduleOrbitalDroidDispenserServer)), 2, false];
-// fire projectile
-_this call ace_zeus_fnc_bi_moduleProjectile;
+if (_activated) then {
+    _ammo = _logic getvariable ["type",gettext (configfile >> "cfgvehicles" >> typeof _logic >> "ammo")];
+    if (_ammo != "") then {
+        _cfgAmmo = configfile >> "cfgammo" >> _ammo;
+        //if !(isclass _cfgAmmo) exitwith {["CfgAmmo class '%1' not found.",_ammo] call bis_fnc_error;};
+        // It seems BI broke this part...
+        // _dirVar = _fnc_scriptname + typeof _logic;
+        // _logic setdir (missionnamespace getvariable [_dirVar,direction _logic]); //--- Restore custom direction
+        _pos = getposatl _logic;
+        _posAmmo = +_pos;
+        _posAmmo set [2,0];
+        _dir = direction _logic;
+        _simulation = tolower gettext (configfile >> "cfgammo" >> _ammo >> "simulation");
+        _altitude = 0;
+        _velocity = [];
+        _attach = false;
+        _radio = "";
+        _delay = 60;
+        _sound = "";
+        _soundSourceClass = "";
+        _hint = [];
+        _shakeStrength = 0;
+        _shakeRadius = 0;
+        switch (_simulation) do {
+            case "shotshell": {
+                _altitude = 1000;
+                _velocity = [0,0,-100];
+                _radio = "SentGenIncoming";
+                _sounds = if (getnumber (_cfgAmmo >> "hit") < 200) then {["mortar1","mortar2"]} else {["shell1","shell2","shell3","shell4"]};
+                _sound = selectRandom _sounds;
+                _hint = ["Curator","PlaceOrdnance"];
+                _shakeStrength = 0.01;
+                _shakeRadius = 300;
+            };
+            case "shotsubmunitions": {
+                _posAmmo = [_posAmmo,500,_dir + 180] call bis_fnc_relpos;
+                _altitude = 1000 - ((getterrainheightasl _posAmmo) - (getterrainheightasl _pos));
+                _posAmmo set [2,_altitude];
+                _velocity = [sin _dir * 68,cos _dir * 68,-100];
+                _radio = "SentGenIncoming";
+                _hint = ["Curator","PlaceOrdnance"];
+                _shakeStrength = 0.02;
+                _shakeRadius = 500;
+            };
+            case "shotilluminating": {
+                _altitude = 66;
+                _velocity = [wind select 0,wind select 1,30];
+                _sound = "SN_Flare_Fired_4";
+                _soundSourceClass = "SoundFlareLoop_F";
+            };
+            case "shotnvgmarker";
+            case "shotsmokex": {
+                _altitude = 0;
+                _velocity = [0,0,0];
+                _attach = true;
+            };
+            default {["Ammo simulation '%1' is not supported",_simulation] call bis_fnc_error;};
+        };
+        _fnc_playRadio = {
+            if (_radio != "") then {
+                _entities = (getposatl _logic) nearentities ["All",100];
+                _sides = [];
+                {
+                    if (isplayer _x) then {
+                        _side = side group _x;
+                        if (_side in [east,west,resistance,civilian]) then {
+                            //--- Play radio (only if it wasn't played recently)
+                            if (CBA_missionTime > _x getVariable ["BIS_fnc_moduleProjectile_radio",-_delay]) then {
+                                [[_side,_radio,"side"],"bis_fnc_sayMessage",_x] call bis_fnc_mp;
+                                _x setVariable ["BIS_fnc_moduleProjectile_radio",CBA_missionTime + _delay];
+                            };
+                        };
+                    };
+                } foreach _entities;
+            };
+        };
+        if (count _hint > 0 && {count objectcurators _logic > 0}) then {
+            [[_hint,nil,nil,nil,nil,nil,nil,true],"bis_fnc_advHint",objectcurators _logic] call bis_fnc_mp;
+        };
+        if (count _velocity == 3) then {
+            _altitude = (_logic getvariable ["altitude",_altitude]) call bis_fnc_parsenumber;
+            _radio = _logic getvariable ["radio",_radio];
+
+            //--- Create projectile
+            _posAmmo set [2,_altitude];
+            _projectile = createvehicle [_ammo,_posAmmo,[],0,"none"];
+            _projectile setpos _posAmmo;
+            _projectile setvelocity _velocity;
+            if (_attach) then {_projectile attachto [_logic,[0,0,_altitude]];};
+
+            // Added by ace_zeus for ace_frag compatibility
+            if (!isNil ace_frag_fnc_addPfhRound) then {
+                [objNull, _ammo, _projectile, true] call ace_frag_fnc_addPfhRound;
+            };
+
+            //--- Play sound
+            if (_sound != "") then {[[_logic,_sound,"say3D"],"bis_fnc_sayMessage"] call bis_fnc_mp;};
+
+            //--- Create sound source
+            _soundSource = if (_soundSourceClass != "") then {createSoundSource [_soundSourceClass,_pos,[],0]} else {objnull};
+
+            // Added by ace_zeus to toggle ordnance radio message
+            if (ace_zeus_radioOrdnance) then {
+                //--- Play radio warning
+                [] call _fnc_playRadio;
+            };
+
+            //--- Update
+            if (_attach) then {
+                waituntil {
+                    _soundSource setposatl getposatl _projectile;
+                    sleep 1;
+                    isnull _projectile || isnull _logic
+                };
+            } else {
+                waituntil {
+                    _soundSource setposatl getposatl _projectile;
+
+                    if (getposatl _logic distance _pos > 0 || direction _logic != _dir) then {
+                        _posNew = getposasl _logic;
+                        _dirDiff = direction _logic - _dir;
+                        _posNew = [_posNew,[getposasl _projectile,_pos] call bis_fnc_distance2d,direction _logic + 180] call bis_fnc_relpos;
+                        _posNew set [2,getposasl _projectile select 2];
+                        _projectile setvelocity ([velocity _projectile,-_dirDiff] call bis_fnc_rotatevector2d);
+                        _projectile setposasl _posNew;
+                        _pos = getposatl _logic;
+                        _dir = direction _logic;
+                        //missionnamespace setvariable [_dirVar,_dir]; See L37
+                    };
+                    sleep 0.1;
+                    isnull _projectile || isnull _logic
+                };
+            };
+            deletevehicle _projectile;
+            deletevehicle _soundSource;
+			LOG("Server, continuing on");
+			_position = position _logic;
+			LOGF_1("Firing Droid Dispenser Artillery at '%1'", _position);
+			_spawner = GVAR(spawnerDefaultObject) createVehicle _position;
+			LOGF_2("Created Droid Dispenser Object '%1' at '%2'", _spawner, _position);
+			[{
+				params["_unit"];
+				LOG("Adding to curators");
+				if(!isServer) exitWith 
+				{
+					LOG("Exiting Client Method Should only run on Server");
+				};
+				[_unit] call FUNC(droidDispenserInit);
+				{
+					_x addCuratorEditableObjects [[_unit], true];
+				} forEach allCurators;
+			}, [_spawner]] call CBA_fnc_execNextFrame;
+            if (count objectcurators _logic > 0) then {
+                //--- Delete curator spawned logic
+                if (_shakeStrength > 0) then {
+                    if (_simulation == "shotsubmunitions") then {sleep 0.5;};
+                    [[_shakeStrength,0.7,[position _logic,_shakeRadius]],"bis_fnc_shakeCuratorCamera"] call bis_fnc_mp;
+                };
+				
+                deletevehicle _logic;
+            } else {
+
+                //--- Repeat to achieve permanent effect
+                _repeat = _logic getvariable ["repeat",0] > 0;
+                if (_repeat) then {
+                    [_logic,_units,_activated] call bis_fnc_moduleprojectile;
+                } else {
+                    deletevehicle _logic;
+                };
+            };
+        } else {
+            deletevehicle _logic;
+        };
+    } else {
+        ["Cannot create projectile, 'ammo' config attribute is missing in %1",typeof _logic] call bis_fnc_error;
+    };
+};