From 76226152134bb20c9eef7b579f398adaaeca90dc Mon Sep 17 00:00:00 2001 From: Chris Cardozo Date: Sat, 10 Oct 2020 08:27:33 -0400 Subject: [PATCH 1/7] Update changelog --- @GMS/addons/custom_server/init/build.sqf | 4 +-- changeLog.sqf | 37 +++++++++++++----------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/@GMS/addons/custom_server/init/build.sqf b/@GMS/addons/custom_server/init/build.sqf index 0e1ad01..ab28d2b 100644 --- a/@GMS/addons/custom_server/init/build.sqf +++ b/@GMS/addons/custom_server/init/build.sqf @@ -1,4 +1,4 @@ -#define blck_buildNumber 228 // Address issues with cleanup of objects +#define blck_buildNumber 230 // Address issues with cleanup of objects #define blck_versionNumber 7.02 -#define blck_buildDate "10-4-20" +#define blck_buildDate "10-5-20" diff --git a/changeLog.sqf b/changeLog.sqf index 8f7ceba..954edf7 100644 --- a/changeLog.sqf +++ b/changeLog.sqf @@ -9,17 +9,24 @@ Many thanks for new Coding and ideas from Grahame. Significant Changes: - ===================== -7.00 Build 218 +7.02 Build 230 + +New: Option to hide bushes and trees that happen to be under the location in which an enterable building is spawned + blck_hideRocksAndPlants = true; // When true, any rocks, trees or bushes under enterable buildings will be 'hidden' + +New: Added support for simple objects. Note that these can be exported by the editor tool now. + New: Option to drop crates on a parachute at mission spawn which adds some randomness to where crates end up. blck_spawnCratesTiming = "atMissionSpawnAir"; New: You can now add money to crates at static missions by defining the following parameter in your .sqf for the mission. _crateMoney = 10000; - // this can be a value or a range such as [1000,10000]; + this can be a value or a range such as [1000,10000]; a random amount of money from 0 to the maximum defined will be added. +New: Added checks and logging for invalid marker types and colors; default values are now provided. + New: Added some basic error checking and logging for incorrect entries for some key settings. New: 3DEN Editor plugin exports missions as .sqf formated text ready to paste into a file. @@ -27,16 +34,20 @@ New: 3DEN Editor plugin exports missions as .sqf formated text ready to paste in Fixed: Don and Hostage missions could not be completed Fixed: Missions tended to spawn all at once -Fixed: vehicles are spawned at a safe spot which should reduce unintended explosions +Fixed: Vehicles sometimes blew up on spawn. vehicles are spawned at a safe spot which should reduce unintended explosions Fixed: Missions sometimes spawned on steep hillsides. -Fixed: Vehicles sometimes blew up on spawn. +Fixed: Missions were not distributed over the entire map. The scripts now pick a random quadrant to search thus ensuring broader distribution of mission locations. Fixed: Money was not added to crates at dynamic missions +Fixed: Markers were not shown if more than once instance of a mission was spawned. +Fixed: No subs or scuba units were spawned at dynamic UMS missions. +Fixed: Jets crashed at spawn in. Changed: Timers for spawning missions adjusted a bit to space out spawn/timeouts a bit more. -Changed: The system has been upgreaded to a state-based system, meaning only one script (GMS_fnc_mainThread)is running once all missions are initialized. -Changed: a lot of debugging was removed. +Changed: The system has been upgraded to a state-based system, meaning only one script (GMS_fnc_mainThread)is running once all missions are initialized. +Changed: a lot of debugging code was removed. Changed: List of missions for dynamic Underwater missions was moved to \Missions\GMS_missionLIsts.sqf - +Changed: Units spawned where the surface is water are spawned with UMS gear now. +Changed: Added some CBA compatability (Thanks to porkeid for the fixes) 6.98 Build 206 FIXED: few minor bug fixes. @@ -59,12 +70,6 @@ Removed: some debugging and map sepcific settings from blck_custom_config.sqf Changed: some code for finding locations for a new mission. Added: all blckeagls map markers have the same prefix: "blckeagls_marker" - - - - - - 6.96 Build 199 Added support for Arma servers not running Epoch or Exile @@ -117,8 +122,6 @@ Added offloading of AI to clients // TODO: set to false before release blck_limit_ai_offload_to_blckeagls = true; // when true, only groups spawned by blckeagls are evaluated. - - Fixed - Vehicle unlock when empty of crew through adding a getOut event handler. Code for spawning vehicles redone to reduced redundancy. Monitoring of groups refined to route mission groups that have left the mission area back to it. @@ -241,7 +244,7 @@ Added: A new mission completion condition for hostage and captive missions. Added: Mission crates can now be spawned on the ground or in the air at mission completion. blck_spawnCratesTiming sets the default for all missions. - blck_spawnCratesTiming = "atMissionEndAir"; // Choices: "atMissionSpawnGround","atMissionStartAir","atMissionEndGround","atMissionEndAir". + blck_spawnCratesTiming = "atMissionEndAir"; // Choices: "atMissionSpawnGround","atMissionSpawnAir","atMissionEndGround","atMissionEndAir". Define _spawnCratesTiming to set this parameter for a particular mission. _spawnCratesTiming = "atMissionEndAir"; See the hostage1.sqf mission as an example. From 43ad4ea1a2af0707a345b170a9e34b6fba6132cf Mon Sep 17 00:00:00 2001 From: Chris Cardozo Date: Sat, 10 Oct 2020 08:28:21 -0400 Subject: [PATCH 2/7] Fix scripts for spawning units/statics using Arma building posns --- .../GMS_fnc_garrisonBuilding_relPosSystem.sqf | 20 +++++++-- ...fnc_spawnGarrisonInsideBuilding_relPos.sqf | 42 ++++++++++++++++--- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_garrisonBuilding_relPosSystem.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_garrisonBuilding_relPosSystem.sqf index a792b95..66add31 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_garrisonBuilding_relPosSystem.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_garrisonBuilding_relPosSystem.sqf @@ -40,13 +40,27 @@ if !(isNull _group) then { { // ["Land_Unfinished_Building_02_F",[-21.8763,-45.978,-0.00213432],0,true,true,0.67,3,[],4], - _x params["_bldClassName","_bldRelPos","_bldDir","_s","_d","_p","_noStatics","_typesStatics","_noUnits"]; - if (_typesStatics isEqualTo []) then {_typesStatics = ["B_HMG_01_high_F"]}; + _x params["_bldClassName","_bldRelPos","_bldDir","_allowDamage","_enableSimulation","_probabilityOfGarrision","_noStatics","_typesStatics","_noUnits"]; + if (_typesStatics isEqualTo []) then {_typesStatics = blck_staticWeapons}; _building = createVehicle[_bldClassName,[0,0,0],[],0,"CAN_COLLIDE"]; _buildingsSpawned pushBack (netID _building); _building setPosATL (_bldRelPos vectorAdd _center); [_building, _bldDir] call blck_fnc_setDirUp; - _staticsSpawned = [_building,_group,_noStatics,_typesStatics,_noUnits,_aiDifficultyLevel,_uniforms,_headGear,_vests,_backpacks,"none",_weaponList,_sideArms] call blck_fnc_spawnGarrisonInsideBuilding_relPos; + _staticsSpawned = [ + _building, + _group, + _noStatics, + _typesStatics, + _noUnits, + _aiDifficultyLevel, + _uniforms, + _headGear, + _vests, + _backpacks, + "none", + _weaponList, + _sideArms + ] call blck_fnc_spawnGarrisonInsideBuilding_relPos; }forEach _garrisonedBuilding_relPosSystem; }; _return = [_group,_buildingsSpawned,_staticsSpawned]; diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnGarrisonInsideBuilding_relPos.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnGarrisonInsideBuilding_relPos.sqf index 5a8e53a..547c5c7 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnGarrisonInsideBuilding_relPos.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnGarrisonInsideBuilding_relPos.sqf @@ -10,7 +10,37 @@ */ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; -params["_building","_group",["_noStatics",0],["_typesStatics",blck_staticWeapons],["_noUnits",0],["_aiDifficultyLevel","Red"], ["_uniforms",[]],["_headGear",[]],["_vests",[]],["_backpacks",[]],["_launcher","none"],["_weaponList",[]],["_sideArms",[]]]; +/* + _building, + _group, + _noStatics, + _typesStatics, + _noUnits, + _aiDifficultyLevel, + _uniforms, + _headGear, + _vests, + _backpacks, + "none", + _weaponList, + _sideArms +*/ +params[ + "_building", + "_group", + ["_noStatics",0], + ["_typesStatics",blck_staticWeapons], + ["_noUnits",0], + ["_aiDifficultyLevel","Red"], + ["_uniforms",[]], + ["_headGear",[]], + ["_vests",[]], + ["_backpacks",[]], + ["_launcher","none"], + ["_weaponList",[]], + ["_sideArms",[]] +]; + if (_weaponList isEqualTo []) then {_weaponList = [_aiDifficultyLevel] call blck_fnc_selectAILoadout}; if (_sideArms isEqualTo []) then {_sideArms = [_aiDifficultyLevel] call blck_fnc_selectAISidearms}; if (_uniforms isEqualTo []) then {_uniforms = [_aiDifficultyLevel] call blck_fnc_selectAIUniforms}; @@ -19,12 +49,11 @@ if (_vests isEqualTo []) then {_vests = [_aiDifficultyLevel] call blck_fnc_ if (_backpacks isEqualTo []) then {_backpacks = [_aiDifficultyLevel] call blck_fnc_selectAIBackpacks}; private["_unit","_obj","_staticClassName","_usedBldPsn","_pos","_obj"]; -private _allBldPsn = [[_building] call BIS_fnc_buildingPositions] call BIS_fnc_arrayShuffle; +private _allBldPsn = ([_building] call BIS_fnc_buildingPositions) call BIS_fnc_arrayShuffle; private _countBldPsn = count _allBldPsn; -private _floor = floor(_countBldPsn/2); -private _ceil = ceil(_countBldPsn/2); -private _statics = if (_ceil > _noStatics) then {_noStatics} else {_ceil}; -private _units = if (_floor > _noUnits) then {_noUnits} else {_floor}; +private _statics = _noStatics min ceil(_countBldPsn/2); +private _units = _countBldPsn - _statics; +diag_log format["_fnc_spawnGarrisonInsideBuilding_relPos: _statics = %1 | _units = %2 | count _allBldPsn = %3 | _allBldPsn %4",_statics,_units,count _allBldPsn,_allBldPsn]; private _staticsSpawned = []; private _locsUsed = []; uiSleep 1; @@ -32,6 +61,7 @@ for "_i" from 1 to _statics do { if (_allBldPsn isEqualTo []) exitWith {}; _pos = _allBldPsn deleteAt 0; + diag_log format["_fnc_spawnGarrisonInsideBuilding_relPos: _pos = %1",_pos]; _locsUsed pushBack _pos; _staticClassName = selectRandom _typesStatics; _obj = [_staticClassName, [0,0,0]] call blck_fnc_spawnVehicle; From 0e01267f18c01bc0c5404b7983c0e2a36b622476 Mon Sep 17 00:00:00 2001 From: Chris Cardozo Date: Sat, 10 Oct 2020 08:28:38 -0400 Subject: [PATCH 3/7] removed needless spaces --- .../Compiles/Missions/GMS_fnc_spawnCompositionObjects.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnCompositionObjects.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnCompositionObjects.sqf index 56f2841..dff8b3e 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnCompositionObjects.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnCompositionObjects.sqf @@ -40,7 +40,6 @@ private _hiddenObjs = []; }; _obj = createVehicle[_className,[0,0,0],[],0,"CAN_COLLIDE"]; _obj setPosATL _objPos; - _newObjs pushback (netID _obj); [_obj, _dir] call blck_fnc_setDirUp; _obj setVectorUp [0,0,1]; From 6bd59ea1a46d97f96710b753220f7e4d217273ab Mon Sep 17 00:00:00 2001 From: Chris Cardozo Date: Sat, 10 Oct 2020 08:28:57 -0400 Subject: [PATCH 4/7] removed logging --- .../Compiles/Missions/GMS_fnc_initializeMission.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_initializeMission.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_initializeMission.sqf index 067ac7f..657434b 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_initializeMission.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_initializeMission.sqf @@ -101,10 +101,8 @@ if !(_defaultMissionLocations isEqualTo []) then if (_isScubaMission) then { _coords = [] call blck_fnc_findShoreLocation; - diag_log format["_initializeMission (102): _coords = %1",_coords]; } else { _coords = [] call blck_fnc_findSafePosn; - diag_log format["_initializeMission (105): _coords = %1",_coords]; }; }; From 7b98a99491a4882c917f6b70966527d781e161f0 Mon Sep 17 00:00:00 2001 From: Chris Cardozo Date: Sat, 10 Oct 2020 08:30:15 -0400 Subject: [PATCH 5/7] Added missing support for subs/scubba --- @blckeagls_EDEN/addons/3EDEN_plugin.pbo | Bin 137360 -> 137888 bytes .../3EDEN_plugin/Export/fn_exportDynamic.sqf | 18 +++++++++++++++++- .../3EDEN_plugin/Export/fn_exportStatic.sqf | 1 - .../addons/3EDEN_plugin/config.cpp | 4 ++-- .../addons/{3EDEN_plugin => }/Guidelines.txt | 0 5 files changed, 19 insertions(+), 4 deletions(-) rename @blckeagls_EDEN/addons/{3EDEN_plugin => }/Guidelines.txt (100%) diff --git a/@blckeagls_EDEN/addons/3EDEN_plugin.pbo b/@blckeagls_EDEN/addons/3EDEN_plugin.pbo index 3d7074220714d3dc2c6544f2122304901d075fb8..1068d5221b0469a044945c373c3d762314aa7113 100644 GIT binary patch delta 684 zcmaJ;J!lj`6n6Zv$wP7nEg3+W;JJo zE5s&Mz+$x!YyuVr45EjP7WRUbeFWRHu(=}Q?%s;pzb;~JQ_~) zhZErR>byFYG*uPV1K&la(^@rbuVu7J5HRk0S3~Al%xfFV)LHWRN|y`j=EqPL@!TjP zV*t+fibh?=jY3gZs+HLiE|h1Ki_H}PLp zV-0mkKwRFC4b!o%IfV0@#HBJ$>(MG%QDZ@J;z_DlN$w=c^H&5Btd-)T+oAlQ+VgLF zOmMlG8Z)Iv$2P$A@x%w1P#0}vnAyAItzfjLfb-F>=iumc%4t&(-}*lXLW4Mtf4@dt z(x&OuEft)>(6=nUXwPSMCJhK(vi1kawo38n^#?G15W@b?4Iri?whK;N;qjMgb13$? zMr{&00(qfp(g683;-Tr1fO#}_O9Z~d5fP}vg5;xJ#yRsn9_d>^y1`qaNtQCwK7t7i wS?pe{zmMdXEpVa#@ExF9|J!%)Og}aJI9c!Y9v^x2>E-*o%U?h5KKSwUHwTH=-~a#s delta 199 zcmZ3mm1Dw2jtRQVGSZnF4H(7v?z%I8!FHL<_`B|t?Zp&%*Be5F?ki@-uiu<2R>>i3 zZq3WZ$(fQ^lB!^AKyFF4HGZWb~T;x|31PLMJ~ZrPx2s zJ+Y`Lvp7FbCpWPI#ttq?EXhnR)+wnhNG(Pe+-}#ySfV}MU^%16_P!mAsRr9WzF?ef bC^CCz(Zh1PQ}%Z3x;9%b#|s{Ja=!%tf2c*w diff --git a/@blckeagls_EDEN/addons/3EDEN_plugin/Export/fn_exportDynamic.sqf b/@blckeagls_EDEN/addons/3EDEN_plugin/Export/fn_exportDynamic.sqf index 48fedeb..b392993 100644 --- a/@blckeagls_EDEN/addons/3EDEN_plugin/Export/fn_exportDynamic.sqf +++ b/@blckeagls_EDEN/addons/3EDEN_plugin/Export/fn_exportDynamic.sqf @@ -152,7 +152,21 @@ for "_i" from 1 to (count _landscape) do private _allowDamage = (_building get3DENAttribute "allowDamage") select 0; private _enableSimulation = (_building get3DENAttribute "enableSimulation") select 0; diag_log format["_exportDynamic-garisonedPos: _building %1 | damage %2 | simulation %3",_building,_allowDamage,_enableSimulation]; - _garisonedPos pushBack format[' ["%1",%2,%3,%4,%5,%6,%7,%8,%9]',typeOf _building,(getPosATL _building) vectorDiff CENTER,getDir _building,_allowDamage,_enableSimulation,oddsOfGarrison,maxGarrisonStatics,typesGarrisonStatics,maxGarrisonUnits]; + /* + // From blck_fnc_garrisonBuilding_RelPosSystem + // ["Land_Unfinished_Building_02_F",[-21.8763,-45.978,-0.00213432],0,true,true,0.67,3,[],4], + _x params["_bldClassName","_bldRelPos","_bldDir","_s","_d","_p","_noStatics","_typesStatics","_noUnits"]; + */ + _garisonedPos pushBack format[' ["%1",%2,%3,%4,%5,%6,%7,%8,%9]', + typeOf _building, + (getPosATL _building) vectorDiff CENTER, + getDir _building, + _allowDamage, + _enableSimulation, + oddsOfGarrison, + maxGarrisonStatics, + typesGarrisonStatics, + maxGarrisonUnits]; } else { _landscape pushBack _building; }; @@ -400,6 +414,8 @@ _lines pushBack format["_maxNoAI = blck_MaxAI_%1;",blck_MissionDifficulty]; _lines pushBack format["_noAIGroups = blck_AIGrps_%1;",blck_MissionDifficulty]; _lines pushBack format["_noVehiclePatrols = blck_SpawnVeh_%1;",blck_MissionDifficulty]; _lines pushBack format["_noEmplacedWeapons = blck_SpawnEmplaced_%1;",blck_MissionDifficulty]; +_lines pushBack "_submarinePatrols = 0; // Default number of submarine patrols at pirate missions"; +_lines pushBack "_scubaPatrols = 0; // Default number of scuba diver patrols at pirate missions"; _lines pushBack ""; _lines pushBack '#include "\q\addons\custom_server\Compiles\Missions\GMS_fnc_missionSpawner.sqf";'; diff --git a/@blckeagls_EDEN/addons/3EDEN_plugin/Export/fn_exportStatic.sqf b/@blckeagls_EDEN/addons/3EDEN_plugin/Export/fn_exportStatic.sqf index 8e0d600..b4aef16 100644 --- a/@blckeagls_EDEN/addons/3EDEN_plugin/Export/fn_exportStatic.sqf +++ b/@blckeagls_EDEN/addons/3EDEN_plugin/Export/fn_exportStatic.sqf @@ -291,7 +291,6 @@ _lines pushBack ""; _lines pushBack "/*"; _lines pushBack " Use the parameters below to customize your mission - see the template or blck_configs.sqf for details about each them"; _lines pushBack "*/"; - _linse pushBack "_useMines = blck_useMines;"; _lines pushBack "_uniforms = blck_SkinList;"; _lines pushBack "_headgear = blck_headgear;"; diff --git a/@blckeagls_EDEN/addons/3EDEN_plugin/config.cpp b/@blckeagls_EDEN/addons/3EDEN_plugin/config.cpp index 72a2777..295f753 100644 --- a/@blckeagls_EDEN/addons/3EDEN_plugin/config.cpp +++ b/@blckeagls_EDEN/addons/3EDEN_plugin/config.cpp @@ -52,8 +52,8 @@ class CfgBlck3DEN class CfgVersion { version = 1.0; - build = 7; - date = "09/21/20"; + build = 8; + date = "10/05/20"; }; }; diff --git a/@blckeagls_EDEN/addons/3EDEN_plugin/Guidelines.txt b/@blckeagls_EDEN/addons/Guidelines.txt similarity index 100% rename from @blckeagls_EDEN/addons/3EDEN_plugin/Guidelines.txt rename to @blckeagls_EDEN/addons/Guidelines.txt From 726e834dca07bf8cc2706dedeb239d78adf97ea4 Mon Sep 17 00:00:00 2001 From: Chris Cardozo Date: Sat, 10 Oct 2020 08:30:34 -0400 Subject: [PATCH 6/7] removed commented out code for debugging --- .../Compiles/Missions/GMS_fnc_endMission.sqf | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_endMission.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_endMission.sqf index 7950fa9..45a5476 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_endMission.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_endMission.sqf @@ -16,12 +16,7 @@ _fn_missionCleanup = { params["_coords","_mines","_objects","_hiddenObjects","_blck_AllMissionAI","_markerName","_cleanupAliveAITimer","_cleanupCompositionTimer",["_isScubaMission",false]]; - /* - private _vars = ["_coords","_mines","_objects","_hiddenObjects","_blck_AllMissionAI","_markerName","_cleanupAliveAITimer","_cleanupCompositionTimer"]; - { - diag_log format["_endMission:_missionCleanup: %1 = %2",_x,_this select _forEachIndex]; - } forEach _vars; - */ + [_mines] call blck_fnc_clearMines; blck_oldMissionObjects pushback [_coords,_objects, (diag_tickTime + _cleanupCompositionTimer)]; blck_hiddenTerrainObjects pushBack[_hiddenObjects,(diag_tickTime + _cleanupCompositionTimer)]; @@ -62,22 +57,6 @@ params[ ["_isScubaMission",false] ]; -/* -{ - diag_log format["_endMission: %1 = %2",_x, _this select _forEachIndex]; -} forEach [ "_coords", - "_mines", - "_objects", - "_hiddenObjects", - "_crates", - "_blck_AllMissionAI", - "_endMsg", - "_markers", - "_markerPos", - "_markerName", - "_markerLabel" - ]; -*/ { [_x] call blck_fnc_deleteMarker; }forEach (_markers); From ebc85dac96832cc648fa1097b54711c750f66d0e Mon Sep 17 00:00:00 2001 From: Chris Cardozo Date: Sat, 10 Oct 2020 08:32:42 -0400 Subject: [PATCH 7/7] Removed some debugging code that was commented out --- .../GMS_fnc_monitorInitializedMissions.sqf | 35 +++---------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf index 306123c..4d5128b 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf @@ -283,7 +283,6 @@ for "_i" from 1 to (count blck_activeMissionsList) do private _userelativepos = true; private _emplacedWeaponsThisMission = [_noEmplacedWeapons] call blck_fnc_getNumberFromRange; - //[format["_monitorInitializedMissions(284): _noEmplacedWeapons = %1 | _emplacedWeaponsThisMission = %2 | _missionEmplacedWeapons = %3",_noEmplacedWeapons,_emplacedWeaponsThisMission,_missionEmplacedWeapons]] call blck_fnc_log; if (blck_useStatic && ((_emplacedWeaponsThisMission > 0) || !(_missionEmplacedWeapons isEqualTo []))) then // TODO: add error checks for grpNull to the emplaced weapon spawner { @@ -298,52 +297,26 @@ for "_i" from 1 to (count blck_activeMissionsList) do uisleep 5; private _noPatrols = [_noVehiclePatrols] call blck_fnc_getNumberFromRange; -<<<<<<< Updated upstream - //diag_log format["_monitorInitializeMissions(299): __noVehiclePatrols %1 | _noPatrols %2 | _missionPatrolVehicles %3",_noVehiclePatrols,_noPatrols,_missionPatrolVehicles]; -======= - //diag_log format["_monitorInitializedMissions(299): _markerMissionName = %2 | count _missionAIVehicles = %1",count _missionAIVehicles,_markerMissionName]; - /* - diag_log format[ - "_monitorInitializeMissions(300): __noVehiclePatrols %1 | _noPatrols %2 | count _missionPatrolVehicles %3 | _missionPatrolVehicles = %4", - _noVehiclePatrols, - _noPatrols, - count _missionPatrolVehicles, - _missionPatrolVehicles - ]; - */ ->>>>>>> Stashed changes + if (blck_useVehiclePatrols && ((_noPatrols > 0) || !(_missionPatrolVehicles isEqualTo []))) then { _temp = [_coords,_noPatrols,_difficulty,_missionPatrolVehicles,_userelativepos,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms,false,_vehicleCrewCount] call blck_fnc_spawnMissionVehiclePatrols; // TODO: add grpNull checks to missionVehicleSpawner if (_temp isEqualTo grpNull) throw 1; _missionAIVehicles append (_temp select 0); - //diag_log format ["_monitorInitializedMissions(306): count (_temp select 0)/no mission vehicles spawned = %1",count (_temp select 0)]; _blck_AllMissionAI append (_temp select 1); }; - //diag_log format["_monitorInitializedMissions(310): _count _missionAIVehicles = %1",count _missionAIVehicles]; - /* - { - diag_log format["_monitorInitializedMissions(318): spawned vehicle %1 of type %2 object %2",_forEachIndex,typeOf _x, _x]; - } forEach _missionAIVehicles; - */ + uiSleep delayTime; - //diag_log format["_monitorInitializedMissions(320): count _submarinePatrolParameters = %1 | _submarinePatrolParameters = %2",count _submarinePatrolParameters,_submarinePatrolParameters]; if (blck_useVehiclePatrols && ((_submarinePatrols > 0) || !(_submarinePatrolParameters isEqualTo []))) then { _temp = [_coords,_noPatrols,_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); - //diag_log format ["_monitorInitializedMissions(327): count (_temp select 0)/no mission vehicles spawned = %1",count (_temp select 0)]; _blck_AllMissionAI append (_temp select 1); }; - //diag_log format["_monitorInitializedMissions(330): count _missionAIVehicles = %1",count _missionAIVehicles]; - /* - { - diag_log format["_monitorInitializedMissions(332): spawned vehicle %1 of type %2 object %2",_forEachIndex,typeOf _x, _x]; - } forEach _missionAIVehicles; - */ + uiSleep delayTime; if (_spawnCratesTiming in ["atMissionSpawnGround","atMissionSpawnAir"]) then @@ -356,7 +329,7 @@ for "_i" from 1 to (count blck_activeMissionsList) do { _crates = [_coords,_missionLootBoxes,_loadCratesTiming, _spawnCratesTiming, "start", _difficulty] call blck_fnc_spawnMissionCrates; }; - //diag_log format["_monitorInitializeMissions (318): crates spawned = %1",_crates]; + if (blck_cleanUpLootChests) then { _objects append _crates;