diff --git a/addons/explosives/ACE_Settings.hpp b/addons/explosives/ACE_Settings.hpp
index 6f48e739cf..e2e987f560 100644
--- a/addons/explosives/ACE_Settings.hpp
+++ b/addons/explosives/ACE_Settings.hpp
@@ -7,8 +7,8 @@ class ACE_Settings {
value = 1;
typeName = "BOOL";
};
- class GVAR(ExplodeOnDefuseChance) {
- value = 0.02;
- typeName = "SCALAR";
+ class GVAR(ExplodeOnDefuse) {
+ value = 1;
+ typeName = "BOOL";
};
};
diff --git a/addons/explosives/CfgAmmo.hpp b/addons/explosives/CfgAmmo.hpp
index 15e742af31..f456476f8f 100644
--- a/addons/explosives/CfgAmmo.hpp
+++ b/addons/explosives/CfgAmmo.hpp
@@ -72,7 +72,7 @@ class CfgAmmo {
class IEDUrbanBig_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1;
- ACE_ExplodeOnDefuse = 1;
+ ACE_explodeOnDefuse = 0.02;
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
};
class IEDUrbanBig_Command_Ammo: IEDUrbanBig_Remote_Ammo {
@@ -84,7 +84,7 @@ class CfgAmmo {
class IEDUrbanSmall_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1;
- ACE_ExplodeOnDefuse = 1;
+ ACE_explodeOnDefuse = 0.02;
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
};
class IEDUrbanSmall_Command_Ammo: IEDUrbanSmall_Remote_Ammo {
@@ -96,7 +96,7 @@ class CfgAmmo {
class IEDLandBig_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1;
- ACE_ExplodeOnDefuse = 1;
+ ACE_explodeOnDefuse = 0.02;
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
};
class IEDLandBig_Command_Ammo: IEDLandBig_Remote_Ammo {
@@ -108,7 +108,7 @@ class CfgAmmo {
class IEDLandSmall_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1;
- ACE_ExplodeOnDefuse = 1;
+ ACE_explodeOnDefuse = 0.02;
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
};
class IEDLandSmall_Command_Ammo: IEDLandSmall_Remote_Ammo {
diff --git a/addons/explosives/CfgModule.hpp b/addons/explosives/CfgModule.hpp
index e614400191..ff6a8bc01d 100644
--- a/addons/explosives/CfgModule.hpp
+++ b/addons/explosives/CfgModule.hpp
@@ -23,11 +23,11 @@ class ACE_ModuleExplosive: Module_F {
typeName = "BOOL";
defaultValue = 1;
};
- class ExplodeOnDefuseChance {
- displayName = "$STR_ACE_Explosive_ExplodeOnDefuseChance_DisplayName";
- description = "$STR_ACE_Explosive_ExplodeOnDefuseChance_Description";
- typeName = "NUMBER";
- defaultValue = 0.02;
+ class ExplodeOnDefuse {
+ displayName = "$STR_ACE_Explosive_ExplodeOnDefuse_DisplayName";
+ description = "$STR_ACE_Explosive_ExplodeOnDefuse_Description";
+ typeName = "BOOL";
+ defaultValue = 1;
};
};
class ModuleDescription: ModuleDescription {
diff --git a/addons/explosives/functions/fnc_defuseExplosive.sqf b/addons/explosives/functions/fnc_defuseExplosive.sqf
index e16a485fe7..628b343aeb 100644
--- a/addons/explosives/functions/fnc_defuseExplosive.sqf
+++ b/addons/explosives/functions/fnc_defuseExplosive.sqf
@@ -18,8 +18,7 @@
EXPLODE_2_PVT(_this,_unit,_explosive);
_explode = random 1.0;
-if (getNumber (ConfigFile >> "CfgAmmo" >> typeOf _explosive >> "ACE_explodeOnDefuse") == 1 &&
- _explode < GVAR(ExplodeOnDefuseChance)) exitWith {
+if (GVAR(ExplodeOnDefuse) && _explode < getNumber(ConfigFile >> "CfgAmmo" >> typeOf _explosive >> "ACE_explodeOnDefuse")) exitWith {
[_unit, -1, [_explosive, 1], true] call FUNC(detonateExplosive);
};
diff --git a/addons/explosives/functions/fnc_module.sqf b/addons/explosives/functions/fnc_module.sqf
index 67de88410d..56225d8ca8 100644
--- a/addons/explosives/functions/fnc_module.sqf
+++ b/addons/explosives/functions/fnc_module.sqf
@@ -27,7 +27,7 @@ if !(_activated) exitWith {};
call EFUNC(Common,readSettingFromModule);
[_logic, QGVAR(PunishNonSpecialists),"PunishNonSpecialists"]
call EFUNC(Common,readSettingFromModule);
-[_logic, QGVAR(ExplodeOnDefuseChance),"ExplodeOnDefuseChance"]
+[_logic, QGVAR(ExplodeOnDefuse),"ExplodeOnDefuse"]
call EFUNC(Common,readSettingFromModule);
diag_log text "[ACE]: Explosive Module Initialized.";
diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml
index 6ac5e09620..d13d0c87f7 100644
--- a/addons/explosives/stringtable.xml
+++ b/addons/explosives/stringtable.xml
@@ -525,11 +525,11 @@
Increase the time it takes to complete actions for non-specialists? Default: Yes
Zwiększyć ilość wymaganego czasu do ukończenia akcji dla nie-specjalistów? Domyślnie: Tak
-
- Explode chance?
+
+ Explode on defusal?
-
- Chance for special explosives to explode on defuse? Default: 0.02 (2%)
+
+ Enable certain explosives to explode on defusal? Default: Yes