Arma3_Epoch/blckeagles-revisited-RC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Development' into Experimental

Browse Source
This commit is contained in:
Chris Cardozo 2020-10-04 10:04:46 -04:00
commit b1864ec337
3 changed files with 68 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_initializeMission.sqf
View File

@ -54,6 +54,7 @@ _missionParameters params[
"_missionLootBoxes", "_missionLootBoxes",
"_missionLootVehicles", "_missionLootVehicles",
"_missionPatrolVehicles", "_missionPatrolVehicles",
"_submarinePatrols",
"_submarinePatrolParameters", "_submarinePatrolParameters",
"_airPatrols", "_airPatrols",
"_noVehiclePatrols", "_noVehiclePatrols",
@ -65,6 +66,7 @@ _missionParameters params[
"_maxNoAI", "_maxNoAI",
"_noAIGroups", "_noAIGroups",
"_missionGroups", "_missionGroups",
"_scubaPatrols",
"_scubaGroupParameters", "_scubaGroupParameters",
"_hostageConfig", "_hostageConfig",
"_enemyLeaderConfig", "_enemyLeaderConfig",

7
@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_missionSpawner.sqf
View File

@ -17,7 +17,8 @@ private ["_abort","_crates","_aiGroup","_objects","_groupPatrolRadius","_mission
"_AI_Vehicles","_timeOut","_aiDifficultyLevel","_missionPatrolVehicles","_missionGroups","_loadCratesTiming","_spawnCratesTiming","_assetSpawned","_hostageConfig", "_AI_Vehicles","_timeOut","_aiDifficultyLevel","_missionPatrolVehicles","_missionGroups","_loadCratesTiming","_spawnCratesTiming","_assetSpawned","_hostageConfig",
"_chanceHeliPatrol","_noPara","_chanceLoot","_heliCrew","_loadCratesTiming","_useMines","_blck_AllMissionAI","_delayTime","_groupPatrolRadius","_simpleObjects", "_chanceHeliPatrol","_noPara","_chanceLoot","_heliCrew","_loadCratesTiming","_useMines","_blck_AllMissionAI","_delayTime","_groupPatrolRadius","_simpleObjects",
"_wait","_missionStartTime","_playerInRange","_missionTimedOut","_temp","_patrolVehicles","_vehToSpawn","_noChoppers","_chancePara","_paraSkill","_marker","_vehicleCrewCount", "_wait","_missionStartTime","_playerInRange","_missionTimedOut","_temp","_patrolVehicles","_vehToSpawn","_noChoppers","_chancePara","_paraSkill","_marker","_vehicleCrewCount",
"_defaultMissionLocations","_garrisonedbuildings_buildingposnsystem","_garrisonedBuilding_ATLsystem", "_isScubaMission","_markerlabel","_missionLootBoxes","_airpatrols"]; "_defaultMissionLocations","_garrisonedbuildings_buildingposnsystem","_garrisonedBuilding_ATLsystem", "_isScubaMission","_markerlabel","_missionLootBoxes","_airpatrols",
"_submarinePatrols","_scubaPatrols"];
params["_markerName",["_aiDifficultyLevel","Red"]]; params["_markerName",["_aiDifficultyLevel","Red"]];
if (isNil "_markerLabel") then {_markerLabel = _markerMissionName}; if (isNil "_markerLabel") then {_markerLabel = _markerMissionName};
@ -54,7 +55,9 @@ if (isNil "_garrisonedBuilding_ATLsystem") then {_garrisonedBuilding_ATLsystem =
if (isNil "_garrisonedBuildings_BuildingPosnSystem") then {_garrisonedBuildings_BuildingPosnSystem = []}; if (isNil "_garrisonedBuildings_BuildingPosnSystem") then {_garrisonedBuildings_BuildingPosnSystem = []};
if (isNil "_vehicleCrewCount") then {_vehicleCrewCount = [_aiDifficultyLevel] call GMS_fnc_selectVehicleCrewCount}; if (isNil "_vehicleCrewCount") then {_vehicleCrewCount = [_aiDifficultyLevel] call GMS_fnc_selectVehicleCrewCount};
if (isNil "_airpatrols") then {_airpatrols = []}; if (isNil "_airpatrols") then {_airpatrols = []};
if (isNil "_submarinePatrols") then {_submarinePatrols = 0};
if (isNil "_submarinePatrolParameters") then {_submarinePatrolParameters = []}; if (isNil "_submarinePatrolParameters") then {_submarinePatrolParameters = []};
if (isNil "_scubaPatrols") then {_scubaPatrols = 0};
if (isNil "_scubagroupparameters") then {_scubagroupparameters = []}; if (isNil "_scubagroupparameters") then {_scubagroupparameters = []};
if (isNil "_markerMissionName") then { if (isNil "_markerMissionName") then {
diag_log format["_fnc_missionSpawner: _markerMissionName not defined, using default value"]; diag_log format["_fnc_missionSpawner: _markerMissionName not defined, using default value"];
@ -111,6 +114,7 @@ private _table = [
_missionLootBoxes, _missionLootBoxes,
_missionLootVehicles, _missionLootVehicles,
_missionPatrolVehicles, _missionPatrolVehicles,
_submarinePatrols, // Added Build 227
_submarinePatrolParameters, _submarinePatrolParameters,
_airPatrols, _airPatrols,
_noVehiclePatrols, _noVehiclePatrols,
@ -122,6 +126,7 @@ private _table = [
_maxNoAI, _maxNoAI,
_noAIGroups, _noAIGroups,
_missionGroups, _missionGroups,
_scubaPatrols, // Added Build 227
_scubaGroupParameters, _scubaGroupParameters,
_hostageConfig, _hostageConfig,
_enemyLeaderConfig, _enemyLeaderConfig,

118
@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf
View File

@ -50,60 +50,62 @@ for "_i" from 1 to (count blck_activeMissionsList) do
]; ];
_missionParameters params[ _missionParameters params[
"_markerName", "_markerName",
"_markerMissionName", "_markerMissionName",
"_endMsg", "_endMsg",
"_startMsg", "_startMsg",
"_defaultMissionLocations", "_defaultMissionLocations",
"_crateLoot", "_crateLoot",
"_lootCounts", "_lootCounts",
"_markerType", "_markerType",
"_markerColor", "_markerColor",
"_markerSize", "_markerSize",
"_markerBrush", "_markerBrush",
"_missionLandscapeMode", "_missionLandscapeMode",
"_garrisonedBuildings_BuildingPosnSystem", "_garrisonedBuildings_BuildingPosnSystem",
"_garrisonedBuilding_ATLsystem", "_garrisonedBuilding_ATLsystem",
"_missionLandscape", "_missionLandscape",
"_simpleObjects", "_simpleObjects",
"_missionLootBoxes", "_missionLootBoxes",
"_missionLootVehicles", "_missionLootVehicles",
"_missionPatrolVehicles", "_missionPatrolVehicles",
"_submarinePatrolParameters", "_submarinePatrols",
"_airPatrols", "_submarinePatrolParameters",
"_noVehiclePatrols", "_airPatrols",
"_vehicleCrewCount", "_noVehiclePatrols",
"_missionEmplacedWeapons", "_vehicleCrewCount",
"_noEmplacedWeapons", "_missionEmplacedWeapons",
"_useMines", "_noEmplacedWeapons",
"_minNoAI", "_useMines",
"_maxNoAI", "_minNoAI",
"_noAIGroups", "_maxNoAI",
"_missionGroups", "_noAIGroups",
"_scubaGroupParameters", "_missionGroups",
"_hostageConfig", "_scubaPatrols",
"_enemyLeaderConfig", "_scubaGroupParameters",
"_assetKilledMsg", "_hostageConfig",
"_uniforms", "_enemyLeaderConfig",
"_headgear", "_assetKilledMsg",
"_vests", "_uniforms",
"_backpacks", "_headgear",
"_weaponList", "_vests",
"_sideArms", "_backpacks",
"_chanceHeliPatrol", "_weaponList",
"_noChoppers", "_sideArms",
"_missionHelis", "_chanceHeliPatrol",
"_chancePara", "_noChoppers",
"_noPara", "_missionHelis",
"_paraTriggerDistance", "_chancePara",
"_paraSkill", "_noPara",
"_chanceLoot", "_paraTriggerDistance",
"_paraLoot", "_paraSkill",
"_paraLootCounts", "_chanceLoot",
"_spawnCratesTiming", "_paraLoot",
"_loadCratesTiming", "_paraLootCounts",
"_endCondition", "_spawnCratesTiming",
"_isScubaMission" "_loadCratesTiming",
"_endCondition",
"_isScubaMission"
]; ];
private _playerInRange = [_coords, blck_TriggerDistance, false] call blck_fnc_playerInRange; private _playerInRange = [_coords, blck_TriggerDistance, false] call blck_fnc_playerInRange;
@ -187,14 +189,14 @@ for "_i" from 1 to (count blck_activeMissionsList) do
_blck_AllMissionAI append (_ai); _blck_AllMissionAI append (_ai);
uiSleep delayTime; uiSleep delayTime;
if !(_scubaGroupParameters isEqualTo []) then if !(_scubaGroupParameters isEqualTo [] || _scubaPatrols > 0) then
{ {
//_umsUniforms = blck_UMS_uniforms; //_umsUniforms = blck_UMS_uniforms;
//_umsHeadgear = blck_UMS_headgear; //_umsHeadgear = blck_UMS_headgear;
//_umsWeapons = blck_UMS_weapons; //_umsWeapons = blck_UMS_weapons;
//_umsVests = blck_UMS_vests; //_umsVests = blck_UMS_vests;
_temp = [_coords, _minNoAI,_maxNoAI,_noAIGroups,_scubaGroupParameters,_difficulty,blck_UMS_uniforms,blck_UMS_headgear,blck_UMS_vests,_backpacks,blck_UMS_weapons,_sideArms,true] call blck_fnc_spawnMissionAI; _temp = [_coords, _minNoAI,_maxNoAI,_scubaPatrols,_scubaGroupParameters,_difficulty,blck_UMS_uniforms,blck_UMS_headgear,blck_UMS_vests,_backpacks,blck_UMS_weapons,_sideArms,true] 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);
@ -277,7 +279,7 @@ for "_i" from 1 to (count blck_activeMissionsList) do
_blck_AllMissionAI append (units (_temp select 0)); _blck_AllMissionAI append (units (_temp select 0));
}; };
}; };
uiSleep 15; uiSleep 5;
private _userelativepos = true; private _userelativepos = true;
private _emplacedWeaponsThisMission = [_noEmplacedWeapons] call blck_fnc_getNumberFromRange; private _emplacedWeaponsThisMission = [_noEmplacedWeapons] call blck_fnc_getNumberFromRange;
@ -293,7 +295,7 @@ for "_i" from 1 to (count blck_activeMissionsList) do
_blck_AllMissionAI append (_temp select 1); _blck_AllMissionAI append (_temp select 1);
}; };
}; };
uisleep 10; uisleep 5;
private _noPatrols = [_noVehiclePatrols] call blck_fnc_getNumberFromRange; private _noPatrols = [_noVehiclePatrols] call blck_fnc_getNumberFromRange;
diag_log format["_monitorInitializeMissions(299): __noVehiclePatrols %1 | _noPatrols %2 | _missionPatrolVehicles %3",_noVehiclePatrols,_noPatrols,_missionPatrolVehicles]; diag_log format["_monitorInitializeMissions(299): __noVehiclePatrols %1 | _noPatrols %2 | _missionPatrolVehicles %3",_noVehiclePatrols,_noPatrols,_missionPatrolVehicles];