New event onDamageEventCancelled

Client/game_sa/CPedSA.cpp

@@ -20,6 +20,7 @@
 #include "CProjectileInfoSA.h"
 #include "CWeaponStatManagerSA.h"
 #include "CFireManagerSA.h"
+#include "CAnimManagerSA.h"
 
 extern CGameSA* pGame;
 
@@ -576,6 +577,25 @@ void CPedSA::GetAttachedSatchels(std::vector<SSatchelsData>& satchelsList) const
     }
 }
 
+bool CPedSA::IsPedCuttingWithChainsaw() const
+{
+    if (GetPedIntelligence()->GetTaskManager()->GetActiveTask()->GetTaskType() == TASK_SIMPLE_FIGHT)
+    {
+        CPedSAInterface* gamePed = GetPedInterface();
+
+        if (gamePed->weaponAudioEntity.m_chainsawState == eChainsawState::CUTTING)
+        {
+            auto cuttingAnim = pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(gamePed->m_pRwObject, "csaw_g");
+            if (!cuttingAnim)
+                cuttingAnim = pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(gamePed->m_pRwObject, "csaw_part");
+
+            return cuttingAnim != nullptr;
+        }
+    }
+
+    return false;
+}
+
 ////////////////////////////////////////////////////////////////
 //
 // CPed_PreRenderAfterTest

Client/game_sa/CPedSA.h

@@ -475,6 +475,8 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA
 
     void GetAttachedSatchels(std::vector<SSatchelsData> &satchelsList) const override;
 
+    bool IsPedCuttingWithChainsaw() const override;
+
     static void StaticSetHooks();
 
 private:

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -4428,6 +4428,68 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
             }
             pDamagedPed->GetGamePlayer()->SetHealth(fPreviousHealth);
             pDamagedPed->GetGamePlayer()->SetArmor(fPreviousArmor);
+
+            if (GetTickCount64_() - pDamagedPed->m_lastEventDamageCancelledTime >= g_TickRateSettings.cancelledDamageInterval)
+            {
+                bool sendPacket = true;
+
+                if (!m_triggerEventDamageCancelledForDamageEveryFrame)
+                {
+                    switch (weaponUsed)
+                    {
+                        case WEAPONTYPE_TEARGAS:
+                        case WEAPONTYPE_SPRAYCAN:
+                        case WEAPONTYPE_EXTINGUISHER:
+                        case WEAPONTYPE_FLAMETHROWER:
+                        case WEAPONTYPE_MOLOTOV:
+                        case WEAPONTYPE_DROWNING:
+                        case WEAPONTYPE_MINIGUN:
+                        case WEAPONTYPE_RUNOVERBYCAR:
+                        {
+                            sendPacket = false;
+                            break;
+                        }
+                        case WEAPONTYPE_CHAINSAW:
+                        {
+                            if (pInflictingEntity && pInflictingEntity->GetType() == eClientEntityType::CCLIENTPED || pInflictingEntity->GetType() == eClientEntityType::CCLIENTPLAYER)
+                            {
+                                CClientPed* attackerPed = static_cast<CClientPed*>(pInflictingEntity);
+                                if (!attackerPed->m_pPlayerPed || !attackerPed->m_pPlayerPed->IsPedCuttingWithChainsaw())
+                                    sendPacket = false;
+                            }
+
+                            break;
+                        }
+                    }
+                }
+
+                if (sendPacket)
+                {
+                    NetBitStreamInterface* bitStream = g_pNet->AllocateNetBitStream();
+
+                    bitStream->Write(pDamagedPed->GetID());
+
+                    bitStream->WriteBit(pInflictingEntity != nullptr);
+                    if (pInflictingEntity)
+                        bitStream->Write(pInflictingEntity->GetID());
+
+                    SWeaponTypeSync weapon;
+                    weapon.data.ucWeaponType = weaponUsed;
+                    bitStream->Write(&weapon);
+
+                    SFloatSync<8, 10> damage;
+                    damage.data.fValue = fDamage;
+                    bitStream->Write(&damage);
+
+                    bitStream->WriteString(m_pLuaManager->GetEvents()->GetEventCancellingResourceName());
+
+                    g_pNet->SendPacket(PACKET_ID_CANCEL_DAMAGE_EVENT, bitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
+                    g_pNet->DeallocateNetBitStream(bitStream);
+
+                    pDamagedPed->m_lastEventDamageCancelledTime = GetTickCount64_();
+                }
+            }
+
             return false;
         }
 
@@ -4787,6 +4849,32 @@ bool CClientGame::VehicleDamageHandler(CEntitySAInterface* pVehicleInterface, fl
         if (!pClientVehicle->CallEvent("onClientVehicleDamage", Arguments, true))
         {
             bAllowDamage = false;
+
+            if (m_triggerEventDamageCancelledForVehicles && GetTickCount64_() - pClientVehicle->m_lastEventDamageCancelledTime >= g_TickRateSettings.cancelledDamageInterval)
+            {
+                NetBitStreamInterface* bitStream = g_pNet->AllocateNetBitStream();
+
+                bitStream->Write(pClientVehicle->GetID());
+
+                bitStream->WriteBit(pClientAttacker != nullptr);
+                if (pClientAttacker)
+                    bitStream->Write(pClientAttacker->GetID());
+
+                SWeaponTypeSync weapon;
+                weapon.data.ucWeaponType = weaponType;
+                bitStream->Write(&weapon);
+
+                SFloatSync<8, 10> damage;
+                damage.data.fValue = fLoss;
+                bitStream->Write(&damage);
+
+                bitStream->WriteString(m_pLuaManager->GetEvents()->GetEventCancellingResourceName());
+
+                g_pNet->SendPacket(PACKET_ID_CANCEL_DAMAGE_EVENT, bitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
+                g_pNet->DeallocateNetBitStream(bitStream);
+
+                pClientVehicle->m_lastEventDamageCancelledTime = GetTickCount64_();
+            }
         }
     }
 

Client/mods/deathmatch/logic/CClientGame.h

@@ -664,6 +664,12 @@ class CClientGame
     void PedStepHandler(CPedSAInterface* pPed, bool bFoot);
     void VehicleWeaponHitHandler(SVehicleWeaponHitEvent& event);
 
+    void SetEventDamageCancelledSettings(bool calledForVehicles, bool calledForDmgEveryFrame) noexcept
+    {
+        m_triggerEventDamageCancelledForVehicles = calledForVehicles;
+        m_triggerEventDamageCancelledForDamageEveryFrame = calledForDmgEveryFrame;
+    }
+
 private:
     eStatus       m_Status;
     eServerType   m_ServerType;
@@ -874,6 +880,9 @@ class CClientGame
     RunNamedAnimTask_type m_mapOfRunNamedAnimTasks;
 
     long long m_timeLastDiscordStateUpdate;
+
+    bool m_triggerEventDamageCancelledForVehicles;
+    bool m_triggerEventDamageCancelledForDamageEveryFrame;
 };
 
 extern CClientGame* g_pClientGame;

Client/mods/deathmatch/logic/CClientPed.h

@@ -740,6 +740,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     uint                                     m_uiFrameLastRebuildPlayer;
     bool                                     m_bIsSyncing;
     bool                                     m_shouldRecreate{false};
+    std::int64_t                             m_lastEventDamageCancelledTime{0};
 
     bool             m_bBulletImpactData;
     CClientEntityPtr m_pBulletImpactEntity;

Client/mods/deathmatch/logic/CClientVehicle.h

@@ -760,4 +760,6 @@ class CClientVehicle : public CClientStreamElement
 
     std::array<CVector, static_cast<std::size_t>(VehicleDummies::VEHICLE_DUMMY_COUNT)> m_dummyPositions;
     bool                                     m_copyDummyPositions = true;
+
+    std::int64_t m_lastEventDamageCancelledTime{0};
 };

Client/mods/deathmatch/logic/CEvents.cpp

@@ -147,8 +147,9 @@ void CEvents::PostEventPulse()
     m_CancelledList.pop_back();
 }
 
-void CEvents::CancelEvent(bool bCancelled)
+void CEvents::CancelEvent(bool bCancelled, const std::string& resourceName)
 {
+    m_eventCancellingResourceName = resourceName;
     m_bEventCancelled = bCancelled;
 }
 

Client/mods/deathmatch/logic/CEvents.h

@@ -42,14 +42,17 @@ class CEvents
     void PreEventPulse();
     void PostEventPulse();
 
