diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..c0f6757 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# top-most EditorConfig file +root = true + +# every file +[*] +indent_style = tab +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.gitignore b/.gitignore index e9f3ca5..8eb3961 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ - *.pbo diff --git a/addons/@ocap/OcapReplaySaver2.cfg.json b/addons/@ocap/OcapReplaySaver2.cfg.json index bd7f02e..172bb43 100644 --- a/addons/@ocap/OcapReplaySaver2.cfg.json +++ b/addons/@ocap/OcapReplaySaver2.cfg.json @@ -1,10 +1,10 @@ { - "addFileUrl": "http://127.0.0.1:5000/data/receive.php?option=addFile", - "dbInsertUrl": "http://127.0.0.1:5000/data/receive.php?option=dbInsert", - "httpRequestTimeout": 120, - "newMode": 1, - "newServerGameType": "PvE", - "newUrl": "http://127.0.0.1:5000/api/v1/operations/add", - "newUrlRequestSecret": "temp123", - "traceLog": 0 + "addFileUrl": "http://127.0.0.1:5000/data/receive.php?option=addFile", + "dbInsertUrl": "http://127.0.0.1:5000/data/receive.php?option=dbInsert", + "httpRequestTimeout": 120, + "newMode": 1, + "newServerGameType": "PvE", + "newUrl": "http://127.0.0.1:5000/api/v1/operations/add", + "newUrlRequestSecret": "temp123", + "traceLog": 0 } diff --git a/addons/@ocap/OcapReplaySaver2.cfg.json.sample b/addons/@ocap/OcapReplaySaver2.cfg.json.sample index 74f977f..73c5228 100644 --- a/addons/@ocap/OcapReplaySaver2.cfg.json.sample +++ b/addons/@ocap/OcapReplaySaver2.cfg.json.sample @@ -1,10 +1,10 @@ { - "addFileUrl": "http://127.0.0.1/data/receive.php?option=addFile", - "dbInsertUrl": "http://127.0.0.1/data/receive.php?option=dbInsert", - "httpRequestTimeout": 120, - "newMode": 0, - "newServerGameType": "TvT", - "newUrl": "https://127.0.0.1/api/v1/operations/add", - "newUrlRequestSecret": "pwd1234", - "traceLog": 0 + "addFileUrl": "http://127.0.0.1/data/receive.php?option=addFile", + "dbInsertUrl": "http://127.0.0.1/data/receive.php?option=dbInsert", + "httpRequestTimeout": 120, + "newMode": 0, + "newServerGameType": "TvT", + "newUrl": "https://127.0.0.1/api/v1/operations/add", + "newUrlRequestSecret": "pwd1234", + "traceLog": 0 } diff --git a/addons/@ocap/addons/ocap/config.cpp b/addons/@ocap/addons/ocap/config.cpp index 6d6f3a7..cd51e41 100644 --- a/addons/@ocap/addons/ocap/config.cpp +++ b/addons/@ocap/addons/ocap/config.cpp @@ -63,4 +63,4 @@ class CfgRemoteExec allowedTargets = 0; }; }; -}; \ No newline at end of file +}; diff --git a/addons/@ocap/addons/ocap/functions/fn_addEventHandlers.sqf b/addons/@ocap/addons/ocap/functions/fn_addEventHandlers.sqf index e65aca1..57a5c9e 100644 --- a/addons/@ocap/addons/ocap/functions/fn_addEventHandlers.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_addEventHandlers.sqf @@ -1,3 +1,3 @@ if ((_this call BIS_fnc_objectType) # 0 == "Soldier") then {_this addEventHandler ["FiredMan", {_this spawn ocap_fnc_eh_fired}]}; _this addEventHandler ["Hit", {_this spawn ocap_fnc_eh_hit}]; -if ((_this call BIS_fnc_objectType) # 0 == "Soldier") then {ocap_fnc_trackAceThrowing remoteExec ["call", _this]}; \ No newline at end of file +if ((_this call BIS_fnc_objectType) # 0 == "Soldier") then {ocap_fnc_trackAceThrowing remoteExec ["call", _this]}; diff --git a/addons/@ocap/addons/ocap/functions/fn_addEventMission.sqf b/addons/@ocap/addons/ocap/functions/fn_addEventMission.sqf index d728ac8..d99f433 100644 --- a/addons/@ocap/addons/ocap/functions/fn_addEventMission.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_addEventMission.sqf @@ -33,7 +33,7 @@ if (ocap_saveMissionEnded) then { // Custom event handler ocap_customEvent_handle = ["ocap_handleCustomEvent", { params ["_eventName", "_eventMessage"]; - [":EVENT:", + [":EVENT:", [ocap_captureFrameNo, _eventName, _eventMessage] ] call ocap_fnc_extension; }] call CBA_fnc_addEventHandler; @@ -46,4 +46,4 @@ call ocap_fnc_handleMarkers; ["WMT_fnc_EndMission", { _this call ocap_fnc_exportData; -}] call CBA_fnc_addEventHandler; \ No newline at end of file +}] call CBA_fnc_addEventHandler; diff --git a/addons/@ocap/addons/ocap/functions/fn_eh_connected.sqf b/addons/@ocap/addons/ocap/functions/fn_eh_connected.sqf index dcad6fe..6a6f47a 100644 --- a/addons/@ocap/addons/ocap/functions/fn_eh_connected.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_eh_connected.sqf @@ -1,3 +1,3 @@ -[":EVENT:", +[":EVENT:", [ocap_captureFrameNo, "connected", _this select 2] -] call ocap_fnc_extension; \ No newline at end of file +] call ocap_fnc_extension; diff --git a/addons/@ocap/addons/ocap/functions/fn_eh_disconnected.sqf b/addons/@ocap/addons/ocap/functions/fn_eh_disconnected.sqf index e717e06..69b88cc 100644 --- a/addons/@ocap/addons/ocap/functions/fn_eh_disconnected.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_eh_disconnected.sqf @@ -1,3 +1,3 @@ -[":EVENT:", +[":EVENT:", [ocap_captureFrameNo, "disconnected", _this select 3] -] call ocap_fnc_extension; \ No newline at end of file +] call ocap_fnc_extension; diff --git a/addons/@ocap/addons/ocap/functions/fn_eh_fired.sqf b/addons/@ocap/addons/ocap/functions/fn_eh_fired.sqf index 8b6a9d5..ad6bd17 100644 --- a/addons/@ocap/addons/ocap/functions/fn_eh_fired.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_eh_fired.sqf @@ -61,7 +61,7 @@ if (_ammoSimType isEqualTo "shotBullet") then { _markTextLocal = format["%1 - %2", _muzzleDisp, _magDisp]; }; }; - + _markName = format["Projectile#%1", _int]; _markColor = "ColorRed"; _markerType = ""; @@ -131,4 +131,4 @@ if (_ammoSimType isEqualTo "shotBullet") then { // deleteMarkerLocal _markName; // }; ["ocap_handleMarker", ["DELETED", _markName]] call CBA_fnc_localEvent; -}; \ No newline at end of file +}; diff --git a/addons/@ocap/addons/ocap/functions/fn_eh_killed.sqf b/addons/@ocap/addons/ocap/functions/fn_eh_killed.sqf index 0b819a5..8a93fdc 100644 --- a/addons/@ocap/addons/ocap/functions/fn_eh_killed.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_eh_killed.sqf @@ -1,100 +1,99 @@ params ["_victim", "_killer", "_instigator"]; if !(_victim getvariable ["ocapIsKilled",false]) then { - _victim setvariable ["ocapIsKilled",true]; + _victim setvariable ["ocapIsKilled",true]; - [_victim, _killer, _instigator] spawn { - params ["_victim", "_killer", "_instigator"]; - private _frame = ocap_captureFrameNo; - if (_killer == _victim) then { - private _time = diag_tickTime; - [_victim, { - _this setVariable ["ace_medical_lastDamageSource", (_this getVariable "ace_medical_lastDamageSource"), 2]; - }] remoteExec ["call", _victim]; - waitUntil {diag_tickTime - _time > 10 || !(isNil {_victim getVariable "ace_medical_lastDamageSource"})}; - _killer = _victim getVariable ["ace_medical_lastDamageSource", _killer]; - } else { - _killer - }; - if (isNull _instigator) then { - _instigator = UAVControl vehicle _killer select 0 - }; - if ((isNull _instigator) || (_instigator == _victim)) then { - _instigator = _killer - }; - if (_instigator isKindOf "AllVehicles") then { - // _instigator = effectiveCommander _instigator - _instigator = call { - if(alive(gunner _instigator))exitWith{gunner _instigator}; - if(alive(commander _instigator))exitWith{commander _instigator}; - if(alive(driver _instigator))exitWith{driver _instigator}; - effectiveCommander _instigator - }; - }; - if (isNull _instigator) then { - _instigator = _killer - }; + [_victim, _killer, _instigator] spawn { + params ["_victim", "_killer", "_instigator"]; + private _frame = ocap_captureFrameNo; + if (_killer == _victim) then { + private _time = diag_tickTime; + [_victim, { + _this setVariable ["ace_medical_lastDamageSource", (_this getVariable "ace_medical_lastDamageSource"), 2]; + }] remoteExec ["call", _victim]; + waitUntil {diag_tickTime - _time > 10 || !(isNil {_victim getVariable "ace_medical_lastDamageSource"})}; + _killer = _victim getVariable ["ace_medical_lastDamageSource", _killer]; + } else { + _killer + }; + if (isNull _instigator) then { + _instigator = UAVControl vehicle _killer select 0 + }; + if ((isNull _instigator) || (_instigator == _victim)) then { + _instigator = _killer + }; + if (_instigator isKindOf "AllVehicles") then { + // _instigator = effectiveCommander _instigator + _instigator = call { + if(alive(gunner _instigator))exitWith{gunner _instigator}; + if(alive(commander _instigator))exitWith{commander _instigator}; + if(alive(driver _instigator))exitWith{driver _instigator}; + effectiveCommander _instigator + }; + }; + if (isNull _instigator) then { + _instigator = _killer + }; - // [ocap_captureFrameNo, "killed", _victimId, ["null"], -1]; - private _victimId = _victim getVariable ["ocap_id", -1]; - if (_victimId == -1) exitWith {}; - private _eventData = [_frame, "killed", _victimId, ["null"], -1]; + // [ocap_captureFrameNo, "killed", _victimId, ["null"], -1]; + private _victimId = _victim getVariable ["ocap_id", -1]; + if (_victimId == -1) exitWith {}; + private _eventData = [_frame, "killed", _victimId, ["null"], -1]; - if (!isNull _instigator) then { - _killerId = _instigator getVariable ["ocap_id", -1]; - if (_killerId != -1) then { - private _killerInfo = []; - if (_instigator isKindOf "CAManBase") then { - if (vehicle _instigator != _instigator) then { + if (!isNull _instigator) then { + _killerId = _instigator getVariable ["ocap_id", -1]; + if (_killerId != -1) then { + private _killerInfo = []; + if (_instigator isKindOf "CAManBase") then { + if (vehicle _instigator != _instigator) then { - // pilot/driver doesn't return a value, so check for this - private _turPath = []; - if (count (assignedVehicleRole _instigator) > 1) then { - _turPath = assignedVehicleRole _instigator select 1; - } else { - _turPath = [-1]; - }; + // pilot/driver doesn't return a value, so check for this + private _turPath = []; + if (count (assignedVehicleRole _instigator) > 1) then { + _turPath = assignedVehicleRole _instigator select 1; + } else { + _turPath = [-1]; + }; - private _curVic = getText(configFile >> "CfgVehicles" >> (typeOf vehicle _instigator) >> "displayName"); - private _curWepInfo = weaponstate [vehicle _instigator, _turPath]; - _curWepInfo params ["_curWep", "_curMuzzle", "_curFiremode", "_curMag"]; - private _curWepDisplayName = getText(configFile >> "CfgWeapons" >> _curWep >> "displayName"); - private _curMagDisplayName = getText(configFile >> "CfgMagazines" >> _curMag >> "displayName"); - - private _text = ""; - if (count _curMagDisplayName < 22) then { - _text = _curVic + " [" + _curWepDisplayName + " / " + _curMagDisplayName + "]"; - } else { - if (_curWep != _curMuzzle) then { - _text = _curVic + " [" + _curWepDisplayName + " / " + _curMuzzle + "]"; - } else { - _text = _curVic + " [" + _curWepDisplayName + "]"; - }; - }; + private _curVic = getText(configFile >> "CfgVehicles" >> (typeOf vehicle _instigator) >> "displayName"); + private _curWepInfo = weaponstate [vehicle _instigator, _turPath]; + _curWepInfo params ["_curWep", "_curMuzzle", "_curFiremode", "_curMag"]; + private _curWepDisplayName = getText(configFile >> "CfgWeapons" >> _curWep >> "displayName"); + private _curMagDisplayName = getText(configFile >> "CfgMagazines" >> _curMag >> "displayName"); + private _text = ""; + if (count _curMagDisplayName < 22) then { + _text = _curVic + " [" + _curWepDisplayName + " / " + _curMagDisplayName + "]"; + } else { + if (_curWep != _curMuzzle) then { + _text = _curVic + " [" + _curWepDisplayName + " / " + _curMuzzle + "]"; + } else { + _text = _curVic + " [" + _curWepDisplayName + "]"; + }; + }; - _killerInfo = [ - _killerId, - _text - ]; - } else { - _killerInfo = [ - _killerId, - getText (configFile >> "CfgWeapons" >> currentWeapon _instigator >> "displayName") - ]; - }; - } else { - _killerInfo = [_killerId]; - }; + _killerInfo = [ + _killerId, + _text + ]; + } else { + _killerInfo = [ + _killerId, + getText (configFile >> "CfgWeapons" >> currentWeapon _instigator >> "displayName") + ]; + }; + } else { + _killerInfo = [_killerId]; + }; - _eventData = [ - _frame, - "killed", - _victimId, - _killerInfo, - round(_instigator distance _victim) - ]; - }; - }; + _eventData = [ + _frame, + "killed", + _victimId, + _killerInfo, + round(_instigator distance _victim) + ]; + }; + }; - [":EVENT:", _eventData] call ocap_fnc_extension; - }; -}; \ No newline at end of file + [":EVENT:", _eventData] call ocap_fnc_extension; + }; +}; diff --git a/addons/@ocap/addons/ocap/functions/fn_exportData.sqf b/addons/@ocap/addons/ocap/functions/fn_exportData.sqf index e4fe3cf..ff74f5d 100644 --- a/addons/@ocap/addons/ocap/functions/fn_exportData.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_exportData.sqf @@ -33,4 +33,4 @@ if (ocap_needToSave) then { }; } else { LOG(["ocap_needToSave is set to false. Not saving"]); -}; \ No newline at end of file +}; diff --git a/addons/@ocap/addons/ocap/functions/fn_extension.sqf b/addons/@ocap/addons/ocap/functions/fn_extension.sqf index c7b3766..20b6b84 100644 --- a/addons/@ocap/addons/ocap/functions/fn_extension.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_extension.sqf @@ -8,4 +8,4 @@ _res params ["_result","_returnCode","_errorCode"]; if (_errorCode != 0 || _returnCode != 0) then { diag_log ["fnc_callextension_zlt.sqf: Error: ", _result, _returnCode, _errorCode, _command, _args]; -} \ No newline at end of file +} diff --git a/addons/@ocap/addons/ocap/functions/fn_getDelay.sqf b/addons/@ocap/addons/ocap/functions/fn_getDelay.sqf index 40db4f0..263880b 100644 --- a/addons/@ocap/addons/ocap/functions/fn_getDelay.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_getDelay.sqf @@ -18,4 +18,4 @@ isNil { _sleep = 0; }; }; -_sleep \ No newline at end of file +_sleep diff --git a/addons/@ocap/addons/ocap/functions/fn_getUnitType.sqf b/addons/@ocap/addons/ocap/functions/fn_getUnitType.sqf index 3faf3ed..e4defd2 100644 --- a/addons/@ocap/addons/ocap/functions/fn_getUnitType.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_getUnitType.sqf @@ -68,4 +68,4 @@ if (_role == "Man") then { }; }; -_role; \ No newline at end of file +_role; diff --git a/addons/@ocap/addons/ocap/functions/fn_handleMarkers.sqf b/addons/@ocap/addons/ocap/functions/fn_handleMarkers.sqf index 299f2a6..31ed963 100644 --- a/addons/@ocap/addons/ocap/functions/fn_handleMarkers.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_handleMarkers.sqf @@ -5,17 +5,12 @@ ocap_markers_tracked = []; // Markers which we saves into replay // create CBA event handler to be called on server ocap_markers_handle = ["ocap_handleMarker", { - params["_eventType", "_mrk_name", "_mrk_owner", "_pos", "_type", "_shape", "_size", "_dir", "_brush", "_color", "_alpha", "_text", "_forceGlobal"]; - - - switch (_eventType) do { case "CREATED":{ - - LOG(ARR2("MARKER:CREATE: Processing marker data -- ", _this)); + LOG(ARR2("MARKER:CREATE: Processing marker data -- ", _this)); private _validate = false; if (_mrk_name in ocap_markers_tracked) then { @@ -33,97 +28,94 @@ ocap_markers_handle = ["ocap_handleMarker", { _validate = true; }; }; - - if (_validate) then { - LOG(ARR4("MARKER:CREATE: Valid CREATED process of marker from", _mrk_owner, "for", _mrk_name)); + if (_validate) then { + LOG(ARR4("MARKER:CREATE: Valid CREATED process of marker from", _mrk_owner, "for", _mrk_name)); - if (_type isEqualTo "") then {_type = "mil_dot"}; - ocap_markers_tracked pushBackUnique _mrk_name; + if (_type isEqualTo "") then {_type = "mil_dot"}; + ocap_markers_tracked pushBackUnique _mrk_name; - private _mrk_color = ""; - private _mrk_colorRaw = getarray (configfile >> "CfgMarkerColors" >> _color >> "color"); - if ((_mrk_colorRaw # 0) isEqualType "" || _color == "Default") then { - _typeSplit = _type select [0, 2]; - if ( - _color == "ColorEAST" || - _typeSplit == "o_" - ) then { - _mrk_color = "#800000"; - } else { + private _mrk_color = ""; + private _mrk_colorRaw = getarray (configfile >> "CfgMarkerColors" >> _color >> "color"); + if ((_mrk_colorRaw # 0) isEqualType "" || _color == "Default") then { + _typeSplit = _type select [0, 2]; if ( - _color == "ColorWEST" || - _typeSplit == "b_" + _color == "ColorEAST" || + _typeSplit == "o_" ) then { - _mrk_color = "#004C99"; + _mrk_color = "#800000"; } else { if ( - _color == "ColorGUER" || - _typeSplit == "n_" + _color == "ColorWEST" || + _typeSplit == "b_" ) then { - _mrk_color = "#008000"; + _mrk_color = "#004C99"; } else { if ( - _color == "ColorCIV" || - _typeSplit == "c_" + _color == "ColorGUER" || + _typeSplit == "n_" ) then { - _mrk_color = "#660080"; - } else { + _mrk_color = "#008000"; + } else { if ( - _color == "ColorUNKNOWN" || - _typeSplit == "u_" + _color == "ColorCIV" || + _typeSplit == "c_" ) then { - _mrk_color = "#B29900"; - } else { - _mrk_color = "#000000"; + _mrk_color = "#660080"; + } else { + if ( + _color == "ColorUNKNOWN" || + _typeSplit == "u_" + ) then { + _mrk_color = "#B29900"; + } else { + _mrk_color = "#000000"; + }; }; }; }; }; + } else { + _mrk_colorRaw = getarray (configfile >> "CfgMarkerColors" >> _color >> "color"); + _mrk_color = (_mrk_colorRaw call bis_fnc_colorRGBtoHTML); }; - } else { - _mrk_colorRaw = getarray (configfile >> "CfgMarkerColors" >> _color >> "color"); - _mrk_color = (_mrk_colorRaw call bis_fnc_colorRGBtoHTML); - }; - - private ["_sideOfMarker"]; - if (_mrk_owner isEqualTo objNull) then { - _forceGlobal = true; - _mrk_owner = -1; - _sideOfMarker = -1; - } else { - _sideOfMarker = (side _mrk_owner) call BIS_fnc_sideID; - _mrk_owner = _mrk_owner getVariable["ocap_id", 0]; - }; - - if (_sideOfMarker isEqualTo 4 || - (["Projectile#", _mrk_name] call BIS_fnc_inString) || - (["Detonation#", _mrk_name] call BIS_fnc_inString) || - (["Mine#", _mrk_name] call BIS_fnc_inString) || - (["ObjectMarker", _mrk_name] call BIS_fnc_inString) || - (["moduleCoverMap", _mrk_name] call BIS_fnc_inString) || - (!isNil "_forceGlobal")) then {_sideOfMarker = -1}; - - private ["_polylinePos"]; - if (count _pos > 2) then { - _polylinePos = []; - for [{_i = 0}, {_i < ((count _pos) - 1)}, {_i = _i + 1}] do { - _polylinePos pushBack [_pos # (_i), _pos # (_i + 1)]; - _i = _i + 1; + private ["_sideOfMarker"]; + if (_mrk_owner isEqualTo objNull) then { + _forceGlobal = true; + _mrk_owner = -1; + _sideOfMarker = -1; + } else { + _sideOfMarker = (side _mrk_owner) call BIS_fnc_sideID; + _mrk_owner = _mrk_owner getVariable["ocap_id", 0]; }; - _pos = _polylinePos; - }; - if (isNil "_dir") then { - _dir = 0; - } else {if (_dir isEqualTo "") then {_dir = 0}}; + if (_sideOfMarker isEqualTo 4 || + (["Projectile#", _mrk_name] call BIS_fnc_inString) || + (["Detonation#", _mrk_name] call BIS_fnc_inString) || + (["Mine#", _mrk_name] call BIS_fnc_inString) || + (["ObjectMarker", _mrk_name] call BIS_fnc_inString) || + (["moduleCoverMap", _mrk_name] call BIS_fnc_inString) || + (!isNil "_forceGlobal")) then {_sideOfMarker = -1}; + + private ["_polylinePos"]; + if (count _pos > 2) then { + _polylinePos = []; + for [{_i = 0}, {_i < ((count _pos) - 1)}, {_i = _i + 1}] do { + _polylinePos pushBack [_pos # (_i), _pos # (_i + 1)]; + _i = _i + 1; + }; + _pos = _polylinePos; + }; + if (isNil "_dir") then { + _dir = 0; + } else {if (_dir isEqualTo "") then {_dir = 0}}; - private _logParams = (str [_mrk_name, _dir, _type, _text, ocap_captureFrameNo, -1, _mrk_owner, _mrk_color, _size, _sideOfMarker, _pos, _shape, _alpha, _brush]); - LOG(ARR4("CREATE:MARKER: Valid CREATED process of", _mrk_name, ", sending to extension -- ", _logParams)); + private _logParams = (str [_mrk_name, _dir, _type, _text, ocap_captureFrameNo, -1, _mrk_owner, _mrk_color, _size, _sideOfMarker, _pos, _shape, _alpha, _brush]); + LOG(ARR4("CREATE:MARKER: Valid CREATED process of", _mrk_name, ", sending to extension -- ", _logParams)); - [":MARKER:CREATE:", [_mrk_name, _dir, _type, _text, ocap_captureFrameNo, -1, _mrk_owner, _mrk_color, _size, _sideOfMarker, _pos, _shape, _alpha, _brush]] call ocap_fnc_extension; + [":MARKER:CREATE:", [_mrk_name, _dir, _type, _text, ocap_captureFrameNo, -1, _mrk_owner, _mrk_color, _size, _sideOfMarker, _pos, _shape, _alpha, _brush]] call ocap_fnc_extension; }; }; @@ -266,4 +258,4 @@ ocap_markers_handle = ["ocap_handleMarker", { LOG(["GETINITIALMARKERS: Successfully parsed init-scripted and editor-placed markers"]); } -] call CBA_fnc_waitUntilAndExecute; \ No newline at end of file +] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/@ocap/addons/ocap/functions/fn_trackAceExplLife.sqf b/addons/@ocap/addons/ocap/functions/fn_trackAceExplLife.sqf index 68a9c38..7a0154f 100644 --- a/addons/@ocap/addons/ocap/functions/fn_trackAceExplLife.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_trackAceExplLife.sqf @@ -45,4 +45,4 @@ if (_nearMines isEqualTo []) then { sleep 10; ["ocap_handleMarker", ["DELETED", _markName]] call CBA_fnc_localEvent; }; -}; \ No newline at end of file +}; diff --git a/addons/@ocap/addons/ocap/functions/fn_trackAceExplPlace.sqf b/addons/@ocap/addons/ocap/functions/fn_trackAceExplPlace.sqf index 7c5dc1e..153fa7c 100644 --- a/addons/@ocap/addons/ocap/functions/fn_trackAceExplPlace.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_trackAceExplPlace.sqf @@ -5,4 +5,4 @@ _placedPos = getPos (_this # 0); [(_this # 0), _placedPos] spawn ocap_fnc_trackAceExplLife; -}] call CBA_fnc_addClassEventHandler; \ No newline at end of file +}] call CBA_fnc_addClassEventHandler; diff --git a/addons/@ocap/addons/ocap/functions/fn_trackAceRemoteDet.sqf b/addons/@ocap/addons/ocap/functions/fn_trackAceRemoteDet.sqf index 8982045..9a8c12c 100644 --- a/addons/@ocap/addons/ocap/functions/fn_trackAceRemoteDet.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_trackAceRemoteDet.sqf @@ -1,6 +1,6 @@ // LOG ACE REMOTE DET EVENTS [{ - params ["_unit", "_range", "_explosive", "_fuzeTime", "_triggerItem"]; + params ["_unit", "_range", "_explosive", "_fuzeTime", "_triggerItem"]; _int = random 2000; @@ -28,4 +28,4 @@ }; true; -}] call ace_explosives_fnc_addDetonateHandler; \ No newline at end of file +}] call ace_explosives_fnc_addDetonateHandler; diff --git a/addons/@ocap/addons/ocap/functions/fn_trackAceThrowing.sqf b/addons/@ocap/addons/ocap/functions/fn_trackAceThrowing.sqf index 51e0879..1d35dda 100644 --- a/addons/@ocap/addons/ocap/functions/fn_trackAceThrowing.sqf +++ b/addons/@ocap/addons/ocap/functions/fn_trackAceThrowing.sqf @@ -1,104 +1,101 @@ trackThrows = ["ace_throwableThrown", { - _this spawn { - - params["_unit", "_projectile"]; - - if (isNull _projectile) then { - _projectile = nearestObject [_unit, "CA_Magazine"]; - }; - - // systemChat str _this; - - // note that thrown objects outside of ACE explosives do not include a "default magazine" property in their config. - // this script will attempt to find a matching classname in CfgMagazines, as some chemlights and smokes are built this way. - // if not found, a default magazine value will be assigned (m67 frag, white smoke, green chemlight) - - _projType = typeOf _projectile; - _projConfig = configOf _projectile; - _projName = getText(configFile >> "CfgAmmo" >> _projType >> "displayName"); - - // systemChat format["Config name: %1", configOf _projectile]; - - _ammoSimType = getText(configFile >> "CfgAmmo" >> _projType >> "simulation"); - // systemChat format["Projectile type: %1", _ammoSimType]; - - _markerType = ""; - _markColor = ""; - _magDisp = ""; - _magPic = ""; - - _magType = getText(_projConfig >> "defaultMagazine"); - if (_magType == "") then { - _magType = configName(configfile >> "CfgMagazines" >> _projType) - }; - - if (!(_magType isEqualTo "")) then { - // systemChat format["Mag type: %1", _magType]; - - _magDisp = getText(configFile >> "CfgMagazines" >> _magType >> "displayNameShort"); - if (_magDisp == "") then { - _magDisp = getText(configFile >> "CfgMagazines" >> _magType >> "displayName") - }; - if (_magDisp == "") then { - _magDisp = _projName; - }; - - _magPic = (getText(configfile >> "CfgMagazines" >> _magType >> "picture")); - // hint parseText format["Projectile fired:
", _magPic]; - if (_magPic == "") then { - _markerType = "mil_triangle"; - _markColor = "ColorRed"; - } else { - _magPicSplit = _magPic splitString "\"; - _magPic = _magPicSplit#((count _magPicSplit) - 1); - _markerType = format["magIcons/%1", _magPic]; - _markColor = "ColorWhite"; - }; - } else { - _markerType = "mil_triangle"; - _markColor = "ColorRed"; - // set defaults based on ammo sim type, if no magazine could be matched - switch (_ammoSimType) do { - case "shotGrenade":{ - _magPic = "\A3\Weapons_F\Data\UI\gear_M67_CA.paa"; - _magDisp = "Frag"; - }; - case "shotSmokeX":{ - _magPic = "\A3\Weapons_f\data\ui\gear_smokegrenade_white_ca.paa"; - _magDisp = "Smoke"; - }; - case "shotIlluminating":{ - _magPic = "\A3\Weapons_F\Data\UI\gear_flare_white_ca.paa"; - _magDisp = "Flare"; - }; - default { - _magPic = "\A3\Weapons_F\Data\UI\gear_M67_CA.paa"; - _magDisp = "Frag"; - }; - }; - // hint parseText format["Projectile fired:
", _magPic]; - _magPicSplit = _magPic splitString "\"; - _magPic = _magPicSplit#((count _magPicSplit) - 1); - _markerType = format["magIcons/%1", _magPic]; - _markColor = "ColorWhite"; - }; - - - - - if (!(_ammoSimType isEqualTo "shotBullet")) then { + _this spawn { + + params["_unit", "_projectile"]; + + if (isNull _projectile) then { + _projectile = nearestObject [_unit, "CA_Magazine"]; + }; + + // systemChat str _this; + + // note that thrown objects outside of ACE explosives do not include a "default magazine" property in their config. + // this script will attempt to find a matching classname in CfgMagazines, as some chemlights and smokes are built this way. + // if not found, a default magazine value will be assigned (m67 frag, white smoke, green chemlight) + + _projType = typeOf _projectile; + _projConfig = configOf _projectile; + _projName = getText(configFile >> "CfgAmmo" >> _projType >> "displayName"); + + // systemChat format["Config name: %1", configOf _projectile]; + + _ammoSimType = getText(configFile >> "CfgAmmo" >> _projType >> "simulation"); + // systemChat format["Projectile type: %1", _ammoSimType]; + + _markerType = ""; + _markColor = ""; + _magDisp = ""; + _magPic = ""; + + _magType = getText(_projConfig >> "defaultMagazine"); + if (_magType == "") then { + _magType = configName(configfile >> "CfgMagazines" >> _projType) + }; + + if (!(_magType isEqualTo "")) then { + // systemChat format["Mag type: %1", _magType]; + + _magDisp = getText(configFile >> "CfgMagazines" >> _magType >> "displayNameShort"); + if (_magDisp == "") then { + _magDisp = getText(configFile >> "CfgMagazines" >> _magType >> "displayName") + }; + if (_magDisp == "") then { + _magDisp = _projName; + }; + + _magPic = (getText(configfile >> "CfgMagazines" >> _magType >> "picture")); + // hint parseText format["Projectile fired:
", _magPic]; + if (_magPic == "") then { + _markerType = "mil_triangle"; + _markColor = "ColorRed"; + } else { + _magPicSplit = _magPic splitString "\"; + _magPic = _magPicSplit#((count _magPicSplit) - 1); + _markerType = format["magIcons/%1", _magPic]; + _markColor = "ColorWhite"; + }; + } else { + _markerType = "mil_triangle"; + _markColor = "ColorRed"; + // set defaults based on ammo sim type, if no magazine could be matched + switch (_ammoSimType) do { + case "shotGrenade":{ + _magPic = "\A3\Weapons_F\Data\UI\gear_M67_CA.paa"; + _magDisp = "Frag"; + }; + case "shotSmokeX":{ + _magPic = "\A3\Weapons_f\data\ui\gear_smokegrenade_white_ca.paa"; + _magDisp = "Smoke"; + }; + case "shotIlluminating":{ + _magPic = "\A3\Weapons_F\Data\UI\gear_flare_white_ca.paa"; + _magDisp = "Flare"; + }; + default { + _magPic = "\A3\Weapons_F\Data\UI\gear_M67_CA.paa"; + _magDisp = "Frag"; + }; + }; + // hint parseText format["Projectile fired:
", _magPic]; + _magPicSplit = _magPic splitString "\"; + _magPic = _magPicSplit#((count _magPicSplit) - 1); + _markerType = format["magIcons/%1", _magPic]; + _markColor = "ColorWhite"; + }; + + if (!(_ammoSimType isEqualTo "shotBullet")) then { _int = random 2000; - - _markTextLocal = format["%1", _magDisp]; - _markName = format["Projectile#%1", _int]; + + _markTextLocal = format["%1", _magDisp]; + _markName = format["Projectile#%1", _int]; _throwerPos = getPos _unit; _throwerPos resize 2; - + ["ocap_handleMarker", ["CREATED", _markName, _unit, _throwerPos, _markerType, "ICON", [1,1], 0, "Solid", _markColor, 1, _markTextLocal, true]] call CBA_fnc_serverEvent; - private _lastPos = []; + private _lastPos = []; waitUntil { _pos = getPosATL _projectile; if (((_pos select 0) isEqualTo 0) || isNull _projectile) exitWith { @@ -106,18 +103,18 @@ trackThrows = ["ace_throwableThrown", { }; _lastPos = _pos; ["ocap_handleMarker", ["UPDATED", _markName, _unit, [_pos # 0, _pos # 1], "", "", "", 0, "", "", 1]] call CBA_fnc_serverEvent; - sleep 0.1; - false; + sleep 0.1; + false; + }; + + if !((count _lastPos) isEqualTo 0) then { + // if (count _lastPos == 3) then { + _lastPos resize 2; + ["ocap_handleMarker", ["UPDATED", _markName, _unit, _lastPos, "", "", "", 0, "", "", 1]] call CBA_fnc_serverEvent; }; - if !((count _lastPos) isEqualTo 0) then { - // if (count _lastPos == 3) then { - _lastPos resize 2; - ["ocap_handleMarker", ["UPDATED", _markName, _unit, _lastPos, "", "", "", 0, "", "", 1]] call CBA_fnc_serverEvent; - }; - - sleep 10; - ["ocap_handleMarker", ["DELETED", _markName]] call CBA_fnc_serverEvent; - }; - }; -}] call CBA_fnc_addEventHandler; \ No newline at end of file + sleep 10; + ["ocap_handleMarker", ["DELETED", _markName]] call CBA_fnc_serverEvent; + }; + }; +}] call CBA_fnc_addEventHandler; diff --git a/addons/@ocap/addons/ocap/functions/markerTestingChecklist.txt b/addons/@ocap/addons/ocap/functions/markerTestingChecklist.txt index 7fdd68c..73c4c97 100644 --- a/addons/@ocap/addons/ocap/functions/markerTestingChecklist.txt +++ b/addons/@ocap/addons/ocap/functions/markerTestingChecklist.txt @@ -16,4 +16,4 @@ Testing Checklist: - 1 icon with text, rotated - 1 icon without text, rotated - 1 icon of type "Infantry", "Armor", etc, rotated - - at least one drawn line (CTRL+Click/Drag) \ No newline at end of file + - at least one drawn line (CTRL+Click/Drag) diff --git a/addons/@ocap/addons/ocap/functions/script_macros.hpp b/addons/@ocap/addons/ocap/functions/script_macros.hpp index 266cd69..d1f39d9 100644 --- a/addons/@ocap/addons/ocap/functions/script_macros.hpp +++ b/addons/@ocap/addons/ocap/functions/script_macros.hpp @@ -1 +1 @@ -#include "\ocap\script_macros.hpp" \ No newline at end of file +#include "\ocap\script_macros.hpp" diff --git a/addons/@ocap/addons/ocap/script_macros.hpp b/addons/@ocap/addons/ocap/script_macros.hpp index eaf2b3f..e2b595c 100644 --- a/addons/@ocap/addons/ocap/script_macros.hpp +++ b/addons/@ocap/addons/ocap/script_macros.hpp @@ -1,4 +1,4 @@ -#define REQUIRED_VERSION 2.0 +#define REQUIRED_VERSION 2.0 #define LOG(_args) [":LOG:", _args] call ocap_fnc_extension #define BOOL(_cond) ([0,1] select (_cond)) @@ -6,4 +6,4 @@ #define ARR3(_arg1, _arg2, _arg3) [_arg1, _arg2, _arg3] #define ARR4(_arg1, _arg2, _arg3, _arg4) [_arg1, _arg2, _arg3, _arg4] #define ARR5(_arg1, _arg2, _arg3, _arg4, _arg5) [_arg1, _arg2, _arg3, _arg4, _arg5] -#define ARR6(_arg1, _arg2, _arg3, _arg4, _arg5, _arg6) [_arg1, _arg2, _arg3, _arg4, _arg5, _arg6] \ No newline at end of file +#define ARR6(_arg1, _arg2, _arg3, _arg4, _arg5, _arg6) [_arg1, _arg2, _arg3, _arg4, _arg5, _arg6] diff --git a/addons/@ocap/licence.txt b/addons/@ocap/licence.txt index 0847d8c..ba93af7 100644 --- a/addons/@ocap/licence.txt +++ b/addons/@ocap/licence.txt @@ -14,4 +14,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . \ No newline at end of file +along with this program. If not, see . diff --git a/addons/@ocap/mod.cpp b/addons/@ocap/mod.cpp index 0c1a503..4a2a884 100644 --- a/addons/@ocap/mod.cpp +++ b/addons/@ocap/mod.cpp @@ -1,11 +1,11 @@ -name = "OCAP"; // Name of your mod -picture = "logo_ocap.paa"; // Picture displayed from the expansions menu. Optimal size is 2048x1024 -//logoSmall = "\Samples_F\Data_01\Logos\logo_small.paa"; // Display next to the item added by the mod -//logo = "\Samples_F\Data_01\Logos\logo.paa"; // Logo displayed in the main menu -//logoOver = "\Samples_F\Data_01\Logos\logoOver.paa"; // When the mouse is over, in the main menu -actionName = "Github"; // Text displayed on the "website" button -action = "https://github.com/OCAPv2"; // Website URL, that can accessed from the expansions menu -tooltipOwned = "Operation Capture and Playback v2"; // Tool tip displayed when the mouse is left over, in the main menu +name = "OCAP"; // Name of your mod +picture = "logo_ocap.paa"; // Picture displayed from the expansions menu. Optimal size is 2048x1024 +//logoSmall = "\Samples_F\Data_01\Logos\logo_small.paa"; // Display next to the item added by the mod +//logo = "\Samples_F\Data_01\Logos\logo.paa"; // Logo displayed in the main menu +//logoOver = "\Samples_F\Data_01\Logos\logoOver.paa"; // When the mouse is over, in the main menu +actionName = "Github"; // Text displayed on the "website" button +action = "https://github.com/OCAPv2"; // Website URL, that can accessed from the expansions menu +tooltipOwned = "Operation Capture and Playback v2"; // Tool tip displayed when the mouse is left over, in the main menu // Color used for DLC stripes and backgrounds (RGBA) dlcColor[] = @@ -17,6 +17,6 @@ dlcColor[] = }; // Overview text, displayed from the extension menu -overview = "OCAP is a tool for Arma 3 that facilitates recording and playback of operations on an interactive web-based map. Reveal where the enemy was located, analyze how each group carried out their assaults, and find out who engaged who, when, and with what. Use it simply for fun or as a training tool to see how well your group performs on ops."; +overview = "OCAP is a tool for Arma 3 that facilitates recording and playback of operations on an interactive web-based map. Reveal where the enemy was located, analyze how each group carried out their assaults, and find out who engaged who, when, and with what. Use it simply for fun or as a training tool to see how well your group performs on ops."; hideName = 0; // Hide the extension name hidePicture = 0; // Hide the extension menu diff --git a/userconfig/ocap/config.hpp b/userconfig/ocap/config.hpp index d480c9a..84a4bb8 100644 --- a/userconfig/ocap/config.hpp +++ b/userconfig/ocap/config.hpp @@ -2,7 +2,7 @@ ocap_nameServer = 'TvT'; ocap_minPlayerCount = 60; ocap_frameCaptureDelay = 1; ocap_excludeClassFromRecord = ["ACE_friesAnchorBar"]; // excludes specific class names from recordings -ocap_excludeMarkerFromRecord = ["SystemMarker_"]; // excludes markers with any of these strings in their name +ocap_excludeMarkerFromRecord = ["SystemMarker_"]; // excludes markers with any of these strings in their name ocap_saveMissionEnded = true; ocap_minMissionTime = 90; -ocap_isDebug = false; \ No newline at end of file +ocap_isDebug = false;