fmt

.astylerc

@@ -1,21 +1,27 @@
 # try to mimic the original gsc provided
+# mode=ghc
 mode=c
 style=allman
 
-indent=tab
+indent=force-tab=2
 lineend=windows
 
 pad-oper
 pad-paren-in
 pad-header
-
+# pad-brackets-in
-# delete-empty-lines
+fill-empty-lines
+squeeze-lines=2
+squeeze-ws
+break-one-line-headers
+add-braces
+remove-comment-prefix
 
 break-blocks
-# remove-braces
 
 indent-switches
 indent-cases
 indent-after-parens
+indent-col1-comments
 
 remove-comment-prefix

.editorconfig

@@ -4,7 +4,7 @@ root = true
 indent_style = tab
 indent_size = 2
 charset = latin1
-trim_trailing_whitespace = true
+trim_trailing_whitespace = false
 insert_final_newline = true
 
 [*.md]

maps/mp/bots/_wp_editor.gsc

@@ -16,21 +16,21 @@ init()
 	{
 		setdvar( "bots_main_debug", 0 );
 	}
-
+	
 	if ( !getdvarint( "bots_main_debug" ) )
 	{
 		return;
 	}
-
+	
 	if ( !getdvarint( "developer" ) )
 	{
 		setdvar( "developer_script", 1 );
 		setdvar( "developer", 1 );
-
+		
 		setdvar( "sv_mapRotation", "map " + getdvar( "mapname" ) );
 		exitlevel( false );
 	}
-
+	
 	setdvar( "bots_main", 0 );
 	setdvar( "bots_main_menu", 0 );
 	setdvar( "bots_manage_fill_mode", 0 );
@@ -38,46 +38,46 @@ init()
 	setdvar( "bots_manage_add", 0 );
 	setdvar( "bots_manage_fill_kick", 1 );
 	setdvar( "bots_manage_fill_spec", 1 );
-
+	
 	if ( getdvar( "bots_main_debug_distance" ) == "" )
 	{
 		setdvar( "bots_main_debug_distance", 512.0 );
 	}
-
+	
 	if ( getdvar( "bots_main_debug_cone" ) == "" )
 	{
 		setdvar( "bots_main_debug_cone", 0.65 );
 	}
-
+	
 	if ( getdvar( "bots_main_debug_minDist" ) == "" )
 	{
 		setdvar( "bots_main_debug_minDist", 32.0 );
 	}
-
+	
 	if ( getdvar( "bots_main_debug_drawThrough" ) == "" )
 	{
 		setdvar( "bots_main_debug_drawThrough", false );
 	}
-
+	
 	if ( getdvar( "bots_main_debug_commandWait" ) == "" )
 	{
 		setdvar( "bots_main_debug_commandWait", 0.5 );
 	}
-
+	
 	setdvar( "player_sustainAmmo", 1 );
-
+	
 	level.waypoints = [];
 	level.waypointcount = 0;
-
+	
 	level waittill( "connected", player );
