fix(TakeDamage): Not setting the damage & damage type

Author: skuzzis

plugin_files/gamedata/core/signatures.json

@@ -59,6 +59,11 @@
         "windows": "48 89 5C 24 ? 48 89 74 24 ? 55 57 41 55 41 56 41 57 48 8D 6C 24 E0",
         "linux": "55 48 89 E5 41 57 41 56 4D 89 C6 41 55 49 89 D5 41 54 49 89 F4"
     },
+    "CTakeDamageInfo_Constructor": {
+        "lib": "server",
+        "windows": "40 53 48 83 EC 60 48 C7 41 38 FF FF FF FF",
+        "linux": "55 48 89 E5 48 83 EC 10 4C 8D 15 ? ? ? ?"
+    },
     "FireOutputInternal": {
         "lib": "server",
         "windows": "4C 89 4C 24 20 53 55 57 41 54 41 56 48 81 EC",

src/memory/signatures/Signatures.h

@@ -33,6 +33,7 @@ typedef void (*GiveNamedItem_t)(CCSPlayer_ItemServices*, const char*, int, int,
 typedef SndOpEventGuid_t(*CBaseEntity_EmitSoundFilter)(IRecipientFilter& filter, CEntityIndex ent, const EmitSound_t& params);
 typedef void (*CBaseEntity_EmitSoundParams)(CBaseEntity*, const char*, int, float, float);
 typedef void (*CBaseEntity_TakeDamage_t)(CBaseEntity*, CTakeDamageInfo*);
+typedef void (*CTakeDamageInfo_Constructor)(CTakeDamageInfo*, CBaseEntity*, CBaseEntity*, CBaseEntity*, const Vector*, const Vector*, float, int, int, void*);
 
 DynLibUtils::CModule DetermineModuleByLibrary(std::string library);
 

src/plugins/core/scripting/sdk/sdkaccess.cpp

@@ -128,19 +128,20 @@ void SDKBaseClass::CBaseEntity_EmitSoundFromEntity(std::string sound_name, float
 }
 
 void SDKBaseClass::CBaseEntity_TakeDamage(EValue attacker, EValue inflictor, EValue ability, int damageType, float damage) {
-    CTakeDamageInfo info;
-    info.m_flDamage = damage;
-    info.m_bitsDamageType = (DDamageTypes_t)damageType;
-    
+    CBaseEntity* pinflictor = nullptr;
+    CBaseEntity* pability = nullptr;
+    CBaseEntity* pattacker = nullptr;
+
     if(ability.isInstance<SDKBaseClass>())
-        info.m_hAbility.Set((CBaseEntity*)ability.cast<SDKBaseClass>().GetPtr());
+        pability = (CBaseEntity*)ability.cast<SDKBaseClass>().GetPtr();
     if(attacker.isInstance<SDKBaseClass>())
-        info.m_hAttacker.Set((CBaseEntity*)attacker.cast<SDKBaseClass>().GetPtr());
+        pattacker = (CBaseEntity*)attacker.cast<SDKBaseClass>().GetPtr();
     if(inflictor.isInstance<SDKBaseClass>())
-        info.m_hInflictor.Set((CBaseEntity*)inflictor.cast<SDKBaseClass>().GetPtr());
+        pinflictor = (CBaseEntity*)inflictor.cast<SDKBaseClass>().GetPtr();
+
+    if(!pinflictor) pinflictor = pattacker;
 
-    if(!info.m_hInflictor.IsValid())
-        info.m_hInflictor.Set(info.m_hAttacker);
+    CTakeDamageInfo info(pinflictor, pattacker, pability, damage, (DDamageTypes_t)damageType);
 
     ((CBaseEntity*)this->GetPtr())->TakeDamage(&info);
 }

src/plugins/loader/scripting/sdk/schema.cpp

@@ -107,7 +107,7 @@ JSValue SDKBaseClass__SetProp(JSContext* ctx, JSValue this_obj, int argc, JSValu
     std::string field_name = EValue::fromJSStack(ct, argv[1]).cast<std::string>();
     EValue val = EValue::fromJSStack(ct, argv[2]);
 
-    uint64_t id = g_callStack->RegisterPluginCallstack(FetchPluginName(ct), string_format("SDK Set: %s::%s(ptr=%p,value=%s)", th->m_className.c_str(), field_name.c_str(), th->GetPtr(), val.tostring()));
+    uint64_t id = g_callStack->RegisterPluginCallstack(FetchPluginName(ct), string_format("SDK Set: %s::%s(ptr=%p,value=%s)", th->m_className.c_str(), field_name.c_str(), th->GetPtr(), val.tostring().c_str()));
     th->UpdateSDK(field_name, val, ct);
     g_callStack->UnregisterPluginCallstack(FetchPluginName(ct), id);
     return JS_UNDEFINED;

src/sdk/entity/CTakeDamageInfo.h

@@ -53,6 +53,17 @@ enum TTakeDamageFlags_t : uint32_t
     DFLAG_IGNORE_ARMOR = 0x800,
 };
 
+struct AttackerInfo_t
+{
+	bool m_bNeedInit;
+	bool m_bIsPawn;
+	bool m_bIsWorld;
+	CHandle<CCSPlayerPawn> m_hAttackerPawn;
+	uint16_t m_nAttackerPlayerSlot;
+	int m_iTeamChecked;
+	int m_nTeam;
+};
+
 struct CTakeDamageInfoContainer
 {
 	CTakeDamageInfo *pInfo;
@@ -64,6 +75,11 @@ class CTakeDamageInfo
 	[[maybe_unused]] uint8_t __pad0000[0x8];
 
 public:
+	CTakeDamageInfo(CBaseEntity* pInflictor, CBaseEntity* pAttacker, CBaseEntity* pAbility, float flDamage, DDamageTypes_t bitsDamageType)
+	{
+        g_Signatures->FetchSignature<CTakeDamageInfo_Constructor>("CTakeDamageInfo_Constructor")(this, pInflictor, pAttacker, pAbility, &vec3_origin, &vec3_origin, flDamage, bitsDamageType, 0, nullptr);
+	}
+
 	Vector m_vecDamageForce;
 	Vector m_vecDamagePosition;
 	Vector m_vecReportedPosition;
@@ -73,32 +89,41 @@ class CTakeDamageInfo
 	CHandle<CBaseEntity> m_hAbility;
 	float m_flDamage;
 	float m_flTotalledDamage;
+	float m_flTotalledDamageAbsorbed;
 	DDamageTypes_t m_bitsDamageType;
 	int32_t m_iDamageCustom;
 	uint8_t m_iAmmoType;
 
 private:
-	[[maybe_unused]] uint8_t __pad0051[0xf];
+	[[maybe_unused]] uint8_t __pad0059[0xf];
 
 public:
 	float m_flOriginalDamage;
 	bool m_bShouldBleed;
 	bool m_bShouldSpark;
 
 private:
-	[[maybe_unused]] uint8_t __pad0066[0xa];
+	[[maybe_unused]] uint8_t __pad006e[0x2];
+
+public:
+	float m_flDamageAbsorbed;
+
+private:
+	[[maybe_unused]] uint8_t __pad0074[0x8];
 
 public:
 	TTakeDamageFlags_t m_nDamageFlags;
-	int32_t m_nNumObjectsPenetrated;
-	uint64_t m_hScriptInstance;
 
 private:
-	[[maybe_unused]] uint8_t __pad0080[0x14];
+	[[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 __pad009d[0x8];
+	[[maybe_unused]] uint8_t __pad00ad[0x4];
 };