From 09530199e8ef14a420eb3cfcbf9c53007c29fcb4 Mon Sep 17 00:00:00 2001 From: Forgetest <33988868+jensewe@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:05:46 +0800 Subject: [PATCH 1/2] Reproduce stagger direction fix on SI (#852) Thanks to Alan on discord for suggesting and testing. --- .../gamedata/l4d_fix_stagger_dir.txt | 116 ++++++++++++++++++ .../plugins/fixes/l4d_fix_stagger_dir.smx | Bin 4278 -> 5314 bytes .../scripting/l4d_fix_stagger_dir.sp | 89 ++++++++++---- 3 files changed, 181 insertions(+), 24 deletions(-) diff --git a/addons/sourcemod/gamedata/l4d_fix_stagger_dir.txt b/addons/sourcemod/gamedata/l4d_fix_stagger_dir.txt index 5fdbc695f..94e23046b 100644 --- a/addons/sourcemod/gamedata/l4d_fix_stagger_dir.txt +++ b/addons/sourcemod/gamedata/l4d_fix_stagger_dir.txt @@ -27,6 +27,51 @@ "left4dead" { + "Functions" + { + "CTerrorPlayer::OnShovedBySurvivor" + { + "linux" + { + "signature" "CTerrorPlayer::OnShovedBySurvivor [clone]" + "callconv" "cdecl" + } + "windows" + { + "signature" "CTerrorPlayer::OnShovedBySurvivor" + "callconv" "stdcall" + } + "return" "void" + "arguments" + { + "this" + { + "type" "cbaseentity" + "linux" + { + "register" "eax" + } + "windows" + { + "register" "ecx" + } + } + "a2" + { + "type" "cbaseentity" + "linux" + { + "register" "edx" + } + } + "a3" + { + "type" "vectorptr" + } + } + } + } + "Offsets" { "CTerrorPlayer::m_PlayerAnimState" @@ -56,11 +101,69 @@ /* 83 ? ? ? 8B ? E8 ? ? ? ? 84 ? 0F 85 ? ? ? ? 8B ? 8B */ /* Search: "Player.Shoved" */ } + + // Stolen from left4dhooks thanks to Silvers + /* + * CTerrorPlayer::OnShovedBySurvivor(CTerrorPlayer*, Vector const&) + */ + "CTerrorPlayer::OnShovedBySurvivor" + { + "library" "server" + "linux" "@_ZN13CTerrorPlayer18OnShovedBySurvivorEPS_RK6Vector" + "windows" "\x81\x2A\x2A\x2A\x2A\x2A\x56\x8B\x2A\xE8\x2A\x2A\x2A\x2A\x84\x2A\x0F\x85" + /* 81 ? ? ? ? ? 56 8B ? E8 ? ? ? ? 84 ? 0F 85 */ + } + + // Stolen from left4dhooks thanks to Silvers + /* + * CTerrorPlayer::OnShovedBySurvivor(CTerrorPlayer*, Vector const&) [clone] + */ + "CTerrorPlayer::OnShovedBySurvivor [clone]" + { + "library" "server" + "linux" "@_ZN13CTerrorPlayer18OnShovedBySurvivorEPS_RK6Vector.part.591" + } } } "left4dead2" { + "Functions" + { + "CTerrorPlayer::OnShovedBySurvivor" + { + "signature" "CTerrorPlayer::OnShovedBySurvivor" + "linux" + { + "callconv" "cdecl" + } + "windows" + { + "callconv" "stdcall" + } + "return" "void" + "arguments" + { + "this" + { + "type" "cbaseentity" + "windows" + { + "register" "ecx" + } + } + "a2" + { + "type" "cbaseentity" + } + "a3" + { + "type" "vectorptr" + } + } + } + } + "Offsets" { /* Windows offset: @@ -104,6 +207,19 @@ * Using a long local jump as the unique portion (last few bytes of sig) */ } + + // Stolen from left4dhooks thanks to Silvers + /* + * CTerrorPlayer::OnShovedBySurvivor(CTerrorPlayer*, Vector const&) - used by L4D2 on Special Infected (got melee'd) + * unique string "jockey_ride" in CTerrorPlayer::OnLeptOnSurvivor(), look up for "JockeyZombie.Ride", look up for var_14, CTerrorPlayer::OnShovedBySurvivor is call after that + */ + "CTerrorPlayer::OnShovedBySurvivor" + { + "library" "server" + "linux" "@_ZN13CTerrorPlayer18OnShovedBySurvivorEPS_RK6Vector" + "windows" "\x55\x8B\xEC\x81\xEC\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x33\xC5\x89\x45\xFC\x53\x8B\x5D\x2A\x56\x57\x8B\x7D\x2A\x8B\xF1" + /* 55 8B EC 81 EC ? ? ? ? A1 ? ? ? ? 33 C5 89 45 FC 53 8B 5D ? 56 57 8B 7D ? 8B F1 */ + } } } } \ No newline at end of file diff --git a/addons/sourcemod/plugins/fixes/l4d_fix_stagger_dir.smx b/addons/sourcemod/plugins/fixes/l4d_fix_stagger_dir.smx index 662881ea45abe1c9da7ba2ac572f8115856c09c2..61273305c7cfe96d63d607b90dc0a1075e6c47ba 100644 GIT binary patch delta 5189 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 F{ST@1qg4O^ delta 4126 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 bGzfZN9qE3 -#include +// #include +#include -#define PLUGIN_VERSION "1.0" +#define PLUGIN_VERSION "1.2" public Plugin myinfo = { @@ -29,28 +30,29 @@ methodmap GameDataWrapper < GameData { if (offset == -1) SetFailState("Missing offset \"%s\"", key); return offset; } - public DynamicDetour CreateDetourOrFail( - const char[] name, - DHookCallback preHook = INVALID_FUNCTION, - DHookCallback postHook = INVALID_FUNCTION) { - DynamicDetour hSetup = DynamicDetour.FromConf(this, name); - if (!hSetup) - SetFailState("Missing detour setup \"%s\"", name); - if (preHook != INVALID_FUNCTION && !hSetup.Enable(Hook_Pre, preHook)) - SetFailState("Failed to pre-detour \"%s\"", name); - if (postHook != INVALID_FUNCTION && !hSetup.Enable(Hook_Post, postHook)) - SetFailState("Failed to post-detour \"%s\"", name); - return hSetup; - } + // public DynamicDetour CreateDetourOrFail( + // const char[] name, + // DHookCallback preHook = INVALID_FUNCTION, + // DHookCallback postHook = INVALID_FUNCTION) { + // DynamicDetour hSetup = DynamicDetour.FromConf(this, name); + // if (!hSetup) + // SetFailState("Missing detour setup \"%s\"", name); + // if (preHook != INVALID_FUNCTION && !hSetup.Enable(Hook_Pre, preHook)) + // SetFailState("Failed to pre-detour \"%s\"", name); + // if (postHook != INVALID_FUNCTION && !hSetup.Enable(Hook_Post, postHook)) + // SetFailState("Failed to post-detour \"%s\"", name); + // return hSetup; + // } } int g_iOffs_m_PlayerAnimState; int g_iOffs_m_flEyeYaw; methodmap Address {} -methodmap PlayerAnimState < Address { - public static PlayerAnimState FromPlayer(int client) { - return view_as(GetEntData(client, g_iOffs_m_PlayerAnimState)); +methodmap PlayerAnimStateEx < Address +{ + public static PlayerAnimStateEx FromPlayer(int client) { + return view_as(GetEntData(client, g_iOffs_m_PlayerAnimState)); } property float m_flEyeYaw { @@ -64,18 +66,57 @@ public void OnPluginStart() g_iOffs_m_PlayerAnimState = gd.GetOffset("CTerrorPlayer::m_PlayerAnimState"); g_iOffs_m_flEyeYaw = gd.GetOffset("m_flEyeYaw"); - delete gd.CreateDetourOrFail("CTerrorPlayer::OnStaggered", DTR_OnStaggered); + // https://github.com/Target5150/MoYu_Server_Stupid_Plugins/issues/70 + // delete gd.CreateDetourOrFail("CTerrorPlayer::OnShovedBySurvivor", DTR_OnShovedBySurvivor); + // delete gd.CreateDetourOrFail("CTerrorPlayer::OnStaggered", DTR_OnStaggered); delete gd; } -MRESReturn DTR_OnStaggered(int client, DHookParam hParams) +public Action L4D_OnShovedBySurvivor(int client, int victim, const float vecDir[3]) +{ + if (IsClientInGame(victim)) + { + float ang[3]; + GetClientAbsAngles(victim, ang); + PlayerAnimStateEx.FromPlayer(victim).m_flEyeYaw = ang[1]; + } + + return Plugin_Continue; +} + +public Action L4D2_OnStagger(int client, int source) { - if (IsClientInGame(client) && GetClientTeam(client) == 2) + if (IsClientInGame(client)) { float ang[3]; GetClientAbsAngles(client, ang); - PlayerAnimState.FromPlayer(client).m_flEyeYaw = ang[1]; + PlayerAnimStateEx.FromPlayer(client).m_flEyeYaw = ang[1]; } - return MRES_Ignored; -} \ No newline at end of file + return Plugin_Continue; +} + +// MRESReturn DTR_OnShovedBySurvivor(DHookParam hParams) +// { +// int client = hParams.Get(1); +// if (IsClientInGame(client)) +// { +// float ang[3]; +// GetClientAbsAngles(client, ang); +// PlayerAnimStateEx.FromPlayer(client).m_flEyeYaw = ang[1]; +// } + +// return MRES_Ignored; +// } + +// MRESReturn DTR_OnStaggered(int client, DHookParam hParams) +// { +// if (IsClientInGame(client)) +// { +// float ang[3]; +// GetClientAbsAngles(client, ang); +// PlayerAnimStateEx.FromPlayer(client).m_flEyeYaw = ang[1]; +// } + +// return MRES_Ignored; +// } \ No newline at end of file From 0eae66dd0ee8fc89a076ecaa40d4547179a08601 Mon Sep 17 00:00:00 2001 From: A1m` <33463136+A1mDev@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:09:18 +0700 Subject: [PATCH 2/2] Add sourcemod 1.13 to check plugins (#849) * Add sourcemod 1.13 to check * Test * Update left4dhooks_lux_library.inc * Update holdout_bonus.sp * Update l4dd_forwards.sp * Update left4dhooks_test.sp * Update survivor_mvp.sp * Update left4dhooks_test.sp * Update left4dhooks_test.sp --- .github/workflows/check_plugins.yml | 1 + addons/sourcemod/scripting/holdout_bonus.sp | 23 ++++++------- .../include/left4dhooks_lux_library.inc | 5 +++ .../sourcemod/scripting/l4dd/l4dd_forwards.sp | 2 +- .../sourcemod/scripting/left4dhooks_test.sp | 32 +++++++++---------- addons/sourcemod/scripting/survivor_mvp.sp | 2 +- 6 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.github/workflows/check_plugins.yml b/.github/workflows/check_plugins.yml index e5ad71985..a07c7c4d9 100644 --- a/.github/workflows/check_plugins.yml +++ b/.github/workflows/check_plugins.yml @@ -32,6 +32,7 @@ jobs: #- "1.10" - "1.11" - "1.12" + - "1.13" steps: - uses: actions/checkout@v4 diff --git a/addons/sourcemod/scripting/holdout_bonus.sp b/addons/sourcemod/scripting/holdout_bonus.sp index 46c10b7eb..0efb16838 100644 --- a/addons/sourcemod/scripting/holdout_bonus.sp +++ b/addons/sourcemod/scripting/holdout_bonus.sp @@ -363,7 +363,7 @@ public HoldOutStarts ( const String:output[], caller, activator, Float:delay ) { if ( g_bHoldoutActive ) { return; } - PrintDebug( 1, "Holdout Starts (hooked)." ); + PrintDebug( "Holdout Starts (hooked)." ); g_bHoldoutActive = true; g_iHoldoutStartTime = GetTime(); @@ -401,7 +401,7 @@ public HoldOutEnds_Hook ( const String:output[], caller, activator, Float:delay // hooked on map logic // only use as safeguard / check for time - PrintDebug( 1, "Holdout Ends (hooked): abs: %i / prg %i / defined %i.", GetTime() - g_iHoldoutStartTime, g_iProgress, g_iHoldoutTime ); + PrintDebug( "Holdout Ends (hooked): abs: %i / prg %i / defined %i.", GetTime() - g_iHoldoutStartTime, g_iProgress, g_iHoldoutTime ); if ( g_bHoldoutActive ) { @@ -417,7 +417,7 @@ stock HoldOutEnds( bool:bByRequest = false ) { g_bHoldoutActive = false; - PrintDebug( 1, "Holdout over, awarding bonus: prg %i / defined %i.", g_iProgress, g_iHoldoutTime ); + PrintDebug( "Holdout over, awarding bonus: prg %i / defined %i.", g_iProgress, g_iHoldoutTime ); g_iActualBonus = CalculateHoldOutBonus(); @@ -638,7 +638,7 @@ KV_Load() return; } - PrintDebug( 1, "Holdout data loaded from file: %s.", sNameBuff ); + PrintDebug( "Holdout data loaded from file: %s.", sNameBuff ); } bool: KV_UpdateHoldoutMapInfo() @@ -680,7 +680,7 @@ bool: KV_UpdateHoldoutMapInfo() KvGetString( g_kHIData, "t_e_hook", g_sHoldoutEndHook, MAXSTR, "" ); } - PrintDebug( 1, "Read holdout mapinfo for '%s': %i / (factor: %.2f; abs: %i).", + PrintDebug( "Read holdout mapinfo for '%s': %i / (factor: %.2f; abs: %i).", mapname, g_bHoldoutThisRound, g_fHoldoutPointFactor, g_iHoldoutPointAbsolute ); @@ -734,13 +734,10 @@ stock GetPlayerCharacter ( client ) return tmpChr; } -stock PrintDebug( debugLevel, const String:Message[], any:... ) +stock PrintDebug( const String:Message[], any:... ) { - //if (debugLevel <= GetConVarInt(g_hCvarDebug)) - //{ - decl String:DebugBuff[256]; - VFormat(DebugBuff, sizeof(DebugBuff), Message, 3); - LogMessage(DebugBuff); - //PrintToServer(DebugBuff); - //} + decl String:DebugBuff[256]; + VFormat(DebugBuff, sizeof(DebugBuff), Message, 3); + LogMessage(DebugBuff); + //PrintToServer(DebugBuff); } \ No newline at end of file diff --git a/addons/sourcemod/scripting/include/left4dhooks_lux_library.inc b/addons/sourcemod/scripting/include/left4dhooks_lux_library.inc index 6e83841a0..b50ed2f3b 100644 --- a/addons/sourcemod/scripting/include/left4dhooks_lux_library.inc +++ b/addons/sourcemod/scripting/include/left4dhooks_lux_library.inc @@ -554,6 +554,11 @@ stock void TE_SetupPhysicsProp(float vecModelOrigin[3], TE_WriteNum("r", RGB[0]); TE_WriteNum("g", RGB[1]); TE_WriteNum("b", RGB[2]); + + // Garbage code to prevent warning, symbol 'iSkin' is not used + if (iSkin == -1) { + LogError("TE_SetupPhysicsProp %d", iSkin); + } } /** diff --git a/addons/sourcemod/scripting/l4dd/l4dd_forwards.sp b/addons/sourcemod/scripting/l4dd/l4dd_forwards.sp index 02941ad78..cab4d4596 100644 --- a/addons/sourcemod/scripting/l4dd/l4dd_forwards.sp +++ b/addons/sourcemod/scripting/l4dd/l4dd_forwards.sp @@ -5517,7 +5517,7 @@ MRESReturn DTR_CSquirrelVM_GetValue(DHookReturn hReturn, DHookParam hParams) // bool StringToVector(const char[] str, const char[] spilt, float vec[3]) { char buffers[3][20]; - if( 3 > ExplodeString(str, spilt, buffers, sizeof(buffers[]), sizeof(buffers[][]), true) ) + if( 3 > ExplodeString(str, spilt, buffers, sizeof(buffers), sizeof(buffers[]), true) ) return false; for( int i = 0; i < 3; ++i ) diff --git a/addons/sourcemod/scripting/left4dhooks_test.sp b/addons/sourcemod/scripting/left4dhooks_test.sp index 3e0676ef3..1086d521d 100644 --- a/addons/sourcemod/scripting/left4dhooks_test.sp +++ b/addons/sourcemod/scripting/left4dhooks_test.sp @@ -334,7 +334,7 @@ Action sm_l4df(int client, int args) return Plugin_Handled; } -stock Action TimerCancelStagger(Handle timer, int client) +/*stock Action TimerCancelStagger(Handle timer, int client) { client = GetClientOfUserId(client); if( client ) @@ -343,7 +343,7 @@ stock Action TimerCancelStagger(Handle timer, int client) } return Plugin_Continue; -} +}*/ Action sm_l4dd(int client, int args) { @@ -2380,7 +2380,7 @@ Action sm_l4dd(int client, int args) return Plugin_Handled; } -stock Action TimerDetonate(Handle timer, int entity) +/*stock Action TimerDetonate(Handle timer, int entity) { entity = EntRefToEntIndex(entity); if( entity != INVALID_ENT_REFERENCE ) @@ -2389,9 +2389,9 @@ stock Action TimerDetonate(Handle timer, int entity) } return Plugin_Continue; -} +}*/ -stock Action TimerDetonateVomitjar(Handle timer, int entity) +/*stock Action TimerDetonateVomitjar(Handle timer, int entity) { entity = EntRefToEntIndex(entity); if( entity != INVALID_ENT_REFERENCE ) @@ -2406,9 +2406,9 @@ stock Action TimerDetonateVomitjar(Handle timer, int entity) } return Plugin_Continue; -} +}*/ -void GetGroundAngles(float vOrigin[3]) +/*void GetGroundAngles(float vOrigin[3]) { float vAng[3], vLookAt[3], vTargetOrigin[3]; @@ -2428,14 +2428,14 @@ void GetGroundAngles(float vOrigin[3]) } delete trace; -} +}*/ -stock bool _TraceFilter(int entity, int contentsMask) +/*stock bool _TraceFilter(int entity, int contentsMask) { if( !entity || entity <= MaxClients || !IsValidEntity(entity) ) // dont let WORLD, or invalid entities be hit return false; return true; -} +}*/ @@ -5720,7 +5720,7 @@ stock void OnPummelTeleport(DataPack dPack) } // To block the stumble animation use the next two functions: -stock Action OnPummelOnAnimPre(int client, int &anim) +/*stock Action OnPummelOnAnimPre(int client, int &anim) { if( anim == L4D2_ACT_TERROR_SLAMMED_WALL || anim == L4D2_ACT_TERROR_SLAMMED_GROUND ) { @@ -5730,14 +5730,14 @@ stock Action OnPummelOnAnimPre(int client, int &anim) } return Plugin_Continue; -} +}*/ -stock Action TimerOnPummelResetAnim(Handle timer, int victim) // Don't need client userID since it's not going to be validated just removed +/*stock Action TimerOnPummelResetAnim(Handle timer, int victim) // Don't need client userID since it's not going to be validated just removed { AnimHookDisable(victim, OnPummelOnAnimPre); return Plugin_Continue; -} +}*/ public void L4D2_OnPummelVictim_Post(int attacker, int victim) { @@ -6131,9 +6131,9 @@ void ForwardCalled(const char[] format, any ...) // PrintToServer("----------"); } -stock bool TraceFilter(int entity, int contentsMask, int client) +/*stock bool TraceFilter(int entity, int contentsMask, int client) { if( entity == client ) return false; return true; -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/addons/sourcemod/scripting/survivor_mvp.sp b/addons/sourcemod/scripting/survivor_mvp.sp index 84ce573b5..3d6dd5945 100644 --- a/addons/sourcemod/scripting/survivor_mvp.sp +++ b/addons/sourcemod/scripting/survivor_mvp.sp @@ -146,7 +146,7 @@ new iRoundNumber; new bInRound; new bPlayerLeftStartArea; // used for tracking FF when RUP enabled -stock char sTmpString[MAX_NAME_LENGTH]; // just used because I'm not going to break my head over why string assignment parameter passing doesn't work +//stock char sTmpString[MAX_NAME_LENGTH]; // just used because I'm not going to break my head over why string assignment parameter passing doesn't work /* * Natives