From 31a64a33b6521a1f95e6b01e0dbd8baabd2ab44c Mon Sep 17 00:00:00 2001 From: Grim <69561145+LinkIsGrim@users.noreply.github.com> Date: Sun, 1 Oct 2023 14:30:24 -0400 Subject: [PATCH] Compat SOG - Add explosives support to 1.3 mines (#9450) * add fuse claymore * add WP mines * missing semicolon * add dummy --- addons/compat_sog/CfgAmmo/explosives.hpp | 4 ++ addons/compat_sog/CfgMagazines/explosives.hpp | 48 +++++++++++++++++++ addons/compat_sog/CfgVehicles/explosives.hpp | 6 +++ .../mines/m18/vn_mine_m18_wp | 0 4 files changed, 58 insertions(+) create mode 100644 tools/pDummies/vn/weapons_f_vietnam_04/mines/m18/vn_mine_m18_wp diff --git a/addons/compat_sog/CfgAmmo/explosives.hpp b/addons/compat_sog/CfgAmmo/explosives.hpp index 1c4e5ff65b..849f7e6948 100644 --- a/addons/compat_sog/CfgAmmo/explosives.hpp +++ b/addons/compat_sog/CfgAmmo/explosives.hpp @@ -10,6 +10,10 @@ class vn_mine_m18_x3_ammo: vn_mine_m18_ammo { EGVAR(explosives,explosive) = "vn_mine_m18_x3_ammo_scripted"; }; +class vn_mine_m18_wp_ammo: vn_mine_m18_ammo { + EGVAR(explosives,explosive) = "vn_mine_m18_wp_ammo_scripted"; +}; + class vn_mine_m16_base; class vn_mine_tripwire_m16_02_ammo: vn_mine_m16_base { EGVAR(explosives,defuseObjectPosition)[] = {0, -0.01, 0.088}; diff --git a/addons/compat_sog/CfgMagazines/explosives.hpp b/addons/compat_sog/CfgMagazines/explosives.hpp index 8da412d6e2..7e25609fc8 100644 --- a/addons/compat_sog/CfgMagazines/explosives.hpp +++ b/addons/compat_sog/CfgMagazines/explosives.hpp @@ -28,6 +28,18 @@ class vn_mine_m18_range_mag: vn_mine_m18_mag { }; }; +// Claymore (Fuse) +class vn_mine_m18_fuze10_mag: vn_mine_m18_mag { + class ACE_Triggers: ACE_Triggers { + class Command: Command { + fuseTime = 10; + }; + class MK16_Transmitter: MK16_Transmitter { + fuseTime = 10; + }; + }; +}; + // Claymore x3 (Remote) class vn_mine_m18_x3_mag: vn_mine_m18_mag { EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m18_x3); @@ -51,6 +63,42 @@ class vn_mine_m18_x3_range_mag: vn_mine_m18_x3_mag { }; }; +// WP Claymore (Remote) +class vn_mine_m18_wp_mag: vn_mine_m18_fuze10_mag { + EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m18_wp); + + class ACE_Triggers { + SupportedTriggers[] = {"Command", "MK16_Transmitter"}; + class Command { + digDistance = -0.05; + fuseTime = 0.5; + }; + class MK16_Transmitter: Command {}; + }; +}; + +// WP Claymore (Proximity) +class vn_mine_m18_wp_range_mag: vn_mine_m18_wp_mag { + class ACE_Triggers { + SupportedTriggers[] = {"PressurePlate"}; + class PressurePlate { + digDistance = -0.05; + }; + }; +}; + +// WP Claymore (Fuse) +class vn_mine_m18_wp_fuze10_mag: vn_mine_m18_wp_mag { + class ACE_Triggers: ACE_Triggers { + class Command: Command { + fuseTime = 10; + }; + class MK16_Transmitter: MK16_Transmitter { + fuseTime = 10; + }; + }; +}; + // Toe-Popper class vn_mine_m14_mag: vn_mine_m18_mag { EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m14); diff --git a/addons/compat_sog/CfgVehicles/explosives.hpp b/addons/compat_sog/CfgVehicles/explosives.hpp index 0ff596451b..81a3fd514d 100644 --- a/addons/compat_sog/CfgVehicles/explosives.hpp +++ b/addons/compat_sog/CfgVehicles/explosives.hpp @@ -30,6 +30,12 @@ class EXPLOSIVES_PLACE(m18_x3): EGVAR(explosives,Place) { }; }; +// WP Claymore +class EXPLOSIVES_PLACE(m18_wp): EXPLOSIVES_PLACE(m18) { + displayName = "$STR_VN_MINE_M18_WP_MAG_DN"; + model = "vn\weapons_f_vietnam_04\mines\m18\vn_mine_m18_wp"; +}; + // Toe-Popper class EXPLOSIVES_PLACE(m14): EGVAR(explosives,Place) { displayName = "$STR_VN_MINE_M14_MAG_DN"; diff --git a/tools/pDummies/vn/weapons_f_vietnam_04/mines/m18/vn_mine_m18_wp b/tools/pDummies/vn/weapons_f_vietnam_04/mines/m18/vn_mine_m18_wp new file mode 100644 index 0000000000..e69de29bb2