From f651d1f7065c27aa5983f6cb57eb6c2a11bf63d1 Mon Sep 17 00:00:00 2001
From: ineed bots <ineedbots@pbot.org>
Date: Fri, 2 Jun 2023 22:34:27 -0600
Subject: [PATCH] botClearMantleOverride builtin

---
 main_shared/maps/mp/bots/_bot_script.gsc | 25 ++++++++++++++++++------
 z_server.bat                             | 22 ++++++++++++++++++---
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index dbf563a..f63307a 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -3072,15 +3072,15 @@ bot_uav_think_loop( data )
 			self BotNotifyBotEvent( "uav_target", "start", player );
 
 			/*
-			distSq = self.pers["bots"]["skill"]["help_dist"] * self.pers["bots"]["skill"]["help_dist"];
+			    distSq = self.pers["bots"]["skill"]["help_dist"] * self.pers["bots"]["skill"]["help_dist"];
 
-			if ( distFromPlayer < distSq && bulletTracePassed( self getEye(), player getTagOrigin( "j_spineupper" ), false, player ) )
-			{
+			    if ( distFromPlayer < distSq && bulletTracePassed( self getEye(), player getTagOrigin( "j_spineupper" ), false, player ) )
+			    {
 				self SetAttacker( player );
-			}
+			    }
 
-			if ( !self HasScriptGoal() && !self.bot_lock_goal )
-			{*/
+			    if ( !self HasScriptGoal() && !self.bot_lock_goal )
+			    {*/
 
 			self SetBotGoal( player.origin, 128 );
 
@@ -5387,6 +5387,8 @@ botClearMovementOverride() {}
 botClearButtonOverride( a ) {}
 botButtonOverride( a, b ) {}
 botClearOverrides( a ) {}
+botMantleOverride() {}
+botClearMantleOverride() {}
 
 /*
 	custom movement stuff
@@ -5413,6 +5415,7 @@ watch_for_override_stuff()
 		chance = 80;
 
 	last_jump_time = 0;
+	need_to_clear_mantle_override = false;
 
 	if ( !getDvarInt( "bots_play_jumpdrop" ) )
 		return;
@@ -5430,6 +5433,12 @@ watch_for_override_stuff()
 		dist = Distance( threat.origin, self.origin );
 		time = GetTime();
 
+		if ( need_to_clear_mantle_override && ( time - last_jump_time ) > 3000 )
+		{
+			need_to_clear_mantle_override = false;
+			self botClearMantleOverride();
+		}
+
 		if ( ( dist > NEAR_DIST ) && ( dist < LONG_DIST ) && ( randomInt( 100 ) < chance ) && ( ( time - last_jump_time ) > SPAM_JUMP_TIME ) )
 		{
 			if ( randomInt( 2 ) )
@@ -5437,6 +5446,8 @@ watch_for_override_stuff()
 				if ( ( getConeDot( threat.origin, self.origin, self getPlayerAngles() ) > 0.8 ) && ( dist > ( NEAR_DIST * 2 ) ) )
 				{
 					last_jump_time = time;
+					need_to_clear_mantle_override = true;
+					self botMantleOverride();
 
 					// drop shot
 					self botMovementOverride( 0, 0 );
@@ -5451,6 +5462,8 @@ watch_for_override_stuff()
 			else
 			{
 				last_jump_time = time;
+				need_to_clear_mantle_override = true;
+				self botMantleOverride();
 
 				// jump shot
 				self botButtonOverride( "gostand", "enable" );
diff --git a/z_server.bat b/z_server.bat
index 39600a7..bec50ce 100644
--- a/z_server.bat
+++ b/z_server.bat
@@ -1,24 +1,40 @@
 @echo off
+::Paste the server key from https://platform.plutonium.pw/serverkeys here
+set key=
 ::RemoteCONtrol password, needed for most management tools like IW4MADMIN and B3. Do not skip if you installing IW4MADMIN.
 set rcon_password=
 ::Name of the config file the server should use.
 set cfg=server.cfg
 ::Name of the server shown in the title of the cmd window. This will NOT bet shown ingame.
-set name=RektT5 Bot Warfare
+set name=PlutoniumT5MP Bot Warfare
 ::Port used by the server (default: 28960)
 set port=28967
 ::What ip to bind too
 set ip=0.0.0.0
 ::Mod name (default "")
 set mod=
+:: current dir of this .bat file
+SET mypath=%~dp0
+SET mypath=%mypath:~0,-1%
+::Only change this when you don't want to keep the bat files in the game folder. MOST WON'T NEED TO EDIT THIS!  %cd%
+set gamepath=%mypath%
+::Your plutonium install path (leave default!)
+set pluto_path=%localappdata%\Plutonium
+:: Gamemode; oneof t4sp, t4mp, t5sp, t5mp, iw5mp, t6mp, t6zm
+set pluto_game_mode=t5mp
+:: Other things to send to cmd
+set cmd_extras=
 
-title RektT5 MP - %name% - Server restarter
+
+title Plutonium - %name% - Server restarter
 echo Visit plutonium.pw / Join the Discord (a6JM2Tv) for NEWS and Updates!
 echo Server "%name%" will load "%cfg%" and listen on port "%port%" UDP with IP "%ip%"!
 echo To shut down the server close this window first!
 echo (%date%)  -  (%time%) %name% server start.
 
+cd /D %pluto_path%
 :server
-start /wait /abovenormal "%name%" "%~dp0rekt\t5m.exe" -console +set dedicated "2" +set net_ip "%ip%" +set net_port "%port%" +set rcon_password "%rcon_password%" +set fs_game "%mod%" +exec "%cfg%"
+start /wait /abovenormal /b "%name%" "bin\plutonium-bootstrapper-win32.exe" %pluto_game_mode% "%gamepath%" -dedicated -key "%key%" +set net_ip "%ip%" +set net_port "%port%" +set rcon_password "%rcon_password%" +set fs_game "%mod%" +exec "%cfg%" %cmd_extras% +map_rotate
 echo (%date%)  -  (%time%) WARNING: %name% server closed or dropped... server restarts.
 goto server
+