New event

Author: FileEX

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -74,12 +74,13 @@ CVector             g_vecBulletFireEndPosition;
 #define DOUBLECLICK_MOVE_THRESHOLD   10.0f
 
 static constexpr long long TIME_DISCORD_UPDATE_RATE = 15000;
+static constexpr int       CANCEL_DAMAGE_EVENT_INTERVAL = 1000;
 
 CClientGame::CClientGame(bool bLocalPlay) : m_ServerInfo(new CServerInfo())
 {
     // Init the global var with ourself
     g_pClientGame = this;
-
+    
     // Packet handler
     m_pPacketHandler = new CPacketHandler();
 
@@ -4428,6 +4429,29 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
             }
             pDamagedPed->GetGamePlayer()->SetHealth(fPreviousHealth);
             pDamagedPed->GetGamePlayer()->SetArmor(fPreviousArmor);
+
+            if (GetTickCount64_() - m_lastCancelDamageEventTime_Ped >= CANCEL_DAMAGE_EVENT_INTERVAL && weaponUsed != eWeaponType::WEAPONTYPE_DROWNING)
+            {
+                NetBitStreamInterface* bitStream = g_pNet->AllocateNetBitStream();
+
+                bitStream->Write(pDamagedPed->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);
+
+                m_lastCancelDamageEventTime_Ped = GetTickCount64_();
+            }
+
             return false;
         }
 
@@ -4787,6 +4811,28 @@ bool CClientGame::VehicleDamageHandler(CEntitySAInterface* pVehicleInterface, fl
         if (!pClientVehicle->CallEvent("onClientVehicleDamage", Arguments, true))
         {
             bAllowDamage = false;
+
+            if (GetTickCount64_() - m_lastCancelDamageEventTime_Vehicle >= CANCEL_DAMAGE_EVENT_INTERVAL)
+            {
+                NetBitStreamInterface* bitStream = g_pNet->AllocateNetBitStream();
+
+                bitStream->Write(pClientVehicle->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);
+
+                m_lastCancelDamageEventTime_Vehicle = GetTickCount64_();
+            }
         }
     }
 

Client/mods/deathmatch/logic/CClientGame.h

@@ -874,6 +874,8 @@ class CClientGame
     RunNamedAnimTask_type m_mapOfRunNamedAnimTasks;
 
     long long m_timeLastDiscordStateUpdate;
+    std::int64_t m_lastCancelDamageEventTime_Ped;
+    std::int64_t m_lastCancelDamageEventTime_Vehicle;
 };
 
 extern CClientGame* g_pClientGame;

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/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;
 

Server/mods/deathmatch/logic/CGame.cpp

@@ -60,6 +60,7 @@
 #include "packets/CPlayerListPacket.h"
 #include "packets/CPlayerClothesPacket.h"
 #include "packets/CPlayerWorldSpecialPropertyPacket.h"
+#include "packets/CDamageCancelEventPacket.h"
 #include "packets/CServerInfoSyncPacket.h"
 #include "packets/CLuaPacket.h"
 #include "../utils/COpenPortsTester.h"
@@ -1330,6 +1331,12 @@ bool CGame::ProcessPacket(CPacket& Packet)
             return true;
         }
 
+        case PACKET_ID_CANCEL_DAMAGE_EVENT:
+        {
+            Packet_CancelDamageEvent(static_cast<CDamageCancelEventPacket&>(Packet));
+            return true;
+        }
+
         default:
             break;
     }
@@ -1650,6 +1657,7 @@ void CGame::AddBuiltInEvents()
     m_Events.AddEvent("onPlayerChangesProtectedData", "element, key, value", nullptr, false);
     m_Events.AddEvent("onPlayerChangesWorldSpecialProperty", "property, enabled", nullptr, false);
     m_Events.AddEvent("onPlayerTeleport", "previousX, previousY, previousZ, currentX, currentY, currentZ", nullptr, false);
+    m_Events.AddEvent("onDamageEventCancelled", "damagedEntity, weapon, damage, resourceName", nullptr, false);
 
     // Ped events
     m_Events.AddEvent("onPedVehicleEnter", "vehicle, seat, jacked", NULL, false);
@@ -4206,6 +4214,27 @@ void CGame::Packet_PlayerWorldSpecialProperty(CPlayerWorldSpecialPropertyPacket&
     player->CallEvent("onPlayerChangesWorldSpecialProperty", arguments, nullptr);
 }
 
+void CGame::Packet_CancelDamageEvent(CDamageCancelEventPacket& packet) noexcept
+{
+    CPlayer* player = packet.GetSourcePlayer();
+    if (!player)
+        return;
+
+    CElement* damagedEntity = CElementIDs::GetElement(packet.GetDamagedEntityID());
+    if (!damagedEntity)
+        return;
+
+    CLuaArguments arguments;
+    arguments.PushElement(damagedEntity);
+    arguments.PushNumber(packet.GetWeaponType());
+    arguments.PushNumber(packet.GetDamage());
+
+    const std::string& resourceName = packet.GetResourceName();
+    arguments.PushString(resourceName);
+
+    player->CallEvent("onDamageEventCancelled", arguments, nullptr);
+}
+
 void CGame::Packet_PlayerModInfo(CPlayerModInfoPacket& Packet)
 {
     CPlayer* pPlayer = Packet.GetSourcePlayer();

Server/mods/deathmatch/logic/CGame.h

@@ -523,6 +523,7 @@ class CGame
     void Packet_PlayerNetworkStatus(class CPlayerNetworkStatusPacket& Packet);
     void Packet_PlayerResourceStart(class CPlayerResourceStartPacket& Packet);
     void Packet_PlayerWorldSpecialProperty(class CPlayerWorldSpecialPropertyPacket& packet) noexcept;
+    void Packet_CancelDamageEvent(class CDamageCancelEventPacket& packet) noexcept;
 
     static void PlayerCompleteConnect(CPlayer* pPlayer);