diff --git a/arma/server/addons/cad/XEH_PREP.hpp b/arma/server/addons/cad/XEH_PREP.hpp index 1e9c4a9..fcebe2a 100644 --- a/arma/server/addons/cad/XEH_PREP.hpp +++ b/arma/server/addons/cad/XEH_PREP.hpp @@ -5,4 +5,4 @@ PREP(initGroupRepository); PREP(initPermissionService); PREP(initPersistenceService); PREP(initRequestRepository); -PREP(registerTaskEventListeners); +PREP(registerEventListeners); diff --git a/arma/server/addons/cad/XEH_preInit.sqf b/arma/server/addons/cad/XEH_preInit.sqf index cfb3c63..c0db76d 100644 --- a/arma/server/addons/cad/XEH_preInit.sqf +++ b/arma/server/addons/cad/XEH_preInit.sqf @@ -5,7 +5,7 @@ PREP_RECOMPILE_START; PREP_RECOMPILE_END; call FUNC(initCadStore); -call FUNC(registerTaskEventListeners); +call FUNC(registerEventListeners); [QGVAR(requestHydrateCad), { params [["_uid", "", [""]]]; diff --git a/arma/server/addons/cad/functions/fnc_registerTaskEventListeners.sqf b/arma/server/addons/cad/functions/fnc_registerEventListeners.sqf similarity index 95% rename from arma/server/addons/cad/functions/fnc_registerTaskEventListeners.sqf rename to arma/server/addons/cad/functions/fnc_registerEventListeners.sqf index 593631a..6b1a500 100644 --- a/arma/server/addons/cad/functions/fnc_registerTaskEventListeners.sqf +++ b/arma/server/addons/cad/functions/fnc_registerEventListeners.sqf @@ -1,13 +1,13 @@ #include "..\script_component.hpp" /* - * File: fnc_registerTaskEventListeners.sqf + * File: fnc_registerEventListeners.sqf * Author: IDSolutions * Date: 2026-05-14 * Public: No * * Description: - * Registers CAD listeners for framework task lifecycle events. + * Registers CAD listeners for framework events that should refresh CAD state. * * Arguments: * None @@ -16,7 +16,7 @@ * Listener tokens [ARRAY] * * Example: - * call forge_server_cad_fnc_registerTaskEventListeners + * call forge_server_cad_fnc_registerEventListeners */ if (isNil QEGVAR(common,EventBus)) then { call EFUNC(common,eventBus); }; diff --git a/arma/server/addons/common/README.md b/arma/server/addons/common/README.md index 26ab914..45d2a53 100644 --- a/arma/server/addons/common/README.md +++ b/arma/server/addons/common/README.md @@ -43,6 +43,41 @@ Payloads should be hash maps and should include stable identifiers first: `taskID`, `requestID`, `groupID`, `uid`, `orgID`, or `accountID` as appropriate. The event bus adds `event`, `source`, and `timestamp` when the event is emitted. +### Current Events +Task lifecycle: +- `task.created` +- `task.started` +- `task.completed` +- `task.failed` +- `task.cleared` + +Task rewards and notifications: +- `task.reward.requested` +- `task.reward.applied` +- `task.reward.failed` +- `task.rating.applied` +- `task.rating.failed` +- `task.notification.requested` +- `task.reward.notification.requested` + +CAD state: +- `cad.assignment.assigned` +- `cad.assignment.created` +- `cad.assignment.acknowledged` +- `cad.assignment.declined` +- `cad.assignment.closed` +- `cad.request.submitted` +- `cad.request.closed` +- `cad.group.updated` + +Client sync and notification requests: +- `notification.requested` +- `bank.account.sync.requested` +- `org.sync.requested` +- `locker.sync.requested` +- `locker.va.sync.requested` +- `garage.vgarage.sync.requested` + ```sqf private _token = EGVAR(common,EventBus) call ["on", [ "task.completed", diff --git a/arma/server/addons/task/XEH_postInit.sqf b/arma/server/addons/task/XEH_postInit.sqf index 7cc2237..7666467 100644 --- a/arma/server/addons/task/XEH_postInit.sqf +++ b/arma/server/addons/task/XEH_postInit.sqf @@ -5,7 +5,7 @@ if (isNil QGVAR(TaskLifecycleEventLogTokens)) then { private _logTaskLifecycleEvent = { params ["_event"]; - if !(missionNamespace getVariable [QGVAR(enableEventLogs), true]) exitWith {}; + if !(missionNamespace getVariable [QGVAR(enableEventLogs), false]) exitWith {}; ["INFO", format [ "Task lifecycle event: %1 taskID=%2 taskType=%3 status=%4 participants=%5", @@ -20,7 +20,7 @@ if (isNil QGVAR(TaskLifecycleEventLogTokens)) then { private _logTaskRewardEvent = { params ["_event"]; - if !(missionNamespace getVariable [QGVAR(enableEventLogs), true]) exitWith {}; + if !(missionNamespace getVariable [QGVAR(enableEventLogs), false]) exitWith {}; ["INFO", format [ "Task reward event: %1 taskID=%2 success=%3 message=%4", @@ -62,7 +62,7 @@ if (isNil QGVAR(TaskNotificationEventTokens)) then { [CRPC(notifications,recieveNotification), [_type, _title, _message], _player] call CFUNC(targetEvent); } forEach _participantUids; - if (missionNamespace getVariable [QGVAR(enableEventLogs), true]) then { + if (missionNamespace getVariable [QGVAR(enableEventLogs), false]) then { ["INFO", format [ "Task notification event: taskID=%1 type=%2 recipients=%3 message=%4", _event getOrDefault ["taskID", ""], @@ -89,7 +89,7 @@ if (isNil QGVAR(TaskNotificationEventTokens)) then { [CRPC(notifications,recieveNotification), [_type, _title, _message], _player] call CFUNC(targetEvent); } forEach _memberUids; - if (missionNamespace getVariable [QGVAR(enableEventLogs), true]) then { + if (missionNamespace getVariable [QGVAR(enableEventLogs), false]) then { ["INFO", format [ "Task reward notification event: taskID=%1 type=%2 recipients=%3 message=%4", _event getOrDefault ["taskID", ""], diff --git a/arma/server/addons/task/initSettings.inc.sqf b/arma/server/addons/task/initSettings.inc.sqf index 4339bcd..b86599c 100644 --- a/arma/server/addons/task/initSettings.inc.sqf +++ b/arma/server/addons/task/initSettings.inc.sqf @@ -7,5 +7,5 @@ [ QGVAR(enableEventLogs), "CHECKBOX", [LSTRING(enableEventLogs), LSTRING(enableEventLogsTooltip)], - _category, true, true + _category, false, true ] call CBA_fnc_addSetting; diff --git a/arma/server/addons/task/stringtable.xml b/arma/server/addons/task/stringtable.xml index ff325d8..43df877 100644 --- a/arma/server/addons/task/stringtable.xml +++ b/arma/server/addons/task/stringtable.xml @@ -8,7 +8,7 @@ Enable Event Logs - Log task event bus lifecycle, reward, rating, and notification events. + Log task event bus lifecycle, reward, rating, and notification events for debugging. Enable Generator