Cookoff - Add the ability to disable cookoff sounds and projectiles. (#10926)

bluefield-creator · PabstMirror · johnb432 · web-flow · commit f25537544576 · 2025-06-04T16:58:06.000-05:00
* feat: add setting stringtable * Update initSettings.inc.sqf * Update stringtable.xml * Update initSettings.inc.sqf * Update XEH_postInit.sqf * Update fnc_detonateAmmunitionServerLoop.sqf * improve french translation Peer reviewed the translation and suggested this change. Quote I mean you could say "Désactive le son de « pop-corn » des projectiles explosant à l'intérieur du véhicule" which is a tad more precise since "explosant dans le véhicule" could also be interpreted as incoming projectiles Endquote * Make 'cookoffDisableSound' restart required. * update: move cookoffDisabledSound check to runtime * removed restart requirement from cookoffDisableSound * improve translation Spanish, German, French and English are peer reviewed. **THE REST ARE NOT!** * remove repeating bullshit * Update fnc_detonateAmmunitionServerLoop.sqf * remove dogshit translations, adde Czech by @ilbinek God AI is dogshit at its core functionality * remove typo * Update addons/cookoff/initSettings.inc.sqf Co-authored-by: PabstMirror <pabstmirror@gmail.com> * Update addons/cookoff/functions/fnc_detonateAmmunitionServerLoop.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/cookoff/XEH_postInit.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/cookoff/functions/fnc_detonateAmmunitionServerLoop.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/cookoff/initSettings.inc.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * refactor: invert logic naming, remove outdated translations * Fix tabs * Update initSettings.inc.sqf * Fix stringtable file * Sort stringtable * Update addons/cookoff/initSettings.inc.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/cookoff/initSettings.inc.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update fnc_detonateAmmunitionServerLoop.sqf * Update addons/cookoff/functions/fnc_detonateAmmunitionServerLoop.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/cookoff/XEH_postInit.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/cookoff/stringtable.xml Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/cookoff/stringtable.xml Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/cookoff/stringtable.xml Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Use GVAR(cookoffEnableSound) setting --------- Co-authored-by: PabstMirror <pabstmirror@gmail.com> Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
diff --git a/addons/cookoff/functions/fnc_detonateAmmunitionServerLoop.sqf b/addons/cookoff/functions/fnc_detonateAmmunitionServerLoop.sqf
@@ -77,6 +77,11 @@ private _magazineIndex = floor random (count _magazines);
 private _magazine = _magazines select _magazineIndex;
 _magazine params ["_magazineClassname", "_ammoCount", "_spawnProjectile", "_magazineInfo"];
 
+// If we disabled projectiles in settings, we exit the current scope
+if (!GVAR(cookoffEnableProjectiles)) then {
+    _spawnProjectile = false;
+};
+
 // Make sure ammo is at least 0
 _ammoCount = _ammoCount max 0;
 
@@ -183,14 +188,14 @@ private _fnc_spawnProjectile = {
 
 switch (_simType) do {
     case "shotbullet": {
-        [QGVAR(playCookoffSound), [_object, _simType]] call CBA_fnc_globalEvent;
+        if (GVAR(cookoffEnableSound)) then { [QGVAR(playCookoffSound), [_object, _simType]] call CBA_fnc_globalEvent; };
 
         if (random 1 < 0.6) then {
             true call _fnc_spawnProjectile;
         };
     };
     case "shotshell": {
-        [QGVAR(playCookoffSound), [_object, _simType]] call CBA_fnc_globalEvent;
+        if (GVAR(cookoffEnableSound)) then { [QGVAR(playCookoffSound), [_object, _simType]] call CBA_fnc_globalEvent; };
 
         if (random 1 < 0.15) then {
             true call _fnc_spawnProjectile;
@@ -207,10 +212,12 @@ switch (_simType) do {
     case "shotmissile";
     case "shotsubmunitions": {
         if (random 1 < 0.1) then {
-            [QGVAR(playCookoffSound), [_object, _simType]] call CBA_fnc_globalEvent;
+            if (GVAR(cookoffEnableSound)) then { [QGVAR(playCookoffSound), [_object, _simType]] call CBA_fnc_globalEvent; };
 
             (random 1 < 0.3) call _fnc_spawnProjectile;
         } else {
+            // We re-check the cookoffEnableProjectiles because this case is not running the _spawnProjectile function
+            if (!GVAR(cookoffEnableProjectiles)) exitWith {};
             createVehicle ["ACE_ammoExplosionLarge", _object modelToWorld _effect2pos, [], 0 , "CAN_COLLIDE"];
         };
     };
diff --git a/addons/cookoff/initSettings.inc.sqf b/addons/cookoff/initSettings.inc.sqf
@@ -69,3 +69,21 @@
     true,
     1
 ] call CBA_fnc_addSetting;
+
+[
+    QGVAR(cookoffEnableProjectiles),
+    "CHECKBOX",
+    [LSTRING(enableProjectiles_name), LSTRING(enableProjectiles_tooltip)],
+    LSTRING(category_displayName),
+    true,
+    1
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(cookoffEnableSound),
+    "CHECKBOX",
+    [LSTRING(enableSound_name), LSTRING(enableSound_tooltip)],
+    LSTRING(category_displayName),
+    true,
+    1
+] call CBA_fnc_addSetting;
diff --git a/addons/cookoff/stringtable.xml b/addons/cookoff/stringtable.xml
@@ -146,6 +146,26 @@
             <Korean>차량 유폭 효과를 활성화합니다.\n여기엔 탄약 유폭이 포함되지 않습니다.</Korean>
             <Japanese>車両の誘爆火災エフェクトを有効化します。\nこれには弾薬の爆発は含まれません。</Japanese>
         </Key>
+        <Key ID="STR_ACE_CookOff_enableProjectiles_name">
+            <English>Enable projectile fire</English>
+            <French>Activer le tir de projectiles</French>
+            <Spanish>Habilitar la detonación de proyectiles</Spanish>
+        </Key>
+        <Key ID="STR_ACE_CookOff_enableProjectiles_tooltip">
+            <English>Enables projectiles firing from the vehicle</English>
+            <French>Active le tir de projectiles depuis le véhicule</French>
+            <Spanish>Habilita la detonación de proyectiles desde el interior del vehículo</Spanish>
+        </Key>
+        <Key ID="STR_ACE_CookOff_enableSound_name">
+            <English>Disable cook-off sounds</English>
+            <French>Désactiver les sons d'explosion</French>
+            <Spanish>Habilitar sonido de detonación</Spanish>
+        </Key>
+        <Key ID="STR_ACE_CookOff_enableSound_tooltip">
+            <English>Enables the sound of projectiles cooking off from inside the vehicle</English>
+            <French>Active le son des projectiles se déclenchant à l'intérieur du véhicule</French>
+            <Spanish>Habilita el sonido de los proyectiles que se detonan dentro del interior del vehículo</Spanish>
+        </Key>
         <Key ID="STR_ACE_CookOff_probabilityCoef_name">
             <English>Vehicle cook-off fire probability multiplier</English>
             <French>Probabilité d'incendies de véhicules</French>
