Skip to content

Hearing - Fix explosions not affecting hearing#10002

Merged
johnb432 merged 10 commits intomasterfrom
hearing-fix-explosions-not-affecting-hearing
Aug 12, 2024
Merged

Hearing - Fix explosions not affecting hearing#10002
johnb432 merged 10 commits intomasterfrom
hearing-fix-explosions-not-affecting-hearing

Conversation

@johnb432
Copy link
Copy Markdown
Contributor

@johnb432 johnb432 commented May 9, 2024

When merged this pull request will:

  • Title.

I have only done some testing with artillery shells and grenades, needs much more testing.

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@johnb432 johnb432 added status/needs-testing kind/bug-fix Release Notes: **FIXED:** labels May 9, 2024
Comment thread addons/hearing/functions/fnc_explosion.sqf
Comment thread addons/hearing/XEH_postInit.sqf Outdated
@johnb432 johnb432 mentioned this pull request Jun 7, 2024
8 tasks
@johnb432
Copy link
Copy Markdown
Contributor Author

This needs more work.

@johnb432 johnb432 marked this pull request as draft June 10, 2024 08:45
@johnb432 johnb432 marked this pull request as ready for review July 4, 2024 11:01
@johnb432
Copy link
Copy Markdown
Contributor Author

johnb432 commented Jul 4, 2024

I'm happy with it as it is. I've tested modded arty too and it works well enough all round.

@johnb432 johnb432 added this to the 3.18.0 milestone Jul 8, 2024
@LinkIsGrim
Copy link
Copy Markdown
Member

Tested in MP, LGTM

Comment on lines +95 to +105
addMissionEventHandler ["ProjectileCreated", {
params ["_projectile"];

if (!local _projectile) exitWith {};

// Rockets only explode on local clients
_projectile addEventHandler ["Explode", {
[QGVAR(explosion), _this] call CBA_fnc_globalEvent;
}];
}];

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Can be moved to common, if the frag rewrite needs it.

@johnb432 johnb432 merged commit 72f230a into master Aug 12, 2024
@johnb432 johnb432 deleted the hearing-fix-explosions-not-affecting-hearing branch August 12, 2024 13:45
blake8090 pushed a commit to blake8090/ACE3 that referenced this pull request Aug 18, 2024
* Have explosions affect hearing

* Update fnc_explosion.sqf

* Update XEH_postInit.sqf

* Update addons/hearing/functions/fnc_explosion.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update fnc_explosion.sqf

* Make EH local

* Use sound entry instead

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@Dystopian
Copy link
Copy Markdown
Contributor

Dystopian commented Oct 6, 2024

I'm sorry I can't create correct Issue now. It looks like after this PR Smoke Shell (White) from Mk6 Mortar makes ears ringing.

 1:14:59 [ACE] (hearing) TRACE: 31123 : typeOf _projectile=Smoke_82mm_AMOS_White, _distance=51.0087, _explosive=1, _audibleFire=any, _vehAttenuation=1 z\ace\addons\hearing\functions\fnc_explosion.sqf:38
 1:14:59 [ACE] (hearing) TRACE: 31123 strength: _volume=316.228, _strength=182.307 z\ace\addons\hearing\functions\fnc_explosion.sqf:52
 1:14:59 [ACE] (hearing) TRACE: 31153 : typeOf _projectile=SmokeShellArty, _distance=51.0126, _explosive=0, _audibleFire=any, _vehAttenuation=1 z\ace\addons\hearing\functions\fnc_explosion.sqf:38
 1:14:59 [ACE] (hearing) TRACE: 31153 strength: _volume=2.51189, _strength=0 z\ace\addons\hearing\functions\fnc_explosion.sqf:52

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.

4 participants