-
Notifications
You must be signed in to change notification settings - Fork 739
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
Cookoff - Mini-Rewrite #9758
Cookoff - Mini-Rewrite #9758
Conversation
Something that has always frustrated me about vehicle cookoff is how the ammo goes shooting out of the vehicle, sometimes landing 100m+ away from it. A round's propellant burning doesn't actually give it velocity unless it's contained by a barrel, it will just pop out of its casing, and ammo in storage shouldn't be exiting the vehicle at all. |
This or #5327 first for review? |
This is fully ready to review. |
I'll hold off from merging until #9061 is merged. |
@johnb432 merge conflicts |
I need to still resolve some stuff, so hold off from merging, I'll handle it. |
I'm done with the changes. Those changes are:
|
* Cook-off improvements * More changes * Update fnc_getVehicleAmmo.sqf * Better engine fire placement * Update fnc_detonateAmmunition.sqf * Update XEH_postInit.sqf * Update fnc_getVehicleAmmo.sqf * Update events-framework.md * Various improvements * Separate effect handling * Tweaks * Update XEH_postInit.sqf * Prevent double ammo detonation * Fixed objects not being able to cook-off again * Added incendiary rounds as source of box cookoff * Converted enable setting to bool * Fixed brackets * Update fnc_cookOff.sqf * Update CfgEden.hpp * Removed GVAR(enable), added GVAR(enableFire) back * Update initSettings.inc.sqf * Update events-framework.md * Update addons/cookoff/functions/fnc_cookOffEffect.sqf * Restructured, redid API events * Fix effect for JIP, minor optimisations * Removed `cbaSettings_settingChanged` * Renamed variables, tweaked string table entries * Update fire damage acemod#9991 * Capitalize comments again * Fix cookoff for very short durations and fix effect removal being too quick
When merged this pull request will:
(exception are the jet and ring effects, as they only last 20 seconds max).vehicle_damage
).GVAR(enable)
has been removed.GVAR(enableFire)
,GVAR(enableAmmoCookoff)
&GVAR(enableAmmobox)
) that allow to control most aspects thatGVAR(enable)
does, making it redundant.QGVAR(enable)
on objects will no longer affect ammo detonation, but only fire effects.QGVAR(enableAmmoCookoff)
already exists and can be set in the editor, although that's currently not listed in the docs - that has been rectified.GVAR(enableFire)
is now the sole setting that handles vehicle cook-off fire. This setting does not handle ammo detonation (handled byGVAR(enableAmmoCookoff)
).GVAR(cookoffDuration)
for cook-off (fixes Cook off bug - vehicle never explodes, and cook off flame occurs multiple times. #9743).GVAR(probabilityCoef)
has been made useful again. It's only used in theadvanced vehicle damage
component.GVAR(removeAmmoDuringCookoff)
fromvehicle_damage
intocookoff
.Changed it so that it removes all magazines upon ammunition cook-off.
SP and MP testing has been conducted, but could use some more.
IMPORTANT
Component - Add|Fix|Improve|Change|Make|Remove {changes}
.