Merge pull request #1248 from jonpas/iedPressurePlates

IED pressure plates
This commit is contained in:
Nicolás Badano 2015-05-16 14:15:49 -03:00
commit dd6f50339c
3 changed files with 92 additions and 62 deletions

View File

@ -98,3 +98,4 @@ adam3adam <br.ada@seznam.cz>
Professor <lukas.trneny@wo.cz> Professor <lukas.trneny@wo.cz>
Winter <simon@agius-muscat.net> Winter <simon@agius-muscat.net>
Dharma Bellamkonda <dharma.bellamkonda@gmail.com> Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
legman <juicemelon@msn.com>

View File

@ -2,85 +2,92 @@ class CfgAmmo {
// All explosive based Ammo classes. These are all listed in case they become required. // All explosive based Ammo classes. These are all listed in case they become required.
class Default; class Default;
class TimeBombCore:Default { class TimeBombCore: Default {
ACE_DefuseTime = 5; ACE_DefuseTime = 5;
}; };
/* /*
class BoundingMineCore:TimeBombCore; class BoundingMineCore: TimeBombCore;
class BoundingMineBase:BoundingMineCore; class BoundingMineBase: BoundingMineCore;
class APERSBoundingMine_Range_Ammo:BoundingMineBase; class APERSBoundingMine_Range_Ammo: BoundingMineBase;
class MineCore: TimeBombCore; class MineCore: TimeBombCore;
class MineBase:MineCore; class MineBase: MineCore;
class APERSMine_Range_Ammo:MineBase; class APERSMine_Range_Ammo: MineBase;
class ATMine_Range_Ammo:MineBase; class ATMine_Range_Ammo: MineBase;
class UnderwaterMine_Range_Ammo:MineBase; class UnderwaterMine_Range_Ammo: MineBase;
class UnderwaterMineAB_Range_Ammo:UnderwaterMine_Range_Ammo; class UnderwaterMineAB_Range_Ammo: UnderwaterMine_Range_Ammo;
class UnderwaterMinePDM_Range_Ammo:UnderwaterMine_Range_Ammo; class UnderwaterMinePDM_Range_Ammo: UnderwaterMine_Range_Ammo;
class DirectionalBombCore:TimeBombCore; class DirectionalBombCore: TimeBombCore;
class DirectionalBombBase:DirectionalBombCore; class DirectionalBombBase: DirectionalBombCore;
class APERSTripMine_Wire_Ammo:DirectionalBombBase; class APERSTripMine_Wire_Ammo: DirectionalBombBase;
class SLAMDirectionalMine_Wire_Ammo:DirectionalBombBase; class SLAMDirectionalMine_Wire_Ammo: DirectionalBombBase;
class PipeBombCore: TimeBombCore; class PipeBombCore: TimeBombCore;
class PipeBombBase:PipeBombCore; class PipeBombBase: PipeBombCore;
*/ */
class DirectionalBombBase; class DirectionalBombBase;
class ClaymoreDirectionalMine_Remote_Ammo:DirectionalBombBase{ class ClaymoreDirectionalMine_Remote_Ammo: DirectionalBombBase {
ACE_Explosive = "ClaymoreDirectionalMine_Remote_Ammo_Scripted"; ACE_Explosive = "ClaymoreDirectionalMine_Remote_Ammo_Scripted";
soundActivation[] = {"",0,0,0}; soundActivation[] = {"", 0, 0, 0};
soundDeactivation[] = {"",0,0,0}; soundDeactivation[] = {"", 0, 0, 0};
}; };
//class ClaymoreDirectionalMine_Remote_Ammo_Scripted:ClaymoreDirectionalMine_Remote_Ammo; //class ClaymoreDirectionalMine_Remote_Ammo_Scripted: ClaymoreDirectionalMine_Remote_Ammo;
class SLAMDirectionalMine_Wire_Ammo:DirectionalBombBase{ class SLAMDirectionalMine_Wire_Ammo: DirectionalBombBase {
indirectHitRange = 20; indirectHitRange = 20;
ACE_explodeOnDefuse = 1; ACE_explodeOnDefuse = 1;
}; };
class SLAMDirectionalMine_Command_Ammo:SLAMDirectionalMine_Wire_Ammo { class SLAMDirectionalMine_Command_Ammo: SLAMDirectionalMine_Wire_Ammo {
mineTrigger = "RemoteTrigger"; mineTrigger = "RemoteTrigger";
ACE_explodeOnDefuse = 0; ACE_explodeOnDefuse = 0;
}; };
class SLAMDirectionalMine_Timer_Ammo:SLAMDirectionalMine_Wire_Ammo { class SLAMDirectionalMine_Timer_Ammo: SLAMDirectionalMine_Wire_Ammo {
mineTrigger = "TimeTrigger"; mineTrigger = "TimeTrigger";
ACE_explodeOnDefuse = 0; ACE_explodeOnDefuse = 0;
}; };
class SLAMDirectionalMine_Magnetic_Ammo:SLAMDirectionalMine_Wire_Ammo { class SLAMDirectionalMine_Magnetic_Ammo: SLAMDirectionalMine_Wire_Ammo {
mineTrigger = "MagneticTrigger"; mineTrigger = "MagneticTrigger";
}; };
class PipeBombBase; class PipeBombBase;
class DemoCharge_Remote_Ammo:PipeBombBase{ class DemoCharge_Remote_Ammo: PipeBombBase {
ACE_Explosive = "DemoCharge_Remote_Ammo_Scripted"; ACE_Explosive = "DemoCharge_Remote_Ammo_Scripted";
soundActivation[] = {"",0,0,0}; soundActivation[] = {"", 0, 0, 0};
soundDeactivation[] = {"",0,0,0}; soundDeactivation[] = {"", 0, 0, 0};
hit = 500; hit = 500;
indirectHit = 500; indirectHit = 500;
indirectHitRange = 7; indirectHitRange = 7;
}; };
class SatchelCharge_Remote_Ammo:PipeBombBase{ class SatchelCharge_Remote_Ammo: PipeBombBase {
ACE_Explosive = "SatchelCharge_Remote_Ammo_Scripted"; ACE_Explosive = "SatchelCharge_Remote_Ammo_Scripted";
soundActivation[] = {"",0,0,0}; soundActivation[] = {"", 0, 0, 0};
soundDeactivation[] = {"",0,0,0}; soundDeactivation[] = {"", 0, 0, 0};
}; };
/*
class DemoCharge_Remote_Ammo_Scripted:DemoCharge_Remote_Ammo;
class SatchelCharge_Remote_Ammo_Scripted:SatchelCharge_Remote_Ammo;
TODO: Configure IEDs to use the system. /*class DemoCharge_Remote_Ammo_Scripted: DemoCharge_Remote_Ammo;
class IEDLandBig_Remote_Ammo:PipeBombBase{ class SatchelCharge_Remote_Ammo_Scripted: SatchelCharge_Remote_Ammo;*/
class IEDUrbanBig_Remote_Ammo: PipeBombBase {
mineTrigger = "RangeTrigger";
triggerWhenDestroyed = 1; triggerWhenDestroyed = 1;
}; soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40};
class IEDLandSmall_Remote_Ammo:PipeBombBase{ };
triggerWhenDestroyed = 1; class IEDLandBig_Remote_Ammo: IEDUrbanBig_Remote_Ammo {
}; mineTrigger = "RangeTrigger";
class IEDUrbanBig_Remote_Ammo:PipeBombBase{ triggerWhenDestroyed = 1;
triggerWhenDestroyed = 1; soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40};
}; };
class IEDUrbanSmall_Remote_Ammo:PipeBombBase{ class IEDUrbanSmall_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1; mineTrigger = "RangeTrigger";
};*/ triggerWhenDestroyed = 1;
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40};
};
class IEDLandSmall_Remote_Ammo: IEDUrbanSmall_Remote_Ammo {
mineTrigger = "RangeTrigger";
triggerWhenDestroyed = 1;
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40};
};
}; };

