diff --git a/addons/explosives/ACE_Settings.hpp b/addons/explosives/ACE_Settings.hpp index e2e987f560..c91c94464d 100644 --- a/addons/explosives/ACE_Settings.hpp +++ b/addons/explosives/ACE_Settings.hpp @@ -7,7 +7,7 @@ class ACE_Settings { value = 1; typeName = "BOOL"; }; - class GVAR(ExplodeOnDefuse) { + class GVAR(ExplodeOnDefuse) { value = 1; typeName = "BOOL"; }; diff --git a/addons/explosives/CfgAmmo.hpp b/addons/explosives/CfgAmmo.hpp index f456476f8f..8299a979b3 100644 --- a/addons/explosives/CfgAmmo.hpp +++ b/addons/explosives/CfgAmmo.hpp @@ -69,52 +69,52 @@ class CfgAmmo { /*class DemoCharge_Remote_Ammo_Scripted: DemoCharge_Remote_Ammo; class SatchelCharge_Remote_Ammo_Scripted: SatchelCharge_Remote_Ammo;*/ - - class IEDUrbanBig_Remote_Ammo: PipeBombBase { - triggerWhenDestroyed = 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 { - mineTrigger = "RemoteTrigger"; - }; - class IEDUrbanBig_Range_Ammo: IEDUrbanBig_Remote_Ammo { - mineTrigger = "RangeTrigger"; - }; - - class IEDUrbanSmall_Remote_Ammo: PipeBombBase { - triggerWhenDestroyed = 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 { - mineTrigger = "RemoteTrigger"; - }; - class IEDUrbanSmall_Range_Ammo: IEDUrbanSmall_Remote_Ammo { - mineTrigger = "RangeTrigger"; - }; - - class IEDLandBig_Remote_Ammo: PipeBombBase { - triggerWhenDestroyed = 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 { - mineTrigger = "RemoteTrigger"; - }; - class IEDLandBig_Range_Ammo: IEDLandBig_Remote_Ammo { - mineTrigger = "RangeTrigger"; - }; - - class IEDLandSmall_Remote_Ammo: PipeBombBase { - triggerWhenDestroyed = 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 { - mineTrigger = "RemoteTrigger"; - }; - class IEDLandSmall_Range_Ammo: IEDLandSmall_Remote_Ammo { - mineTrigger = "RangeTrigger"; - }; + + class IEDUrbanBig_Remote_Ammo: PipeBombBase { + triggerWhenDestroyed = 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 { + mineTrigger = "RemoteTrigger"; + }; + class IEDUrbanBig_Range_Ammo: IEDUrbanBig_Remote_Ammo { + mineTrigger = "RangeTrigger"; + }; + + class IEDUrbanSmall_Remote_Ammo: PipeBombBase { + triggerWhenDestroyed = 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 { + mineTrigger = "RemoteTrigger"; + }; + class IEDUrbanSmall_Range_Ammo: IEDUrbanSmall_Remote_Ammo { + mineTrigger = "RangeTrigger"; + }; + + class IEDLandBig_Remote_Ammo: PipeBombBase { + triggerWhenDestroyed = 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 { + mineTrigger = "RemoteTrigger"; + }; + class IEDLandBig_Range_Ammo: IEDLandBig_Remote_Ammo { + mineTrigger = "RangeTrigger"; + }; + + class IEDLandSmall_Remote_Ammo: PipeBombBase { + triggerWhenDestroyed = 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 { + mineTrigger = "RemoteTrigger"; + }; + class IEDLandSmall_Range_Ammo: IEDLandSmall_Remote_Ammo { + mineTrigger = "RangeTrigger"; + }; }; diff --git a/addons/explosives/CfgModule.hpp b/addons/explosives/CfgModule.hpp index ff6a8bc01d..217048d200 100644 --- a/addons/explosives/CfgModule.hpp +++ b/addons/explosives/CfgModule.hpp @@ -23,7 +23,7 @@ class ACE_ModuleExplosive: Module_F { typeName = "BOOL"; defaultValue = 1; }; - class ExplodeOnDefuse { + class ExplodeOnDefuse { displayName = "$STR_ACE_Explosive_ExplodeOnDefuse_DisplayName"; description = "$STR_ACE_Explosive_ExplodeOnDefuse_Description"; typeName = "BOOL"; diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index d13d0c87f7..c8b537a515 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -525,7 +525,7 @@ 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 on defusal?