From 5b0e5176b5d98ab0e277fc6d21670a5f197f419e Mon Sep 17 00:00:00 2001 From: Wikot235 <149392035+Wikot235@users.noreply.github.com> Date: Sat, 17 May 2025 23:44:07 +0200 Subject: [PATCH 1/2] Fixed the issue --- sp/src/game/server/hl2/npc_combines.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sp/src/game/server/hl2/npc_combines.cpp b/sp/src/game/server/hl2/npc_combines.cpp index be85d895ab8..b550d847759 100644 --- a/sp/src/game/server/hl2/npc_combines.cpp +++ b/sp/src/game/server/hl2/npc_combines.cpp @@ -38,6 +38,11 @@ ConVar sk_combine_guard_kick( "sk_combine_guard_kick", "0"); ConVar combine_guard_spawn_health( "combine_guard_spawn_health", "1" ); extern ConVar sk_plr_dmg_buckshot; + +#ifdef MAPBASE + ConVar sk_combine_head_dmg_multiplier( "sk_combine_head_dmg_multiplier", "2" ); +#endif + extern ConVar sk_plr_num_shotgun_pellets; //Whether or not the combine should spawn health on death @@ -222,8 +227,14 @@ float CNPC_CombineS::GetHitgroupDamageMultiplier( int iHitGroup, const CTakeDama { case HITGROUP_HEAD: { + +#ifdef MAPBASE + // Now you don't have to change the headshot damage in + return sk_combine_head_dmg_multiplier.GetFloat(); +#else // Soldiers take double headshot damage return 2.0f; +#endif } } From 1857ca4e2b6024dd8eb16fdbcdbf200ed8d32af5 Mon Sep 17 00:00:00 2001 From: Wikot235 <149392035+Wikot235@users.noreply.github.com> Date: Sat, 17 May 2025 23:57:20 +0200 Subject: [PATCH 2/2] Fixed my shitty comment (it's the second time today something stupid like that happened to me) --- sp/src/game/server/hl2/npc_combines.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sp/src/game/server/hl2/npc_combines.cpp b/sp/src/game/server/hl2/npc_combines.cpp index b550d847759..61f8156d73e 100644 --- a/sp/src/game/server/hl2/npc_combines.cpp +++ b/sp/src/game/server/hl2/npc_combines.cpp @@ -229,7 +229,7 @@ float CNPC_CombineS::GetHitgroupDamageMultiplier( int iHitGroup, const CTakeDama { #ifdef MAPBASE - // Now you don't have to change the headshot damage in + // Now you can change the multiplier of headshot damage in console! return sk_combine_head_dmg_multiplier.GetFloat(); #else // Soldiers take double headshot damage