-
+	
 	player thread onPlayerSpawned();
 }
 
 onPlayerSpawned()
 {
 	self endon( "disconnect" );
-
+	
 	for ( ;; )
 	{
 		self waittill( "spawned_player" );
@@ -89,12 +89,12 @@ beginDebug()
 {
 	self endon( "disconnect" );
 	self endon( "death" );
-
+	
 	level.wptolink = -1;
 	level.autolink = false;
 	self.closest = -1;
 	self.command = undefined;
-
+	
 	self clearperks();
 	self takeallweapons();
 	self.specialty = [];
@@ -102,14 +102,14 @@ beginDebug()
 	self setactionslot( 3, "altMode" );
 	self giveweapon( "frag_grenade_mp" );
 	self freezecontrols( false );
-
+	
 	self thread debug();
 	self thread addWaypoints();
 	self thread linkWaypoints();
 	self thread deleteWaypoints();
 	self thread watchSaveWaypointsCommand();
 	self thread sayExtras();
-
+	
 	self thread textScroll( "^1SecondaryOffhand - ^2Add Waypoint; ^3MeleeButton - ^4Link Waypoint; ^5FragButton - ^6delete Waypoint; ^7UseButton + AttackButton - ^8Save" );
 }
 
@@ -125,54 +125,54 @@ debug()
 {
 	self endon( "disconnect" );
 	self endon( "death" );
-
+	
 	for ( ;; )
 	{
 		wait 0.05;
-
+		
 		if ( isdefined( self.command ) )
 		{
 			continue;
 		}
-
+		
 		closest = -1;
 		myEye = self gettagorigin( "j_head" );
 		myAngles = self getplayerangles();
-
+		
 		for ( i = 0; i < level.waypointcount; i++ )
 		{
 			if ( closest == -1 || closer( self.origin, level.waypoints[ i ].origin, level.waypoints[ closest ].origin ) )
 			{
 				closest = i;
 			}
-
+			
 			wpOrg = level.waypoints[ i ].origin + ( 0, 0, 25 );
-
+			
 			if ( distance( level.waypoints[ i ].origin, self.origin ) < getdvarfloat( "bots_main_debug_distance" ) && ( bullettracepassed( myEye, wpOrg, false, self ) || getdvarint( "bots_main_debug_drawThrough" ) ) )
 			{
 				for ( h = level.waypoints[ i ].children.size - 1; h >= 0; h-- )
 				{
 					line( wpOrg, level.waypoints[ level.waypoints[ i ].children[ h ] ].origin + ( 0, 0, 25 ), ( 1, 0, 1 ) );
 				}
-
+				
 				if ( getConeDot( wpOrg, myEye, myAngles ) > getdvarfloat( "bots_main_debug_cone" ) )
 				{
 					print3d( wpOrg, i, ( 1, 0, 0 ), 2 );
 				}
-
+				
 				if ( isdefined( level.waypoints[ i ].angles ) && level.waypoints[ i ].type != "stand" )
 				{
 					line( wpOrg, wpOrg + anglestoforward( level.waypoints[ i ].angles ) * 64, ( 1, 1, 1 ) );
 				}
 			}
 		}
-
+		
 		self.closest = closest;
-
+		
 		if ( closest != -1 )
 		{
 			stringChildren = "";
-
+			
 			for ( i = 0; i < level.waypoints[ closest ].children.size; i++ )
 			{
 				if ( i != 0 )
@@ -184,9 +184,9 @@ debug()
 					stringChildren = stringChildren + level.waypoints[ closest ].children[ i ];
 				}
 			}
-
+			
 			print3d( level.waypoints[ closest ].origin + ( 0, 0, 35 ), stringChildren, ( 0, 1, 0 ), 2 );
-
+			
 			print3d( level.waypoints[ closest ].origin + ( 0, 0, 15 ), level.waypoints[ closest ].type, ( 0, 1, 0 ), 2 );
 		}
 	}
@@ -196,28 +196,28 @@ addWaypoints()
 {
 	self endon( "disconnect" );
 	self endon( "death" );
-
+	
 	for ( ;; )
 	{
 		while ( !self secondaryoffhandbuttonpressed() || isdefined( self.command ) )
 		{
 			wait 0.05;
 		}
-
+		
 		pos = self getorigin();
 		self.command = true;
-
+		
 		self iprintln( "Adding a waypoint..." );
 		self iprintln( "ADS - climb; Attack + Use - tube" );
 		self iprintln( "Attack - grenade; Use - claymore" );
 		self iprintln( "Else(wait) - your stance" );
-
+		
 		wait getdvarfloat( "bots_main_debug_commandWait" );
-
+		
 		self addWaypoint( pos );
-
+		
 		self.command = undefined;
-
+		
 		while ( self secondaryoffhandbuttonpressed() )
 		{
 			wait 0.05;
@@ -229,20 +229,20 @@ linkWaypoints()
 {
 	self endon( "disconnect" );
 	self endon( "death" );
-
+	
 	for ( ;; )
 	{
 		while ( !self meleebuttonpressed() || isdefined( self.command ) )
 		{
 			wait 0.05;
 		}
-
+		
 		self.command = true;
-
+		
 		self iprintln( "ADS - unlink; Else(wait) - Link" );
-
+		
 		wait getdvarfloat( "bots_main_debug_commandWait" );
-
+		
 		if ( !self adsbuttonpressed() )
 		{
 			self LinkWaypoint( self.closest );
@@ -251,9 +251,9 @@ linkWaypoints()
 		{
 			self UnLinkWaypoint( self.closest );
 		}
-
+		
 		self.command = undefined;
-
+		
 		while ( self meleebuttonpressed() )
 		{
 			wait 0.05;
@@ -265,21 +265,21 @@ deleteWaypoints()
 {
 	self endon( "disconnect" );
 	self endon( "death" );
-
+	
 	for ( ;; )
 	{
 		while ( !self fragbuttonpressed() || isdefined( self.command ) )
 		{
 			wait 0.05;
 		}
-
+		
 		self.command = true;
-
+		
 		self iprintln( "Attack - deleteAll; ADS - Load" );
 		self iprintln( "Else(wait) - delete" );
-
+		
 		wait getdvarfloat( "bots_main_debug_commandWait" );
-
+		
 		if ( self attackbuttonpressed() )
 		{
 			self deleteAllWaypoints();
@@ -292,9 +292,9 @@ deleteWaypoints()
 		{
 			self deleteWaypoint( self.closest );
 		}
-
+		
 		self.command = undefined;
-
+		
 		while ( self fragbuttonpressed() )
 		{
 			wait 0.05;
@@ -306,76 +306,76 @@ watchSaveWaypointsCommand()
 {
 	self endon( "death" );
 	self endon( "disconnect" );
-
+	
 	for ( ;; )
 	{
 		while ( !self usebuttonpressed() || !self attackbuttonpressed() || isdefined( self.command ) )
 		{
 			wait 0.05;
 		}
-
+		
 		self.command = true;
-
+		
 		self iprintln( "ADS - Autolink; Else(wait) - Save" );
-
+		
 		wait getdvarfloat( "bots_main_debug_commandWait" );
-
+		
 		if ( !self adsbuttonpressed() )
 		{
 			self checkForWarnings();
 			wait 1;
-
+			
 			logprint( "***********ABiliTy's WPDump**************\n\n" );
 			logprint( "\n\n\n\n" );
 			mpnm = getMapName( getdvar( "mapname" ) );
 			logprint( "\n\n" + mpnm + "()\n{\n/*" );
 			logprint( "*/waypoints = [];\n/*" );
-
+			
 			for ( i = 0; i < level.waypointcount; i++ )
 			{
 				logprint( "*/waypoints[ " + i + " ] = spawnstruct();\n/*" );
 				logprint( "*/waypoints[ " + i + " ].origin = " + level.waypoints[ i ].origin + ";\n/*" );
 				logprint( "*/waypoints[ " + i + " ].type = \"" + level.waypoints[ i ].type + "\";\n/*" );
-
+				
 				for ( c = 0; c < level.waypoints[ i ].children.size; c++ )
 				{
 					logprint( "*/waypoints[ " + i + " ].children[ " + c + " ] = " + level.waypoints[ i ].children[ c ] + ";\n/*" );
 				}
-
+				
 				if ( isdefined( level.waypoints[ i ].angles ) && ( level.waypoints[ i ].type == "claymore" || level.waypoints[ i ].type == "tube" || ( level.waypoints[ i ].type == "crouch" && level.waypoints[ i ].children.size == 1 ) || level.waypoints[ i ].type == "climb" || level.waypoints[ i ].type == "grenade" ) )
 				{
 					logprint( "*/waypoints[ " + i + " ].angles = " + level.waypoints[ i ].angles + ";\n/*" );
 				}
 			}
-
+			
 			logprint( "*/return waypoints;\n}\n\n\n\n" );
-
+			
 			filename = "waypoints/" + getdvar( "mapname" ) + "_wp.csv";
-
+			
 			println( "********* Start Bot Warfare WPDump *********" );
 			println( level.waypointcount );
-
+			
 			BotBuiltinFileWrite( filename, level.waypointcount + "\n", "write" );
-
+			
 			for ( i = 0; i < level.waypointcount; i++ )
 			{
 				str = "";
 				wp = level.waypoints[ i ];
-
+				
 				str += wp.origin[ 0 ] + " " + wp.origin[ 1 ] + " " + wp.origin[ 2 ] + ",";
-
+				
 				for ( h = 0; h < wp.children.size; h++ )
 				{
 					str += wp.children[ h ];
-
+					
 					if ( h < wp.children.size - 1 )
 					{
 						str += " ";
 					}
 				}
-
+				
 				str += "," + wp.type + ",";
-
+				
 				if ( isdefined( wp.angles ) )
 				{
 					str += wp.angles[ 0 ] + " " + wp.angles[ 1 ] + " " + wp.angles[ 2 ] + ",";
@@ -384,15 +384,15 @@ watchSaveWaypointsCommand()
 				{
 					str += ",";
 				}
-
+				
 				str += ",";
-
+				
 				println( str );
 				BotBuiltinFileWrite( filename, str + "\n", "append" );
 			}
-
+			
 			println( "\n\n\n\n\n\n" );
-
+			
 			self iprintln( "Saved!!! to " + filename );
 		}
 		else
@@ -410,9 +410,9 @@ watchSaveWaypointsCommand()
 				level.wptolink = self.closest;
 			}
 		}
-
+		
 		self.command = undefined;
-
+		
 		while ( self usebuttonpressed() && self attackbuttonpressed() )
 		{
 			wait 0.05;
@@ -425,9 +425,9 @@ LoadWaypoints()
 	self deleteAllWaypoints();
 	self iprintlnbold( "Loading WPS..." );
 	load_waypoints();
-
+	
 	wait 1;
-
+	
 	self checkForWarnings();
 }
 
@@ -437,12 +437,12 @@ checkForWarnings()
 	{
 		self iprintln( "WARNING: waypointCount is " + level.waypointcount );
 	}
-
+	
 	if ( level.waypointcount != level.waypoints.size )
 	{
 		self iprintln( "WARNING: waypointCount is not " + level.waypoints.size );
 	}
-
+	
 	for ( i = 0; i < level.waypointcount; i++ )
 	{
 		if ( !isdefined( level.waypoints[ i ] ) )
@@ -450,7 +450,7 @@ checkForWarnings()
 			self iprintln( "WARNING: waypoint " + i + " is undefined" );
 			continue;
 		}
-
+		
 		if ( level.waypoints[ i ].children.size <= 0 )
 		{
 			self iprintln( "WARNING: waypoint " + i + " childCount is " + level.waypoints[ i ].children.size );
@@ -466,7 +466,7 @@ checkForWarnings()
 				for ( h = level.waypoints[ i ].children.size - 1; h >= 0; h-- )
 				{
 					child = level.waypoints[ i ].children[ h ];
-
+					
 					if ( !isdefined( level.waypoints[ child ] ) )
 					{
 						self iprintln( "WARNING: waypoint " + i + " child " + child + " is undefined" );
@@ -478,13 +478,13 @@ checkForWarnings()
 				}
 			}
 		}
-
+		
 		if ( !isdefined( level.waypoints[ i ].type ) )
 		{
 			self iprintln( "WARNING: waypoint " + i + " type is undefined" );
 			continue;
 		}
-
+		
 		if ( !isdefined( level.waypoints[ i ].angles ) && ( level.waypoints[ i ].type == "claymore" || level.waypoints[ i ].type == "tube" || ( level.waypoints[ i ].type == "crouch" && level.waypoints[ i ].children.size == 1 ) || level.waypoints[ i ].type == "climb" || level.waypoints[ i ].type == "grenade" ) )
 		{
 			self iprintln( "WARNING: waypoint " + i + " angles is undefined" );
@@ -496,7 +496,7 @@ deleteAllWaypoints()
 {
 	level.waypoints = [];
 	level.waypointcount = 0;
-
+	
 	self iprintln( "DelAllWps" );
 }
 
@@ -507,16 +507,16 @@ deleteWaypoint( nwp )
 		self iprintln( "No close enough waypoint to delete." );
 		return;
 	}
-
+	
 	level.wptolink = -1;
-
+	
 	for ( i = level.waypoints[ nwp ].children.size - 1; i >= 0; i-- )
 	{
 		child = level.waypoints[ nwp ].children[ i ];
-
+		
 		level.waypoints[ child ].children = array_remove( level.waypoints[ child ].children, nwp );
 	}
-
+	
 	for ( i = 0; i < level.waypointcount; i++ )
 	{
 		for ( h = level.waypoints[ i ].children.size - 1; h >= 0; h-- )
@@ -527,7 +527,7 @@ deleteWaypoint( nwp )
 			}
 		}
 	}
-
+	
 	for ( entry = 0; entry < level.waypointcount; entry++ )
 	{
 		if ( entry == nwp )
@@ -537,23 +537,23 @@ deleteWaypoint( nwp )
 				level.waypoints[ entry ] = level.waypoints[ entry + 1 ];
 				entry++;
 			}
-
+			
 			level.waypoints[ entry ] = undefined;
 			break;
 		}
 	}
-
+	
 	level.waypointcount--;
-
+	
 	self iprintln( "DelWp " + nwp );
 }
 
 addWaypoint( pos )
 {
 	level.waypoints[ level.waypointcount ] = spawnstruct();
-
+	
 	level.waypoints[ level.waypointcount ].origin = pos;
-
+	
 	if ( self adsbuttonpressed() )
 	{
 		level.waypoints[ level.waypointcount ].type = "climb";
@@ -574,20 +574,20 @@ addWaypoint( pos )
 	{
 		level.waypoints[ level.waypointcount ].type = self getstance();
 	}
-
+	
 	level.waypoints[ level.waypointcount ].angles = self getplayerangles();
-
+	
 	level.waypoints[ level.waypointcount ].children = [];
-
+	
 	self iprintln( level.waypoints[ level.waypointcount ].type + " Waypoint " + level.waypointcount + " Added at " + pos );
-
+	
 	if ( level.autolink )
 	{
 		if ( level.wptolink == -1 )
 		{
 			level.wptolink = level.waypointcount - 1;
 		}
-
+		
 		level.waypointcount++;
 		self LinkWaypoint( level.waypointcount - 1 );
 	}
@@ -605,17 +605,17 @@ UnLinkWaypoint( nwp )
 		level.wptolink = -1;
 		return;
 	}
-
+	
 	if ( level.wptolink == -1 || nwp == level.wptolink )
 	{
 		level.wptolink = nwp;
 		self iprintln( "Waypoint unlink Started " + nwp );
 		return;
 	}
-
+	
 	level.waypoints[ nwp ].children = array_remove( level.waypoints[ nwp ].children, level.wptolink );
 	level.waypoints[ level.wptolink ].children = array_remove( level.waypoints[ level.wptolink ].children, nwp );
-
+	
 	self iprintln( "Waypoint " + nwp + " Broken to " + level.wptolink );
 	level.wptolink = -1;
 }
@@ -628,16 +628,16 @@ LinkWaypoint( nwp )
 		level.wptolink = -1;
 		return;
 	}
-
+	
 	if ( level.wptolink == -1 || nwp == level.wptolink )
 	{
 		level.wptolink = nwp;
 		self iprintln( "Waypoint Link Started " + nwp );
 		return;
 	}
-
+	
 	weGood = true;
-
+	
 	for ( i = level.waypoints[ level.wptolink ].children.size - 1; i >= 0; i-- )
 	{
 		if ( level.waypoints[ level.wptolink ].children[ i ] == nwp )
@@ -646,7 +646,7 @@ LinkWaypoint( nwp )
 			break;
 		}
 	}
-
+	
 	if ( weGood )
 	{
 		for ( i = level.waypoints[ nwp ].children.size - 1; i >= 0; i-- )
@@ -658,17 +658,17 @@ LinkWaypoint( nwp )
 			}
 		}
 	}
-
+	
 	if ( !weGood )
 	{
 		self iprintln( "Waypoint Link Cancelled " + nwp + " and " + level.wptolink + " already linked." );
 		level.wptolink = -1;
 		return;
 	}
-
+	
 	level.waypoints[ level.wptolink ].children[ level.waypoints[ level.wptolink ].children.size ] = nwp;
 	level.waypoints[ nwp ].children[ level.waypoints[ nwp ].children.size ] = level.wptolink;
-
+	
 	self iprintln( "Waypoint " + nwp + " Linked to " + level.wptolink );
 	level.wptolink = -1;
 }
@@ -685,15 +685,15 @@ textScroll( string )
 	self endon( "death" );
 	self endon( "disconnect" );
 	// thanks ActionScript
-
+	
 	back = createbar( ( 0, 0, 0 ), 1000, 30 );
 	back setpoint( "CENTER", undefined, 0, 220 );
 	self thread destroyOnDeath( back );
-
+	
 	text = createfontstring( "default", 1.5 );
 	text settext( string );
 	self thread destroyOnDeath( text );
-
+	
 	for ( ;; )
 	{
 		text setpoint( "CENTER", undefined, 1200, 220 );