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

Changed: Remove ear ringing from flashbang explosions when wearing protective gear (e.g. ComTacs) #6746

Merged
merged 2 commits into from
Dec 28, 2018

Conversation

bux
Copy link
Member

@bux bux commented Dec 27, 2018

When merged this pull request will:

  • title
  • also reduces ear ringing strength by damageCoefficent if above a certain threshold (not that it matters too much with our current ear ringing implementation)

@bux bux added the kind/enhancement Release Notes: **IMPROVED:** label Dec 27, 2018
@bux bux added this to the 3.13.0 milestone Dec 27, 2018
@bux bux changed the title Remove ear ringing from flashbangs when wearing protective gear Remove ear ringing from flashbangs when wearing protective gear (e.g. ComTacs) Dec 27, 2018
Copy link
Contributor

@alganthe alganthe left a comment

Choose a reason for hiding this comment

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

Tested in game, works as expected.

@bux bux changed the title Remove ear ringing from flashbangs when wearing protective gear (e.g. ComTacs) Changed: Remove ear ringing from flashbang explosions when wearing protective gear (e.g. ComTacs) Dec 28, 2018
@bux bux merged commit cf1910e into master Dec 28, 2018
@bux bux deleted the Peltors-Remove-Earringing branch December 28, 2018 13:46
@PabstMirror
Copy link
Contributor

https://github.com/acemod/ACE3/blob/master/addons/hearing/functions/fnc_earRinging.sqf
already does
_strength * GVAR(damageCoefficent
so now we are effectively doing _strength * EGVAR(hearing,damageCoefficent)^2

@bux
Copy link
Member Author

bux commented Dec 29, 2018

40 * _strength * EGVAR(hearing,damageCoefficent)^2
I agree, it looks redundant.

I can change it back. Despiste the one more operation that is performed, it doesn't matter much because of the way we handle ear ringing

if (GVAR(deafnessDV) > 19.75) then {
playSound (["ACE_Combat_Deafness_Heavy", "ACE_Combat_Deafness_Heavy_NoRing"] select GVAR(DisableEarRinging));
} else {
playSound (["ACE_Combat_Deafness_Medium", "ACE_Combat_Deafness_Medium_NoRing"] select GVAR(DisableEarRinging));
};

It would be better to offer some more different ear ringing sounds/volumes for different strength levels.

@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.6 Feb 23, 2019
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
…otective gear (e.g. ComTacs) (#6746)

* Remove ear ringing from flashbangs when wearing protective gear, reduce strength by damageCoefficent
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants