Tripflares - Change setting to different magazines

Also Make airburst a trigger option
acemod · Feb 23, 2025 · 4f34540 · 4f34540
1 parent 222c408
commit 4f34540
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 130 deletions.
diff --git a/addons/explosives/ACE_Triggers.hpp b/addons/explosives/ACE_Triggers.hpp
@@ -65,4 +65,10 @@ class ACE_Triggers {
         picture = QPATHTOF(Data\UI\Tripwire.paa);
         onPlace = QUOTE(false);
     };
+    class Tripwire_Airburst {
+        isAttachable = 0;
+        displayName = CSTRING(Tripwire_Airburst);
+        picture = QPATHTOF(Data\UI\Tripwire.paa);
+        onPlace = QUOTE((_this # 1) setVariable [ARR_3(QQGVAR(airburst),true,true)]; false);
+    };
 };
diff --git a/addons/explosives/CfgAmmo.hpp b/addons/explosives/CfgAmmo.hpp
@@ -36,13 +36,14 @@ class CfgAmmo {
     };
 
     class ACE_FlareTripMine_Wire_Ammo: APERSTripMine_Wire_Ammo {
+        GVAR(flareClass) = "F_40mm_White";
         SoundSetExplosion[] = {};
         defaultMagazine = "ACE_FlareTripMine_Mag"; // Mag that gets dropped after defuse
         hit = 0;
         indirectHit = 0;
         indirectHitRange = 0;
         soundHit[] = {"A3\Sounds_F\weapons\smokeshell\smoke_3",1.25893,1,100};
-        explosionEffects = "ACE_TripflareEffect";
+        explosionEffects = "";
         CraterEffects = "";
         soundTrigger[] = {"",1,1};
         class CamShakeExplode {
@@ -51,10 +52,17 @@ class CfgAmmo {
             frequency = 0;
             distance = 0;
         };
+        class EventHandlers {
+            init = QUOTE(call FUNC(tripflare_init));
+        };
+    };
+    class ACE_FlareTripMine_Wire_Ammo_Red: ACE_FlareTripMine_Wire_Ammo {
+        defaultMagazine = "ACE_FlareTripMine_Mag_Red";
+        GVAR(flareClass) = "F_40mm_Red";
     };
-    class ACE_FlareTripMineAir_Wire_Ammo: ACE_FlareTripMine_Wire_Ammo {
-        defaultMagazine = "ACE_FlareTripMineAir_Mag";
-        explosionEffects = "ACE_TripflareAirEffect";
+    class ACE_FlareTripMine_Wire_Ammo_Green: ACE_FlareTripMine_Wire_Ammo {
+        defaultMagazine = "ACE_FlareTripMine_Mag_Green";
+        GVAR(flareClass) = "F_40mm_Green";
     };
 
     class F_20mm_Red;

diff --git a/addons/explosives/CfgCloudlets.hpp b/addons/explosives/CfgCloudlets.hpp
diff --git a/addons/explosives/CfgMagazines.hpp b/addons/explosives/CfgMagazines.hpp
@@ -47,10 +47,19 @@ class CfgMagazines {
         displayName = CSTRING(TripFlare_Name);
         descriptionShort = CSTRING(TripFlare_Description);
         class Library {libTextDesc = CSTRING(TripFlare_Description);};
+        class ACE_Triggers {
+            SupportedTriggers[] = {"Tripwire", "Tripwire_Airburst"};
+            class Tripwire;
+            class Tripwire_Airburst;
+        };
+    };
+    class ACE_FlareTripMine_Mag_Red: ACE_FlareTripMine_Mag {
+        ammo = "ACE_FlareTripMine_Wire_Ammo_Red";
+        displayName = CSTRING(TripFlare_Name_Red);
     };
-    class ACE_FlareTripMineAir_Mag: ACE_FlareTripMine_Mag {
-        ammo = "ACE_FlareTripMineAir_Wire_Ammo";
-        displayName = CSTRING(TripFlareAir_Name);
+    class ACE_FlareTripMine_Mag_Green: ACE_FlareTripMine_Mag {
+        ammo = "ACE_FlareTripMine_Wire_Ammo_Green";
+        displayName = CSTRING(TripFlare_Name_Green);
     };
 
     class ClaymoreDirectionalMine_Remote_Mag: CA_Magazine {

diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp
@@ -372,9 +372,13 @@ class CfgVehicles {
         ammo = "ACE_FlareTripMine_Wire_Ammo";
         displayName = CSTRING(TripFlare_Name);
     };
-    class ACE_FlareTripMineAir: ACE_FlareTripMine {
-        ammo = "ACE_FlareTripMineAir_Wire_Ammo";
-        displayName = CSTRING(TripFlareAir_Name);
+    class ACE_FlareTripMineRed: ACE_FlareTripMine {
+        ammo = "ACE_FlareTripMine_Wire_Ammo_Red";
+        displayName = CSTRING(TripFlare_Name_Red);
+    };
+    class ACE_FlareTripMineGreen: ACE_FlareTripMine {
+        ammo = "ACE_FlareTripMine_Wire_Ammo_Green";
+        displayName = CSTRING(TripFlare_Name_Green);
     };
 
     class Claymore_F: MineBase {

diff --git a/addons/explosives/CfgWeapons.hpp b/addons/explosives/CfgWeapons.hpp
@@ -4,7 +4,7 @@ class CfgWeapons {
         muzzles[] += {QGVAR(muzzle)};
         class PutMuzzle: Default {};
         class GVAR(muzzle): PutMuzzle {
-            magazines[] = {"ACE_FlareTripMine_Mag", "ACE_APERSMine_ToePopper_Mag"};
+            magazines[] = {"ACE_FlareTripMine_Mag", "ACE_FlareTripMine_Mag_Red", "ACE_FlareTripMine_Mag_Green", "ACE_APERSMine_ToePopper_Mag"};
         };
     };
 

diff --git a/addons/explosives/XEH_PREP.hpp b/addons/explosives/XEH_PREP.hpp
@@ -34,11 +34,11 @@ PREP(selectTrigger);
 PREP(setupExplosive);
 PREP(setPosition);
 PREP(setSpeedDial);
-PREP(spawnFlare);
 PREP(startDefuse);
 PREP(startTimer);
 PREP(triggerType);
 PREP(allowDefuse);
 PREP(isAllowedDefuse);
 PREP(checkDetonateHandlers);
 PREP(woundsHandlerToePopper);
+PREP(tripflare_init);
diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp
@@ -3,7 +3,7 @@
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
-        units[] = {"ACE_ModuleMine_SLAMBottomMine", "ACE_ModuleExplosive_IEDUrbanBig_Range", "ACE_ModuleExplosive_IEDLandBig_Range", "ACE_ModuleExplosive_IEDUrbanSmall_Range", "ACE_ModuleExplosive_IEDLandSmall_Range", "ACE_APERSMine_ToePopper"};
+        units[] = {"ACE_ModuleMine_SLAMBottomMine", "ACE_ModuleExplosive_IEDUrbanBig_Range", "ACE_ModuleExplosive_IEDLandBig_Range", "ACE_ModuleExplosive_IEDUrbanSmall_Range", "ACE_ModuleExplosive_IEDLandSmall_Range", "ACE_APERSMine_ToePopper", "ACE_FlareTripMine_Mag", "ACE_FlareTripMine_Mag_Red", "ACE_FlareTripMine_Mag_Green"};
         weapons[] = {"ACE_Clacker", "ACE_DefusalKit", "ACE_M26_Clacker", "ACE_DeadManSwitch", "ACE_Cellphone"};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_interaction"};
@@ -21,7 +21,6 @@ class CfgPatches {
 #include "CfgMagazines.hpp"
 #include "CfgWeapons.hpp"
 #include "CfgVehicles.hpp"
-#include "CfgCloudlets.hpp"
 
 #include "ACE_Triggers.hpp"
 #include "ACE_Arsenal_Stats.hpp"

diff --git a/addons/explosives/functions/fnc_spawnFlare.sqf b/addons/explosives/functions/fnc_spawnFlare.sqf
diff --git a/addons/explosives/functions/fnc_tripflare_init.sqf b/addons/explosives/functions/fnc_tripflare_init.sqf
@@ -0,0 +1,37 @@
+#include "..\script_component.hpp"
+/*
+ * Author: VKing, MikeMF, PabstMirror
+ * Spawns a flare on the ground for tripflare trigger
+ *
+ * Arguments:
+ * 0: Ammo <OBJECT>
+ * 1: Position ASL <ARRAY>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [flare, [0,0,0]] call ace_explosives_fnc_tripflare_init
+ *
+ * Public: no
+ */
+
+params ["_mine"];
+_mine addEventHandler ["Explode", { // runs where mine is local
+    params ["_projectile", "_posASL"];
+    TRACE_2("tripflare-explode",_projectile,_posASL);
+
+    private _flareClass = getText ((configOf _projectile) >> QGVAR(flareClass));
+    if (_flareClass == "") exitWith { ERROR_1("bad flare cfg %1",typeOf _projectile) };
+
+    private _airburst = _projectile getVariable [QGVAR(airburst), false];
+    if (_airburst) then { 
+        _posASL set [2, _posASL # 2 + 200];
+    };
+
+    private _flare = createVehicle [_flareClass, ASLToAGL _posASL, [], 0, "CAN_COLLIDE"];
+    _flare setVelocity [0, 0, -1]; // Used for air mode, does nothing if already on the ground.
+
+    TRACE_1("",_flare);
+    ["ace_tripflareTriggered", [_flare, ASLToAGL _posASL]] call CBA_fnc_globalEvent;
+}];
diff --git a/addons/explosives/initSettings.inc.sqf b/addons/explosives/initSettings.inc.sqf
@@ -53,13 +53,3 @@ private _categoryStr = format ["ACE %1", LLSTRING(Menu)];
     [_categoryStr, LLSTRING(ExplosiveTimer)],
     [0, 5999, TIMER_VALUE_DEFAULT]
 ] call CBA_fnc_addSetting;
-
-// Tripflares
-[
-    QGVAR(tripflareColour),
-    "LIST",
-    [LLSTRING(TripflareColour_DisplayName), LLSTRING(TripflareColour_Description)],
-    [_categoryStr, LLSTRING(Tripflares)],
-    [[0, 1, 2], ["$str_cfg_markercol_white", "$str_cfg_markercol_red", "$str_cfg_markercol_green"], 1],
-    1
-] call CBA_fnc_addSetting;
diff --git a/addons/explosives/scripts/TripflareAirEffect.sqf b/addons/explosives/scripts/TripflareAirEffect.sqf
diff --git a/addons/explosives/scripts/TripflareEffect.sqf b/addons/explosives/scripts/TripflareEffect.sqf
diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml
@@ -1044,6 +1044,12 @@
             <Chinese>絆線閃光地雷</Chinese>
             <Chinesesimp>绊线信号弹</Chinesesimp>
         </Key>
+        <Key ID="STR_ACE_Explosives_TripFlare_Name_Red">
+            <English>Tripwire Flare (Red)</English>
+        </Key>
+        <Key ID="STR_ACE_Explosives_TripFlare_Name_Green">
+            <English>Tripwire Flare (Green)</English>
+        </Key>
         <Key ID="STR_ACE_Explosives_TripWire">
             <English>Tripwire</English>
             <Czech>Nástražný drát</Czech>
@@ -1061,6 +1067,9 @@
             <Turkish>Telli tuzak</Turkish>
             <Hungarian>Botlódrót</Hungarian>
         </Key>
+        <Key ID="STR_ACE_Explosives_TripWire_Airburst">
+            <English>Tripwire - Airburst</English>
+        </Key>
         <Key ID="STR_ACE_Explosives_apersToePopper">
             <English>APERS Mine (Toe-Popper)</English>
             <French>Mine APERS (Toe-Popper)</French>
@@ -1187,17 +1196,5 @@
             <Turkish>Zamanlayıcı</Turkish>
             <Hungarian>Időzítő</Hungarian>
         </Key>
-        <Key ID="STR_ACE_Explosives_Tripflares">
-            <English>Tripflares</English>
-        </Key>
-        <Key ID="STR_ACE_Explosives_TripflareColour_DisplayName">
-            <English>Tripflare Colour</English>
-        </Key>
-        <Key ID="STR_ACE_Explosives_TripflareColour_Description">
-            <English>What colour the tripflare will be</English>
-        </Key>
-        <Key ID="STR_ACE_Explosives_TripFlareAir_Name">
-            <English>Tripwire Flare (Air)</English>
-        </Key>
     </Package>
 </Project>