From 846b1730d094a93c24177670569e79adfac9941d Mon Sep 17 00:00:00 2001 From: Grim <69561145+LinkIsGrim@users.noreply.github.com> Date: Sun, 3 Sep 2023 13:06:50 -0400 Subject: [PATCH] XEH - Add more events (#1588) --- addons/xeh/CfgEventHandlers.hpp | 43 +++++++++++++-------- addons/xeh/script_component.hpp | 35 ++++++++++------- addons/xeh/script_xeh.hpp | 66 ++++++++++++++++++++------------- 3 files changed, 89 insertions(+), 55 deletions(-) diff --git a/addons/xeh/CfgEventHandlers.hpp b/addons/xeh/CfgEventHandlers.hpp index 4dbeb4ce8c..aadba0e256 100644 --- a/addons/xeh/CfgEventHandlers.hpp +++ b/addons/xeh/CfgEventHandlers.hpp @@ -29,10 +29,14 @@ class Extended_InitPost_EventHandlers {}; class Extended_AnimChanged_EventHandlers {}; class Extended_AnimDone_EventHandlers {}; class Extended_AnimStateChanged_EventHandlers {}; +class Extended_CargoLoaded_EventHandlers {}; +class Extended_CargoUnloaded_EventHandlers {}; class Extended_ContainerClosed_EventHandlers {}; class Extended_ContainerOpened_EventHandlers {}; class Extended_ControlsShifted_EventHandlers {}; class Extended_Dammaged_EventHandlers {}; +class Extended_Deleted_EventHandlers {}; +class Extended_Disassembled_EventHandlers {}; class Extended_Engine_EventHandlers {}; class Extended_EpeContact_EventHandlers {}; class Extended_EpeContactEnd_EventHandlers {}; @@ -40,15 +44,18 @@ class Extended_EpeContactStart_EventHandlers {}; class Extended_Explosion_EventHandlers {}; class Extended_Fired_EventHandlers {}; // Backwards compatibility, uses XEH notation class Extended_FiredBIS_EventHandlers {}; // New fired EH, uses BIS notation +class Extended_FiredMan_EventHandlers {}; class Extended_FiredNear_EventHandlers {}; class Extended_Fuel_EventHandlers {}; class Extended_Gear_EventHandlers {}; +class Extended_GestureChanged_EventHandlers {}; +class Extended_GestureDone_EventHandlers {}; class Extended_GetIn_EventHandlers {}; class Extended_GetInMan_EventHandlers {}; class Extended_GetOut_EventHandlers {}; class Extended_GetOutMan_EventHandlers {}; -//class Extended_HandleDamage_EventHandlers {}; // Not implemented yet -//class Extended_HandleHeal_EventHandlers {}; // Not implemented yet +//class Extended_HandleDamage_EventHandlers {}; +//class Extended_HandleHeal_EventHandlers {}; class Extended_Hit_EventHandlers {}; class Extended_HitPart_EventHandlers {}; class Extended_IncomingMissile_EventHandlers {}; @@ -59,27 +66,33 @@ class Extended_Killed_EventHandlers {}; class Extended_LandedStopped_EventHandlers {}; class Extended_LandedTouchDown_EventHandlers {}; class Extended_Local_EventHandlers {}; - -// Don't work -/* -class Extended_MPHit_EventHandlers {}; -class Extended_MPKilled_EventHandlers {}; -class Extended_MPRespawn_EventHandlers {}; -*/ - +class Extended_OpticsModeChanged_EventHandlers {}; +class Extended_OpticsSwitch_EventHandlers {}; class Extended_Put_EventHandlers {}; +class Extended_Reloaded_EventHandlers {}; class Extended_Respawn_EventHandlers {}; +class Extended_RopeAttach_EventHandlers {}; +class Extended_RopeBreak_EventHandlers {}; class Extended_SeatSwitched_EventHandlers {}; class Extended_SeatSwitchedMan_EventHandlers {}; +class Extended_SlotItemChanged_EventHandlers {}; class Extended_SoundPlayed_EventHandlers {}; +class Extended_Suppressed_EventHandlers {}; class Extended_Take_EventHandlers {}; -class Extended_WeaponAssembled_EventHandlers {}; -class Extended_WeaponDisassembled_EventHandlers {}; -class Extended_Reloaded_EventHandlers {}; -class Extended_FiredMan_EventHandlers {}; class Extended_TurnIn_EventHandlers {}; class Extended_TurnOut_EventHandlers {}; -class Extended_Deleted_EventHandlers {}; +class Extended_VisionModeChanged_EventHandlers {}; +class Extended_WeaponAssembled_EventHandlers {}; +class Extended_WeaponDisassembled_EventHandlers {}; +class Extended_WeaponDeployed_EventHandlers {}; +class Extended_WeaponRested_EventHandlers {}; + +// Don't work +/* +class Extended_MPHit_EventHandlers {}; +class Extended_MPKilled_EventHandlers {}; +class Extended_MPRespawn_EventHandlers {}; +*/ // display xeh class Extended_DisplayLoad_EventHandlers { diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp index fb99a60563..12b163f39a 100644 --- a/addons/xeh/script_component.hpp +++ b/addons/xeh/script_component.hpp @@ -43,12 +43,16 @@ #define XEH_EVENTS \ "AnimChanged", \ - "AnimStateChanged", \ "AnimDone", \ + "AnimStateChanged", \ + "CargoLoaded", \ + "CargoUnloaded", \ "ContainerClosed", \ "ContainerOpened", \ "ControlsShifted", \ "Dammaged", \ + "Deleted", \ + "Disassembled", \ "Engine", \ "EpeContact", \ "EpeContactEnd", \ @@ -56,14 +60,16 @@ "Explosion", \ "Fired", \ "FiredBis", \ + "FiredMan", \ "FiredNear", \ "Fuel", \ "Gear", \ + "GestureChanged", \ + "GestureDone", \ "GetIn", \ "GetInMan", \ "GetOut", \ "GetOutMan", \ - "HandleHeal", \ "Hit", \ "HitPart", \ "IncomingMissile", \ @@ -75,22 +81,23 @@ "LandedTouchDown", \ "LandedStopped", \ "Local", \ - "Respawn", \ + "OpticsModeChanged", \ + "OpticsSwitch", \ "Put", \ - "Take", \ + "Reloaded", \ + "Respawn", \ + "RopeAttach", \ + "RopeBreak", \ "SeatSwitched", \ "SeatSwitchedMan", \ + "SlotItemChanged", \ "SoundPlayed", \ + "Suppressed", \ + "Take", \ + "TurnIn", \ + "TurnOut", \ + "VisionModeChanged", \ "WeaponAssembled", \ "WeaponDisassembled", \ "WeaponDeployed", \ - "WeaponRested", \ - "Reloaded", \ - "FiredMan", \ - "TurnIn", \ - "TurnOut", \ - "Deleted", \ - "Disassembled", \ - "Suppressed", \ - "GestureChanged", \ - "GestureDone" + "WeaponRested" diff --git a/addons/xeh/script_xeh.hpp b/addons/xeh/script_xeh.hpp index 2eba00016f..9b483e842b 100644 --- a/addons/xeh/script_xeh.hpp +++ b/addons/xeh/script_xeh.hpp @@ -14,23 +14,29 @@ fired = "call cba_xeh_fnc_fired"; \ animChanged = "call cba_xeh_fnc_animChanged"; \ animDone = "call cba_xeh_fnc_animDone"; \ animStateChanged = "call cba_xeh_fnc_animStateChanged"; \ +cargoLoaded = "call cba_xeh_fnc_cargoLoaded"; \ +cargoUnloaded = "call cba_xeh_fnc_cargoUnloaded"; \ containerClosed = "call cba_xeh_fnc_containerClosed"; \ containerOpened = "call cba_xeh_fnc_containerOpened"; \ controlsShifted = "call cba_xeh_fnc_controlsShifted"; \ dammaged = "call cba_xeh_fnc_dammaged"; \ +deleted = "call cba_xeh_fnc_deleted"; \ +disassembled = "call cba_xeh_fnc_disassembled"; \ engine = "call cba_xeh_fnc_engine"; \ epeContact = "call cba_xeh_fnc_epeContact"; \ epeContactEnd = "call cba_xeh_fnc_epeContactEnd"; \ epeContactStart = "call cba_xeh_fnc_epeContactStart"; \ explosion = "call cba_xeh_fnc_explosion"; \ +firedMan = "call cba_xeh_fnc_firedMan"; \ firedNear = "call cba_xeh_fnc_firedNear"; \ fuel = "call cba_xeh_fnc_cba_xeh_fuel"; \ gear = "call cba_xeh_fnc_gear"; \ +gestureChanged = "call cba_xeh_fnc_gestureChanged"; \ +gestureDone = "call cba_xeh_fnc_gestureDone"; \ 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"; \ @@ -40,25 +46,27 @@ killed = "call cba_xeh_fnc_killed"; \ landedTouchDown = "call cba_xeh_fnc_landedTouchDown"; \ landedStopped = "call cba_xeh_fnc_landedStopped"; \ local = "call cba_xeh_fnc_local"; \ -respawn = "call cba_xeh_fnc_respawn"; \ +opticsModeChanged = "call cba_xeh_fnc_opticsModeChanged"; \ +opticsSwitch = "call cba_xeh_fnc_opticsSwitch"; \ put = "call cba_xeh_fnc_put"; \ -take = "call cba_xeh_fnc_take"; \ +reloaded = "call cba_xeh_fnc_reloaded"; \ +respawn = "call cba_xeh_fnc_respawn"; \ +ropeAttach = "call cba_xeh_fnc_ropeAttach"; \ +ropeBreak = "call cba_xeh_fnc_ropeBreak"; \ seatSwitched = "call cba_xeh_fnc_seatSwitched"; \ seatSwitchedMan = "call cba_xeh_fnc_seatSwitchedMan"; \ +slotItemChanged = "call cba_xeh_fnc_slotItemChanged"; \ +suppressed = "call cba_xeh_fnc_suppressed"; \ soundPlayed = "call cba_xeh_fnc_soundPlayed"; \ +take = "call cba_xeh_fnc_take"; \ +turnIn = "call cba_xeh_fnc_turnIn"; \ +turnOut = "call cba_xeh_fnc_turnOut"; \ +visionModeChanged = "call cba_xeh_fnc_visionModeChanged"; \ weaponAssembled = "call cba_xeh_fnc_weaponAssembled"; \ weaponDisassembled = "call cba_xeh_fnc_weaponDisassembled"; \ weaponDeployed = "call cba_xeh_fnc_weaponDeployed"; \ -weaponRested = "call cba_xeh_fnc_weaponRested"; \ -reloaded = "call cba_xeh_fnc_reloaded"; \ -firedMan = "call cba_xeh_fnc_firedMan"; \ -turnIn = "call cba_xeh_fnc_turnIn"; \ -turnOut = "call cba_xeh_fnc_turnOut"; \ -deleted = "call cba_xeh_fnc_deleted"; \ -disassembled = "call cba_xeh_fnc_disassembled"; \ -Suppressed = "call cba_xeh_fnc_Suppressed"; \ -gestureChanged = "call cba_xeh_fnc_gestureChanged"; \ -gestureDone = "call cba_xeh_fnc_gestureDone"; +weaponRested = "call cba_xeh_fnc_weaponRested"; + /* MACRO: DELETE_EVENTHANDLERS @@ -71,23 +79,29 @@ fired = ""; \ animChanged = ""; \ animDone = ""; \ animStateChanged = ""; \ +cargoLoaded = ""; \ +cargoUnloaded = ""; \ containerClosed = ""; \ containerOpened = ""; \ controlsShifted = ""; \ dammaged = ""; \ +deleted = ""; \ +disassembled = ""; \ engine = ""; \ epeContact = ""; \ epeContactEnd = ""; \ epeContactStart = ""; \ explosion = ""; \ +firedMan = ""; \ firedNear = ""; \ fuel = ""; \ gear = ""; \ +gestureChanged = ""; \ +gestureDone = "" \ getIn = ""; \ getInMan = ""; \ getOut = ""; \ getOutMan = ""; \ -handleHeal = ""; \ hit = ""; \ hitPart = ""; \ incomingMissile = ""; \ @@ -97,22 +111,22 @@ killed = ""; \ landedTouchDown = ""; \ landedStopped = ""; \ local = ""; \ -respawn = ""; \ +opticsModeChanged = ""; \ +opticsSwitch = ""; \ put = ""; \ -take = ""; \ +reloaded = ""; \ +respawn = ""; \ +ropeAttach = ""; \ +ropeBreak = ""; \ seatSwitched = ""; \ seatSwitchedMan = ""; \ soundPlayed = ""; \ +suppressed = ""; \ +take = ""; \ +turnIn = ""; \ +turnOut = ""; \ +visionModeChanged = ""; \ weaponAssembled = ""; \ weaponDisassembled = ""; \ weaponDeployed = ""; \ -weaponRested = ""; \ -reloaded = ""; \ -firedMan = ""; \ -turnIn = ""; \ -turnOut = ""; \ -deleted = ""; \ -disassembled = ""; \ -Suppressed = ""; \ -gestureChanged = ""; \ -gestureDone = "" +weaponRested = "";