refactor: knockback system (#344)

* refactor knoback system

* adjust something

* Fix weapon lookup

---------

Co-authored-by: Vauff <mctehkitti@gmail.com>

Author: Kxnrl

src/cs2_sdk/entity/ctakedamageinfo.h

@@ -1,4 +1,4 @@
-/**
+/**
  * =============================================================================
  * CS2Fixes
  * Copyright (C) 2023-2025 Source2ZE
@@ -77,12 +77,14 @@ struct AttackerInfo_t
 	int m_iTeamChecked;
 	int m_nTeam;
 };
+static_assert(sizeof(AttackerInfo_t) == 20);
 
 // No idea what this is meant to have, but OnTakeDamage_Alive expects this and we only care about pInfo
 struct CTakeDamageInfoContainer
 {
 	CTakeDamageInfo* pInfo;
 };
+class CGameTrace;
 
 class CTakeDamageInfo
 {
@@ -100,50 +102,42 @@ class CTakeDamageInfo
 		addresses::CTakeDamageInfo_Constructor(this, pInflictor, pAttacker, pAbility, &vec3_origin, &vec3_origin, flDamage, bitsDamageType, 0, nullptr);
 	}
 
-	Vector m_vecDamageForce;
-	Vector m_vecDamagePosition;
-	Vector m_vecReportedPosition;
-	Vector m_vecDamageDirection;
-	CHandle<CBaseEntity> m_hInflictor;
-	CHandle<CBaseEntity> m_hAttacker;
-	CHandle<CBaseEntity> m_hAbility;
-	float m_flDamage;
-	float m_flTotalledDamage;
-	float m_flTotalledDamageAbsorbed;
-	DamageTypes_t m_bitsDamageType;
-	int32_t m_iDamageCustom;
-	uint8_t m_iAmmoType;
+	Vector m_vecDamageForce;		   // 0x8  |  8
+	Vector m_vecDamagePosition;		   // 0x14 | 20
+	Vector m_vecReportedPosition;	   // 0x20 | 32
+	Vector m_vecDamageDirection;	   // 0x2c | 44
+	CHandle<CBaseEntity> m_hInflictor; // 0x38 | 56
+	CHandle<CBaseEntity> m_hAttacker;  // 0x3c | 60
+	CHandle<CBaseEntity> m_hAbility;   // 0x40 | 64
+	float m_flDamage;				   // 0x44 | 68
+	float m_flTotalledDamage;		   // 0x48 | 72
+	float m_flTotalledDamageAbsorbed;  // 0x4c | 76
+	DamageTypes_t m_bitsDamageType;	   // 0x50 | 80
+	int32_t m_iDamageCustom;		   // 0x54 | 84
+	uint8_t m_iAmmoType;			   // 0x58 | 88
 
 private:
-	[[maybe_unused]] uint8_t __pad0059[0xf];
+	[[maybe_unused]] uint8_t _x51[15]; // 0x59
 
 public:
-	float m_flOriginalDamage;
-	bool m_bShouldBleed;
-	bool m_bShouldSpark;
+	float m_flOriginalDamage; // 0x68 | 104
+	bool m_bShouldBleed;	  // 0x6c | 108
+	bool m_bShouldSpark;	  // 0x6d | 109
 
 private:
-	[[maybe_unused]] uint8_t __pad006e[0x2];
+	[[maybe_unused]] uint8_t _x66[0x2]; // 0x66
 
 public:
-	float m_flDamageAbsorbed;
+	float m_flDamageAbsorbed;					// 0x70 | 112
+	CGameTrace* m_pTrace;						// 0x78 | 120
+	TakeDamageFlags_t m_nDamageFlags;			// 0x80 | 128
+	int32_t m_nNumObjectsPenetrated;			// 0x88 | 136
+	float m_flFriendlyFireDamageReductionRatio; // 0x8c | 140
+	void* m_hScriptInstance;					// 0x90 | 144
+	AttackerInfo_t m_AttackerInfo;				// 0x98 | 152
+	bool m_bInTakeDamageFlow;					// 0xac | 172
 
 private:
-	[[maybe_unused]] uint8_t __pad0074[0x8];
-
-public:
-	TakeDamageFlags_t m_nDamageFlags;
-
-private:
-	[[maybe_unused]] uint8_t __pad0084[0x4];
-
-public:
-	int32_t m_nNumObjectsPenetrated;
-	float m_flFriendlyFireDamageReductionRatio;
-	uint64_t m_hScriptInstance;
-	AttackerInfo_t m_AttackerInfo;
-	bool m_bInTakeDamageFlow;
-
-private:
-	[[maybe_unused]] uint8_t __pad00ad[0x4];
+	[[maybe_unused]] int32_t m_nUnknown2; // 0xa0 | 176
 };
+static_assert(sizeof(CTakeDamageInfo) == 184);

src/detours.cpp

@@ -90,7 +90,7 @@ CConVar<bool> g_cvarBlockMolotovSelfDmg("cs2f_block_molotov_self_dmg", FCVAR_NON
 CConVar<bool> g_cvarBlockAllDamage("cs2f_block_all_dmg", FCVAR_NONE, "Whether to block all damage to players", false);
 CConVar<bool> g_cvarFixBlockDamage("cs2f_fix_block_dmg", FCVAR_NONE, "Whether to fix block-damage on players", false);
 
-void FASTCALL Detour_CBaseEntity_TakeDamageOld(CBaseEntity* pThis, CTakeDamageInfo* inputInfo)
+int64 FASTCALL Detour_CBaseEntity_TakeDamageOld(CBaseEntity* pThis, CTakeDamageInfo* inputInfo)
 {
 #ifdef _DEBUG
 	Message("\n--------------------------------\n"
@@ -111,7 +111,7 @@ void FASTCALL Detour_CBaseEntity_TakeDamageOld(CBaseEntity* pThis, CTakeDamageIn
 
 	// Block all player damage if desired
 	if (g_cvarBlockAllDamage.Get() && pThis->IsPawn())
-		return;
+		return 0;
 
 	CBaseEntity* pInflictor = inputInfo->m_hInflictor.Get();
 	const char* pszInflictorClass = pInflictor ? pInflictor->GetClassname() : "";
@@ -137,9 +137,14 @@ void FASTCALL Detour_CBaseEntity_TakeDamageOld(CBaseEntity* pThis, CTakeDamageIn
 
 	// Prevent molly on self
 	if (g_cvarBlockMolotovSelfDmg.Get() && inputInfo->m_hAttacker == pThis && !V_strncmp(pszInflictorClass, "inferno", 7))
-		return;
+		return 0;
+
+	const auto damage = CBaseEntity_TakeDamageOld(pThis, inputInfo);
+
+	if (damage > 0 && g_cvarEnableZR.Get() && pThis->IsPawn())
+		ZR_OnPlayerTakeDamage(reinterpret_cast<CCSPlayerPawn*>(pThis), inputInfo, static_cast<int32>(damage));
 
-	CBaseEntity_TakeDamageOld(pThis, inputInfo);
+	return damage;
 }
 
 CConVar<bool> g_cvarUseOldPush("cs2f_use_old_push", FCVAR_NONE, "Whether to use the old CSGO trigger_push behavior", false);

src/detours.h

@@ -1,4 +1,4 @@
-/**
+/**
  * =============================================================================
  * CS2Fixes
  * Copyright (C) 2023-2025 Source2ZE
@@ -63,7 +63,7 @@ void FASTCALL Detour_UTIL_SayTextFilter(IRecipientFilter&, const char*, CCSPlaye
 void FASTCALL Detour_UTIL_SayText2Filter(IRecipientFilter&, CCSPlayerController*, uint64, const char*, const char*, const char*, const char*, const char*);
 bool FASTCALL Detour_IsHearingClient(void*, int);
 void FASTCALL Detour_TriggerPush_Touch(CTriggerPush* pPush, CBaseEntity* pOther);
-void FASTCALL Detour_CBaseEntity_TakeDamageOld(CBaseEntity* pThis, CTakeDamageInfo* inputInfo);
+int64 FASTCALL Detour_CBaseEntity_TakeDamageOld(CBaseEntity* pThis, CTakeDamageInfo* inputInfo);
 bool FASTCALL Detour_CCSPlayer_WeaponServices_CanUse(CCSPlayer_WeaponServices*, CBasePlayerWeapon*);
 void FASTCALL Detour_CCSPlayer_WeaponServices_EquipWeapon(CCSPlayer_WeaponServices*, CBasePlayerWeapon*);
 bool FASTCALL Detour_CEntityIdentity_AcceptInput(CEntityIdentity* pThis, CUtlSymbolLarge* pInputName, CEntityInstance* pActivator, CEntityInstance* pCaller, variant_t* value, int nOutputID);

src/events.cpp

@@ -198,9 +198,6 @@ CConVar<bool> g_cvarEnableTopDefender("cs2f_topdefender_enable", FCVAR_NONE, "Wh
 
 GAME_EVENT_F(player_hurt)
 {
-	if (g_cvarEnableZR.Get())
-		ZR_OnPlayerHurt(pEvent);
-
 	if (!g_cvarEnableTopDefender.Get())
 		return;
 

src/zombiereborn.cpp

@@ -1,4 +1,4 @@
-/**
+/**
  * =============================================================================
  * CS2Fixes
  * Copyright (C) 2023-2025 Source2ZE
@@ -276,13 +276,13 @@ void ZRClass::Override(ordered_json jsonKeys, std::string szClassname)
 }
 
 ZRHumanClass::ZRHumanClass(ordered_json jsonKeys, std::string szClassname) :
-	ZRClass(jsonKeys, szClassname, CS_TEAM_CT){};
+	ZRClass(jsonKeys, szClassname, CS_TEAM_CT) {};
 
 ZRZombieClass::ZRZombieClass(ordered_json jsonKeys, std::string szClassname) :
 	ZRClass(jsonKeys, szClassname, CS_TEAM_T),
 	iHealthRegenCount(jsonKeys.value("health_regen_count", 0)),
 	flHealthRegenInterval(jsonKeys.value("health_regen_interval", 0)),
-	flKnockback(jsonKeys.value("knockback", 1.0)){};
+	flKnockback(jsonKeys.value("knockback", 1.0)) {};
 
 void ZRZombieClass::Override(ordered_json jsonKeys, std::string szClassname)
 {
@@ -1066,7 +1066,10 @@ void ZR_OnPlayerSpawn(CCSPlayerController* pController)
 
 void ZR_ApplyKnockback(CCSPlayerPawn* pHuman, CCSPlayerPawn* pVictim, int iDamage, const char* szWeapon, int hitgroup, float classknockback)
 {
-	std::shared_ptr<ZRWeapon> pWeapon = g_pZRWeaponConfig->FindWeapon(szWeapon);
+	if (V_strlen(szWeapon) <= 7)
+		return;
+
+	std::shared_ptr<ZRWeapon> pWeapon = g_pZRWeaponConfig->FindWeapon(szWeapon + 7);
 	std::shared_ptr<ZRHitgroup> pHitgroup = g_pZRHitgroupConfig->FindHitgroupIndex(hitgroup);
 	// player shouldn't be able to pick up that weapon in the first place, but just in case
 	if (!pWeapon)
@@ -1602,21 +1605,35 @@ void ZR_Hook_ClientCommand_JoinTeam(CPlayerSlot slot, const CCommand& args)
 		SpawnPlayer(pController);
 }
 
-void ZR_OnPlayerHurt(IGameEvent* pEvent)
+void ZR_OnPlayerTakeDamage(CCSPlayerPawn* pVictimPawn, const CTakeDamageInfo* pInfo, const int32 damage)
 {
-	CCSPlayerController* pAttackerController = (CCSPlayerController*)pEvent->GetPlayerController("attacker");
-	CCSPlayerController* pVictimController = (CCSPlayerController*)pEvent->GetPlayerController("userid");
-	const char* szWeapon = pEvent->GetString("weapon");
-	int iDmgHealth = pEvent->GetInt("dmg_health");
-	int iHitGroup = pEvent->GetInt("hitgroup");
+	// bullet only
+	if ((pInfo->m_bitsDamageType & DMG_BULLET) == 0 || !pInfo->m_pTrace || !pInfo->m_pTrace->m_pHitbox)
+		return;
+
+	const auto pVictimController = reinterpret_cast<CCSPlayerController*>(pVictimPawn->GetController());
+	if (!pVictimController || !pVictimController->IsConnected())
+		return;
 
-	// grenade and molotov knockbacks are handled by TakeDamage detours
-	if (!pAttackerController || !pVictimController || !V_strncmp(szWeapon, "inferno", 7) || !V_strncmp(szWeapon, "hegrenade", 9))
+	if (!pInfo->m_AttackerInfo.m_bIsPawn)
 		return;
 
-	if (pAttackerController->m_iTeamNum() == CS_TEAM_CT && pVictimController->m_iTeamNum() == CS_TEAM_T)
+	const auto pKillerPawn = pInfo->m_AttackerInfo.m_hAttackerPawn.Get();
+	if (!pKillerPawn || !pKillerPawn->IsPawn()) // I don't know why this maybe non-pawn entity??
+		return;
+
+	const auto pAbility = pInfo->m_hAbility.Get();
+	if (!pAbility)
+		return;
+
+	const char* pszWeapon = pAbility->GetClassname();
+
+	if (!V_strncasecmp(pszWeapon, "weapon_", 7))
+		pszWeapon = reinterpret_cast<CBasePlayerWeapon*>(pAbility)->GetWeaponClassname();
+
+	if (pKillerPawn->m_iTeamNum() == CS_TEAM_CT && pVictimPawn->m_iTeamNum() == CS_TEAM_T)
 	{
-		float flClassKnockback = 1.0f;
+		auto flClassKnockback = 1.0f;
 
 		if (pVictimController->GetZEPlayer())
 		{
@@ -1626,7 +1643,7 @@ void ZR_OnPlayerHurt(IGameEvent* pEvent)
 				flClassKnockback = static_pointer_cast<ZRZombieClass>(activeClass)->flKnockback;
 		}
 
-		ZR_ApplyKnockback((CCSPlayerPawn*)pAttackerController->GetPawn(), (CCSPlayerPawn*)pVictimController->GetPawn(), iDmgHealth, szWeapon, iHitGroup, flClassKnockback);
+		ZR_ApplyKnockback(pKillerPawn, pVictimPawn, damage, pszWeapon, pInfo->m_pTrace->m_pHitbox->m_nGroupId, flClassKnockback);
 	}
 }
 

src/zombiereborn.h

@@ -1,4 +1,4 @@
-/**
+/**
  * =============================================================================
  * CS2Fixes
  * Copyright (C) 2023-2025 Source2ZE
@@ -136,7 +136,7 @@ struct ZRClass
 struct ZRHumanClass : ZRClass
 {
 	ZRHumanClass(std::shared_ptr<ZRHumanClass> pClass) :
-		ZRClass(pClass, CS_TEAM_CT){};
+		ZRClass(pClass, CS_TEAM_CT) {};
 	ZRHumanClass(ordered_json jsonKeys, std::string szClassname);
 };
 
@@ -149,7 +149,7 @@ struct ZRZombieClass : ZRClass
 		ZRClass(pClass, CS_TEAM_T),
 		iHealthRegenCount(pClass->iHealthRegenCount),
 		flHealthRegenInterval(pClass->flHealthRegenInterval),
-		flKnockback(pClass->flKnockback){};
+		flKnockback(pClass->flKnockback) {};
 	ZRZombieClass(ordered_json jsonKeys, std::string szClassname);
 	void PrintInfo()
 	{
@@ -226,7 +226,7 @@ class CZRRegenTimer : public CTimerBase
 {
 public:
 	CZRRegenTimer(float flRegenInterval, int iRegenAmount, CHandle<CCSPlayerPawn> hPawnHandle) :
-		CTimerBase(flRegenInterval, false, false), m_iRegenAmount(iRegenAmount), m_hPawnHandle(hPawnHandle){};
+		CTimerBase(flRegenInterval, false, false), m_iRegenAmount(iRegenAmount), m_hPawnHandle(hPawnHandle) {};
 
 	bool Execute();
 	static void StartRegen(float flRegenInterval, int iRegenAmount, CCSPlayerController* pController);
@@ -291,7 +291,7 @@ void ZR_OnLevelInit();
 void ZR_OnRoundPrestart(IGameEvent* pEvent);
 void ZR_OnRoundStart(IGameEvent* pEvent);
 void ZR_OnPlayerSpawn(CCSPlayerController* pController);
-void ZR_OnPlayerHurt(IGameEvent* pEvent);
+void ZR_OnPlayerTakeDamage(CCSPlayerPawn* pVictimPawn, const CTakeDamageInfo* pInfo, const int32 damage);
 void ZR_OnPlayerDeath(IGameEvent* pEvent);
 void ZR_OnRoundFreezeEnd(IGameEvent* pEvent);
 void ZR_OnRoundTimeWarning(IGameEvent* pEvent);