Skip to content

fix: sector event routing, type guards, and color field #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fank merged 10 commits into from
Mar 7, 2026
Merged

fix: sector event routing, type guards, and color field #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
513012e
fix: pass side field through sector events to extension
fank Mar 7, 2026
9d9a408
docs: design for separating capturedFlag from :EVENT:SECTOR:
fank Mar 7, 2026
565cb96
fix: remove capturedFlag from :EVENT:SECTOR: routing
fank Mar 7, 2026
8f004ab
fix: simplify side extraction in sector event routing
fank Mar 7, 2026
d3f94f6
fix: add type guard for side extraction in sector events
fank Mar 7, 2026
77b3c4c
fix: update sector event comment and add type guards to all params
fank Mar 7, 2026
2d1f06f
feat: capture color field from sector events
fank Mar 7, 2026
9b73cc2
fix: restore sector example in comment, not flag capture
fank Mar 7, 2026
8143fbc
fix: add empty color field to sector capture events
fank Mar 7, 2026
1d2f5d3
chore: remove outdated design doc
fank Mar 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions addons/recorder/fnc_handleCustomEvent.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@

Description:
Routes custom events to the extension with typed positional args based on
event type. Sector events (captured/contested/capturedFlag) use :EVENT:SECTOR:
with structured fields; endMission uses :EVENT:ENDMISSION: with side and
message; all other events use :EVENT:GENERAL: with JSON-encoded extraData.
event type. Sector events (captured/contested) use :EVENT:SECTOR: with
structured fields; endMission uses :EVENT:ENDMISSION: with side and
message; all other events (including capturedFlag) use :EVENT:GENERAL:
with JSON-encoded extraData.

Applied during initialization of OCAP in <OCAP_recorder_fnc_init>.

Expand All @@ -22,7 +23,7 @@
Examples:
(start code)
// Sector captured with structured data (sent by fnc_trackSectors)
[QGVARMAIN(customEvent), ["captured", ["sector", "Sector Alpha", [100, 200, 0]]]] call CBA_fnc_localEvent;
[QGVARMAIN(customEvent), ["captured", ["sector", "Sector Alpha", str west, "", getPos _sector]]] call CBA_fnc_localEvent;

// End mission with side and message
[QGVARMAIN(customEvent), ["endMission", [str west, "BLUFOR controlled all sectors!"]]] call CBA_fnc_localEvent;
Expand All @@ -49,14 +50,15 @@ params [

switch (_eventName) do {
case "captured";
case "contested";
case "capturedFlag": {
case "contested": {
private _args = [GVAR(captureFrameNo), _eventName];

if (_eventMessage isEqualType []) then {
// Array format: ["objectType", "unitName", ...maybePosition...]
_args pushBack (_eventMessage param [0, ""]);
_args pushBack (_eventMessage param [1, ""]);
// Array format: [objectType, unitName, side, color, [posX, posY, posZ]]
_args pushBack (_eventMessage param [0, "", [""]]);
_args pushBack (_eventMessage param [1, "", [""]]);
_args pushBack (_eventMessage param [2, "", [""]]);
_args pushBack (_eventMessage param [3, "", [""]]);
{
if (_x isEqualType [] && {count _x >= 2} && {(_x # 0) isEqualType 0}) exitWith {
_args append _x;
Expand Down
4 changes: 2 additions & 2 deletions addons/recorder/fnc_trackSectors.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ if (_this isEqualType [] && {count _this > 0}) exitWith {

private _pos = getPosATL _sector;
if (_newOwner isEqualTo sideUnknown) then {
[QGVARMAIN(customEvent), ["contested", ["sector", _name, _pos]]] call CBA_fnc_localEvent;
[QGVARMAIN(customEvent), ["contested", ["sector", _name, "", "", _pos]]] call CBA_fnc_localEvent;
} else {
[QGVARMAIN(customEvent), ["captured", ["sector", _name, _pos]]] call CBA_fnc_localEvent;
[QGVARMAIN(customEvent), ["captured", ["sector", _name, str _newOwner, "", _pos]]] call CBA_fnc_localEvent;
};
}] call BIS_fnc_addScriptedEventHandler;
};
Expand Down