From 449cb6f54c9fbad225dd9c6b1651a738b1dcabce Mon Sep 17 00:00:00 2001
From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com>
Date: Mon, 27 Dec 2021 04:43:43 +0000
Subject: fix some crashes and evac playing in ttdm

---
 Northstar.CustomServers/mod.json                                       | 3 +--
 Northstar.CustomServers/mod/cfg/autoexec_ns_server.cfg                 | 2 +-
 .../mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut                  | 1 +
 Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'Northstar.CustomServers')

diff --git a/Northstar.CustomServers/mod.json b/Northstar.CustomServers/mod.json
index 65aa7190b..40e64cf65 100644
--- a/Northstar.CustomServers/mod.json
+++ b/Northstar.CustomServers/mod.json
@@ -47,9 +47,8 @@
 		},
 		
 		{
-			// default 0 because broken
 			"Name": "ns_private_match_override_maxplayers",
-			"DefaultValue": "0"
+			"DefaultValue": "1"
 		},
 		
 		{
diff --git a/Northstar.CustomServers/mod/cfg/autoexec_ns_server.cfg b/Northstar.CustomServers/mod/cfg/autoexec_ns_server.cfg
index cfd0ffe84..d92ca3ec1 100644
--- a/Northstar.CustomServers/mod/cfg/autoexec_ns_server.cfg
+++ b/Northstar.CustomServers/mod/cfg/autoexec_ns_server.cfg
@@ -16,7 +16,7 @@ ns_should_return_to_lobby 1 // whether the server should return to private match
 
 net_chan_limit_mode 2 // kick clients that go over the limit
 net_chan_limit_msec_per_sec 100 // number of milliseconds of server netchan processing time clients can use per second before getting kicked
-sv_querylimit_per_sec 10 // number of connectionless packets clients can send to this server per second without getting blocked
+sv_querylimit_per_sec 15 // number of connectionless packets clients can send to this server per second without getting blocked
 base_tickinterval_mp 0.016666667 // default tickrate: 60 tick
 sv_updaterate_mp 20 // default updaterate: 20 tick
 sv_minupdaterate 20 // unsure if this actually works, but if it does, should set minimum client updaterate
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut
index a7dc00de1..9e5d95bac 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut
@@ -11,6 +11,7 @@ void function GamemodeTTDM_Init()
 	SetLoadoutGracePeriodEnabled( false )
 	
 	ClassicMP_SetCustomIntro( TTDMIntroSetup, TTDMIntroLength )
+	ClassicMP_ForceDisableEpilogue( true )
 	
 	AddCallback_OnPlayerKilled( AddTeamScoreForPlayerKilled ) // dont have to track autotitan kills since you cant leave your titan in this mode
 	
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut
index 58a4be024..92307f3cb 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut
@@ -191,6 +191,7 @@ void function PlayerWatchesWargamesIntro( entity player )
 			player.ClearParent()
 			player.UnforceStand()
 			player.MovementEnable()
+			player.ClearInvulnerable()
 			Remote_CallFunction_NonReplay( player, "ServerCallback_ClearFactionLeaderIntro" )
 		}
 	})
@@ -224,6 +225,7 @@ void function PlayerWatchesWargamesIntro( entity player )
 	TrainingPod_ViewConeLock_PodClosed( player )
 	player.DisableWeaponViewModel()
 	player.MovementDisable()
+	player.SetInvulnerable()
 	
 	// spawn faction leader
 	// no clue why client subtracts 4.5 from the time we give this, so just add it here instead
-- 
cgit v1.2.3