Merge branch 'Experimental'

@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_initializeMission.sqf

@@ -5,7 +5,7 @@
 */
 
 #include "\q\addons\custom_server\Configs\blck_defines.hpp";
-
+// Need to debug for GM map
 private ["_coords","_coordArray","_return"];
 params["_missionCategoryDescriptors","_missionParameters","_missionCount"];
  _missionCategoryDescriptors params [

@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_monitorInitializedMissions.sqf

@@ -270,7 +270,6 @@ for "_i" from 1 to (count blck_activeMissionsList) do
 
 				if !(_garrisonedBuildings_BuildingPosnSystem isEqualTo []) then
 				{
-					//  params["_building","_group",["_noStatics",0],["_typesStatics",blck_staticWeapons],["_noUnits",0],["_aiDifficultyLevel","Red"],	["_uniforms",[]],["_headGear",[]],["_vests",[]],["_backpacks",[]],["_launcher","none"],["_weaponList",[]],["_sideArms",[]]];
 					private _temp = [_coords, _garrisonedBuildings_BuildingPosnSystem, _difficulty,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms] call blck_fnc_garrisonBuilding_RelPosSystem;
 					if (_temp isEqualTo grpNull) then {throw 1} else 
 					// TODO: add error checks for grpNull to the RelPosSystem
@@ -298,6 +297,7 @@ for "_i" from 1 to (count blck_activeMissionsList) do
 				uisleep 5;
 
 				private _noPatrols = [_noVehiclePatrols] call blck_fnc_getNumberFromRange;
+
 				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;

@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf

@@ -37,7 +37,7 @@ if (_patrolsThisMission isEqualTo []) then
 
 		private _v = [_skillAI] call blck_fnc_selectPatrolVehicle;
 		_patrolsThisMission pushBack [_v, _x];
-		diag_log format["_spawnMissionVehiclePatrols(36): _v = %1 | _patrolsThisMission = %2",_v,_patrolsThisMission];
+		//diag_log format["_spawnMissionVehiclePatrols(36): _v = %1 | _patrolsThisMission = %2",_v,_patrolsThisMission];
 	}forEach _spawnLocations;
 };
 //diag_log format["_spawnMissionVehiclePatrols(42): _patrolsThisMission = %1",_patrolsThisMission];

@GMS/addons/custom_server/Compiles/Units/GMS_fnc_handlePlayerUpdates.sqf

@@ -34,6 +34,9 @@ _fn_doUpdates = {
 		{
 			[["showScore",[_reward,"",_kills],""],[_player]] call blck_fnc_messageplayers;
 		};
+
+		// SUggestion to update Epoch player stats from He-Man
+		[_killer, "AIKills", 1, true] call EPOCH_server_updatePlayerStats;		
 	};
 	if (toLower(blck_modType) isEqualTo "exile") then
 	{

@GMS/addons/custom_server/Compiles/Units/GMS_fnc_processAIKill.sqf

@@ -15,6 +15,15 @@
 
 params["_unit","_killer","_instigator"];
 
+// the blck_graveyardGroup is always owned by the server.
+// which makes some cleanup easier
+[_unit] joinSilent blck_graveyardGroup;
+
+if (count(units (group _unit)) isEqualTo 0) then 
+{
+	deleteGroup _group;
+};
+
 if (local _unit) then 
 {
 	if !((vehicle _unit) isKindOf "Man") then 
@@ -35,12 +44,7 @@ _unit disableAI "ALL";
 {
 	_unit removeAllEventHandlers _x;
 }forEach["FiredNear","Reloaded"];
-[_unit] joinSilent blck_graveyardGroup;
 
-if (count(units (group _unit)) isEqualTo 0) then 
-{
-	deleteGroup _group;
-};
 
 if !((vehicle _unit) isKindOf "Man") then 
 {

@GMS/addons/custom_server/Compiles/Units/GMS_fnc_removeLaunchers.sqf

@@ -11,21 +11,27 @@
 */
 #include "\q\addons\custom_server\Configs\blck_defines.hpp";
 
-private["_launcher","_launcherRounds"];
 params["_unit"];  // = _this select 0;
-_launcher = _unit getVariable ["Launcher",""];
+private _loadout = _unit getVariable["launcher",[[],[]]];
-_unit removeWeapon _Launcher;
+//diag_log format["_removeLaunchers: _loadout = %1",_loadout];
-if (_launcher != "") then 
+private _mags = magazines _unit;
+//diag_log format["_removeLaunchers: _mags = %1",_mags];
 {
-	_unit removeWeapon _Launcher;
+	if (_forEachIndex > 0) then 
 	{
-		if (_launcher in weaponCargo _x) exitWith {
+		//diag_log format["_removeLaunchers: _x = %1",_x];
-			deleteVehicle _x;
+		_unit removeMagazines _x;
 	};
-	} forEach ((getPosATL _unit) nearObjects ["WeaponHolderSimulated",10]);	
+} forEach (_loadout select 1);
-	_launcherRounds = getArray (configFile >> "CfgWeapons" >> _Launcher >> "magazines"); //0;
-	{
-		if(_x in _launcherRounds) then {_unit removeMagazine _x;};
-	} count magazines _unit;
-};
 
+private _launcher = _loadout select 0;
+if !(_launcher isEqualTo []) then 
+{
+	if (_launcher in (weapons _unit)) then {
+			_unit removeWeapon _launcher;
+	} else {	
+		{
+			if (_launcher in (weaponCargo _x)) exitWith {deleteVehicle _x};
+		} forEach (_unit nearObjects ["WeaponHolderSimulated",10]);
+	};
+};

@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf

@@ -13,7 +13,7 @@
 #include "\q\addons\custom_server\Configs\blck_defines.hpp";
 
 private ["_i","_weap","_unit","_skillLevel","_aiSkills","_launcherRound","_index","_ammoChoices","_optics","_pointers","_muzzles","_underbarrel","_legalOptics"];
-params["_pos","_aiGroup",["_skillLevel","red"],["_uniforms", []],["_headGear",[]],["_vests",[]],["_backpacks",[]],["_Launcher","none"],["_weaponList",[]],["_sideArms",[]],["_scuba",false],["_garrison",false]];
+params["_pos","_aiGroup",["_skillLevel","red"],["_uniforms", []],["_headGear",[]],["_vests",[]],["_backpacks",[]],["_launcher","none"],["_weaponList",[]],["_sideArms",[]],["_scuba",false],["_garrison",false]];
 
 if (_weaponList isEqualTo []) then {_weaponList = [_skillLevel] call blck_fnc_selectAILoadout};
 if (_sideArms  isEqualTo [])  then {_sideArms = [_skillLevel] call blck_fnc_selectAISidearms};
@@ -95,17 +95,11 @@ _weap = selectRandom _weaponList;
 _unit addWeaponGlobal  _weap; 
 _ammoChoices = getArray (configFile >> "CfgWeapons" >> _weap >> "magazines");
 _unit addMagazines[selectRandom _ammochoices,3];
-/*
-_optics = getArray (configfile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "CowsSlot" >> "compatibleItems");
-_pointers = getArray (configFile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "PointerSlot" >> "compatibleItems");
-_muzzles = getArray (configFile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "MuzzleSlot" >> "compatibleItems");
-_underbarrel = getArray (configFile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "UnderBarrelSlot" >> "compatibleItems");
-*/
 
-if (random 1 < 0.4) then {_unit addPrimaryWeaponItem (selectRandom ([_weap, 101] call BIS_fnc_compatibleItems))};  // muzzles
+if (random 1 < blck_chanceMuzzle) then {_unit addPrimaryWeaponItem (selectRandom ([_weap, 101] call BIS_fnc_compatibleItems))};  // muzzles
-if (random 1 < 0.4) then {_unit addPrimaryWeaponItem (selectRandom ([_weap, 201] call BIS_fnc_compatibleItems))};  // optics
+if (random 1 < blck_chanceOptics) then {_unit addPrimaryWeaponItem (selectRandom ([_weap, 201] call BIS_fnc_compatibleItems))};  // optics
-if (random 1 < 0.4) then {_unit addPrimaryWeaponItem (selectRandom ([_weap, 301] call BIS_fnc_compatibleItems))};  // pointers
+if (random 1 < blck_chancePointer) then {_unit addPrimaryWeaponItem (selectRandom ([_weap, 301] call BIS_fnc_compatibleItems))};  // pointers
-if (random 1 < 0.4) then {_unit addPrimaryWeaponItem (selectRandom ([_weap, 302] call BIS_fnc_compatibleItems))};  // underbarrel
+if (random 1 < blck_chanceUnderbarrel) then {_unit addPrimaryWeaponItem (selectRandom ([_weap, 302] call BIS_fnc_compatibleItems))};  // underbarrel
 if ((count(getArray (configFile >> "cfgWeapons" >> _weap >> "muzzles"))) > 1) then 
 {
 	_unit addMagazine "1Rnd_HE_Grenade_shell";
@@ -129,23 +123,6 @@ if (round(random 10) <= 5) then
 	_unit addItem selectRandom blck_specialItems;
 };
 
-/*
-if ( !(_Launcher isEqualTo "none") && !(_backpacks  isEqualTo [])) then
-{
-	_unit addWeaponGlobal _Launcher;
-	_unit addBackpack (selectRandom _backpacks);
-	for "_i" from 1 to 3 do 
-	{
-		_unit addItemToBackpack (getArray (configFile >> "CfgWeapons" >> _Launcher >> "magazines") select 0); // call BIS_fnc_selectRandom;
-	};
-	_unit setVariable["Launcher",_launcher,true];
-} else {
-	if ( random (1) < blck_chanceBackpack && !(_backpacks  isEqualTo [])) then
-	{ 
-		_unit addBackpack selectRandom _backpacks;
-	};
-};
-*/
 if !(_backpacks isEqualTo []) then 
 {
 	if (_Launcher isEqualTo "none") then 
@@ -155,14 +132,17 @@ if !(_backpacks isEqualTo []) then
 			_unit addBackpack selectRandom _backpacks;
 		};
 	} else {
-		_unit addWeaponGlobal _Launcher;
+		_unit addWeaponGlobal _launcher;
 		_unit addBackpack (selectRandom _backpacks);
+		private _roundsAdded = [];
 		private _mags = getArray (configFile >> "CfgWeapons" >> _Launcher >> "magazines");
 		for "_i" from 1 to 3 do 
 		{
-			_unit addItemToBackpack (_mags select 0); // call BIS_fnc_selectRandom;
+			private _lr = selectRandom _mags; // call BIS_fnc_selectRandom;
+			_roundsAdded pushBack _lr;
+			_unit addItemToBackpack _lr;
 		};
-		_unit setVariable["Launcher",_launcher,true];		
+		_unit setVariable["Launcher",[_launcher,_roundsAdded],true];		
 	};
 };
 

