diff --git a/DamageProxy/configs/damageproxy/ze_mountain_escape_v5_zy.cfg b/DamageProxy/configs/damageproxy/ze_mountain_escape_v5_zy.cfg index 57c91199..54a828a4 100644 --- a/DamageProxy/configs/damageproxy/ze_mountain_escape_v5_zy.cfg +++ b/DamageProxy/configs/damageproxy/ze_mountain_escape_v5_zy.cfg @@ -8,16 +8,22 @@ "z2530359" // Balrog { + "KnockbackScale" "0.0" "KillPush" "0" + "NoSlowDown" "1" } "z11197" // Titan { + "KnockbackScale" "0.0" "KillPush" "0" + "NoSlowDown" "1" } "z1910977" // Pyramid Head { + "KnockbackScale" "0.0" "KillPush" "0" + "NoSlowDown" "1" } } diff --git a/DamageProxy/scripting/DamageProxy.sp b/DamageProxy/scripting/DamageProxy.sp index 994799e2..15a85bcd 100644 --- a/DamageProxy/scripting/DamageProxy.sp +++ b/DamageProxy/scripting/DamageProxy.sp @@ -6,6 +6,7 @@ #include #include #include +#include #include public Plugin myinfo = @@ -57,6 +58,13 @@ public void OnPluginStart() g_hActiveWeapon = FindSendPropInfo("CBaseCombatCharacter", "m_hActiveWeapon"); if(g_hActiveWeapon == -1) SetFailState("Couldn't find CBaseCombatCharacter::m_hActiveWeapon"); + + PhysboxToClientMap(g_iPhysboxToClient, true); +} + +public void OnPluginEnd() +{ + PhysboxToClientMap(g_iPhysboxToClient, false); } public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max) @@ -155,7 +163,7 @@ public void OnWeaponEquipped(int client, int entity) ZR_SetClientKnockbackScale(client, fKnockbackScale); float fKnockbackMaxForce = g_Config.GetFloat("KnockbackMaxForce", 0.0); - if(fKnockbackMaxForce >= 0.0) + if(fKnockbackMaxForce > 0.0) ZR_SetClientKnockbackMaxForce(client, fKnockbackMaxForce); float fKnockbackMaxVel = g_Config.GetFloat("KnockbackMaxVel", -1.0); diff --git a/LagCompensation/scripting/LagCompensation.sp b/LagCompensation/scripting/LagCompensation.sp index d8d27e4b..d25f58dd 100644 --- a/LagCompensation/scripting/LagCompensation.sp +++ b/LagCompensation/scripting/LagCompensation.sp @@ -627,18 +627,13 @@ public void OnEntitySpawned(int entity, const char[] classname) if(!IsValidEntity(entity)) return; - +/* if(!strncmp(classname, "func_physbox", 12)) { - int iParent = GetEntPropEnt(entity, Prop_Data, "m_pParent"); - if(iParent != INVALID_ENT_REFERENCE) - { - AddEntityForLagCompensation(entity, false); - } - + AddEntityForLagCompensation(entity, false); return; } - +*/ if(!(StrEqual(classname, "trigger_hurt"))) return; diff --git a/includes/CSSFixes.inc b/includes/CSSFixes.inc index 3639d00d..ed2c1982 100644 --- a/includes/CSSFixes.inc +++ b/includes/CSSFixes.inc @@ -26,6 +26,10 @@ native void FilterClientEntityMap(char map[MAXPLAYERS + 1][2048], bool set); // Block triggers TriggerMoved from touching any client by setting it to 1 for the entity index. native void FilterTriggerTouchPlayers(char map[2048], bool set); +// Map entities to client entity in FireBullets/SwingOrStab ShouldHitEntity. +// Aka. shoot and knife through physboxes that are parented to teammates (white knight, gandalf, horse, etc.) +native void PhysboxToClientMap(char map[2048], bool set); + public Extension __ext_CSSFixes = { name = "CSSFixes",