diff --git a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_alertNearbyVehicles.sqf b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_alertNearbyVehicles.sqf index e8af0d6..c96531c 100644 --- a/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_alertNearbyVehicles.sqf +++ b/@GMS/addons/custom_server/Compiles/Units/GMS_fnc_alertNearbyVehicles.sqf @@ -11,7 +11,7 @@ */ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; -params[["_target",objNull]; +params[["_target",objNull]]; if (isnull _target) exitWith {objNull}; private _nearestVehicles = (nearestObjects [getPos _target,["Car","Truck","Tank","Ship"],300]); if (_nearestVehicles isEqualTo []) exitWith diff --git a/@GMS/addons/custom_server/Configs/blck_configs.sqf b/@GMS/addons/custom_server/Configs/blck_configs.sqf index 946fe32..50831a4 100644 --- a/@GMS/addons/custom_server/Configs/blck_configs.sqf +++ b/@GMS/addons/custom_server/Configs/blck_configs.sqf @@ -17,7 +17,7 @@ changing any of these variables may break the mission systemChat */ blck_locationBlackList = []; // Do not touch ... - blck_debugON = true; // Do not touch ... + blck_debugON = false; // Do not touch ... blck_debugLevel = 0; // Do not touch ... #ifdef blck_milServer if (true) exitWith @@ -45,7 +45,7 @@ blck_spawnMapAddons = true; // 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_simulationManager = blck_useBlckeaglsSimulationManager; - diag_log format["[blckeagls] blck_configs: blck_simulationManager = %1",blck_simulationManager]; + //diag_log format["[blckeagls] blck_configs: blck_simulationManager = %1",blck_simulationManager]; /* blck_simulationManagementOff - no simulation management occurs blck_useBlckeaglsSimulationManager - simulation is enabled/disabled by periodic checks for nearby players; a 'wake' function is included when a units simulation is turned on @@ -426,18 +426,12 @@ execVM "\q\addons\custom_server\Configs\blck_configs_exile.sqf"; }; uiSleep 10; - //waitUntil{!isNil "blck_useConfigsGeneratedLoadouts"}; - //diag_log format["blck_maximumItemPriceInAI_Loadouts defined as %1",blck_maximumItemPriceInAI_Loadouts]; - //waitUntil {!isNil "blck_maximumItemPriceInAI_Loadouts"}; if (blck_useConfigsGeneratedLoadouts) then { diag_log format["[blckeagls] Dynamic Configs Enabled"]; execVM "\q\addons\custom_server\Configs\blck_dynamicConfigs.sqf"; } else { - if (blck_verifyClassNames) then - { - }; }; blck_configsLoaded = true; diff --git a/@GMS/addons/custom_server/Configs/blck_configs_mil.sqf b/@GMS/addons/custom_server/Configs/blck_configs_mil.sqf index 4b6f5c2..efba4d9 100644 --- a/@GMS/addons/custom_server/Configs/blck_configs_mil.sqf +++ b/@GMS/addons/custom_server/Configs/blck_configs_mil.sqf @@ -27,7 +27,7 @@ blck_spawnMapAddons = true; // 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_simulationManager = blck_useBlckeaglsSimulationManagement; - diag_log format["[blckeagls] blck_configs: blck_simulationManager = %1",blck_simulationManager]; + //diag_log format["[blckeagls] blck_configs: blck_simulationManager = %1",blck_simulationManager]; // 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_timeAccelerationDay = 2; // Daytime time accelearation diff --git a/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_initializeMission.sqf b/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_initializeMission.sqf index 0fa9b02..c0fe1b9 100644 --- a/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_initializeMission.sqf +++ b/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_initializeMission.sqf @@ -16,11 +16,11 @@ if (isNil "_markerColor") then {_markerColor = "ColorBlack"}; if (isNil "_markerType") then {_markerType = ["mil_box",[]]}; if (isNil "_missionLandscape") then {_missionLandscape = []}; if (isNil "_garrisonedBuilding_ASLsystem") then { - diag_log "_fnc_sm_initializeMission: _garrisonedBuilding_ASLsystem set to []"; + //diag_log "_fnc_sm_initializeMission: _garrisonedBuilding_ASLsystem set to []"; _garrisonedBuilding_ASLsystem = []; }; if (isNil "_garrisonedBuildings_BuildingPosnSystem") then { - diag_log "_fnc_sm_initializeMission: _garrisonedBuildings_BuildingPosnSystem set to []"; + //diag_log "_fnc_sm_initializeMission: _garrisonedBuildings_BuildingPosnSystem set to []"; _garrisonedBuildings_BuildingPosnSystem = []; }; if (isNil "_airPatrols") then {_airPatrols = []}; diff --git a/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnLootContainers.sqf b/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnLootContainers.sqf index 34f0a71..a2fe092 100644 --- a/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnLootContainers.sqf +++ b/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnLootContainers.sqf @@ -22,7 +22,7 @@ if !(_objects isEqualTo []) exitWith diag_log format["_fnc_sm_spawnLootContainers (21):-> _x = %1",_x]; }; #endif - diag_log format["_fnc_sm_spawnLootContainers (21):-> _x = %1",_x]; + //diag_log format["_fnc_sm_spawnLootContainers (21):-> _x = %1",_x]; // [selectRandom blck_crateTypes,[22904.8,16742.5,6.30195],[[0,1,0],[0,0,1]],[true,false], _crateLoot, _lootCounts] _x params["_crateClassName","_cratePosASL","_vectorDirUp","_allowDamageSim","_crateLoot","_lootCounts"]; _crate = [_cratePosASL, _crateClassName] call blck_fnc_spawnCrate; @@ -33,13 +33,6 @@ if !(_objects isEqualTo []) exitWith // In the case where no loot crate parameters are defined in _objects just spawn 1 at the center of the mission. if (_objects isEqualTo []) then { - #ifdef blck_debugMode - if (blck_debugLevel > 2) then - { - diag_log format["_fnc_sm_spawnLootContainers: _this = %1",_this]; - diag_log format["_fnc_sm_spawnLootContainers: _coords = %1",_coords]; - }; - #endif _crateType = selectRandom blck_crateTypes; _crate = [_coords,_crateType] call blck_fnc_spawnCrate; [_crate,blck_BoxLoot_Red,blck_lootCountsGreen] call blck_fnc_fillBoxes; diff --git a/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnObjectASLVectorDirUp.sqf b/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnObjectASLVectorDirUp.sqf index 0fb23aa..9ed7137 100644 --- a/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnObjectASLVectorDirUp.sqf +++ b/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnObjectASLVectorDirUp.sqf @@ -11,11 +11,7 @@ http://creativecommons.org/licenses/by-nc-sa/4.0/ */ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; -diag_log format["_fnc_sm_spawnObjectASLVectorDirUp: _this = %1",_this]; params["_buildingClassName","_posASL","_vectorDirUp","_enableDamSim"]; -{ - diag_log format["_fnc_sm_spawnObjectASLVectorDirUp: %1 = %2",_x select 0, _x select 1]; -}forEach [["_buildingClassName",_buildingClassName],["_posASL",_posASL],["_vectorDirUp",_vectorDirUp],["_enableDamSim",_enableDamSim]]; _object = createVehicle [_buildingClassName, [0,0,0], [], 0, "CAN_COLLIDE"]; _object setPosASL _posASL; _object setVectorDirAndUp _vectorDirUp; diff --git a/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnObjects.sqf b/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnObjects.sqf index 5a10740..c9f885f 100644 --- a/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnObjects.sqf +++ b/@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_spawnObjects.sqf @@ -11,21 +11,9 @@ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; params["_objects"]; -//diag_log format["_sm_spawnObjects:: _objects = %1",_objects]; private["_objects","_object"]; - { - diag_log format["_sm_spawnObjects:: spawning object of type %1 with parameters of %2",_x select 0, _x]; - //private _object = (_x select 0) createVehicle [0,0,0]; - // [type, position, markers, placement, special] _object = [_x select 0, _x select 1, _x select 2, _x select 3] call blck_fnc_sm_spawnObjectASLVectorDirUp; - /* - _object = createVehicle [_x select 0, _x select 1, [], 0, "CAN_COLLIDE"]; - _object setPosASL (_x select 1); - _object setVectorDirAndUp (_x select 2); - _object enableSimulationGlobal ((_x select 3) select 0); - _object allowDamage ((_x select 3) select 1); - */ } forEach _objects; diff --git a/@GMS/addons/custom_server/init/GMS_fnc_getTraderCites.sqf b/@GMS/addons/custom_server/init/GMS_fnc_getTraderCites.sqf index 9d3429c..96e0211 100644 --- a/@GMS/addons/custom_server/init/GMS_fnc_getTraderCites.sqf +++ b/@GMS/addons/custom_server/init/GMS_fnc_getTraderCites.sqf @@ -18,9 +18,6 @@ if ((tolower blck_modType) isEqualTo "epoch") then private _telePos = getArray(configFile >> "CfgEpoch" >> worldName >> "telePos" ); { blck_locationBlackList pushback [_x select 3, 1000]; - #ifdef blck_debugMode - if (blck_debugON) then {diag_log format["[blckeagls] _fnc_getTraderCitiesEpoch:: -- >> Added epoch trader city location at %1", (_x select 3)];}; - #endif } foreach _telePos; }; @@ -31,26 +28,16 @@ if ((tolower blck_modType) isEqualTo "exile") then private _traderCites = allMapMarkers; private _tc = []; { - //if (blck_debugON) then {diag_log format["[blckeagls] _fnc_getExileLocations :: -- >> Evaluating Markertype of %1", (getMarkerType _x)];}; if (getMarkerType _x isEqualTo "ExileTraderZone" && blck_blacklistTraderCities) then { blck_locationBlackList pushback [(getMarkerPos _x),1000]; - #ifdef blck_debugMode - if (blck_debugON) then {diag_log format["[blckeagls] _fnc_getExileLocations :: -- >> Added Exile Trader location at %1", (getMarkerPos _x)];}; - #endif }; if ((getMarkerType _x isEqualTo "ExileSpawnZone") && blck_blacklistSpawns) then { - blck_locationBlackList pushback [(getMarkerPos _x),1000]; - #ifdef blck_debugMode - if (blck_debugON) then {diag_log format["[blckeagls] _fnc_getExileLocations :: -- >> Added Exile Spawn location at %1", (getMarkerPos _x)];}; - #endif + blck_locationBlackList pushback [(getMarkerPos _x),1000]; }; // if (getMarkerType _x isEqualTo "ExileConcreteMixerZone" && blck_listConcreteMixerZones) then { - blck_locationBlackList pushback [(getMarkerPos _x),1000]; - #ifdef blck_debugMode - if (blck_debugON) then {diag_log format["[blckeagls] _fnc_getExileLocations :: -- >> Added Exile Concrete Mixer location at %1", (getMarkerPos _x)];}; - #endif + blck_locationBlackList pushback [(getMarkerPos _x),1000]; }; }forEach _traderCites; }; diff --git a/@GMS/addons/custom_server/init/blck_init_server.sqf b/@GMS/addons/custom_server/init/blck_init_server.sqf index 70d37ac..90ddf14 100644 --- a/@GMS/addons/custom_server/init/blck_init_server.sqf +++ b/@GMS/addons/custom_server/init/blck_init_server.sqf @@ -31,7 +31,7 @@ diag_log format["[blckeagls] Loading Server Mission System"]; // compile functions call compileFinal preprocessFileLineNumbers "\q\addons\custom_server\Compiles\blck_functions.sqf"; -diag_log format["[blckeagls] functions compiled in %1 seconds",diag_tickTime-_blck_loadingStartTime]; +diag_log format["[blckeagls] functions compiled"]; call compile preprocessfilelinenumbers "\q\addons\custom_server\Configs\blck_configs.sqf"; waitUntil{(!isNil "blck_useHC") && (!isNil "blck_simulationManager") && (!isNil "blck_debugOn")};