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

Zeus - Don't trigger suicide bomber if unconsicous #6324

Merged
merged 2 commits into from
May 4, 2018
Merged

Zeus - Don't trigger suicide bomber if unconsicous #6324

merged 2 commits into from
May 4, 2018

Conversation

Vdauphin
Copy link
Contributor

@Vdauphin Vdauphin commented May 4, 2018

Not sure if it is intended but this will prevent the detonation if the suicide bomber is unconscious. From my point of view, the suicider is not supposed to activate his bomb when he is unconscious. Let me know ...

When merged this pull request will:

  • check if [_unit] call EFUNC(common,isAwake) before trigger the bomb.

prevent the detonation if the unit is unconscious. The suicider is not supposed to activate his bomb if is unconscious
@kymckay
Copy link
Member

kymckay commented May 4, 2018

This will break the module, because the bomber could pass out and wake back up and then never trigger

@Vdauphin
Copy link
Contributor Author

Vdauphin commented May 4, 2018

I see!

@kymckay
Copy link
Member

kymckay commented May 4, 2018

However, your point is right. You can add another exitWith below this one that just exits the current frame and doesn't remove the PFH 👍

@Vdauphin
Copy link
Contributor Author

Vdauphin commented May 4, 2018

I was also thinking about this solution ;)

@kymckay
Copy link
Member

kymckay commented May 4, 2018

I'm probably going to extend the module to include a dead man's switch option anyway, so this will work for that once I get around to it 👍

@Vdauphin
Copy link
Contributor Author

Vdauphin commented May 4, 2018

I am pushing but do what you want with this!

Vdauphin added a commit to Vdauphin/HeartsAndMinds that referenced this pull request May 4, 2018
([_suicider] call ace_common_fnc_isAwake) this check will be useless  if this is accepted acemod/ACE3#6324
@dedmen
Copy link
Contributor

dedmen commented May 4, 2018

Well if it's a dead-man switch. He would trigger when unconcious.

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label May 4, 2018
@PabstMirror PabstMirror added this to the 3.13.0 milestone May 4, 2018
@PabstMirror PabstMirror changed the title Check if suicide bomber isAwake Zeus - Don't trigger suicide bomber if unconsicous May 4, 2018
@PabstMirror PabstMirror merged commit 2668bdc into acemod:master May 4, 2018
@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.3 Jul 5, 2018
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
Zeus - Don't trigger suicide bomber if unconsicous
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants