Skip to content
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

Jump to bottom

Explosives - Add "ace_explosives_setup" CBA Event #9197

Merged
merged 4 commits into from
Jun 20, 2023
Merged

Explosives - Add "ace_explosives_setup" CBA Event #9197

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eed7c2
Update fnc_setupExplosive.sqf
ThatArcanist May 10, 2023
e2f01d1
Merge branch 'acemod:master' into ExplosivesSetupEvent
ThatArcanist May 24, 2023
5d11c8e
Update events-framework.md
ThatArcanist May 24, 2023
65cc1aa
Update events-framework.md
ThatArcanist Jun 20, 2023
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
1 change: 1 addition & 0 deletions addons/explosives/functions/fnc_setupExplosive.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ GVAR(TweakedAngle) = 0;
_unit setVariable [QGVAR(PlantingExplosive), true];
[{_this setVariable [QGVAR(PlantingExplosive), false]}, _unit, 1.5] call CBA_fnc_waitAndExecute;

[QGVAR(setup), [_expSetupVehicle, _magClassname, _unit]] call CBA_fnc_globalEvent;
};
} else {
private _screenPos = worldToScreen (_virtualPosASL call EFUNC(common,ASLToPosition));
Expand Down
2 changes: 2 additions & 0 deletions docs/wiki/framework/events-framework.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ MenuType: 0 = Interaction, 1 = Self Interaction
|`ace_allowDefuse` | [_mine, _allow] | Global or Target | Callable | Set allowance of the dynamic defusal action on a mine
|`ace_tripflareTriggered` | [_flareObject, [_posX, _posY, _posZ]] | Global | Listen | Tripflare triggered
|`ace_explosives_clackerAdded` | [_unit, _explosive, _id] | Local | Listen | Clacker added to explosive
|`ace_explosives_setup` | [_explosive, _dir, _pitch, _unit] | Global | Listen | Explosive is placed in the world
|`ace_explosives_place` | [_explosiveVehicle, _magClassname, _unit] | Global | Listen | Explosive is armed
BrettMayson marked this conversation as resolved.
Show resolved Hide resolved

### 2.9 Logistics Wirecutter (`ace_logistics`)

Expand Down