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

Add weapon checks to suicide by gun in mouth #353

Merged
merged 5 commits into from
Mar 14, 2021
Merged

Add weapon checks to suicide by gun in mouth #353

merged 5 commits into from
Mar 14, 2021

Conversation

du-top
Copy link
Contributor

@du-top du-top commented Mar 7, 2021

Putting your gun in your mouth and pulling the trigger killed you even if the gun's safety is still on. While comparing the suicide subroutine with the Fire subroutine, I found other checks that were also missing.

  • gun fired even if safety was on.
  • gun fired even if it was submerged, while not being waterproof.
  • gun fired even if some other conditions of the player are not met, like:
    • the huge Hulk hands couldn't fit in the trigger guard
    • the player is not living
    • the player is not an advanced tool user
    • the player is clumsy and unlucky and shoots himself in the foot instead an drops the gun

This is now changed to the following behavior:

First I check if the gun is not waterproof and the player is submerged. While in the Fire subroutine the gun will just not fire, I will show a message to the user, because it's stupid if you get a message with "...pulls the trigger" and then ... nothing. Tested in the cistern.

Then the special checks (Hulk, clumsy, ...), the same subroutine called in the Fire subroutine is called.

If the safety is on, the same reflex-unsafety-ing as in Fire is performed. If you are trained enough to do it by reflex, the same reflex should kick in when you do it ... to yourself.


I'm not sure why my syncs from original Vesta.Bay/dev to my own dev are shown here, even if without file changes. If I did something wrong, please tell me what. I'm still a Subversion main...

@du-top
Copy link
Contributor Author

du-top commented Mar 7, 2021

Uhm... will my username, which unfortunately contains a slash ("-") be a problem? It's supposed to be the first part in the slash-separated changelog file...

@wb13
Copy link
Contributor

wb13 commented Mar 13, 2021

Uhm... will my username, which unfortunately contains a slash ("-") be a problem? It's supposed to be the first part in the slash-separated changelog file...

I'm fairly sure it's fine, but you can change the author to Dutop if you want to be safe.

You might need to rename your changelog file to Dutop-PR-353 though -- I think the changelog generation script is picky about that.

@wb13 wb13 merged commit 27633ef into VestaOfOrion:dev Mar 14, 2021
@io-util io-util added the Fix Fixes a bug label Mar 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants