From b697c9e20d7e48f7fbaa31ae004d5292f3c3b9f5 Mon Sep 17 00:00:00 2001 From: INeedBots Date: Wed, 4 Nov 2020 17:07:45 -0600 Subject: [PATCH] post death delay --- main/pvbrust.cfg | 3 ++- main/pvbvote.cfg | 3 ++- main/server.cfg | 3 ++- userraw/maps/mp/gametypes/_damage.gsc | 6 +++--- userraw/maps/mp/gametypes/_gamelogic.gsc | 5 +++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/main/pvbrust.cfg b/main/pvbrust.cfg index 2101be4..5b0f417 100644 --- a/main/pvbrust.cfg +++ b/main/pvbrust.cfg @@ -563,6 +563,7 @@ set scr_voting_bots "0" set scr_nuke_increases_streak "0" set headshot_detach_head "1" set scr_killstreaks_increase_killstreak "1" +set scr_postDeathDelayMod "1.0" // _weapon set scr_allowDropWeaponOnCommand "1" @@ -581,8 +582,8 @@ set scr_killstreak_rollover "1" set scr_killstreakHud "1" set scr_maxKillstreakRollover "1" set scr_killstreak_mod "0" -set scr_specialist "1" set scr_killstreak_print "1" +set scr_specialist "1" //set scr_specialist_killCount_ "4" set scr_specialist_perks1 "specialty_scavenger,specialty_fastreload,specialty_marathon" set scr_specialist_perks2 "specialty_bulletdamage,specialty_lightweight,specialty_coldblooded,specialty_explosivedamage,specialty_hardline" diff --git a/main/pvbvote.cfg b/main/pvbvote.cfg index 34ac343..d2011c1 100644 --- a/main/pvbvote.cfg +++ b/main/pvbvote.cfg @@ -563,6 +563,7 @@ set scr_voting_bots "0" set scr_nuke_increases_streak "0" set headshot_detach_head "1" set scr_killstreaks_increase_killstreak "1" +set scr_postDeathDelayMod "1.0" // _weapon set scr_allowDropWeaponOnCommand "1" @@ -581,8 +582,8 @@ set scr_killstreak_rollover "1" set scr_killstreakHud "1" set scr_maxKillstreakRollover "1" set scr_killstreak_mod "0" -set scr_specialist "1" set scr_killstreak_print "1" +set scr_specialist "1" //set scr_specialist_killCount_ "4" set scr_specialist_perks1 "specialty_scavenger,specialty_fastreload,specialty_marathon" set scr_specialist_perks2 "specialty_bulletdamage,specialty_lightweight,specialty_coldblooded,specialty_explosivedamage,specialty_hardline" diff --git a/main/server.cfg b/main/server.cfg index 2beb152..69cebfa 100644 --- a/main/server.cfg +++ b/main/server.cfg @@ -563,6 +563,7 @@ set scr_voting_bots "0" set scr_nuke_increases_streak "0" set headshot_detach_head "1" set scr_killstreaks_increase_killstreak "1" +set scr_postDeathDelayMod "1.0" // _weapon set scr_allowDropWeaponOnCommand "1" @@ -581,8 +582,8 @@ set scr_killstreak_rollover "1" set scr_killstreakHud "1" set scr_maxKillstreakRollover "1" set scr_killstreak_mod "0" -set scr_specialist "1" set scr_killstreak_print "1" +set scr_specialist "1" //set scr_specialist_killCount_ "4" set scr_specialist_perks1 "specialty_scavenger,specialty_fastreload,specialty_marathon" set scr_specialist_perks2 "specialty_bulletdamage,specialty_lightweight,specialty_coldblooded,specialty_explosivedamage,specialty_hardline" diff --git a/userraw/maps/mp/gametypes/_damage.gsc b/userraw/maps/mp/gametypes/_damage.gsc index ba85c44..0c4ca8b 100644 --- a/userraw/maps/mp/gametypes/_damage.gsc +++ b/userraw/maps/mp/gametypes/_damage.gsc @@ -778,9 +778,9 @@ PlayerKilled_internal( eInflictor, attacker, victim, iDamage, sMeansOfDeath, sWe } // let the player watch themselves die - wait( 0.25 ); + wait( 0.25 * level.postDeathDelayMod ); victim thread maps\mp\gametypes\_killcam::cancelKillCamOnUse(); - wait( 0.25 ); + wait( 0.25 * level.postDeathDelayMod ); self.respawnTimerStartTime = gettime() + 1000; timeUntilSpawn = maps\mp\gametypes\_playerlogic::TimeUntilSpawn( true ); @@ -788,7 +788,7 @@ PlayerKilled_internal( eInflictor, attacker, victim, iDamage, sMeansOfDeath, sWe timeUntilSpawn = 1; victim thread maps\mp\gametypes\_playerlogic::predictAboutToSpawnPlayerOverTime( timeUntilSpawn ); - wait( 1.0 ); + wait( 1.0 * level.postDeathDelayMod ); victim notify( "death_delay_finished" ); } diff --git a/userraw/maps/mp/gametypes/_gamelogic.gsc b/userraw/maps/mp/gametypes/_gamelogic.gsc index f43635a..38def33 100644 --- a/userraw/maps/mp/gametypes/_gamelogic.gsc +++ b/userraw/maps/mp/gametypes/_gamelogic.gsc @@ -55,6 +55,9 @@ - headshot_detach_head false - (default) headshots dismember the victim's head + + - scr_postDeathDelayMod + 1.0 - (default) Multiplier of how long to wait after death (watching your dead body before the killcam starts) Thanks: banz, 23Furious */ @@ -1392,6 +1395,7 @@ Callback_StartGameType() setDvarIfUninitialized( "scr_nuke_increases_streak", true ); setDvarIfUninitialized( "headshot_detach_head", false ); setDvarIfUninitialized( "scr_killstreaks_increase_killstreak", true ); + setDvarIfUninitialized( "scr_postDeathDelayMod", 1.0 ); level.extraDamageFeedback = getDvarInt("scr_extraDamageFeedback"); level.allowPrintDamage = getDvarInt("scr_printDamage"); @@ -1411,6 +1415,7 @@ Callback_StartGameType() level.headShotDetachHead = getDvarInt("headshot_detach_head"); level.nukeIncreasesStreak = getDvarInt( "scr_nuke_increases_streak" ); level.killstreaksIncreaseKillstreak = getDvarInt( "scr_killstreaks_increase_killstreak" ); + level.postDeathDelayMod = getDvarFloat("scr_postDeathDelayMod"); if ( level.voting ) level.votingMapsTok = randomizeMaps();