From 039f7aa0f895d2b0fd8939f1bb4a47c53854d5b3 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Wed, 8 Dec 2021 18:34:37 -0800 Subject: [PATCH] Add delay to push when landing on players --- scripts/zm/main/_zm_reimagined.gsc | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/scripts/zm/main/_zm_reimagined.gsc b/scripts/zm/main/_zm_reimagined.gsc index 39fc6745..f8530eea 100644 --- a/scripts/zm/main/_zm_reimagined.gsc +++ b/scripts/zm/main/_zm_reimagined.gsc @@ -1701,13 +1701,15 @@ track_players_intersection_tracker() while ( 1 ) { - killed_players = 0; players = getPlayers(); i = 0; while ( i < players.size ) { + playeri_on_top = 0; + if ( players[ i ] maps/mp/zombies/_zm_laststand::player_is_in_laststand() || players[ i ].sessionstate != "playing" ) { + players[i].time_on_top_of_player = undefined; i++; continue; } @@ -1745,22 +1747,26 @@ track_players_intersection_tracker() players[j] dodamage( 1000, (0, 0, 0) ); } - players[i] random_push(); - } - else - { - if(getDvar("g_gametype") == "zgrief" && players[i]._encounters_team != players[j]._encounters_team) + playeri_on_top = 1; + if(!isDefined(players[i].time_on_top_of_player)) { - players[i] [[level.store_player_damage_info_func]](players[j], "none", "MOD_FALLING"); - players[i] dodamage( 1000, (0, 0, 0) ); + players[i].time_on_top_of_player = getTime(); } - players[j] random_push(); + if((getTime() - players[i].time_on_top_of_player) >= 1000) + { + players[i] random_push(); + } } j++; } + if(!playeri_on_top) + { + players[i].time_on_top_of_player = undefined; + } + i++; }