Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explosives - Change SLAM magnetic to detonate upon defusal #6827

Merged
merged 2 commits into from
Feb 24, 2019
Merged

Explosives - Change SLAM magnetic to detonate upon defusal #6827

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fceebe3
Change SLAM magnetic to detonate upon defusal
alganthe Feb 20, 2019
68d3ecf
Disable explodeOnDefuseChance on SLAM timer mode
PabstMirror Feb 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions addons/explosives/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class CfgAmmo {
GVAR(size) = 0;
};

// "The SLAM has an anti-tamper feature that is only active in the bottom- and side-attack modes."
class SLAMDirectionalMine_Wire_Ammo: DirectionalBombBase {
indirectHitRange = 20;
GVAR(explodeOnDefuseChance) = 1;
Expand All @@ -77,10 +78,11 @@ class CfgAmmo {
};
class ACE_SLAMDirectionalMine_Timer_Ammo: SLAMDirectionalMine_Wire_Ammo {
mineTrigger = "TimeTrigger";
GVAR(explodeOnDefuseChance) = 0;
};
class ACE_SLAMDirectionalMine_Magnetic_Ammo: SLAMDirectionalMine_Wire_Ammo {
mineTrigger = "ACE_MagneticTrigger";
GVAR(explodeOnDefuseChance) = 0;
GVAR(explodeOnDefuseChance) = 1;
explosionAngle = 360;
indirectHitRange = 1;
mineInconspicuousness = 25;
Expand Down Expand Up @@ -165,16 +167,16 @@ class CfgAmmo {
class ACE_IEDLandSmall_Range_Ammo: IEDLandBig_Remote_Ammo {
mineTrigger = "RangeTriggerShort";
};

// Orange DLC:
class APERSMineDispenser_Ammo: PipeBombBase {
class APERSMineDispenser_Ammo: PipeBombBase {
GVAR(magazine) = "APERSMineDispenser_Mag";
GVAR(Explosive) = "APERSMineDispenser_Ammo_Scripted"; // triggerWhenDestroyed = 1;
GVAR(size) = 0;
GVAR(defuseObjectPosition)[] = {0.0, -0.05, 0.15};
};
class APERSMine_Range_Ammo;
class TrainingMine_Ammo: APERSMine_Range_Ammo {
class TrainingMine_Ammo: APERSMine_Range_Ammo {
GVAR(magazine) = "TrainingMine_Mag";
GVAR(size) = 0;
GVAR(defuseObjectPosition)[] = {0, 0, 0.15};
Expand Down