diff --git a/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_checkGroupWaypointStatus.sqf b/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_checkGroupWaypointStatus.sqf index 304d8be..b98f930 100644 --- a/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_checkGroupWaypointStatus.sqf +++ b/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_checkGroupWaypointStatus.sqf @@ -16,7 +16,7 @@ params["_group","_maxTime","_radius"]; if (diag_tickTime > (_group getVariable "timeStamp") + _maxTime) then // || ( (getPos (leader)) distance2d (_group getVariable "patrolCenter") > _radius)) then { - (leader _group) call blck_fnc_changeToMoveWaypoint; + (leader _group) call blck_fnc_setNextWaypoint; #ifdef blck_debugMode if (blck_debugLevel > 1) then {diag_log format["_fnc_checkGroupWaypointStatus: group %1 stuck, waypoint reset",_group];}; #endif diff --git a/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_create_AI_Group.sqf b/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_create_AI_Group.sqf index 67fd439..dca73eb 100644 --- a/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_create_AI_Group.sqf +++ b/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_create_AI_Group.sqf @@ -14,8 +14,7 @@ params[["_side",blck_AI_Side],["_deleteWhenEmpty",true]]; // for information about the _deleteWhenEmpty parameter see: https://community.bistudio.com/wiki/createGroup #ifdef blck_debugMode -if (blck_debugLevel > 1) then -{diag_log format["_fnc_createGroup: _this = %1",_this]}; +if (blck_debugLevel > 1) then {diag_log format["_fnc_createGroup: _this = %1",_this]}; #endif private _groupSpawned = createGroup [_side, true]; 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 5d22d75..60ec1ce 100644 --- a/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_setNextWaypoint.sqf +++ b/@GMS/addons/custom_server/Compiles/Groups/GMS_fnc_setNextWaypoint.sqf @@ -10,6 +10,11 @@ All the code and information provided here is provided under an Attribution Non-Commercial ShareAlike 4.0 Commons License. http://creativecommons.org/licenses/by-nc-sa/4.0/ + + TODO: Replaces changeToMoveWaypoint + and + Replaces changeToSADWaypoint + */ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; @@ -44,7 +49,7 @@ if (isNull _nearestEnemy) then _wp setWaypointCompletionRadius 0; _wp setWaypointTimeout _wpTimeout; _group setCurrentWaypoint _wp; - diag_log format["_fnc_setNextWaypoin[no enemies]t: _group = %1 | _newPos = %2 | waypointStatements = %3",_group,_newWPPos,waypointStatements _wp]; + //diag_log format["_fnc_setNextWaypoin[no enemies]t: _group = %1 | _newPos = %2 | waypointStatements = %3",_group,_newWPPos,waypointStatements _wp]; } else { // move toward that enemy using hunting logic // possibly along patrol perimeter @@ -73,7 +78,7 @@ if (isNull _nearestEnemy) then }; private _newWPPos = _pos getPos[_huntDistance,_vector]; - diag_log format["_fnc_setextWaypoint: _pos = %1 | _patrolRadius = %5 | _newWPPos = %2 | _huntDistance = %3 | _vector = %4",_pos,_newWPPos,_huntDistance,_vector,_patrolRadius]; + //diag_log format["_fnc_setextWaypoint: _pos = %1 | _patrolRadius = %5 | _newWPPos = %2 | _huntDistance = %3 | _vector = %4",_pos,_newWPPos,_huntDistance,_vector,_patrolRadius]; _wp setWaypointPosition [_newWPPos,0]; _wp setWaypointBehaviour "SAD"; _group setBehaviour "AWARE"; diff --git a/@GMS/addons/custom_server/Compiles/HC/GMS_fnc_HC_XferGroup.sqf b/@GMS/addons/custom_server/Compiles/HC/GMS_fnc_HC_XferGroup.sqf index b40798e..0afb336 100644 --- a/@GMS/addons/custom_server/Compiles/HC/GMS_fnc_HC_XferGroup.sqf +++ b/@GMS/addons/custom_server/Compiles/HC/GMS_fnc_HC_XferGroup.sqf @@ -7,6 +7,7 @@ All the code and information provided here is provided under an Attribution Non-Commercial ShareAlike 4.0 Commons License. http://creativecommons.org/licenses/by-nc-sa/4.0/ + // todo: No longer needed ? */ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; 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 d17e428..0c69b8f 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_endMission.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_endMission.sqf @@ -69,7 +69,7 @@ _fn_missionCleanup = { [_mines,_objects,_blck_AllMissionAI,_mission,_cleanupAliveAITimer,_cleanupCompositionTimer,_isScubaMission] call _fn_missionCleanup; { - deleteVehicle _x; + //if (local _x) then {deleteVehicle _x}; }forEach _crates; { deleteVehicle _x; @@ -133,4 +133,4 @@ _fn_missionCleanup = { diag_log format["_fnc_endMission: after to running mission end functions -> blck_missionsRunning = %1 | blck_dynamicUMS_MissionsRuning = %2",blck_missionsRunning,blck_dynamicUMS_MissionsRuning]; #endif //diag_log format["_fnc_endMission (138): after to running mission end functions -> blck_missionsRunning = %1 | blck_dynamicUMS_MissionsRuning = %2",blck_missionsRunning,blck_dynamicUMS_MissionsRuning]; - _endCondition \ No newline at end of file + _endCondition 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 7c444c9..64aca66 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 @@ -20,9 +20,11 @@ params["_center","_garrisonedBuilding_relPosSystem", ["_weaponList",[]], ["_sideArms",[]] ]; +/* { diag_log format["_fnc_garrisonBuilding_relPosSystem: _this %1 = %2",_forEachIndex,_this select _forEachIndex]; }forEach _this; +*/ 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}; diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnEmplaced.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnEmplaced.sqf index 64c16be..27b98fc 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnEmplaced.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnEmplaced.sqf @@ -50,7 +50,7 @@ if (_missionEmplacedWeapons isEqualTo []) then //if (isNull _empGroup) exitWith {_abort = _true}; _wep = [_wepnClassName,[0,0,0],false] call blck_fnc_spawnVehicle; //_empGroup setVariable["groupVehicle",_wep]; - _wep setVariable["vehicleGroup",_empGroup]; + //_wep setVariable["vehicleGroup",_empGroup]; _wep setVariable["GRG_vehType","emplaced"]; _wep setPosATL _pos; [_wep,false] call blck_fnc_configureMissionVehicle; diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnEmplaceds.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnEmplaceds.sqf index bc2086b..e262077 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnEmplaceds.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnEmplaceds.sqf @@ -46,7 +46,7 @@ if (_missionEmplacedWeapons isEqualTo []) then //if (isNull _empGroup) exitWith {_abort = _true}; _wep = [_wepnClassName,[0,0,0],false] call blck_fnc_spawnVehicle; //_empGroup setVariable["groupVehicle",_wep]; - _wep setVariable["vehicleGroup",_empGroup]; + //_wep setVariable["vehicleGroup",_empGroup]; _wep setVariable["GRG_vehType","emplaced"]; _wep setPosATL _pos; [_wep,false] call blck_fnc_configureMissionVehicle; diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnVehiclePatrols.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnVehiclePatrols.sqf index 77e5701..54304b4 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnVehiclePatrols.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_sm_spawnVehiclePatrols.sqf @@ -27,11 +27,9 @@ if (_vehiclePatrolSpawns isEqualTo []) then }; { - private ["_vehicle","_spawnPos","_difficulty","_patrolRadius"]; - _vehicle = _x select 0; - _spawnPos = _x select 1; - _difficulty = _x select 2; - _patrolRadius = _x select 3; + private _patrolVehicle = objNull; + _x params["_vehicle","_spawnPos","_difficulty","_patrolRadius"]; + diag_log format["_fnc_sm_spawnVehiclePatrols:"]; //_newGroup = [_x,_unitsPerGroup,_unitsPerGroup,_aiDifficultyLevel,_coords,_minDist,_maxDist,_uniforms,_headGear,true,_weapons,_vests,_isScubaGroup] call blck_fnc_spawnGroup; private _vehGroup = [blck_AI_Side,true] call blck_fnc_createGroup; _vehGroup setVariable["soldierType","vehicle"]; @@ -41,13 +39,10 @@ if (_vehiclePatrolSpawns isEqualTo []) then //params["_center","_pos",["_vehType","I_G_Offroad_01_armed_F"],["_minDis",30],["_maxDis",45],["_group",grpNull]]; _patrolVehicle = [_spawnPos,_spawnPos,_vehicle,_patrolRadius,_patrolRadius,_vehGroup] call blck_fnc_spawnVehiclePatrol; // Check whether we should pass the group; looks like we should. - // Nope, not necessary - //_vehGroup setVariable["groupVehicle",_vehicle]; - - if !(isNull _patrolVehicle) then - { - _patrolVehicle setVariable["vehicleGroup",_vehGroup]; - }; + //if !(isNull _patrolVehicle) then + //{ + //_patrolVehicle setVariable["vehicleGroup",_vehGroup]; + //}; }; } forEach _vehiclePatrolSpawns; diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf index f45a178..cb1c64f 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf @@ -53,17 +53,20 @@ if (_missionPatrolVehicles isEqualTo []) then _vehicle = _x select 0; _vehGroup = [blck_AI_Side,true] call blck_fnc_createGroup; - _vehGroup setVariable["soldierType","vehicle"]; + _patrolVehicle = objNull; + diag_log format["fnc_spawnMissionVehiclePatrols(50): _vehicle = %1 | _spawnPos = %2 | _vehGroup = %3",_vehicle,_spawnPos,_vehGroup]; if !(isNull _vehGroup) then { + _vehGroup setVariable["soldierType","vehicle"]; [_vehGroup,_spawnPos,_coords,_crewCount,_crewCount,_skillAI,1,2,false,_uniforms, _headGear,_vests,_backpacks,_weaponList,_sideArms,_isScubaGroup] call blck_fnc_spawnGroup; + _missionAI append (units _vehGroup); blck_monitoredMissionAIGroups pushBack _vehGroup; //params["_center","_pos",["_vehType","I_G_Offroad_01_armed_F"],["_minDis",40],["_maxDis",60],["_group",grpNull],["_setWaypoints",true],["_crewCount",4]]; _patrolVehicle = [_coords,_spawnPos,_vehicle,40,60,_vehGroup,true,_crewCount] call blck_fnc_spawnVehiclePatrol; if !(isNull _patrolVehicle) then { - _patrolVehicle setVariable["vehicleGroup",_vehGroup]; + //_patrolVehicle setVariable["vehicleGroup",_vehGroup]; _vehicles pushback _patrolVehicle; //blck_monitoredVehicles pushBack _patrolVehicle; _missionAI append (units _vehGroup); diff --git a/@GMS/addons/custom_server/Compiles/Units/GMS_EH_unitWeaponReloaded.sqf b/@GMS/addons/custom_server/Compiles/Units/GMS_EH_unitWeaponReloaded.sqf index 962c113..771695d 100644 --- a/@GMS/addons/custom_server/Compiles/Units/GMS_EH_unitWeaponReloaded.sqf +++ b/@GMS/addons/custom_server/Compiles/Units/GMS_EH_unitWeaponReloaded.sqf @@ -26,15 +26,12 @@ */ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; -//private ["_unit","_mag"]; -//_unit = _this select 0; -//_mag = _this select 3 select 0; (_this select 0) addMagazine (_this select 3 select 0); #ifdef blck_debugMode if (blck_debugLevel > 2) then { //diag_log format["_EH_unitWeaponReloaded:: unit %1 reloaded weapon %2 with magazine %3",_this select 0, (_this select 3 select 0)]; //diag_log format["_EH_unitWeaponReloaded:: unit %1 currently has the following magazines 2",_this select 0,magazines (_this select 0)]; - diag_log format["_EH_unitWeaponReloaded:: one magazine of type %1 added to inventory of unit %2",_mag,_unit]; + diag_log format["_EH_unitWeaponReloaded:: one magazine of type %1 added to inventory of unit %2",_mag,(_this select 3 select 0]; }; #endif diff --git a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_processAIKill.sqf b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_processAIKill.sqf index 4f3a6ca..3abf314 100644 --- a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_processAIKill.sqf +++ b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_processAIKill.sqf @@ -29,7 +29,7 @@ if (count(units (group _unit)) isEqualTo 0) then [_unit] joinSilent grpNull; if !(_unit isKindOf "Man") then { - diag_log format["_fnc_processAIKill: unit linked to crew of vehicle %1 | typeOf (vehicle _unit = %2)",vehicle _unit,typeOf (vehicle _unit)]; + //diag_log format["_fnc_processAIKill: unit linked to crew of vehicle %1 | typeOf (vehicle _unit = %2)",vehicle _unit,typeOf (vehicle _unit)]; [_unit, ["Eject", vehicle _unit]] remoteExec ["action",(owner _unit)]; }; diff --git a/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf b/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf index b91efdb..5a120f6 100644 --- a/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf +++ b/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf @@ -13,12 +13,7 @@ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; params["_vehType","_pos",["_special","NONE"]]; -//diag_log format["spawnVehicle.sqf: _this = %3 | _vehType = %1 | _pos = %2",_vehType,_pos,_this]; - -#ifdef blck_debugMode -if (blck_debugLevel > 1) then {diag_log format["spawnVehicle.sqf: _vehType = %1 | _pos = %2",_vehType,_pos];}; -#endif - +diag_log format["spawnVehicle.sqf: _this = %3 | _vehType = %1 | _pos = %2",_vehType,_pos,_this]; private _veh = createVehicle[_vehType, _pos, [], 0, _special]; _veh setVectorUp surfaceNormal position _veh; _veh allowDamage true; @@ -26,15 +21,6 @@ _veh enableRopeAttach true; _veh setVariable["blck_vehicle",true]; [_veh] call blck_fnc_protectVehicle; [_veh] call blck_fnc_emptyObject; -#ifdef blck_debugMode -if (blck_debugLevel > 1) then {diag_log format["spawnVehicle.sqf:: vehicle spawned is %1",_veh];}; -#endif -// params["_veh",["_clearInventory",true]]; -//[_veh,_clearInventory] call blck_fnc_configureMissionVehicle; - -#ifdef blck_debugMode -if (blck_debugLevel > 1) then {diag_log format["spawnVehicle:: returning parameter _veh = %1",_veh];}; -#endif - +diag_log format["spawnVehicle:: returning parameter _veh = %1",_veh]; _veh diff --git a/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehiclePatrol.sqf b/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehiclePatrol.sqf index 1620985..0dbd480 100644 --- a/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehiclePatrol.sqf +++ b/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehiclePatrol.sqf @@ -13,38 +13,39 @@ */ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; -params["_center","_pos",["_vehType","I_G_Offroad_01_armed_F"],["_minDis",40],["_maxDis",60],["_group",grpNull],["_setWaypoints",true],["_crewCount",4]]; +params["_center","_pos",["_vehType","I_G_Offroad_01_armed_F"],["_minDis",40],["_maxDis",60],["_group",grpNull],["_setWaypoints",true],["_crewCount",4],["_patrolRadius",150],["_waypointTimeout",[5,7.5,10]]]; -//_center Center of the mission area - this is usuall the position treated as the center by the mission spawner. Vehicles will patrol the perimeter of the mission area. +{ + diag_log format["_fnc_spawnVehiclePatrol/Vehicles: parameter %1 = %2",_forEachIndex,_x]; +}forEach _this; +//_center Center of the mission area - this is usually the position treated as the center by the mission spawner. Vehicles will patrol the perimeter of the mission area. // _pos the approximate spawn point for the vehicle //_vehType = [_this,1,"I_G_Offroad_01_armed_F"] call BIS_fnc_param; -//_minDis = minimum distance from the center of the mission for vehicle waypoints -//_maxDis = maximum distance from the center of the mission for vehicle waypoints +//_minDis = +//_maxDis = //_groupForVehiclePatrol = The group with which to man the vehicle // _crewCount = the number of AI including driver and gunners to place in the vehicle -// TODO: verify that all old code is now called in the varous functions -private["_veh"]; -if !(isNull _group) then { - _veh = [_vehType,_pos] call blck_fnc_spawnVehicle; - //diag_log format["_fnc_spawnVehiclePatrol: _veh = %1 | typeOf _ve = %2",_veh,typeOf _veh]; - //_veh addMPEventHandler["MPHit",{ _this call blck_EH_AIVehicle_HandleHit}]; - //_veh addMPEventHandler["MPKilled",{_this call blck_EH_vehicleKilled}]; - //_veh addEventHandler["GetOut",{_this remoteExec["blck_EH_vehicleGetOut",2]}]; - _veh setVariable["blck_vehicleSearchRadius",blck_playerDetectionRangeGroundVehicle]; - _veh setVariable["blck_vehiclePlayerDetectionOdds",blck_vehiclePlayerDetectionOdds]; - private _maxCrew = [_crewCount] call blck_fnc_getNumberFromRange; - [_veh,_group,_crewCount] call blck_fnc_loadVehicleCrew; - //diag_log format["_fnc_spawnVehiclePatrol: crew of vehicle %1 = %2",_veh, crew _veh]; - [_veh,2] call blck_fnc_configureMissionVehicle; - if (_setWaypoints) then - { - // params["_pos","_minDis","_maxDis","_group",["_mode","random"],["_wpPatrolMode","SAD"],["_soldierType","null"] ]; - #define vehiclePatrolRadius 400 - #defin vehicleWaypointTimout [6, 9, 12] - [_center,_minDis,_maxDis,_group,"perimeter","SAD","vehicle",vehiclePatrolRadius,vehicleWaypointTimout] spawn blck_fnc_setupWaypoints; - }; +if (_group isEqualTo grpNull) exitWith + { + diag_log format["_fnc_spawnVehiclePatrols(48): Function can not accept a null group"]; }; +private _veh = objNull; +diag_log format["_fnc_spawnVehiclePatrol(28): _vehType = %1",_vehType]; +_veh = [_vehType,_pos] call blck_fnc_spawnVehicle; +diag_log format["_fnc_spawnVehiclePatrol(30): _veh = %1 | typeOf _veh = %2",_veh,typeOf _veh]; +_veh setVariable["blck_vehicleSearchRadius",blck_playerDetectionRangeGroundVehicle]; +_veh setVariable["blck_vehiclePlayerDetectionOdds",blck_vehiclePlayerDetectionOdds]; +private _maxCrew = [_crewCount] call blck_fnc_getNumberFromRange; +[_veh,_group,_maxCrew] call blck_fnc_loadVehicleCrew; +diag_log format["_fnc_spawnVehiclePatrol(35): crew of vehicle %1 = %2",_veh, crew _veh]; +[_veh,2] call blck_fnc_configureMissionVehicle; +if (_setWaypoints) then +{ + // params["_pos","_minDis","_maxDis","_group",["_mode","random"],["_wpPatrolMode","SAD"],["_soldierType","null"] ]; + [_center,_minDis,_maxDis,_group,"perimeter","SAD","vehicle",_patrolRadius,_waypointTimeout] spawn blck_fnc_setupWaypoints; +}; +diag_log format["_fnc_spawnVehiclePatrols(50): _veh = %1",_veh]; _veh diff --git a/@GMS/addons/custom_server/Compiles/blck_functions.sqf b/@GMS/addons/custom_server/Compiles/blck_functions.sqf index 23dda9a..0596e1f 100644 --- a/@GMS/addons/custom_server/Compiles/blck_functions.sqf +++ b/@GMS/addons/custom_server/Compiles/blck_functions.sqf @@ -169,6 +169,7 @@ private _functions = [ ["blck_fnc_checkForEmptyVehicle","\q\addons\custom_server\Compiles\Vehicles\GMS_fnc_checkForEmptyVehicle.sqf"], ["blck_fnc_handleEmptyVehicle","\q\addons\custom_server\Compiles\Vehicles\GMS_fnc_handleEmptyVehicle.sqf"], ["blck_fnc_loadVehicleCrew","\q\addons\custom_server\Compiles\Vehicles\GMS_fnc_loadVehicleCrew.sqf"], + ["blck_fnc_selectVehicleCrewCount","\q\addons\custom_server\Compiles\Missions\GMS_fnc_selectVehicleCrewCount.sqf"], // functions to support Units ["blck_fnc_removeGear","\q\addons\custom_server\Compiles\Units\GMS_fnc_removeGear.sqf"], // Strip an AI unit of all gear. diff --git a/@GMS/addons/custom_server/Configs/blck_configs_exile_mil.sqf b/@GMS/addons/custom_server/Configs/blck_configs_exile_mil.sqf index a88877a..8e053d0 100644 --- a/@GMS/addons/custom_server/Configs/blck_configs_exile_mil.sqf +++ b/@GMS/addons/custom_server/Configs/blck_configs_exile_mil.sqf @@ -185,6 +185,7 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR "B_APC_Tracked_01_rcws_F" ]; // Type of vehicle spawned to defend AI bases + /// Defined again below in this instance to show options available and also my personal preferences for mil servers blck_AIPatrolVehiclesBlue = [ "Exile_Car_Offroad_Armed_Guerilla01", "Exile_Car_Offroad_Armed_Guerilla02", diff --git a/@GMS/addons/custom_server/Configs/blck_configs_mil.sqf b/@GMS/addons/custom_server/Configs/blck_configs_mil.sqf index 2deb29e..6c6bf67 100644 --- a/@GMS/addons/custom_server/Configs/blck_configs_mil.sqf +++ b/@GMS/addons/custom_server/Configs/blck_configs_mil.sqf @@ -155,14 +155,14 @@ // Heli Patrol Heli Types // Armed Helis ////////////////////////////// - _blck_littleBirds = ["B_Heli_Light_01_armed_F"]; // AH-9 Pawnee (WEST) - _blck_armed_hellcats = ["I_Heli_light_03_F"]; - _blck_armed_orcas = ["O_Heli_Light_02_F","O_Heli_Light_02_v2_F"]; - _blck_armed_ghosthawks = ["B_Heli_Transport_01_F","B_Heli_Transport_01_camo_F"]; - _blck_armed_hurons = ["B_Heli_Transport_03_F","B_Heli_Transport_03_black_F"]; - _blck_armed_attackHelis = ["B_Heli_Attack_01_F"]; - _blck_armed_heavyAttackHelis = ["O_Heli_Attack_02_F","O_Heli_Attack_02_black_F"]; - _blck_fighters = [ + blck_littleBirds = ["B_Heli_Light_01_armed_F"]; // AH-9 Pawnee (WEST) + blck_armed_hellcats = ["I_Heli_light_03_F"]; + blck_armed_orcas = ["O_Heli_Light_02_F","O_Heli_Light_02_v2_F"]; + blck_armed_ghosthawks = ["B_Heli_Transport_01_F","B_Heli_Transport_01_camo_F"]; + blck_armed_hurons = ["B_Heli_Transport_03_F","B_Heli_Transport_03_black_F"]; + blck_armed_attackHelis = ["B_Heli_Attack_01_F"]; + blck_armed_heavyAttackHelis = ["O_Heli_Attack_02_F","O_Heli_Attack_02_black_F"]; + blck_fighters = [ //"O_Plane_CAS_02_F", // /ti-199 Neophron (CAS) "I_Plane_Fighter_03_AA_F", // A-143 Buzzard (AA) //"I_Plane_Fighter_04_F", // A-149 Gryphon @@ -188,27 +188,27 @@ /////////////////////////////// blck_chanceHeliPatrolBlue = 0.8; //[0 - 1] Set to 0 to deactivate and 1 to always have a heli spawn over the mission center and patrol the mission area. The chance of paratroops dropping from the heli is defined by blck_chancePara(Blue|Red|Green|Orange) above. - blck_patrolHelisBlue = _blck_littleBirds; + blck_patrolHelisBlue = blck_littleBirds; blck_noPatrolHelisBlue = 0; blck_chanceHeliPatrolRed = 0.8; // 0.4; - blck_patrolHelisRed = _blck_armed_hellcats; + blck_patrolHelisRed = blck_armed_hellcats; blck_noPatrolHelisRed = 1; blck_chanceHeliPatrolGreen = 0.9999; - blck_patrolHelisGreen = _blck_armed_ghosthawks; + blck_patrolHelisGreen = blck_armed_ghosthawks; blck_noPatrolHelisGreen = [1,3]; blck_chanceHeliPatrolOrange = 0.9999; - blck_patrolHelisOrange = _blck_armed_attackHelis + _blck_armed_heavyAttackHelis; // + _blck_fighters; + blck_patrolHelisOrange = blck_armed_attackHelis + blck_armed_heavyAttackHelis; // + _blck_fighters; blck_noPatrolHelisOrange = [2,4]; if (toLower(worldName) isEqualTo "namalsk") then { - blck_patrolHelisRed = _blck_littleBirds + _blck_armed_hellcats; - blck_patrolHelisGreen = _blck_armed_hellcats + _blck_armed_ghosthawks; + blck_patrolHelisRed = blck_littleBirds + blck_armed_hellcats; + blck_patrolHelisGreen = blck_armed_hellcats + blck_armed_ghosthawks; blck_noPatrolHelisGreen = 1; - blck_patrolHelisOrange = _blck_armed_ghosthawks; + blck_patrolHelisOrange = blck_armed_ghosthawks; blck_noPatrolHelisOrange = 1; }; //////////////////// diff --git a/@GMS/addons/custom_server/init/blck_init_server.sqf b/@GMS/addons/custom_server/init/blck_init_server.sqf index 67eb21b..66a2799 100644 --- a/@GMS/addons/custom_server/init/blck_init_server.sqf +++ b/@GMS/addons/custom_server/init/blck_init_server.sqf @@ -83,7 +83,7 @@ switch (blck_simulationManager) do }; diag_log format["[blckeagls] version %1 Build %2 Loaded in %3 seconds",blck_versionNumber,blck_buildNumber,diag_tickTime - _blck_loadingStartTime]; //,blck_modType]; -diag_log format["blckeagls] waiting for players to join ---- >>>>"]; +diag_log format["[blckeagls] waiting for players to join ---- >>>>"]; if ( !(blck_debugON) && (blck_debugLevel isEqualTo 0)) then {