Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

IED Class Inheritance Fixes

Browse Source
This commit is contained in:
AKALegman 2015-05-30 16:57:50 +01:00
parent fe1055bdbb
commit 3b01da6962
2 changed files with 66 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
addons/explosives/CfgAmmo.hpp
View File

@ -69,25 +69,48 @@ class CfgAmmo {
/*class DemoCharge_Remote_Ammo_Scripted: DemoCharge_Remote_Ammo; /*class DemoCharge_Remote_Ammo_Scripted: DemoCharge_Remote_Ammo;
class SatchelCharge_Remote_Ammo_Scripted: SatchelCharge_Remote_Ammo;*/ class SatchelCharge_Remote_Ammo_Scripted: SatchelCharge_Remote_Ammo;*/
class IEDUrbanBig_Remote_Ammo: PipeBombBase { class IEDUrbanBig_Remote_Ammo: PipeBombBase {
mineTrigger = "RangeTrigger"; triggerWhenDestroyed = 1;
triggerWhenDestroyed = 1; soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40}; };
}; class IEDUrbanBig_Command_Ammo: IEDUrbanBig_Remote_Ammo {
class IEDLandBig_Remote_Ammo: PipeBombBase { mineTrigger = "RemoteTrigger";
mineTrigger = "RangeTrigger"; };
triggerWhenDestroyed = 1; class IEDUrbanBig_Range_Ammo: IEDUrbanBig_Remote_Ammo {
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40}; mineTrigger = "RangeTrigger";
}; };
class IEDUrbanSmall_Remote_Ammo: PipeBombBase {
mineTrigger = "RangeTrigger"; class IEDUrbanSmall_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1; triggerWhenDestroyed = 1;
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40}; soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
}; };
class IEDLandSmall_Remote_Ammo: PipeBombBase { class IEDUrbanSmall_Command_Ammo: IEDUrbanSmall_Remote_Ammo {
mineTrigger = "RangeTrigger"; mineTrigger = "RemoteTrigger";
triggerWhenDestroyed = 1; };
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.562341, 1, 40}; 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";
};
}; };

36
addons/explosives/CfgMagazines.hpp
View File

@ -95,29 +95,33 @@ class CfgMagazines {
}; };
}; };
}; };
class IEDUrbanBig_Remote_Mag: DemoCharge_Remote_Mag { class IEDUrbanBig_Remote_Mag: DemoCharge_Remote_Mag {
ACE_SetupObject = "ACE_Explosives_Place_IEDUrbanBig"; class ACE_Triggers {
class ACE_Triggers { SupportedTriggers[] = {"Command", "DeadmanSwitch", "Cellphone", "PressurePlate"};
SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone", "PressurePlate"};
class Command { class Command {
FuseTime = 0.5; FuseTime = 0.5;
ammo = "IEDUrbanBig_Command_Ammo";
}; };
class DeadmanSwitch:Command {}; class DeadmanSwitch: Command{};
class Cellphone:Command {}; class Cellphone: Command{};
class PressurePlate { class PressurePlate{
displayName = $STR_ACE_Explosives_SLAME_Magnetic; displayName = $STR_ACE_Explosives_SLAME_Magnetic;
digDistance = 0; digDistance = 0;
ammo = "IEDUrbanBig_Remote_Ammo"; ammo = "IEDUrbanBig_Range_Ammo";
pitch = 0; 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 ACE_Triggers: ACE_Triggers {
class Command: Command {
ammo = "IEDLandBig_Command_Ammo";
};
class PressurePlate: PressurePlate { class PressurePlate: PressurePlate {
ammo = "IEDLandBig_Remote_Ammo"; ammo = "IEDLandBig_Range_Ammo";
}; };
}; };
}; };
@ -127,13 +131,14 @@ class CfgMagazines {
SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone", "PressurePlate"}; SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone", "PressurePlate"};
class Command { class Command {
FuseTime = 0.5; FuseTime = 0.5;
ammo = "IEDUrbanSmall_Command_Ammo";
}; };
class DeadmanSwitch: Command {}; class DeadmanSwitch: Command {};
class Cellphone: Command {}; class Cellphone: Command {};
class PressurePlate { class PressurePlate {
displayName = $STR_ACE_Explosives_SLAME_Magnetic; displayName = $STR_ACE_Explosives_SLAME_Magnetic;
digDistance = 0; digDistance = 0;
ammo = "IEDUrbanSmall_Remote_Ammo"; ammo = "IEDUrbanSmall_Range_Ammo";
pitch = 0; pitch = 0;
}; };
}; };
@ -141,8 +146,11 @@ class CfgMagazines {
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 ACE_Triggers: ACE_Triggers {
class Command: Command {
ammo = "IEDLandSmall_Command_Ammo";
};
class PressurePlate: PressurePlate { class PressurePlate: PressurePlate {
ammo = "IEDLandSmall_Remote_Ammo"; ammo = "IEDLandSmall_Range_Ammo";
}; };
}; };
}; };