diff --git a/@GMS/addons/custom_server.pbo b/@GMS/addons/custom_server.pbo new file mode 100644 index 0000000..db9b97a Binary files /dev/null and b/@GMS/addons/custom_server.pbo differ diff --git a/@GMS/addons/custom_server.pbo.bak b/@GMS/addons/custom_server.pbo.bak new file mode 100644 index 0000000..db9b97a Binary files /dev/null and b/@GMS/addons/custom_server.pbo.bak differ diff --git a/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_setNextWaypoint.sqf b/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_setNextWaypoint.sqf index b197096..0aab86e 100644 --- a/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_setNextWaypoint.sqf +++ b/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_setNextWaypoint.sqf @@ -17,12 +17,10 @@ private["_group","_wp","_index","_pattern","_mode","_arc","_dis","_wpPos"]; _group = group _this; - _group setVariable["timeStamp",diag_tickTime]; _group setcombatmode "YELLOW"; _group setBehaviour "COMBAT" _wp = [_group, 0]; - _pattern = _group getVariable["wpPattern",[]]; _index = _group getVariable["wpIndex",0]; _index = _index + 1; diff --git a/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnMissionHeli.sqf b/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnMissionHeli.sqf index b2fa2d5..1cb1b2b 100644 --- a/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnMissionHeli.sqf +++ b/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnMissionHeli.sqf @@ -11,7 +11,7 @@ http://creativecommons.org/licenses/by-nc-sa/4.0/ */ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; -private["_grpPilot","_chopperType","_patrolHeli","_launcherType","_unitPilot","_unitCrew","_mags","_turret","_return","_abort","_supplyHeli"]; +private["_grpPilot","_chopperType","_patrolHeli","_launcherType","_unitPilot","_unitCrew","_mags","_turret","_return","_abort","_supplyHeli","_minDist","_maxDist"]; params["_coords","_skillAI","_helis",["_uniforms",[]], ["_headGear",[]],["_vests",[]],["_backpacks",[]],["_weaponList",[]],["_sideArms",[]],["_Launcher","none"]]; if (_uniforms isEqualTo []) then {_uniforms = [_skillAI] call blck_fnc_selectAIUniforms}; @@ -55,7 +55,19 @@ if !(isNull _grpPilot) then _grpPilot setVariable["arc",0]; _grpPilot setVariable["wpRadius",30]; _grpPilot setVariable["wpMode","SAD"]; - + // [_pos,_minDist,_maxDist,_groupSpawned,"random","SAD","infantry"] spawn blck_fnc_setupWaypoints; + diag_log format["_fnc_spawnMissionHeli - max radii are: blue %1 | red %2 | green %3 | orange %4",blck_maxPatrolRadiusHelisBlue,blck_maxPatrolRadiusHelisRed,blck_maxPatrolRadiusHelisGreen,blck_maxPatrolRadiusHelisOrange]; + switch (toLower(_skillAI)) do + { + case "blue": {_minDist = 150;_maxDist = blck_maxPatrolRadiusHelisBlue}; + case "red" : {_minDist = 150;_maxDist = blck_maxPatrolRadiusHelisRed}; + case "green" : {_minDist = 150;_maxDist = blck_maxPatrolRadiusHelisGreen}; + case "orange" : {_minDist = 150;_maxDist = blck_maxPatrolRadiusHelisOrange}; + default {_minDist = 150; _maxDist = 500}; + }; + diag_log format["_fnc_spawnMissionHeli(59): _skillAI = %1 | _minDist = %2 | _maxDist = %3",_skillAI,_minDist,_maxDist]; + [_coords,_minDist,_maxDist,_grpPilot,"random","SAD","pilot"] call blck_fnc_setupWaypoints; + blck_monitoredMissionAIGroups pushBack _grpPilot; //create helicopter and spawn it if (( typeName _helis) isEqualTo "ARRAY") then { @@ -150,8 +162,6 @@ if !(isNull _grpPilot) then diag_log format["_fnc_spawnMissionHeli (133)::-->> Heli %1 outfited with a crew numbering %2",_patrolHeli, crew _patrolHeli]; }; #endif - - //blck_monitoredMissionAIGroups pushBack _grpPilot; }; //diag_log format["[blckeagls] _fnc_spawnMissionHeli:: _patrolHeli %1 | _grpPilot %2 | _abort %3",_patrolHeli,_grpPilot,_abort]; _return = [_patrolHeli,units _grpPilot,_abort]; diff --git a/@GMS/addons/custom_server/Configs/blck_defines.hpp b/@GMS/addons/custom_server/Configs/blck_defines.hpp index 8e328f9..24af3a0 100644 --- a/@GMS/addons/custom_server/Configs/blck_defines.hpp +++ b/@GMS/addons/custom_server/Configs/blck_defines.hpp @@ -13,18 +13,16 @@ #define useAPEX -#define blck_milServer -#define blck_useCUP -#define blck_useRHS +//#define blck_milServer +//#define blck_useCUP +//#define blck_useRHS //////////////////////////// // Do not touch anything below this line /////////////////////////// -//#define useDynamicSimulation //#define blck_debugMode -//#define GRG_TestServer -#define GRGserver + #define blck_triggerLoopCompleteTime 40*60 #define onFoot 1 @@ -49,3 +47,13 @@ #define blck_simulationManagementOff 0 #define blck_useBlckeaglsSimulationManagement 1 #define blck_useDynamicSimulationManagement 2 + +#define blck_maxPatrolRadiusHelisBlue 300 +#define blck_maxPatrolRadiusHelisRed 400 +#define blck_maxPatrolRadiusHelisGreen 500 +#define blck_maxPatrolRadiusHelisOrange 650 + +#define blck_turnBackRadiusInfantry 800 +#define blck_turnBackRadiusVehicles 1000 +#define blck_turnBackRadiusHelis 1000 +#define blck_turnBackRadiusJets 1500 diff --git a/@GMS/addons/custom_server/init/build.sqf b/@GMS/addons/custom_server/init/build.sqf index 36b5f24..8949d0d 100644 --- a/@GMS/addons/custom_server/init/build.sqf +++ b/@GMS/addons/custom_server/init/build.sqf @@ -1,6 +1,6 @@ private ["_version","_versionDate"]; -blck_version = "6.86 Build 155"; +blck_version = "6.86 Build 156"; _blck_version = blck_version; -_blck_versionDate = "10-20-18 1:30 AM"; +_blck_versionDate = "10-22-18 1:30 AM"; blck_pvs_version = _blck_version; publicVariable blck_pvs_version;