Merge pull request #20 from johnb432/dev

1.3.9.0

Author: johnb432

CHANGELOG.md

@@ -1,3 +1,8 @@
+# Changelog for AIMEE 27.9.2025
+
+1.3.9.0
+- Added search light interactions.
+
 # Changelog for AIMEE 29.6.2025
 
 1.3.8.0

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 1
 #define MINOR 3
-#define PATCHLVL 8
+#define PATCHLVL 9
 #define BUILD 0

addons/vehicle_controls/CfgVehicles.hpp

@@ -71,6 +71,20 @@
         statement = QUOTE(_target setCollisionLight false);\
     }
 
+#define SEARCH_LIGHT_ACTION \
+    class GVAR(searchLightOnAction) {\
+        condition = QUOTE(GVAR(settingSearchAction) && {(_target unitTurret _player) isEqualTo [0]} && {!isLightOn [ARR_2(_target,[0])]});\
+        displayName = CQSTRING(STR_action_searchlights_on);\
+        icon = ICON_LIGHTS_ON;\
+        statement = QPACTION('SearchLightOn',_target);\
+    };\
+    class GVAR(searchLightOffAction) {\
+        condition = QUOTE(GVAR(settingSearchAction) && {(_target unitTurret _player) isEqualTo [0]} && {isLightOn [ARR_2(_target,[0])]});\
+        displayName = CQSTRING(STR_action_searchlights_off);\
+        icon = ICON_LIGHTS_OFF;\
+        statement = QPACTION('SearchLightOff',_target);\
+    }
+
 #define HOVER_ACTION \
     class GVAR(hoverAction) {\
         condition = QUOTE(GVAR(settingHoverAction) && {'AutoHover' call EFUNC(main,ignoreKeybind)} && {!isAutoHoverOn _target} && {[ARR_2(_player,_target)] call FUNC(isDriver)});\
@@ -136,6 +150,12 @@ class CfgVehicles {
             HOVER_ACTION;
         };
     };
+	class Helicopter_Base_F: Helicopter {};
+	class Heli_light_03_base_F: Helicopter_Base_F {
+        class ACE_SelfActions: ACE_SelfActions {
+            SEARCH_LIGHT_ACTION;
+        };
+    };
 
     class Plane: Air {
         class ACE_SelfActions {

addons/vehicle_controls/XEH_preInit.sqf

@@ -7,6 +7,7 @@ ADDON = false;
 // CBA Settings
 SETTING(settingGearAction,"CHECKBOX",true);
 SETTING(settingCollisionAction,"CHECKBOX",true);
+SETTING(settingSearchAction,"CHECKBOX",true);
 SETTING(settingLightsAction,"CHECKBOX",true);
 SETTING(settingHoverAction,"CHECKBOX",true);
 SETTING(settingManualAction,"CHECKBOX",true);

addons/vehicle_controls/stringtable.xml

@@ -79,6 +79,14 @@
             <Original>Allows the player to toggle manual fire using the ACE interaction menu.</Original>
             <English>Allows the player to toggle manual fire using the ACE interaction menu.</English>
         </Key>
+        <Key ID="STR_AIMEE_vehicle_controls_settingSearchAction">
+            <Original>Enable search light toggle</Original>
+            <English>Enable search light toggle</English>
+        </Key>
+        <Key ID="STR_AIMEE_vehicle_controls_settingSearchAction_ToolTip">
+            <Original>Allows the player to toggle search lights using the ACE interaction menu.</Original>
+            <English>Allows the player to toggle search lights using the ACE interaction menu.</English>
+        </Key>
         <Key ID="STR_AIMEE_vehicle_controls_settingTakeControlsAction">
             <Original>Enable taking controls for helicopters</Original>
             <English>Enable taking controls for helicopters</English>