diff --git a/MPMissions/Exile.Altis/debug/blckClient.sqf b/MPMissions/Exile.Altis/debug/blckClient.sqf index ee16c5f..99211f1 100644 --- a/MPMissions/Exile.Altis/debug/blckClient.sqf +++ b/MPMissions/Exile.Altis/debug/blckClient.sqf @@ -1,10 +1,10 @@ //////////////////////////////////////////// // Start Server-side functions and Create, Display Mission Messages for blckeagls mission system for Arma 3 Epoch -// Last Updated 11/20/16 +// Last Updated 1/11/17 // by Ghostrider-DbD- ////////////////////////////////////////// -if (hasInterface) then +if !(isServer) then { //diag_log "[blckeagls] initializing client variables"; blck_MarkerPeristTime = 300; @@ -116,8 +116,6 @@ if (hasInterface) then blck_processingKill = -1; }; }; - - //"blck_Message" addPublicVariableEventHandler fn_handleMessage = { //private["_event","_msg","_mission"]; @@ -172,29 +170,16 @@ if (hasInterface) then }; - //diag_log "[blckeagls] spawning JIP markers"; - if (!isNil "blck_OrangeMarker") then {[blck_OrangeMarker] execVM "debug\spawnMarker.sqf"}; - if (!isNil "blck_GreenMarker") then {[blck_GreenMarker] execVM "debug\spawnMarker.sqf"}; - if (!isNil "blck_RedMarker") then {[blck_RedMarker] execVM "debug\spawnMarker.sqf"}; - if (!isNil "blck_BlueMarker") then {[blck_BlueMarker] execVM "debug\spawnMarker.sqf"}; + diag_log "blck client loaded ver 1/11/17 2.0 8 PM"; + diag_log "[blckeagls] starting client loop"; - diag_log "blck client loaded ver 8/14/16 1.0 7:47 AM"; - //diag_log "[blckeagls] starting client loop"; - private["_start"]; - _start = diag_tickTime; while {true} do { - if !(blck_Message isEqualTo "") then - { - diag_log format["[blckClient] blck_Message = %1", blck_message]; - private["_message"]; - _message = blck_message; - _message spawn fn_handleMessage; - blck_Message = ""; - } else - { - uiSleep 0.3; - }; + waitUntil {!(blck_message isEqualTo "")}; + //diag_log format["[blckClient] blck_Message = %1", blck_message]; + private["_message"]; + _message = blck_message; + _message spawn fn_handleMessage; + blck_Message = ""; }; -}; - +}; \ No newline at end of file diff --git a/MPMissions/Exile.Altis/debug/blckconfigs.sqf b/MPMissions/Exile.Altis/debug/blckconfigs.sqf new file mode 100644 index 0000000..1b1ce57 --- /dev/null +++ b/MPMissions/Exile.Altis/debug/blckconfigs.sqf @@ -0,0 +1,20 @@ +//////////////////////////////////////////// +// Define configurations for the client-side of the mission system +// Last Updated 11/20/16 +// by Ghostrider-DbD- +////////////////////////////////////////// + +//diag_log "[blckeagls] initializing client variables"; +blck_MarkerPeristTime = 300; +blck_useHint = true; +blck_useSystemChat = false; +blck_useTitleText = false; +blck_useDynamic = false; +blck_useToast = false; // Exile only +blck_aiKilluseSystemChat = true; +blck_aiKilluseDynamic = false; +blck_aiKilluseTitleText = false; +blck_processingMsg = -1; +blck_processingKill = -1; + + diff --git a/MPMissions/Exile.Altis/debug/spawnMarker.sqf b/MPMissions/Exile.Altis/debug/spawnMarker.sqf index 3c6bd4d..ac830f1 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"]]; - diag_log format["_blck_fn_configureIconMarker: _name=%1; _pos=%2; _color=%3; _text=%4",_name,_pos,_color,_text]; + if (blck_debugLevel > 2) then {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,19 +74,15 @@ _blck_fn_configureIconMarker = { _MainMarker setMarkerText _text; }; -if (isServer && (blck_debugLevel isEqualTo 3)) then -{ - 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"]; -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 (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 { diff --git a/MPMissions/epoch.Altis/debug/blckClient.sqf b/MPMissions/epoch.Altis/debug/blckClient.sqf index 5e1a86b..99211f1 100644 --- a/MPMissions/epoch.Altis/debug/blckClient.sqf +++ b/MPMissions/epoch.Altis/debug/blckClient.sqf @@ -1,18 +1,29 @@ //////////////////////////////////////////// // Start Server-side functions and Create, Display Mission Messages for blckeagls mission system for Arma 3 Epoch -// Last Updated 1/12/17 +// Last Updated 1/11/17 // by Ghostrider-DbD- ////////////////////////////////////////// -if (isServer || (!hasInterface)) exitWith {}; - - #include "blckconfigs.sqf"; - +if !(isServer) then +{ + //diag_log "[blckeagls] initializing client variables"; + blck_MarkerPeristTime = 300; + blck_useHint = false; + blck_useSystemChat = true; + blck_useTitleText = false; + blck_useDynamic = true; + blck_useToast = false; // Exile only + blck_aiKilluseSystemChat = true; + blck_aiKilluseDynamic = false; + blck_aiKilluseTitleText = false; + blck_processingMsg = -1; + blck_processingKill = -1; blck_message = ""; + fn_killScoreNotification = { params["_bonus","_distanceBonus","_killStreak"]; //diag_log format["fn_killScoreNotification:: -- >> _bonus = %1 | _distanceBonus = %2 | _killStreak = %3",_bonus,_distanceBonus,_killStreak]; - private _msg2 = format["AI Killed
"]; + _msg2 = format["AI Killed
"]; if (typeName _bonus isEqualTo "SCALAR") then // add message for the bonus { if (_bonus > 0) then @@ -34,7 +45,7 @@ if (isServer || (!hasInterface)) exitWith {}; _msg2 = _msg2 + format["Killstreak %1X
",_killStreak]; }; }; - [parseText _msg2,[0.0823437 * safezoneW + safezoneX,0.379 * safezoneH + safezoneY,0.0812109 * safezoneW,0.253 * safezoneH], nil, 3, 0.3, 0] spawn BIS_fnc_textTiles; + [parseText _msg2,[0.0823437 * safezoneW + safezoneX,0.379 * safezoneH + safezoneY,0.0812109 * safezoneW,0.253 * safezoneH], nil, 7, 0.3, 0] spawn BIS_fnc_textTiles; }; fn_dynamicNotification = { @@ -89,7 +100,7 @@ if (isServer || (!hasInterface)) exitWith {}; fn_AI_KilledNotification = { private["_message","_text","_screentime","_xcoord","_ycoord"]; _message = _this select 0; - //diag_log format["_fn_AI_KilledNotification ====] Paremeters: _message= %1", _message]; + //diag_log format["_fn_AI_KilledNotification ====] Paremeters _event %1 _message %2 _mission %3",_message]; if (blck_aiKilluseSystemChat) then {systemChat format["%1",_message];}; if (blck_aiKilluseTitleText) then {titleText [_message, "PLAIN DOWN",5];uiSleep 5; titleText ["", "PLAIN DOWN",5]}; if (blck_aiKilluseDynamic) then { @@ -105,30 +116,28 @@ if (isServer || (!hasInterface)) exitWith {}; blck_processingKill = -1; }; }; - - //"blck_Message" addPublicVariableEventHandler fn_handleMessage = { //private["_event","_msg","_mission"]; - //diag_log format["fn_handleMessage ====] Paremeters = _this = %1",_this]; + diag_log format["blck_Message ====] Paremeters = _this = %1",_this]; params["_event","_message",["_mission",""]]; - private _timer = 0; - //diag_log format["fn_handleMessage ====] Paremeters _event= %1 _message= %2 paramter #3= %3",_event,_message,_mission]; - //diag_log format["fn_handleMessage ====] _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; }; @@ -144,15 +153,14 @@ if (isServer || (!hasInterface)) exitWith {}; 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": { - //[1] spawn BIS_fnc_Earthquake; - private _msg = format["IED Detonated %1
"," **Vehicle Damaged** "]; - systemChat "IED Detonated Nearby: Vehicle Damaged"; - [parseText _msg,[0.314375 * safezoneW + safezoneX,0.687 * safezoneH + safezoneY,0.37125 * safezoneW,0.044 * safezoneH], nil, 3, 0.1, 0] spawn BIS_fnc_textTiles; - playSound "BattlefieldExplosions3_3D"; + [1] call BIS_fnc_Earthquake; + //["IED","Bandits targeted your vehicle with an IED"] call fn_dynamicNotification; + ["Bandits targeted your vehicle with an IED.", 5] call Epoch_message; + for "_i" from 1 to 3 do {playSound "BattlefieldExplosions3_3D";uiSleep 0.3;}; }; case "showScore": { @@ -174,6 +182,4 @@ if (isServer || (!hasInterface)) exitWith {}; _message spawn fn_handleMessage; blck_Message = ""; }; - - - +}; \ No newline at end of file diff --git a/MPMissions/epoch.Altis/initPlayerLocal.sqf b/MPMissions/epoch.Altis/init.sqf similarity index 100% rename from MPMissions/epoch.Altis/initPlayerLocal.sqf rename to MPMissions/epoch.Altis/init.sqf