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

Fix detonate action pictures

Browse Source
This commit is contained in:
VKing 2016-01-15 00:25:02 +01:00
parent 05c80c2368
commit 4e8ea4f8e6
3 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/explosives/CfgAmmo.hpp
View File

@ -29,12 +29,15 @@ class CfgAmmo {
*/ */
class DirectionalBombBase; class DirectionalBombBase;
class ClaymoreDirectionalMine_Remote_Ammo: DirectionalBombBase { class ClaymoreDirectionalMine_Remote_Ammo: DirectionalBombBase {
GVAR(magazine) = "ClaymoreDirectionalMine_Remote_Mag";
GVAR(Explosive) = "ClaymoreDirectionalMine_Remote_Ammo_Scripted"; GVAR(Explosive) = "ClaymoreDirectionalMine_Remote_Ammo_Scripted";
GVAR(defuseObjectPosition[]) = {0, 0, 0.038}; GVAR(defuseObjectPosition[]) = {0, 0, 0.038};
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 {
GVAR(magazine) = "ClaymoreDirectionalMine_Remote_Mag";
};
class APERSTripMine_Wire_Ammo: DirectionalBombBase { class APERSTripMine_Wire_Ammo: DirectionalBombBase {
GVAR(defuseObjectPosition[]) = {-1.415, 0, 0.12}; GVAR(defuseObjectPosition[]) = {-1.415, 0, 0.12};
@ -43,6 +46,7 @@ class CfgAmmo {
class SLAMDirectionalMine_Wire_Ammo: DirectionalBombBase { class SLAMDirectionalMine_Wire_Ammo: DirectionalBombBase {
indirectHitRange = 20; indirectHitRange = 20;
GVAR(explodeOnDefuseChance) = 1; GVAR(explodeOnDefuseChance) = 1;
GVAR(magazine) = "SLAMDirectionalMine_Wire_Mag";
}; };
class ACE_SLAMDirectionalMine_Command_Ammo: SLAMDirectionalMine_Wire_Ammo { class ACE_SLAMDirectionalMine_Command_Ammo: SLAMDirectionalMine_Wire_Ammo {
mineTrigger = "RemoteTrigger"; mineTrigger = "RemoteTrigger";
@ -62,6 +66,7 @@ class CfgAmmo {
class PipeBombBase; class PipeBombBase;
class DemoCharge_Remote_Ammo: PipeBombBase { class DemoCharge_Remote_Ammo: PipeBombBase {
GVAR(magazine) = "DemoCharge_Remote_Mag";
GVAR(Explosive) = "DemoCharge_Remote_Ammo_Scripted"; GVAR(Explosive) = "DemoCharge_Remote_Ammo_Scripted";
GVAR(defuseObjectPosition[]) = {0.07, 0, 0.055}; GVAR(defuseObjectPosition[]) = {0.07, 0, 0.055};
soundActivation[] = {"", 0, 0, 0}; soundActivation[] = {"", 0, 0, 0};
@ -71,18 +76,24 @@ class CfgAmmo {
indirectHitRange = 7; indirectHitRange = 7;
}; };
class SatchelCharge_Remote_Ammo: PipeBombBase { class SatchelCharge_Remote_Ammo: PipeBombBase {
GVAR(magazine) = "SatchelCharge_Remote_Mag";
GVAR(Explosive) = "SatchelCharge_Remote_Ammo_Scripted"; GVAR(Explosive) = "SatchelCharge_Remote_Ammo_Scripted";
GVAR(defuseObjectPosition[]) = {0.1, 0.1, 0.05}; GVAR(defuseObjectPosition[]) = {0.1, 0.1, 0.05};
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 DemoCharge_Remote_Ammo_Scripted: DemoCharge_Remote_Ammo {
class SatchelCharge_Remote_Ammo_Scripted: SatchelCharge_Remote_Ammo;*/ GVAR(magazine) = "DemoCharge_Remote_Mag";
};
class SatchelCharge_Remote_Ammo_Scripted: SatchelCharge_Remote_Ammo {
GVAR(magazine) = "SatchelCharge_Remote_Mag";
};
class IEDUrbanBig_Remote_Ammo: PipeBombBase { class IEDUrbanBig_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1; triggerWhenDestroyed = 1;
GVAR(explodeOnDefuseChance) = 0.02; GVAR(explodeOnDefuseChance) = 0.02;
GVAR(magazine) = "IEDUrbanBig_Remote_Mag";
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40}; soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
}; };
class ACE_IEDUrbanBig_Command_Ammo: IEDUrbanBig_Remote_Ammo { class ACE_IEDUrbanBig_Command_Ammo: IEDUrbanBig_Remote_Ammo {
@ -95,6 +106,7 @@ class CfgAmmo {
class IEDUrbanSmall_Remote_Ammo: PipeBombBase { class IEDUrbanSmall_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1; triggerWhenDestroyed = 1;
GVAR(explodeOnDefuseChance) = 0.02; GVAR(explodeOnDefuseChance) = 0.02;
GVAR(magazine) = "IEDUrbanSmall_Remote_Mag";
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40}; soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
}; };
class ACE_IEDUrbanSmall_Command_Ammo: IEDUrbanSmall_Remote_Ammo { class ACE_IEDUrbanSmall_Command_Ammo: IEDUrbanSmall_Remote_Ammo {
@ -107,6 +119,7 @@ class CfgAmmo {
class IEDLandBig_Remote_Ammo: PipeBombBase { class IEDLandBig_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1; triggerWhenDestroyed = 1;
GVAR(explodeOnDefuseChance) = 0.02; GVAR(explodeOnDefuseChance) = 0.02;
GVAR(magazine) = "IEDLandBig_Remote_Mag";
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40}; soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
}; };
class ACE_IEDLandBig_Command_Ammo: IEDLandBig_Remote_Ammo { class ACE_IEDLandBig_Command_Ammo: IEDLandBig_Remote_Ammo {
@ -119,6 +132,7 @@ class CfgAmmo {
class IEDLandSmall_Remote_Ammo: PipeBombBase { class IEDLandSmall_Remote_Ammo: PipeBombBase {
triggerWhenDestroyed = 1; triggerWhenDestroyed = 1;
GVAR(explodeOnDefuseChance) = 0.02; GVAR(explodeOnDefuseChance) = 0.02;
GVAR(magazine) = "IEDLandSmall_Remote_Mag";
soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40}; soundTrigger[] = {"A3\Sounds_F\weapons\mines\mech_trigger_1", 0.8, 1, 40};
}; };
class ACE_IEDLandSmall_Command_Ammo: IEDLandSmall_Remote_Ammo { class ACE_IEDLandSmall_Command_Ammo: IEDLandSmall_Remote_Ammo {

30
addons/explosives/CfgVehicles.hpp
View File

@ -341,18 +341,8 @@ class CfgVehicles {
// Editor placed mines // Editor placed mines
class MineBase; class MineBase;
class SatchelCharge_F: MineBase {
GVAR(magazine) = "SatchelCharge_Remote_Mag";
};
class DemoCharge_F: MineBase {
GVAR(magazine) = "DemoCharge_Remote_Mag";
};
class Claymore_F: MineBase {
GVAR(magazine) = "ClaymoreDirectionalMine_Remote_Mag";
};
class SLAMDirectionalMine: MineBase { class SLAMDirectionalMine: MineBase {
displayName = CSTRING(Module_SLAMSideAttack_DisplayName); displayName = CSTRING(Module_SLAMSideAttack_DisplayName);
GVAR(magazine) = "SLAMDirectionalMine_Wire_Mag";
}; };
class ACE_SLAMBottomMine: SLAMDirectionalMine { class ACE_SLAMBottomMine: SLAMDirectionalMine {
author = ECSTRING(common,aceteam); author = ECSTRING(common,aceteam);
@ -361,40 +351,28 @@ class CfgVehicles {
// TODO: Find a way to place the mine laying down instead of standing up // TODO: Find a way to place the mine laying down instead of standing up
}; };
class IEDUrbanBig_F: MineBase { class IEDUrbanBig_F;
GVAR(magazine) = "IEDUrbanBig_Remote_Mag";
};
class ACE_IEDUrbanBig_Range: IEDUrbanBig_F { class ACE_IEDUrbanBig_Range: IEDUrbanBig_F {
author = ECSTRING(common,aceteam); author = ECSTRING(common,aceteam);
ammo = "ACE_IEDUrbanBig_Range_Ammo"; ammo = "ACE_IEDUrbanBig_Range_Ammo";
GVAR(magazine) = "IEDUrbanBig_Remote_Mag";
displayName = CSTRING(Module_IEDUrbanBig_Range_DisplayName); displayName = CSTRING(Module_IEDUrbanBig_Range_DisplayName);
}; };
class IEDLandBig_F: MineBase { class IEDLandBig_F;
GVAR(magazine) = "IEDLandBig_Remote_Mag";
};
class ACE_IEDLandBig_Range: IEDLandBig_F { class ACE_IEDLandBig_Range: IEDLandBig_F {
author = ECSTRING(common,aceteam); author = ECSTRING(common,aceteam);
ammo = "ACE_IEDLandBig_Range_Ammo"; ammo = "ACE_IEDLandBig_Range_Ammo";
GVAR(magazine) = "IEDLandBig_Remote_Mag";
displayName = CSTRING(Module_IEDLandBig_Range_DisplayName); displayName = CSTRING(Module_IEDLandBig_Range_DisplayName);
}; };
class IEDUrbanSmall_F: MineBase { class IEDUrbanSmall_F;
GVAR(magazine) = "IEDUrbanSmall_Remote_Mag";
};
class ACE_IEDUrbanSmall_Range: IEDUrbanSmall_F { class ACE_IEDUrbanSmall_Range: IEDUrbanSmall_F {
author = ECSTRING(common,aceteam); author = ECSTRING(common,aceteam);
ammo = "ACE_IEDUrbanSmall_Range_Ammo"; ammo = "ACE_IEDUrbanSmall_Range_Ammo";
GVAR(magazine) = "IEDUrbanSmall_Remote_Mag";
displayName = CSTRING(Module_IEDUrbanSmall_Range_DisplayName); displayName = CSTRING(Module_IEDUrbanSmall_Range_DisplayName);
}; };
class IEDLandSmall_F: MineBase { class IEDLandSmall_F;
GVAR(magazine) = "IEDLandSmall_Remote_Mag";
};
class ACE_IEDLandSmall_Range: IEDLandSmall_F { class ACE_IEDLandSmall_Range: IEDLandSmall_F {
author = ECSTRING(common,aceteam); author = ECSTRING(common,aceteam);
ammo = "ACE_IEDLandSmall_Range_Ammo"; ammo = "ACE_IEDLandSmall_Range_Ammo";
GVAR(magazine) = "IEDLandSmall_Remote_Mag";
displayName = CSTRING(Module_IEDLandSmall_Range_DisplayName); displayName = CSTRING(Module_IEDLandSmall_Range_DisplayName);
}; };

2
addons/explosives/functions/fnc_connectExplosive.sqf
View File

@ -22,6 +22,6 @@ TRACE_3("Params",_unit,_object,_detonator);
private _detonatorConfig = getText (configFile >> "CfgWeapons" >> _detonator >> QGVAR(triggerType)); private _detonatorConfig = getText (configFile >> "CfgWeapons" >> _detonator >> QGVAR(triggerType));
private _magazineClass = getText (configFile >> "CfgVehicles" >> typeOf _object >> QGVAR(magazine)); private _magazineClass = getText (configFile >> "CfgAmmo" >> typeOf _object >> QGVAR(magazine));
[_unit, _object, _magazineClass, [configFile >> "ACE_Triggers" >> _detonatorConfig]] call FUNC(addClacker); [_unit, _object, _magazineClass, [configFile >> "ACE_Triggers" >> _detonatorConfig]] call FUNC(addClacker);