From 7b10ecc052f8e2ab3753e595b11eeb4663518508 Mon Sep 17 00:00:00 2001 From: Andrew Vespade <54606021+vespade@users.noreply.github.com> Date: Wed, 16 Oct 2024 10:23:43 -0700 Subject: [PATCH] Add new 2.18 events & handleHeal --- addons/xeh/CfgEventHandlers.hpp | 8 +++++++- addons/xeh/script_component.hpp | 7 +++++++ addons/xeh/script_xeh.hpp | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/addons/xeh/CfgEventHandlers.hpp b/addons/xeh/CfgEventHandlers.hpp index aadba0e25..f54c99b1d 100644 --- a/addons/xeh/CfgEventHandlers.hpp +++ b/addons/xeh/CfgEventHandlers.hpp @@ -29,6 +29,8 @@ class Extended_InitPost_EventHandlers {}; class Extended_AnimChanged_EventHandlers {}; class Extended_AnimDone_EventHandlers {}; class Extended_AnimStateChanged_EventHandlers {}; +class Extended_Assembled_EventHandlers {}; +class Extended_Attached_EventHandlers {}; class Extended_CargoLoaded_EventHandlers {}; class Extended_CargoUnloaded_EventHandlers {}; class Extended_ContainerClosed_EventHandlers {}; @@ -36,6 +38,7 @@ class Extended_ContainerOpened_EventHandlers {}; class Extended_ControlsShifted_EventHandlers {}; class Extended_Dammaged_EventHandlers {}; class Extended_Deleted_EventHandlers {}; +class Extended_Detached_EventHandlers {}; class Extended_Disassembled_EventHandlers {}; class Extended_Engine_EventHandlers {}; class Extended_EpeContact_EventHandlers {}; @@ -55,7 +58,7 @@ class Extended_GetInMan_EventHandlers {}; class Extended_GetOut_EventHandlers {}; class Extended_GetOutMan_EventHandlers {}; //class Extended_HandleDamage_EventHandlers {}; -//class Extended_HandleHeal_EventHandlers {}; +class Extended_HandleHeal_EventHandlers {}; class Extended_Hit_EventHandlers {}; class Extended_HitPart_EventHandlers {}; class Extended_IncomingMissile_EventHandlers {}; @@ -65,7 +68,9 @@ class Extended_InventoryOpened_EventHandlers {}; class Extended_Killed_EventHandlers {}; class Extended_LandedStopped_EventHandlers {}; class Extended_LandedTouchDown_EventHandlers {}; +class Extended_LeaningChanged_EventHandlers {}; class Extended_Local_EventHandlers {}; +class Extended_MagazineUnloaded_EventHandlers {}; class Extended_OpticsModeChanged_EventHandlers {}; class Extended_OpticsSwitch_EventHandlers {}; class Extended_Put_EventHandlers {}; @@ -83,6 +88,7 @@ class Extended_TurnIn_EventHandlers {}; class Extended_TurnOut_EventHandlers {}; class Extended_VisionModeChanged_EventHandlers {}; class Extended_WeaponAssembled_EventHandlers {}; +class Extended_WeaponChanged_EventHandlers {}; class Extended_WeaponDisassembled_EventHandlers {}; class Extended_WeaponDeployed_EventHandlers {}; class Extended_WeaponRested_EventHandlers {}; diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp index b938db016..2de28ae50 100644 --- a/addons/xeh/script_component.hpp +++ b/addons/xeh/script_component.hpp @@ -45,6 +45,8 @@ "AnimChanged", \ "AnimDone", \ "AnimStateChanged", \ + "Assembled", \ + "Attached", \ "CargoLoaded", \ "CargoUnloaded", \ "ContainerClosed", \ @@ -52,6 +54,7 @@ "ControlsShifted", \ "Dammaged", \ "Deleted", \ + "Detached", \ "Disassembled", \ "Engine", \ "EpeContact", \ @@ -70,6 +73,7 @@ "GetInMan", \ "GetOut", \ "GetOutMan", \ + "HandleHeal", \ "Hit", \ "HitPart", \ "IncomingMissile", \ @@ -80,7 +84,9 @@ "Killed", \ "LandedTouchDown", \ "LandedStopped", \ + "LeaningChanged", \ "Local", \ + "MagazineUnloaded", \ "OpticsModeChanged", \ "OpticsSwitch", \ "Put", \ @@ -98,6 +104,7 @@ "TurnOut", \ "VisionModeChanged", \ "WeaponAssembled", \ + "WeaponChanged", \ "WeaponDisassembled", \ "WeaponDeployed", \ "WeaponRested" diff --git a/addons/xeh/script_xeh.hpp b/addons/xeh/script_xeh.hpp index 9b483e842..451d46da4 100644 --- a/addons/xeh/script_xeh.hpp +++ b/addons/xeh/script_xeh.hpp @@ -14,6 +14,8 @@ fired = "call cba_xeh_fnc_fired"; \ animChanged = "call cba_xeh_fnc_animChanged"; \ animDone = "call cba_xeh_fnc_animDone"; \ animStateChanged = "call cba_xeh_fnc_animStateChanged"; \ +assembled = "call cba_xeh_fnc_assembled"; \ +attached = "call cba_xeh_fnc_attached"; \ cargoLoaded = "call cba_xeh_fnc_cargoLoaded"; \ cargoUnloaded = "call cba_xeh_fnc_cargoUnloaded"; \ containerClosed = "call cba_xeh_fnc_containerClosed"; \ @@ -21,6 +23,7 @@ containerOpened = "call cba_xeh_fnc_containerOpened"; \ controlsShifted = "call cba_xeh_fnc_controlsShifted"; \ dammaged = "call cba_xeh_fnc_dammaged"; \ deleted = "call cba_xeh_fnc_deleted"; \ +detached = "call cba_xeh_fnc_detached"; \ disassembled = "call cba_xeh_fnc_disassembled"; \ engine = "call cba_xeh_fnc_engine"; \ epeContact = "call cba_xeh_fnc_epeContact"; \ @@ -37,6 +40,7 @@ getIn = "call cba_xeh_fnc_getIn"; \ getInMan = "call cba_xeh_fnc_getInMan"; \ getOut = "call cba_xeh_fnc_getOut"; \ getOutMan = "call cba_xeh_fnc_getOutMan"; \ +handleHeal = "call cba_xeh_fnc_handleHeal"; \ hit = "call cba_xeh_fnc_hit"; \ hitPart = "call cba_xeh_fnc_hitPart"; \ incomingMissile = "call cba_xeh_fnc_incomingMissile"; \ @@ -45,7 +49,9 @@ inventoryOpened = "call cba_xeh_fnc_inventoryOpened"; \ killed = "call cba_xeh_fnc_killed"; \ landedTouchDown = "call cba_xeh_fnc_landedTouchDown"; \ landedStopped = "call cba_xeh_fnc_landedStopped"; \ +leaningChanged = "call cba_xeh_fnc_leaningChanged"; \ local = "call cba_xeh_fnc_local"; \ +magazineUnloaded = "call cba_xeh_fnc_magazineUnloaded"; \ opticsModeChanged = "call cba_xeh_fnc_opticsModeChanged"; \ opticsSwitch = "call cba_xeh_fnc_opticsSwitch"; \ put = "call cba_xeh_fnc_put"; \ @@ -63,6 +69,7 @@ turnIn = "call cba_xeh_fnc_turnIn"; \ turnOut = "call cba_xeh_fnc_turnOut"; \ visionModeChanged = "call cba_xeh_fnc_visionModeChanged"; \ weaponAssembled = "call cba_xeh_fnc_weaponAssembled"; \ +weaponChanged = "call cba_xeh_fnc_weaponChanged"; \ weaponDisassembled = "call cba_xeh_fnc_weaponDisassembled"; \ weaponDeployed = "call cba_xeh_fnc_weaponDeployed"; \ weaponRested = "call cba_xeh_fnc_weaponRested"; @@ -79,6 +86,8 @@ fired = ""; \ animChanged = ""; \ animDone = ""; \ animStateChanged = ""; \ +assembled = ""; \ +attached = ""; \ cargoLoaded = ""; \ cargoUnloaded = ""; \ containerClosed = ""; \ @@ -86,6 +95,7 @@ containerOpened = ""; \ controlsShifted = ""; \ dammaged = ""; \ deleted = ""; \ +detached = ""; \ disassembled = ""; \ engine = ""; \ epeContact = ""; \ @@ -102,6 +112,7 @@ getIn = ""; \ getInMan = ""; \ getOut = ""; \ getOutMan = ""; \ +handleHeal = ""; \ hit = ""; \ hitPart = ""; \ incomingMissile = ""; \ @@ -110,7 +121,9 @@ inventoryOpened = ""; \ killed = ""; \ landedTouchDown = ""; \ landedStopped = ""; \ +leaningChanged = ""; \ local = ""; \ +magazineUnloaded = ""; \ opticsModeChanged = ""; \ opticsSwitch = ""; \ put = ""; \ @@ -127,6 +140,7 @@ turnIn = ""; \ turnOut = ""; \ visionModeChanged = ""; \ weaponAssembled = ""; \ +weaponChanged = ""; \ weaponDisassembled = ""; \ weaponDeployed = ""; \ weaponRested = "";