Arma3_Epoch/blckeagles-revisited-RC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed some unecessary loging

Browse Source
This commit is contained in:
Ghostrider-DbD- 2017-06-10 12:07:01 -04:00
parent 033b6cfe4a
commit 05548035ee
11 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_cleanupAliveAI.sqf
View File

@ -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]; //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 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:: deleting unit %1",_x];
diag_log format["_fnc_cleanupAliveAI:: vehicle _x = %1",vehicle _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:: objectParent _x = %1",objectParent _x];
if ((alive _x) && !(isNull objectParent _x)) then // mark the vehicle for deletion 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; [objectParent _x] call blck_fn_deleteAIvehicle;
}; };
[_x] call blck_fnc_deleteAI; [_x] call blck_fnc_deleteAI;

2
@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_processIlleagalAIKills.sqf
View File

@ -12,7 +12,7 @@
private["_missionType","_wasRunover","_launcher","_legal"]; private["_missionType","_wasRunover","_launcher","_legal"];
params["_unit","_killer"]; 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",""]; _launcher = _unit getVariable ["Launcher",""];
_legal = true; _legal = true;

6
@epochhive/addons/custom_server/Compiles/Units/GMS_fnc_rewardKiller.sqf
View File

@ -19,7 +19,7 @@ params["_unit","_killer"];
private["_modType","_reward","_maxReward","_dist","_killstreakReward","_distanceBonus","_newKillerScore","_newKillerFrags","_money"]; private["_modType","_reward","_maxReward","_dist","_killstreakReward","_distanceBonus","_newKillerScore","_newKillerFrags","_money"];
_modType = call blck_fnc_getModType; _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") exitWith {}; // Have players pull crypto from AI bodies now that this feature is available.
/* /*
if (_modType isEqualTo "Epoch") then if (_modType isEqualTo "Epoch") then
@ -83,9 +83,9 @@ if (_modType isEqualTo "Exile") then
_killstreakBonus = 3 * (_killer getVariable["blck_kills",0]); _killstreakBonus = 3 * (_killer getVariable["blck_kills",0]);
_respectGained = 25 + _distanceBonus + _killstreakBonus; _respectGained = 25 + _distanceBonus + _killstreakBonus;
_score = _killer getVariable ["ExileScore", 0]; _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); _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]; _killer setVariable ["ExileScore", _score];
format["setAccountScore:%1:%2", _score,getPlayerUID _killer] call ExileServer_system_database_query_fireAndForget; format["setAccountScore:%1:%2", _score,getPlayerUID _killer] call ExileServer_system_database_query_fireAndForget;
_newKillerFrags = _killer getVariable ["ExileKills", 0]; _newKillerFrags = _killer getVariable ["ExileKills", 0];

16
MPMissions/Exile.Altis/debug/blckClient.sqf
View File

@ -3,7 +3,9 @@
// Last Updated 1/11/17 // Last Updated 1/11/17
// by Ghostrider-DbD- // 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 if !(isServer) then
{ {
//diag_log "[blckeagls] initializing client variables"; //diag_log "[blckeagls] initializing client variables";
@ -119,25 +121,25 @@ if !(isServer) then
fn_handleMessage = { fn_handleMessage = {
//private["_event","_msg","_mission"]; //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",""]]; 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 ====] 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 ====] _message isEqualTo %1",_message];
switch (_event) do switch (_event) do
{ {
case "start": case "start":
{ {
playSound "UAV_05"; playSound "UAV_05";
diag_log "switch start"; //diag_log "switch start";
//_mission = _this select 1 select 2; //_mission = _this select 1 select 2;
[_event,_message,_mission] spawn fn_missionNotification; [_event,_message,_mission] spawn fn_missionNotification;
}; };
case "end": case "end":
{ {
playSound "UAV_03"; playSound "UAV_03";
diag_log "switch end"; //diag_log "switch end";
//_mission = _this select 1 select 2; //_mission = _this select 1 select 2;
[_event,_message,_mission] spawn fn_missionNotification; [_event,_message,_mission] spawn fn_missionNotification;
}; };
@ -153,7 +155,7 @@ if !(isServer) then
case "reinforcements": case "reinforcements":
{ {
if ( (player distance _mission) < 1000) then {playsound "AddItemOK"; ["Alert",_message] call fn_dynamicNotification;}; if ( (player distance _mission) < 1000) then {playsound "AddItemOK"; ["Alert",_message] call fn_dynamicNotification;};
diag_log "---->>>> Reinforcements Spotted"; //diag_log "---->>>> Reinforcements Spotted";
}; };
case "IED": case "IED":
{ {

4
MPMissions/Exile.Altis/debug/deleteMarker.sqf
View File

@ -5,8 +5,10 @@
////////////////////////////////////////// //////////////////////////////////////////
// delete a marker // delete a marker
//diag_log format["blck_fnc_deleteMarker:: _this = %1",_this];
private["_markerName"]; private["_markerName"];
_markerName = _this select 0; _markerName = _this select 0;
deleteMarker _markerName; //deleteMarker _markerName;
_markerName = "label" + _markerName; _markerName = "label" + _markerName;
deleteMarker _markerName; deleteMarker _markerName;
//diag_log format["deleteMarker complete script for _this = %1",_this];

3
MPMissions/Exile.Altis/debug/missionCompleteMarker.sqf
View File

@ -7,7 +7,7 @@
// this will not show to JIP players // this will not show to JIP players
private["_location","_MainMarker","_name"]; private["_location","_MainMarker","_name"];
//diag_log format["blck_fnc_missionCompleteMarker:: _this = %1",_this];
_location = _this select 0; _location = _this select 0;
_name = str(random(1000000)) + "MarkerCleared"; _name = str(random(1000000)) + "MarkerCleared";
_MainMarker = createMarker [_name, _location]; _MainMarker = createMarker [_name, _location];
@ -16,3 +16,4 @@ _MainMarker setMarkerType "n_hq";
_MainMarker setMarkerText "Mission Cleared"; _MainMarker setMarkerText "Mission Cleared";
uiSleep 300; uiSleep 300;
deleteMarker _MainMarker; deleteMarker _MainMarker;
//diag_log format["missionCompleteMarker complete script for _this = %1",_this];

14
MPMissions/Exile.Altis/debug/spawnMarker.sqf
View File

@ -64,7 +64,7 @@ _blck_fn_configureRoundMarker = {
_blck_fn_configureIconMarker = { _blck_fn_configureIconMarker = {
private["_MainMarker"]; private["_MainMarker"];
params["_name","_pos",["_color","ColorBlack"],["_text",""],["_icon","mil_triangle"]]; 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; _name = "label" + _name;
_MainMarker = createMarker [_name, _pos]; _MainMarker = createMarker [_name, _pos];
@ -74,15 +74,14 @@ _blck_fn_configureIconMarker = {
_MainMarker setMarkerText _text; _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""]" // _this = [[""BlueMarker"",[12524.1,18204.7,0],""Bandit Patrol"",""center"",""ColorBlue"",[""ELIPSE"",[175,175]]],""ColorBlue"",""BlueMarker""]"
params["_mArray"]; params["_mArray"];
_mArray params["_missionType","_markerPos","_markerLabel","_markerLabelType","_markerColor","_markerType"]; _mArray params["_missionType","_markerPos","_markerLabel","_markerLabelType","_markerColor","_markerType"];
_markerType params["_mShape","_mSize","_mBrush"]; _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 .... if ((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then // not an Icon ....
{ {
switch (_missionType) do { 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;}; 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"]]; // params["_name","_pos",["_color","ColorBlack"],["_text",""],["_icon","mil_triangle"]];
[_missionType,_markerPos, _markerColor,_markerLabel,_markerType select 0] call _blck_fn_configureIconMarker; [_missionType,_markerPos, _markerColor,_markerLabel,_markerType select 0] call _blck_fn_configureIconMarker;
}; };
//diag_log format["spawnMarker complete script for _this = %1",_this];

6
MPMissions/epoch.Altis/debug/blckClient.sqf
View File

@ -3,7 +3,9 @@
// Last Updated 1/11/17 // Last Updated 1/11/17
// by Ghostrider-DbD- // 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 if !(isServer) then
{ {
//diag_log "[blckeagls] initializing client variables"; //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 "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 while {true} do
{ {

4
MPMissions/epoch.Altis/debug/deleteMarker.sqf
View File

@ -5,8 +5,10 @@
////////////////////////////////////////// //////////////////////////////////////////
// delete a marker // delete a marker
//diag_log format["blck_fnc_deleteMarker:: _this = %1",_this];
private["_markerName"]; private["_markerName"];
_markerName = _this select 0; _markerName = _this select 0;
deleteMarker _markerName; //deleteMarker _markerName;
_markerName = "label" + _markerName; _markerName = "label" + _markerName;
deleteMarker _markerName; deleteMarker _markerName;
//diag_log format["deleteMarker complete script for _this = %1",_this];

3
MPMissions/epoch.Altis/debug/missionCompleteMarker.sqf
View File

@ -7,7 +7,7 @@
// this will not show to JIP players // this will not show to JIP players
private["_location","_MainMarker","_name"]; private["_location","_MainMarker","_name"];
//diag_log format["blck_fnc_missionCompleteMarker:: _this = %1",_this];
_location = _this select 0; _location = _this select 0;
_name = str(random(1000000)) + "MarkerCleared"; _name = str(random(1000000)) + "MarkerCleared";
_MainMarker = createMarker [_name, _location]; _MainMarker = createMarker [_name, _location];
@ -16,3 +16,4 @@ _MainMarker setMarkerType "n_hq";
_MainMarker setMarkerText "Mission Cleared"; _MainMarker setMarkerText "Mission Cleared";
uiSleep 300; uiSleep 300;
deleteMarker _MainMarker; deleteMarker _MainMarker;
//diag_log format["missionCompleteMarker complete script for _this = %1",_this];

16
MPMissions/epoch.Altis/debug/spawnMarker.sqf
View File

@ -74,19 +74,14 @@ _blck_fn_configureIconMarker = {
_MainMarker setMarkerText _text; _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""]" // _this = [[""BlueMarker"",[12524.1,18204.7,0],""Bandit Patrol"",""center"",""ColorBlue"",[""ELIPSE"",[175,175]]],""ColorBlue"",""BlueMarker""]"
params["_mArray"]; params["_mArray"];
_mArray params["_missionType","_markerPos","_markerLabel","_markerLabelType","_markerColor","_markerType"]; _mArray params["_missionType","_markerPos","_markerLabel","_markerLabelType","_markerColor","_markerType"];
_markerType params["_mShape","_mSize","_mBrush"]; _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 .... if ((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then // not an Icon ....
{ {
switch (_missionType) do { 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;}; 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"]]; // params["_name","_pos",["_color","ColorBlack"],["_text",""],["_icon","mil_triangle"]];
[_missionType,_markerPos, _markerColor,_markerLabel,_markerType select 0] call _blck_fn_configureIconMarker; [_missionType,_markerPos, _markerColor,_markerLabel,_markerType select 0] call _blck_fn_configureIconMarker;
}; };
//diag_log format["spawnMarker complete script for _this = %1",_this];