-    void CancelEvent(bool bCancelled = true);
+    void CancelEvent(bool bCancelled = true, const std::string& resourceName = std::string());
     bool WasEventCancelled();
 
+    std::string GetEventCancellingResourceName() const noexcept { return m_eventCancellingResourceName; }
+
 private:
     void RemoveAllEvents();
 
     CFastHashMap<SString, SEvent*> m_EventHashMap;
     std::vector<int>               m_CancelledList;
     bool                           m_bEventCancelled;
     bool                           m_bWasEventCancelled;
+    std::string                    m_eventCancellingResourceName{};
 };

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -5482,6 +5482,14 @@ void CPacketHandler::Packet_SyncSettings(NetBitStreamInterface& bitStream)
     uchar ucAllowShotgunDamageFix = 0;
     bitStream.Read(ucAllowShotgunDamageFix);
 
+    bool triggerEventDamageCancelledForVehicles;
+    bitStream.ReadBit(triggerEventDamageCancelledForVehicles);
+
+    bool triggerEventDamageCancelledForDamageEveryFrame;
+    bitStream.ReadBit(triggerEventDamageCancelledForDamageEveryFrame);
+
+    g_pClientGame->SetEventDamageCancelledSettings(triggerEventDamageCancelledForVehicles, triggerEventDamageCancelledForDamageEveryFrame);
+
     SMiscGameSettings miscGameSettings;
     miscGameSettings.bUseAltPulseOrder = (ucUseAltPulseOrder != 0);
     miscGameSettings.bAllowFastSprintFix = (ucAllowFastSprintFix != 0);

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -221,9 +221,9 @@ bool CStaticFunctionDefinitions::TriggerLatentServerEvent(const char* szName, CC
     return false;
 }
 
-bool CStaticFunctionDefinitions::CancelEvent(bool bCancel)
+bool CStaticFunctionDefinitions::CancelEvent(bool bCancel, CLuaMain* luaMain)
 {
-    m_pEvents->CancelEvent(bCancel);
+    m_pEvents->CancelEvent(bCancel, luaMain->GetResource()->GetName());
     return true;
 }
 

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -35,7 +35,7 @@ class CStaticFunctionDefinitions
     static bool TriggerServerEvent(const char* szName, CClientEntity& CallWithEntity, CLuaArguments& Arguments);
     static bool TriggerLatentServerEvent(const char* szName, CClientEntity& CallWithEntity, CLuaArguments& Arguments, int bandwidth, CLuaMain* pLuaMain,
                                          ushort usResourceNetId);
-    static bool CancelEvent(bool bCancel);
+    static bool CancelEvent(bool bCancel, CLuaMain* luaMain);
     static bool WasEventCancelled();
 
     // Misc funcs

Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.Event.cpp

@@ -270,7 +270,7 @@ int CLuaFunctionDefs::TriggerServerEvent(lua_State* luaVM)
 int CLuaFunctionDefs::CancelEvent(lua_State* luaVM)
 {
     // Cancel it
-    if (CStaticFunctionDefinitions::CancelEvent(true))
+    if (CStaticFunctionDefinitions::CancelEvent(true, m_pLuaManager->GetVirtualMachine(luaVM)))
     {
         lua_pushboolean(luaVM, true);
         return 1;

Client/mods/deathmatch/logic/lua/CLuaManager.h

@@ -42,6 +42,7 @@ class CLuaManager
     void ProcessPendingDeleteList();
 
     bool IsLuaVMValid(lua_State* luaVM) { return MapFindRef(m_VirtualMachineMap, luaVM) != nullptr; };
+    CEvents* GetEvents() const noexcept { return m_pEvents; }
 
     CClientGUIManager* m_pGUIManager;
 

Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp

@@ -603,6 +603,7 @@ void CWorldRPCs::SetSyncIntervals(NetBitStreamInterface& bitStream)
     bitStream.Read(g_TickRateSettings.iKeySyncAnalogMove);
     bitStream.Read(g_TickRateSettings.iPedSyncerDistance);
     bitStream.Read(g_TickRateSettings.iUnoccupiedVehicleSyncerDistance);
+    bitStream.Read(g_TickRateSettings.cancelledDamageInterval);
 }
 
 void CWorldRPCs::SetMoonSize(NetBitStreamInterface& bitStream)

Client/sdk/game/CPed.h

@@ -307,4 +307,6 @@ class CPed : public virtual CPhysical
     virtual void GetAttachedSatchels(std::vector<SSatchelsData> &satchelsList) const = 0;
 
     virtual void Say(const ePedSpeechContext& speechId, float probability) = 0;
+
+    virtual bool IsPedCuttingWithChainsaw() const = 0;
 };