View File

@ -1,6 +1,6 @@
class CfgMagazines { class CfgMagazines {
class CA_Magazine; class CA_Magazine;
class ATMine_Range_Mag:CA_Magazine{ class ATMine_Range_Mag: CA_Magazine {
ACE_Placeable = 1; ACE_Placeable = 1;
useAction = 0; useAction = 0;
ACE_SetupObject = "ACE_Explosives_Place_ATMine"; // CfgVehicle class for setup object. ACE_SetupObject = "ACE_Explosives_Place_ATMine"; // CfgVehicle class for setup object.
@ -12,7 +12,7 @@ class CfgMagazines {
}; };
}; };
}; };
class APERSBoundingMine_Range_Mag:ATMine_Range_Mag{ class APERSBoundingMine_Range_Mag: ATMine_Range_Mag {
ACE_SetupObject = "ACE_Explosives_Place_APERSBoundingMine"; ACE_SetupObject = "ACE_Explosives_Place_APERSBoundingMine";
class ACE_Triggers { class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"}; SupportedTriggers[] = {"PressurePlate"};
@ -21,7 +21,7 @@ class CfgMagazines {
}; };
}; };
}; };
class APERSMine_Range_Mag:ATMine_Range_Mag{ class APERSMine_Range_Mag: ATMine_Range_Mag {
ACE_SetupObject = "ACE_Explosives_Place_APERSMine"; ACE_SetupObject = "ACE_Explosives_Place_APERSMine";
class ACE_Triggers { class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"}; SupportedTriggers[] = {"PressurePlate"};
@ -30,7 +30,7 @@ class CfgMagazines {
}; };
}; };
}; };
class APERSTripMine_Wire_Mag:ATMine_Range_Mag{ class APERSTripMine_Wire_Mag: ATMine_Range_Mag {
ACE_SetupObject = "ACE_Explosives_Place_APERSTripwireMine"; ACE_SetupObject = "ACE_Explosives_Place_APERSTripwireMine";
class ACE_Triggers { class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"}; SupportedTriggers[] = {"Tripwire"};
@ -38,7 +38,7 @@ class CfgMagazines {
}; };
}; };
class ClaymoreDirectionalMine_Remote_Mag:CA_Magazine{ class ClaymoreDirectionalMine_Remote_Mag: CA_Magazine {
ACE_Placeable = 1; ACE_Placeable = 1;
useAction = 0; useAction = 0;
ACE_SetupObject = "ACE_Explosives_Place_Claymore"; ACE_SetupObject = "ACE_Explosives_Place_Claymore";
@ -51,7 +51,7 @@ class CfgMagazines {
}; };
}; };
class SatchelCharge_Remote_Mag:CA_Magazine{ class SatchelCharge_Remote_Mag: CA_Magazine {
ACE_Placeable = 1; ACE_Placeable = 1;
useAction = 0; useAction = 0;
ACE_SetupObject = "ACE_Explosives_Place_SatchelCharge"; ACE_SetupObject = "ACE_Explosives_Place_SatchelCharge";
@ -64,16 +64,16 @@ class CfgMagazines {
class Command { class Command {
FuseTime = 0.5; FuseTime = 0.5;
}; };
class MK16_Transmitter:Command{}; class MK16_Transmitter: Command {};
class DeadmanSwitch:Command{}; class DeadmanSwitch: Command {};
}; };
}; };
class DemoCharge_Remote_Mag:SatchelCharge_Remote_Mag{ class DemoCharge_Remote_Mag: SatchelCharge_Remote_Mag {
ACE_SetupObject = "ACE_Explosives_Place_DemoCharge"; ACE_SetupObject = "ACE_Explosives_Place_DemoCharge";
model = "\A3\Weapons_F\explosives\c4_charge_small_d"; model = "\A3\Weapons_F\explosives\c4_charge_small_d";
}; };
class SLAMDirectionalMine_Wire_Mag: ATMine_Range_Mag{ class SLAMDirectionalMine_Wire_Mag: ATMine_Range_Mag {
ACE_SetupObject = "ACE_Explosives_Place_SLAM"; ACE_SetupObject = "ACE_Explosives_Place_SLAM";
class ACE_Triggers { class ACE_Triggers {
SupportedTriggers[] = {"IRSensor","PressurePlate","Timer","Command"}; SupportedTriggers[] = {"IRSensor","PressurePlate","Timer","Command"};
@ -99,29 +99,51 @@ class CfgMagazines {
class IEDUrbanBig_Remote_Mag: DemoCharge_Remote_Mag { class IEDUrbanBig_Remote_Mag: DemoCharge_Remote_Mag {
ACE_SetupObject = "ACE_Explosives_Place_IEDUrbanBig"; ACE_SetupObject = "ACE_Explosives_Place_IEDUrbanBig";
class ACE_Triggers { class ACE_Triggers {
SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone"}; SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone", "PressurePlate"};
class Command { class Command {
FuseTime = 0.5; FuseTime = 0.5;
}; };
class DeadmanSwitch:Command{}; class DeadmanSwitch:Command {};
class Cellphone:Command{}; class Cellphone:Command {};
class PressurePlate {
displayName = $STR_ACE_Explosives_SLAME_Magnetic;
digDistance = 0;
ammo = "IEDUrbanBig_Remote_Ammo";
pitch = 0;
}; };
}; };
class IEDLandBig_Remote_Mag: IEDUrbanBig_Remote_Mag{ };
class IEDLandBig_Remote_Mag: IEDUrbanBig_Remote_Mag {
ACE_SetupObject = "ACE_Explosives_Place_IEDLandBig"; ACE_SetupObject = "ACE_Explosives_Place_IEDLandBig";
class ACE_Triggers: ACE_Triggers {
class PressurePlate: PressurePlate {
ammo = "IEDLandBig_Remote_Ammo";
};
};
}; };
class IEDUrbanSmall_Remote_Mag: DemoCharge_Remote_Mag { class IEDUrbanSmall_Remote_Mag: DemoCharge_Remote_Mag {
ACE_SetupObject = "ACE_Explosives_Place_IEDUrbanSmall"; ACE_SetupObject = "ACE_Explosives_Place_IEDUrbanSmall";
class ACE_Triggers { class ACE_Triggers {
SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone"}; SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone", "PressurePlate"};
class Command { class Command {
FuseTime = 0.5; FuseTime = 0.5;
}; };
class DeadmanSwitch:Command{}; class DeadmanSwitch: Command {};
class Cellphone:Command{}; class Cellphone: Command {};
class PressurePlate {
displayName = $STR_ACE_Explosives_SLAME_Magnetic;
digDistance = 0;
ammo = "IEDUrbanSmall_Remote_Ammo";
pitch = 0;
};
}; };
}; };
class IEDLandSmall_Remote_Mag: IEDUrbanSmall_Remote_Mag { class IEDLandSmall_Remote_Mag: IEDUrbanSmall_Remote_Mag {
ACE_SetupObject = "ACE_Explosives_Place_IEDLandSmall"; ACE_SetupObject = "ACE_Explosives_Place_IEDLandSmall";
class ACE_Triggers: ACE_Triggers {
class PressurePlate: PressurePlate {
ammo = "IEDLandSmall_Remote_Ammo";
};
};
}; };
}; };