diff --git a/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_cleanupAliveAI.sqf b/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_cleanupAliveAI.sqf index 0390861..b904443 100644 --- a/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_cleanupAliveAI.sqf +++ b/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_cleanupAliveAI.sqf @@ -41,16 +41,16 @@ for "_i" from 1 to (count blck_liveMissionAI) do //diag_log format["_fnc_cleanupAliveAI:: (34) evaluating with delete time = %2 and diag_tickTime %1", diag_tickTime, _units select 1]; if (diag_tickTime > (_units select 1) ) then { - diag_log format["_fnc_cleanupAliveAI:: cleaning up AI group %1",_units]; + //diag_log format["_fnc_cleanupAliveAI:: cleaning up AI group %1",_units]; { - diag_log format["_fnc_cleanupAliveAI:: deleting unit %1",_x]; - diag_log format["_fnc_cleanupAliveAI:: vehicle _x = %1",vehicle _x]; - diag_log format["_fnc_cleanupAliveAI:: objectParent _x = %1",objectParent _x]; + //diag_log format["_fnc_cleanupAliveAI:: deleting unit %1",_x]; + //diag_log format["_fnc_cleanupAliveAI:: vehicle _x = %1",vehicle _x]; + //diag_log format["_fnc_cleanupAliveAI:: objectParent _x = %1",objectParent _x]; if ((alive _x) && !(isNull objectParent _x)) then // mark the vehicle for deletion { - diag_log format["_fnc_cleanupAliveAI: deleteing objectParent %1 [%3] for unit %2",objectParent _x, _x, typeName (objectParent _x), typeOf (objectParent _x)]; + //diag_log format["_fnc_cleanupAliveAI: deleteing objectParent %1 [%3] for unit %2",objectParent _x, _x, typeName (objectParent _x), typeOf (objectParent _x)]; [objectParent _x] call blck_fn_deleteAIvehicle; }; [_x] call blck_fnc_deleteAI; diff --git a/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_processIlleagalAIKills.sqf b/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_processIlleagalAIKills.sqf index 6a2ab40..33d8566 100644 --- a/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_processIlleagalAIKills.sqf +++ b/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_processIlleagalAIKills.sqf @@ -12,7 +12,7 @@ private["_missionType","_wasRunover","_launcher","_legal"]; params["_unit","_killer"]; -diag_log format["##-processIlleagalAIKills.sqf-## processing illeagal kills for unit %1",_unit]; +//diag_log format["##-processIlleagalAIKills.sqf-## processing illeagal kills for unit %1",_unit]; _launcher = _unit getVariable ["Launcher",""]; _legal = true; diff --git a/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_rewardKiller.sqf b/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_rewardKiller.sqf index fbd8aa0..b40d9a7 100644 --- a/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_rewardKiller.sqf +++ b/@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_rewardKiller.sqf @@ -19,7 +19,7 @@ params["_unit","_killer"]; private["_modType","_reward","_maxReward","_dist","_killstreakReward","_distanceBonus","_newKillerScore","_newKillerFrags","_money"]; _modType = call blck_fnc_getModType; -diag_log format["[blckeagles] rewardKiller:: - _modType = %1",_modType]; +//diag_log format["[blckeagles] rewardKiller:: - _modType = %1",_modType]; if (_modType isEqualTo "Epoch") exitWith {}; // Have players pull crypto from AI bodies now that this feature is available. /* if (_modType isEqualTo "Epoch") then @@ -83,9 +83,9 @@ if (_modType isEqualTo "Exile") then _killstreakBonus = 3 * (_killer getVariable["blck_kills",0]); _respectGained = 25 + _distanceBonus + _killstreakBonus; _score = _killer getVariable ["ExileScore", 0]; - diag_log format["GMS_fnc_rewardKiller.sqf:: ExileScore = %1",_killer getVariable ["ExileScore", 0]]; + //diag_log format["GMS_fnc_rewardKiller.sqf:: ExileScore = %1",_killer getVariable ["ExileScore", 0]]; _score = _score + (_respectGained); - diag_log format["GMS_fnc_rewardKiller.sqf:: _new = %1",_score]; + //diag_log format["GMS_fnc_rewardKiller.sqf:: _new = %1",_score]; _killer setVariable ["ExileScore", _score]; format["setAccountScore:%1:%2", _score,getPlayerUID _killer] call ExileServer_system_database_query_fireAndForget; _newKillerFrags = _killer getVariable ["ExileKills", 0]; diff --git a/MPMissions/Exile.Altis/debug/blckClient.sqf b/MPMissions/Exile.Altis/debug/blckClient.sqf index 99211f1..9ef231a 100644 --- a/MPMissions/Exile.Altis/debug/blckClient.sqf +++ b/MPMissions/Exile.Altis/debug/blckClient.sqf @@ -3,7 +3,9 @@ // Last Updated 1/11/17 // by Ghostrider-DbD- ////////////////////////////////////////// - +blck_fnc_spawnMarker = compileFinal preprocessfilelinenumbers "debug\spawnMarker.sqf"; +blck_fnc_deleteMarker = compileFinal preprocessfilelinenumbers "debug\deleteMarker.sqf"; +blck_fnc_missionCompleteMarker = compileFinal preprocessfilelinenumbers "debug\missionCompleteMarker.sqf"; if !(isServer) then { //diag_log "[blckeagls] initializing client variables"; @@ -119,25 +121,25 @@ if !(isServer) then fn_handleMessage = { //private["_event","_msg","_mission"]; - diag_log format["blck_Message ====] Paremeters = _this = %1",_this]; + //diag_log format["blck_Message ====] Paremeters = _this = %1",_this]; params["_event","_message",["_mission",""]]; - diag_log format["blck_Message ====] Paremeters _event %1 _message %2 paramter #3 %3",_event,_message,_mission]; - diag_log format["blck_Message ====] _message isEqualTo %1",_message]; + //diag_log format["blck_Message ====] Paremeters _event %1 _message %2 paramter #3 %3",_event,_message,_mission]; + //diag_log format["blck_Message ====] _message isEqualTo %1",_message]; switch (_event) do { case "start": { playSound "UAV_05"; - diag_log "switch start"; + //diag_log "switch start"; //_mission = _this select 1 select 2; [_event,_message,_mission] spawn fn_missionNotification; }; case "end": { playSound "UAV_03"; - diag_log "switch end"; + //diag_log "switch end"; //_mission = _this select 1 select 2; [_event,_message,_mission] spawn fn_missionNotification; }; @@ -153,7 +155,7 @@ if !(isServer) then case "reinforcements": { if ( (player distance _mission) < 1000) then {playsound "AddItemOK"; ["Alert",_message] call fn_dynamicNotification;}; - diag_log "---->>>> Reinforcements Spotted"; + //diag_log "---->>>> Reinforcements Spotted"; }; case "IED": { diff --git a/MPMissions/Exile.Altis/debug/deleteMarker.sqf b/MPMissions/Exile.Altis/debug/deleteMarker.sqf index 68f214e..99458cb 100644 --- a/MPMissions/Exile.Altis/debug/deleteMarker.sqf +++ b/MPMissions/Exile.Altis/debug/deleteMarker.sqf @@ -5,8 +5,10 @@ ////////////////////////////////////////// // delete a marker +//diag_log format["blck_fnc_deleteMarker:: _this = %1",_this]; private["_markerName"]; _markerName = _this select 0; -deleteMarker _markerName; +//deleteMarker _markerName; _markerName = "label" + _markerName; deleteMarker _markerName; +//diag_log format["deleteMarker complete script for _this = %1",_this]; diff --git a/MPMissions/Exile.Altis/debug/missionCompleteMarker.sqf b/MPMissions/Exile.Altis/debug/missionCompleteMarker.sqf index 35ebc0b..ea8eee7 100644 --- a/MPMissions/Exile.Altis/debug/missionCompleteMarker.sqf +++ b/MPMissions/Exile.Altis/debug/missionCompleteMarker.sqf @@ -7,7 +7,7 @@ // this will not show to JIP players private["_location","_MainMarker","_name"]; - +//diag_log format["blck_fnc_missionCompleteMarker:: _this = %1",_this]; _location = _this select 0; _name = str(random(1000000)) + "MarkerCleared"; _MainMarker = createMarker [_name, _location]; @@ -16,3 +16,4 @@ _MainMarker setMarkerType "n_hq"; _MainMarker setMarkerText "Mission Cleared"; uiSleep 300; deleteMarker _MainMarker; +//diag_log format["missionCompleteMarker complete script for _this = %1",_this]; diff --git a/MPMissions/Exile.Altis/debug/spawnMarker.sqf b/MPMissions/Exile.Altis/debug/spawnMarker.sqf index ac830f1..32ad44a 100644 --- a/MPMissions/Exile.Altis/debug/spawnMarker.sqf +++ b/MPMissions/Exile.Altis/debug/spawnMarker.sqf @@ -64,7 +64,7 @@ _blck_fn_configureRoundMarker = { _blck_fn_configureIconMarker = { private["_MainMarker"]; params["_name","_pos",["_color","ColorBlack"],["_text",""],["_icon","mil_triangle"]]; - if (blck_debugLevel > 2) then {diag_log format["_blck_fn_configureIconMarker: _name=%1; _pos=%2; _color=%3; _text=%4",_name,_pos,_color,_text];}; + //diag_log format["_blck_fn_configureIconMarker: _name=%1; _pos=%2; _color=%3; _text=%4",_name,_pos,_color,_text]; _name = "label" + _name; _MainMarker = createMarker [_name, _pos]; @@ -74,15 +74,14 @@ _blck_fn_configureIconMarker = { _MainMarker setMarkerText _text; }; +//diag_log format["spawnMarker:: -- >> _this = %1",_this]; // _this = [[""BlueMarker"",[12524.1,18204.7,0],""Bandit Patrol"",""center"",""ColorBlue"",[""ELIPSE"",[175,175]]],""ColorBlue"",""BlueMarker""]" params["_mArray"]; + _mArray params["_missionType","_markerPos","_markerLabel","_markerLabelType","_markerColor","_markerType"]; _markerType params["_mShape","_mSize","_mBrush"]; +//diag_log format["spawnMarker.sqf:: -- >> _missionType %1 | _markerPos %2 | _markerLabel %3 | _markerLabelType %4 | _markerColor %5 | _markerType %6",_missionType,_markerPos,_markerLabel,_markerLabelType,_markerColor,_markerType]; -//if (isServer && (blck_debugLevel > 0)) then -//{ - if (blck_debugLevel > 1) then {diag_log format["spawnMarker.sqf:: -- >> _missionType %1 | _markerPos %2 | _markerLabel %3 | _markerLabelType %4 | _markerColor %5 | _markerType %6",_missionType,_markerPos,_markerLabel,_markerLabelType,_markerColor,_markerType];}; -//}; if ((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then // not an Icon .... { switch (_missionType) do { @@ -91,9 +90,10 @@ if ((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then // not an Icon .... default {[_missionType,_markerPos,_markerColor,_markerLabel, _mSize,_markerLabelType,_mShape,_mBrush] call _blck_fn_configureRoundMarker;}; }; }; -if !((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then { // Deal with case of an icon +if !((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then +{ // Deal with case of an icon // params["_name","_pos",["_color","ColorBlack"],["_text",""],["_icon","mil_triangle"]]; [_missionType,_markerPos, _markerColor,_markerLabel,_markerType select 0] call _blck_fn_configureIconMarker; }; - +//diag_log format["spawnMarker complete script for _this = %1",_this]; diff --git a/MPMissions/epoch.Altis/debug/blckClient.sqf b/MPMissions/epoch.Altis/debug/blckClient.sqf index f469b4d..9ef231a 100644 --- a/MPMissions/epoch.Altis/debug/blckClient.sqf +++ b/MPMissions/epoch.Altis/debug/blckClient.sqf @@ -3,7 +3,9 @@ // Last Updated 1/11/17 // by Ghostrider-DbD- ////////////////////////////////////////// - +blck_fnc_spawnMarker = compileFinal preprocessfilelinenumbers "debug\spawnMarker.sqf"; +blck_fnc_deleteMarker = compileFinal preprocessfilelinenumbers "debug\deleteMarker.sqf"; +blck_fnc_missionCompleteMarker = compileFinal preprocessfilelinenumbers "debug\missionCompleteMarker.sqf"; if !(isServer) then { //diag_log "[blckeagls] initializing client variables"; @@ -171,7 +173,7 @@ if !(isServer) then }; diag_log "blck client loaded ver 1/11/17 2.0 8 PM"; - //diag_log "[blckeagls] starting client loop"; + diag_log "[blckeagls] starting client loop"; while {true} do { diff --git a/MPMissions/epoch.Altis/debug/deleteMarker.sqf b/MPMissions/epoch.Altis/debug/deleteMarker.sqf index 68f214e..99458cb 100644 --- a/MPMissions/epoch.Altis/debug/deleteMarker.sqf +++ b/MPMissions/epoch.Altis/debug/deleteMarker.sqf @@ -5,8 +5,10 @@ ////////////////////////////////////////// // delete a marker +//diag_log format["blck_fnc_deleteMarker:: _this = %1",_this]; private["_markerName"]; _markerName = _this select 0; -deleteMarker _markerName; +//deleteMarker _markerName; _markerName = "label" + _markerName; deleteMarker _markerName; +//diag_log format["deleteMarker complete script for _this = %1",_this]; diff --git a/MPMissions/epoch.Altis/debug/missionCompleteMarker.sqf b/MPMissions/epoch.Altis/debug/missionCompleteMarker.sqf index 35ebc0b..ea8eee7 100644 --- a/MPMissions/epoch.Altis/debug/missionCompleteMarker.sqf +++ b/MPMissions/epoch.Altis/debug/missionCompleteMarker.sqf @@ -7,7 +7,7 @@ // this will not show to JIP players private["_location","_MainMarker","_name"]; - +//diag_log format["blck_fnc_missionCompleteMarker:: _this = %1",_this]; _location = _this select 0; _name = str(random(1000000)) + "MarkerCleared"; _MainMarker = createMarker [_name, _location]; @@ -16,3 +16,4 @@ _MainMarker setMarkerType "n_hq"; _MainMarker setMarkerText "Mission Cleared"; uiSleep 300; deleteMarker _MainMarker; +//diag_log format["missionCompleteMarker complete script for _this = %1",_this]; diff --git a/MPMissions/epoch.Altis/debug/spawnMarker.sqf b/MPMissions/epoch.Altis/debug/spawnMarker.sqf index b6c698b..32ad44a 100644 --- a/MPMissions/epoch.Altis/debug/spawnMarker.sqf +++ b/MPMissions/epoch.Altis/debug/spawnMarker.sqf @@ -74,19 +74,14 @@ _blck_fn_configureIconMarker = { _MainMarker setMarkerText _text; }; -if (isServer && (blck_debugLevel isEqualTo 3)) then -{ - diag_log format["spawnMarker:: -- >> _this = %1",_this]; -}; +//diag_log format["spawnMarker:: -- >> _this = %1",_this]; // _this = [[""BlueMarker"",[12524.1,18204.7,0],""Bandit Patrol"",""center"",""ColorBlue"",[""ELIPSE"",[175,175]]],""ColorBlue"",""BlueMarker""]" params["_mArray"]; + _mArray params["_missionType","_markerPos","_markerLabel","_markerLabelType","_markerColor","_markerType"]; _markerType params["_mShape","_mSize","_mBrush"]; +//diag_log format["spawnMarker.sqf:: -- >> _missionType %1 | _markerPos %2 | _markerLabel %3 | _markerLabelType %4 | _markerColor %5 | _markerType %6",_missionType,_markerPos,_markerLabel,_markerLabelType,_markerColor,_markerType]; -if (isServer && (blck_debugLevel isEqualTo 3)) then -{ - diag_log format["spawnMarker.sqf:: -- >> _missionType %1 | _markerPos %2 | _markerLabel %3 | _markerLabelType %4 | _markerColor %5 | _markerType %6",_missionType,_markerPos,_markerLabel,_markerLabelType,_markerColor,_markerType]; -}; if ((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then // not an Icon .... { switch (_missionType) do { @@ -95,9 +90,10 @@ if ((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then // not an Icon .... default {[_missionType,_markerPos,_markerColor,_markerLabel, _mSize,_markerLabelType,_mShape,_mBrush] call _blck_fn_configureRoundMarker;}; }; }; -if !((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then { // Deal with case of an icon +if !((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then +{ // Deal with case of an icon // params["_name","_pos",["_color","ColorBlack"],["_text",""],["_icon","mil_triangle"]]; [_missionType,_markerPos, _markerColor,_markerLabel,_markerType select 0] call _blck_fn_configureIconMarker; }; - +//diag_log format["spawnMarker complete script for _this = %1",_this];