Server/mods/deathmatch/editor.conf

@@ -153,6 +153,10 @@
     <!-- Keysync analog movement sync interval. For limiting key sync packets due to joystick movement. Default: 100 -->
     <keysync_analog_sync_interval>100</keysync_analog_sync_interval>
 
+    <!-- This parameter specifies the interval at which the onDamageEventCancelled event can be sent.
+          Value: 50-4000, default: 1000 -->
+    <cancelled_damage_send_interval>1000</cancelled_damage_send_interval>
+
     <!-- This parameter can improve the reliability of shots when using certain weapons. However, it uses more bandwidth.
          Values: 0 - disabled , 1 - enabled ; default value: 1. -->
     <bullet_sync>1</bullet_sync>
@@ -296,6 +300,14 @@
          Values: 0 - Off, 1 - Enabled.  Default - 1 -->
     <check_duplicate_serials>1</check_duplicate_serials>
 
+    <!-- This parameter specifies whether the onDamageEventCancelled event should also be triggered for vehicles, i.e. when onClientVehicleDamage is cancelled. Every hit or scrape on a vehicle counts as damage for it, so if you are naturally cancelling this event, it is recommended to leave this parameter set to 0 to avoid unnecessary event flooding.
+          Values: 0 - Off, 1 - Enabled. Default: 0 -->
+    <cancelled_damage_for_vehicles>0</cancelled_damage_for_vehicles>
+
+    <!-- This parameter specifies whether the onDamageEventCancelled event should be triggered when a ped takes damage every frame (drowning, burning, fire extinguisher, spraycan, runover by car, minigun, chainsaw cutting, teargas). 
+          Values: 0 - Off, 1 - Enabled. Default: 1 -->
+    <cancelled_damage_send_frame_based_dmg>1</cancelled_damage_send_frame_based_dmg>
+
     <!-- Specifies the module(s) which are loaded with the server. To load several modules, add more <module>
          parameter(s). Optional parameter. -->
     <!-- <module src="sample_win32.dll"/> -->

Server/mods/deathmatch/local.conf

@@ -153,6 +153,10 @@
     <!-- Keysync analog movement sync interval. For limiting key sync packets due to joystick movement. Default: 100 -->
     <keysync_analog_sync_interval>100</keysync_analog_sync_interval>
 
+    <!-- This parameter specifies the interval at which the onDamageEventCancelled event can be sent.
+          Value: 50-4000, default: 1000 -->
+    <cancelled_damage_send_interval>1000</cancelled_damage_send_interval>
+
     <!-- This parameter can improve the reliability of shots when using certain weapons. However, it uses more bandwidth.
          Values: 0 - disabled , 1 - enabled ; default value: 1. -->
     <bullet_sync>1</bullet_sync>
@@ -302,6 +306,14 @@
          Values: 0 - Off, 1 - Enabled.  Default - 1 -->
     <check_duplicate_serials>1</check_duplicate_serials>
 
+    <!-- This parameter specifies whether the onDamageEventCancelled event should also be triggered for vehicles, i.e. when onClientVehicleDamage is cancelled. Every hit or scrape on a vehicle counts as damage for it, so if you are naturally cancelling this event, it is recommended to leave this parameter set to 0 to avoid unnecessary event flooding.
+          Values: 0 - Off, 1 - Enabled. Default: 0 -->
+    <cancelled_damage_for_vehicles>0</cancelled_damage_for_vehicles>
+
+    <!-- This parameter specifies whether the onDamageEventCancelled event should be triggered when a ped takes damage every frame (drowning, burning, fire extinguisher, spraycan, runover by car, minigun, chainsaw cutting, teargas). 
+          Values: 0 - Off, 1 - Enabled. Default: 1 -->
+    <cancelled_damage_send_frame_based_dmg>1</cancelled_damage_send_frame_based_dmg>
+
     <!-- Specifies the module(s) which are loaded with the server. To load several modules, add more <module>
          parameter(s). Optional parameter. -->
     <!-- <module src="sample_win32.dll"/> -->