@GMS/addons/custom_server/Configs/blck_configs.sqf

@@ -439,6 +439,12 @@
 	blck_maxMoneyRed = 15;
 	blck_maxMoneyBlue = 10;
 
+	// Define the chance of attachments 
+	blck_chanceOptics = 0.4;
+	blck_chanceMuzzle = 0.3;
+	blck_chancePointer = 0.25;
+	blck_chanceUnderbarrel = 0.25;
+
 	#ifdef GRGserver
 	blck_AIAlertDistance = [250,450,650,800];  //  Radius within which AI will be notified of enemy activity. Depricated as a group-sed system is used now. The group is informed of the enemy location when a group member is hit or killed.
 	//blck_AIAlertDistance = [150,225,400,500];

@GMS/addons/custom_server/Configs/blck_configs_mil.sqf

@@ -24,13 +24,13 @@
 		3) A time acceleration module.
 	*/
 
-	blck_spawnMapAddons = true;  // When true map addons will be spawned based on parameters  define in custum_server\MapAddons\MapAddons_init.sqf
+	blck_spawnMapAddons = false;  // When true map addons will be spawned based on parameters  define in custum_server\MapAddons\MapAddons_init.sqf
-	blck_spawnStaticLootCrates = true; // When true, static loot crates will be spawned and loaded with loot as specified in custom_server\SLS\SLS_init_Epoch.sqf (or its exile equivalent).
+	blck_spawnStaticLootCrates = false; // When true, static loot crates will be spawned and loaded with loot as specified in custom_server\SLS\SLS_init_Epoch.sqf (or its exile equivalent).
 	blck_simulationManager = blck_useBlckeaglsSimulationManagement; 
 	blck_hideRocksAndPlants = true;  //  When true, any rocks, trees or bushes under enterable buildings will be 'hidden'
 
 	// Note that you can define map-specific variants in custom_server\configs\blck_custom_config.sqf
-	blck_useTimeAcceleration = true; // When true, time acceleration will be periodically updated based on amount of daylight at that time according to the values below.
+	blck_useTimeAcceleration = false; // When true, time acceleration will be periodically updated based on amount of daylight at that time according to the values below.
 	blck_timeAccelerationDay = 2;  // Daytime time accelearation
 	blck_timeAccelerationDusk = 4; // Dawn/dusk time accelearation
 	blck_timeAccelerationNight = 8;  // Nighttim time acceleration	
@@ -78,7 +78,7 @@
 
 	//Minimum distance between missions
 	blck_MinDistanceFromMission = 2000;
-	blck_minDistanceToBases = 800;
+	blck_minDistanceToBases = 500;
 	blck_minDistanceToPlayer = 500;
 	blck_minDistanceFromTowns = 300;
 	blck_minDistanceFromDMS = 500;  // minimum distance for a blackeagls mission from any nearby DMS missions. set to -1 to disable this check.
@@ -420,7 +420,11 @@
 	blck_maxMoneyGreen = 40;
 	blck_maxMoneyRed = 30;
 	blck_maxMoneyBlue = 20;
-
+	// Define the chance of attachments 
+	blck_chanceOptics = 0.4;
+	blck_chanceMuzzle = 0.3;
+	blck_chancePointer = 0.25;
+	blck_chanceUnderbarrel = 0.25;
 	if (toLower(blck_modType) isEqualTo "epoch") then
 	{
 		[format[" Loading Mission System using Parameters for %1 for militarized servers",blck_modType]] call blck_fnc_log;

@GMS/addons/custom_server/init/build.sqf

@@ -1,4 +1,4 @@
 
-#define blck_buildNumber 231  //  Address issues with cleanup of objects
+#define blck_buildNumber 232  //  Address issues with cleanup of objects
 #define blck_versionNumber 7.03
-#define blck_buildDate "10-12-20"
+#define blck_buildDate "10-31-20"