From 941d46b3342f6c84138078dd16d30b0954ac7d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 8 Jan 2020 00:25:52 +0100 Subject: [PATCH 1/2] Cook Off - Change Cook Off events to global and add to events docs --- addons/cookoff/functions/fnc_cookOff.sqf | 2 +- addons/cookoff/functions/fnc_cookOffBox.sqf | 2 +- addons/cookoff/functions/fnc_engineFire.sqf | 2 +- docs/wiki/framework/events-framework.md | 7 +++++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/addons/cookoff/functions/fnc_cookOff.sqf b/addons/cookoff/functions/fnc_cookOff.sqf index c19f968c47..51f35ea813 100644 --- a/addons/cookoff/functions/fnc_cookOff.sqf +++ b/addons/cookoff/functions/fnc_cookOff.sqf @@ -21,7 +21,7 @@ if (_vehicle getVariable [QGVAR(isCookingOff), false]) exitWith {}; _vehicle setVariable [QGVAR(isCookingOff), true]; if (local _vehicle) then { - [QGVAR(cookOff), _vehicle] call CBA_fnc_remoteEvent; + [QGVAR(cookOff), _vehicle] call CBA_fnc_globalEvent; }; [{ diff --git a/addons/cookoff/functions/fnc_cookOffBox.sqf b/addons/cookoff/functions/fnc_cookOffBox.sqf index 8f6ef7f2f0..28e3a91108 100644 --- a/addons/cookoff/functions/fnc_cookOffBox.sqf +++ b/addons/cookoff/functions/fnc_cookOffBox.sqf @@ -21,7 +21,7 @@ if (_box getVariable [QGVAR(isCookingOff), false]) exitWith {}; _box setVariable [QGVAR(isCookingOff), true]; if (local _box) then { - [QGVAR(cookOffBox), _box] call CBA_fnc_remoteEvent; + [QGVAR(cookOffBox), _box] call CBA_fnc_globalEvent; }; [{ diff --git a/addons/cookoff/functions/fnc_engineFire.sqf b/addons/cookoff/functions/fnc_engineFire.sqf index 6ed6920b7c..f5ad3e1cf9 100644 --- a/addons/cookoff/functions/fnc_engineFire.sqf +++ b/addons/cookoff/functions/fnc_engineFire.sqf @@ -21,7 +21,7 @@ if (_vehicle getVariable [QGVAR(isEngineSmoking), false]) exitWith {}; _vehicle setVariable [QGVAR(isEngineSmoking), true]; if (local _vehicle) then { - [QGVAR(engineFire), _vehicle] call CBA_fnc_remoteEvent; + [QGVAR(engineFire), _vehicle] call CBA_fnc_globalEvent; }; private _offset = getArray (_vehicle call CBA_fnc_getObjectConfig >> QGVAR(engineSmokeOffset)); diff --git a/docs/wiki/framework/events-framework.md b/docs/wiki/framework/events-framework.md index f4f0cf9fae..5c7a164d30 100644 --- a/docs/wiki/framework/events-framework.md +++ b/docs/wiki/framework/events-framework.md @@ -97,6 +97,13 @@ MenuType: 0 = Interaction, 1 = Self Interaction |`ace_refuel_tick` | [_source, _target, _amount] | Local | Listen | Amount of fuel transferred in a tick |`ace_refuel_stopped` | [_source, _target] | Local | Listen | Refueling has stopped +### 2.10 Cook Off (`ace_cookoff`) + +| Event Key | Parameters | Locality | Type | Description | +|----------|---------|---------|---------|---------|---------| +|`ace_cookoff_cookOff` | [_vehicle] | Global | Listen | Vehicle cook off has started +|`ace_cookoff_cookOffBox` | [_box] | Global | Listen | Ammo box cook off has started +|`ace_cookoff_engineFire` | [_vehicle] | Global | Listen | Engine fire has started ## 3. Usage Also Reference [CBA Events System](https://github.com/CBATeam/CBA_A3/wiki/Custom-Events-System){:target="_blank"} documentation. From 4fd927ff6be67972de8a13555f02afe46058e20f Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 10 Jan 2020 09:51:14 -0600 Subject: [PATCH 2/2] remove array from cookoff doc event --- docs/wiki/framework/events-framework.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/wiki/framework/events-framework.md b/docs/wiki/framework/events-framework.md index 5c7a164d30..30feada6cf 100644 --- a/docs/wiki/framework/events-framework.md +++ b/docs/wiki/framework/events-framework.md @@ -101,9 +101,9 @@ MenuType: 0 = Interaction, 1 = Self Interaction | Event Key | Parameters | Locality | Type | Description | |----------|---------|---------|---------|---------|---------| -|`ace_cookoff_cookOff` | [_vehicle] | Global | Listen | Vehicle cook off has started -|`ace_cookoff_cookOffBox` | [_box] | Global | Listen | Ammo box cook off has started -|`ace_cookoff_engineFire` | [_vehicle] | Global | Listen | Engine fire has started +|`ace_cookoff_cookOff` | _vehicle | Global | Listen | Vehicle cook off has started +|`ace_cookoff_cookOffBox` | _box | Global | Listen | Ammo box cook off has started +|`ace_cookoff_engineFire` | _vehicle | Global | Listen | Engine fire has started ## 3. Usage Also Reference [CBA Events System](https://github.com/CBATeam/CBA_A3/wiki/Custom-Events-System){:target="_blank"} documentation.