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.

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

Explosives - Add Cellphone/Detonator Keybinds #9687

Merged
merged 18 commits into from
Feb 7, 2024

Conversation

mrschick
Copy link
Contributor

@mrschick mrschick commented Dec 24, 2023

When merged this pull request will:

  • Add Cellphone Keybind (unbound by default) to open the Cellphone interface;

  • Add Detonate All on Active Detonator Keybind (unbound by default) to detonate all explosives tied to the current Active Detonator;
    When connecting the first explosive to a detonator, that detonator will be selected as the active one, afterwards it's possible to switch the Active Detonator as desired via a Set Active Detonator interaction on any non-active detonator;

  • Add Cycle Active Detonator Keybind (unbound by default) to cycle between the currently carried triggers, thereby selecting which is the Active Detonator, is visualized by CBA Notification common/fnc_displayTextPicture;

  • Only show Detonate All interaction on a detonator if connected to more than 1 explosive, to allow the ace_interact_menu_consolidateSingleChild setting to consolidate that interaction;

This allows ace_interact_menu_consolidateSingleChild to collapse trigger interactions for a single explosive code.
Triggers all explosives on current "active clacker", which auto-assigns to first connected clacker and is re-assignable via clacker self-interactions.
@LinkIsGrim
Copy link
Contributor

I'd leave defaults for detonation unbound. Alt is used for freelook and C for toggling combat pace, and both are used frequently.

A "Cycle Active Detonator" keybind would be nice, as well.

@LinkIsGrim LinkIsGrim added the kind/feature Release Notes: **ADDED:** label Dec 24, 2023
addons/explosives/initKeybinds.inc.sqf Outdated Show resolved Hide resolved
docs/wiki/feature/explosives.md Outdated Show resolved Hide resolved
Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the whole, not a fan of the checks that are case sensitive (I realise that it was already a problem before this PR, but we shouldn't make it worse).

addons/explosives/functions/fnc_addDetonateActions.sqf Outdated Show resolved Hide resolved
addons/explosives/functions/fnc_addDetonateActions.sqf Outdated Show resolved Hide resolved
addons/explosives/functions/fnc_addDetonateActions.sqf Outdated Show resolved Hide resolved
addons/explosives/functions/fnc_addDetonateActions.sqf Outdated Show resolved Hide resolved
addons/explosives/initKeybinds.inc.sqf Outdated Show resolved Hide resolved
addons/explosives/functions/fnc_selectTrigger.sqf Outdated Show resolved Hide resolved
mrschick and others added 3 commits December 24, 2023 11:25
Co-Authored-By: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@LinkIsGrim
Copy link
Contributor

Code LGTM, review after testing.

Side-note: looking at the explosives component in general is giving me a headache.

@mrschick
Copy link
Contributor Author

A "Cycle Active Detonator" keybind would be nice, as well.

Done 👌🏻

addons/explosives/functions/fnc_cycleActiveTrigger.sqf Outdated Show resolved Hide resolved
addons/explosives/functions/fnc_cycleActiveTrigger.sqf Outdated Show resolved Hide resolved
addons/explosives/initKeybinds.inc.sqf Outdated Show resolved Hide resolved
addons/explosives/initKeybinds.inc.sqf Outdated Show resolved Hide resolved
addons/explosives/initKeybinds.inc.sqf Outdated Show resolved Hide resolved
addons/explosives/initKeybinds.inc.sqf Outdated Show resolved Hide resolved
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@mrschick
Copy link
Contributor Author

mrschick commented Feb 6, 2024

I believe this is pretty much complete.

@LinkIsGrim
Copy link
Contributor

Reviewing this without getting distracted by the rest of the explosives module is a challenge but I'll get to it.

addons/explosives/initKeybinds.inc.sqf Outdated Show resolved Hide resolved
Copy link
Contributor

@LinkIsGrim LinkIsGrim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM other than above

@LinkIsGrim LinkIsGrim added this to the 3.16.4 milestone Feb 7, 2024
addons/explosives/initKeybinds.inc.sqf Outdated Show resolved Hide resolved
addons/explosives/functions/fnc_cycleActiveTrigger.sqf Outdated Show resolved Hide resolved
addons/explosives/functions/fnc_addDetonateActions.sqf Outdated Show resolved Hide resolved
addons/explosives/functions/fnc_addDetonateActions.sqf Outdated Show resolved Hide resolved
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
addons/explosives/initKeybinds.inc.sqf Outdated Show resolved Hide resolved
mrschick and others added 2 commits February 7, 2024 16:19
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@LinkIsGrim LinkIsGrim dismissed their stale review February 7, 2024 16:04

Changes made

@LinkIsGrim LinkIsGrim merged commit 2f9b700 into acemod:master Feb 7, 2024
5 checks passed
@mrschick mrschick deleted the feature/detonator-keybinds branch February 8, 2024 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants