Subs now spawned at pirate missions.
This commit is contained in:
parent
fef589f94c
commit
b077b80337
@ -178,12 +178,21 @@ for "_i" from 1 to (count blck_activeMissionsList) do
|
|||||||
_objects append _temp;
|
_objects append _temp;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
_temp = [_coords, _minNoAI,_maxNoAI,_noAIGroups,_missionGroups,_difficulty,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms] call blck_fnc_spawnMissionAI;
|
_temp = [_coords, _minNoAI,_maxNoAI,_noAIGroups,_missionGroups,_difficulty,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms,_isScubaMission] call blck_fnc_spawnMissionAI;
|
||||||
_temp params["_ai","_abort"];
|
_temp params["_ai","_abort"];
|
||||||
if (_abort) throw 1;
|
if (_abort) throw 1;
|
||||||
_blck_AllMissionAI append (_ai);
|
_blck_AllMissionAI append (_ai);
|
||||||
uiSleep delayTime;
|
uiSleep delayTime;
|
||||||
|
|
||||||
|
if !(_scubaGroupParameters isEqualTo []) then
|
||||||
|
{
|
||||||
|
_temp = [_coords, _minNoAI,_maxNoAI,_noAIGroups,_scubaGroupParameters,_difficulty,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms,_isScubaMission] call blck_fnc_spawnMissionAI;
|
||||||
|
_temp params["_ai","_abort"];
|
||||||
|
if (_abort) throw 1;
|
||||||
|
_blck_AllMissionAI append (_ai);
|
||||||
|
};
|
||||||
|
uiSleep delayTime;
|
||||||
|
|
||||||
if !(_hostageConfig isEqualTo []) then
|
if !(_hostageConfig isEqualTo []) then
|
||||||
{
|
{
|
||||||
_temp = [_coords,_hostageConfig] call blck_fnc_spawnHostage;
|
_temp = [_coords,_hostageConfig] call blck_fnc_spawnHostage;
|
||||||
@ -278,19 +287,26 @@ for "_i" from 1 to (count blck_activeMissionsList) do
|
|||||||
uisleep 10;
|
uisleep 10;
|
||||||
|
|
||||||
private _noVehiclePatrols = [_noVehiclePatrols] call blck_fnc_getNumberFromRange;
|
private _noVehiclePatrols = [_noVehiclePatrols] call blck_fnc_getNumberFromRange;
|
||||||
if (blck_useVehiclePatrols && ((_noVehiclePatrols > 0) || count _missionPatrolVehicles > 0)) then
|
if (blck_useVehiclePatrols && ((_noVehiclePatrols > 0) || !(_missionPatrolVehicles isEqualTo []))) then
|
||||||
{
|
{
|
||||||
_temp = [_coords,_noVehiclePatrols,_difficulty,_missionPatrolVehicles,_userelativepos,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms,false,_vehicleCrewCount] call blck_fnc_spawnMissionVehiclePatrols;
|
_temp = [_coords,_noVehiclePatrols,_difficulty,_missionPatrolVehicles,_userelativepos,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms,false,_vehicleCrewCount] call blck_fnc_spawnMissionVehiclePatrols;
|
||||||
// TODO: add grpNull checks to missionVehicleSpawner
|
// TODO: add grpNull checks to missionVehicleSpawner
|
||||||
if (_temp isEqualTo grpNull) then {throw 1} else
|
if (_temp isEqualTo grpNull) throw 1;
|
||||||
{
|
_missionAIVehicles append (_temp select 0);
|
||||||
//diag_log format["_monitorInitializeMissions(299): _temp select 0 = %1",_temp select 0];
|
_blck_AllMissionAI append (_temp select 1);
|
||||||
//diag_log format["_monitorInitializedMissions(300): _temp select 1 = %1",_temp select 1];
|
|
||||||
_missionAIVehicles = _temp select 0;
|
|
||||||
_blck_AllMissionAI append (_temp select 1);
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
uiSleep delayTime;
|
uiSleep delayTime;
|
||||||
|
if (blck_useVehiclePatrols && ((_noVehiclePatrols > 0) || !(_submarinePatrolParameters isEqualTo []))) then
|
||||||
|
{
|
||||||
|
//params["_coords","_noVehiclePatrols","_skillAI","_missionPatrolVehicles",["_useRelativePos",true],["_uniforms",[]], ["_headGear",[]],["_vests",[]],["_backpacks",[]],["_weaponList",[]],["_sideArms",[]], ["_isScubaGroup",false],["_crewCount",4]];
|
||||||
|
_temp = [_coords,_noVehiclePatrols,_difficulty,_submarinePatrolParameters,_userelativepos,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms,_isScubaMission,_vehicleCrewCount] call blck_fnc_spawnMissionVehiclePatrols;
|
||||||
|
// TODO: add grpNull checks to missionVehicleSpawner
|
||||||
|
if (_temp isEqualTo grpNull) throw 1;
|
||||||
|
_missionAIVehicles append (_temp select 0);
|
||||||
|
_blck_AllMissionAI append (_temp select 1);
|
||||||
|
};
|
||||||
|
uiSleep delayTime;
|
||||||
|
|
||||||
if (blck_debugLevel >= 3) then {diag_log format["monitorInitializedMissions: _spawnCrateTiming = %1 _loadCratesTiming = %2 | _markerMissionName = %3",_spawnCratesTiming,_loadCratesTiming, _markerMissionName]};
|
if (blck_debugLevel >= 3) then {diag_log format["monitorInitializedMissions: _spawnCrateTiming = %1 _loadCratesTiming = %2 | _markerMissionName = %3",_spawnCratesTiming,_loadCratesTiming, _markerMissionName]};
|
||||||
if (blck_debugLevel >= 3) then {diag_log format["monitorInitializedMissions: _missionLootBoxes = %1",_missionLootBoxes]};
|
if (blck_debugLevel >= 3) then {diag_log format["monitorInitializedMissions: _missionLootBoxes = %1",_missionLootBoxes]};
|
||||||
if (_spawnCratesTiming in ["atMissionSpawnGround","atMissionSpawnAir"]) then
|
if (_spawnCratesTiming in ["atMissionSpawnGround","atMissionSpawnAir"]) then
|
||||||
|
Loading…
Reference in New Issue
Block a user