From 3b01da696253bfa8f08a3017022be395b7a6b1ce Mon Sep 17 00:00:00 2001
From: AKALegman <juicemelon@msn.com>
Date: Sat, 30 May 2015 16:57:50 +0100
Subject: [PATCH] IED Class Inheritance Fixes

---
 addons/explosives/CfgAmmo.hpp      | 65 ++++++++++++++++++++----------
 addons/explosives/CfgMagazines.hpp | 36 ++++++++++-------
 2 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/addons/explosives/CfgAmmo.hpp b/addons/explosives/CfgAmmo.hpp
index c6d70bc64a..ace7d5ef02 100644
--- a/addons/explosives/CfgAmmo.hpp
+++ b/addons/explosives/CfgAmmo.hpp
@@ -69,25 +69,48 @@ class CfgAmmo {
     
     /*class DemoCharge_Remote_Ammo_Scripted: DemoCharge_Remote_Ammo;
     class SatchelCharge_Remote_Ammo_Scripted: SatchelCharge_Remote_Ammo;*/
-
-    class IEDUrbanBig_Remote_Ammo: PipeBombBase {
-        mineTrigger = "RangeTrigger";
-        triggerWhenDestroyed = 1;
-        soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40};
-    };
-    class IEDLandBig_Remote_Ammo: PipeBombBase {
-        mineTrigger = "RangeTrigger";
-        triggerWhenDestroyed = 1;
-        soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40};
-    };
-    class IEDUrbanSmall_Remote_Ammo: PipeBombBase {
-        mineTrigger = "RangeTrigger";
-        triggerWhenDestroyed = 1;
-        soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40};
-    };
-    class IEDLandSmall_Remote_Ammo: PipeBombBase {
-        mineTrigger = "RangeTrigger";
-        triggerWhenDestroyed = 1;
-        soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40};
-    };
+	
+	class IEDUrbanBig_Remote_Ammo: PipeBombBase {
+		triggerWhenDestroyed = 1;
+		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;
+		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;
+		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;
+		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/CfgMagazines.hpp b/addons/explosives/CfgMagazines.hpp
index 248ee12640..bb8b0080bb 100644
--- a/addons/explosives/CfgMagazines.hpp
+++ b/addons/explosives/CfgMagazines.hpp
@@ -95,29 +95,33 @@ class CfgMagazines {
             };
         };
     };
-
-    class IEDUrbanBig_Remote_Mag: DemoCharge_Remote_Mag {
-        ACE_SetupObject = "ACE_Explosives_Place_IEDUrbanBig";
-        class ACE_Triggers {
-            SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone", "PressurePlate"};
+	
+	class IEDUrbanBig_Remote_Mag: DemoCharge_Remote_Mag {
+		class ACE_Triggers {
+            SupportedTriggers[] = {"Command", "DeadmanSwitch", "Cellphone", "PressurePlate"};
             class Command {
                 FuseTime = 0.5;
+				ammo = "IEDUrbanBig_Command_Ammo";
             };
-            class DeadmanSwitch:Command {};
-            class Cellphone:Command {};
-            class PressurePlate {
+            class DeadmanSwitch: Command{};
+            class Cellphone: Command{};
+            class PressurePlate{
                 displayName = $STR_ACE_Explosives_SLAME_Magnetic;
                 digDistance = 0;
-                ammo = "IEDUrbanBig_Remote_Ammo";
+                ammo = "IEDUrbanBig_Range_Ammo";
                 pitch = 0;
             };
-        };
-    };
+        };		
+	};
+	
     class IEDLandBig_Remote_Mag: IEDUrbanBig_Remote_Mag {
         ACE_SetupObject = "ACE_Explosives_Place_IEDLandBig";
         class ACE_Triggers: ACE_Triggers {
+			class Command: Command {
+				ammo = "IEDLandBig_Command_Ammo";
+			};
             class PressurePlate: PressurePlate {
-                ammo = "IEDLandBig_Remote_Ammo";
+                ammo = "IEDLandBig_Range_Ammo";
             };
         };
     };
@@ -127,13 +131,14 @@ class CfgMagazines {
             SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone", "PressurePlate"};
             class Command {
                 FuseTime = 0.5;
+				ammo = "IEDUrbanSmall_Command_Ammo";
             };
             class DeadmanSwitch: Command {};
             class Cellphone: Command {};
             class PressurePlate {
                 displayName = $STR_ACE_Explosives_SLAME_Magnetic;
                 digDistance = 0;
-                ammo = "IEDUrbanSmall_Remote_Ammo";
+                ammo = "IEDUrbanSmall_Range_Ammo";
                 pitch = 0;
             };
         };
@@ -141,8 +146,11 @@ class CfgMagazines {
     class IEDLandSmall_Remote_Mag: IEDUrbanSmall_Remote_Mag {
         ACE_SetupObject = "ACE_Explosives_Place_IEDLandSmall";
         class ACE_Triggers: ACE_Triggers {
+			class Command: Command {
+				ammo = "IEDLandSmall_Command_Ammo";
+			};
             class PressurePlate: PressurePlate {
-                ammo = "IEDLandSmall_Remote_Ammo";
+                ammo = "IEDLandSmall_Range_Ammo";
             };
         };
     };