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/bots/_bot.gsc

@@ -29,52 +29,52 @@ init()
 	
 	if ( getdvar( "bots_main_GUIDs" ) == "" )
 	{
-		setdvar( "bots_main_GUIDs", "" );   // guids of players who will be given host powers, comma seperated
+		setdvar( "bots_main_GUIDs", "" ); // guids of players who will be given host powers, comma seperated
 	}
 	
 	if ( getdvar( "bots_main_firstIsHost" ) == "" )
 	{
-		setdvar( "bots_main_firstIsHost", false );   // first player to connect is a host
+		setdvar( "bots_main_firstIsHost", false ); // first player to connect is a host
 	}
 	
 	if ( getdvar( "bots_main_waitForHostTime" ) == "" )
 	{
-		setdvar( "bots_main_waitForHostTime", 10.0 );   // how long to wait to wait for the host player
+		setdvar( "bots_main_waitForHostTime", 10.0 ); // how long to wait to wait for the host player
 	}
 	
 	if ( getdvar( "bots_main_kickBotsAtEnd" ) == "" )
 	{
-		setdvar( "bots_main_kickBotsAtEnd", false );   // kicks the bots at game end
+		setdvar( "bots_main_kickBotsAtEnd", false ); // kicks the bots at game end
 	}
 	
 	if ( getdvar( "bots_manage_add" ) == "" )
 	{
-		setdvar( "bots_manage_add", 0 );   // amount of bots to add to the game
+		setdvar( "bots_manage_add", 0 ); // amount of bots to add to the game
 	}
 	
 	if ( getdvar( "bots_manage_fill" ) == "" )
 	{
-		setdvar( "bots_manage_fill", 0 );   // amount of bots to maintain
+		setdvar( "bots_manage_fill", 0 ); // amount of bots to maintain
 	}
 	
 	if ( getdvar( "bots_manage_fill_mode" ) == "" )
 	{
-		setdvar( "bots_manage_fill_mode", 0 );   // fill mode, 0 adds everyone, 1 just bots, 2 maintains at maps, 3 is 2 with 1
+		setdvar( "bots_manage_fill_mode", 0 ); // fill mode, 0 adds everyone, 1 just bots, 2 maintains at maps, 3 is 2 with 1
 	}
 	
 	if ( getdvar( "bots_manage_fill_kick" ) == "" )
 	{
-		setdvar( "bots_manage_fill_kick", false );   // kick bots if too many
+		setdvar( "bots_manage_fill_kick", false ); // kick bots if too many
 	}
 	
 	if ( getdvar( "bots_skill" ) == "" )
 	{
-		setdvar( "bots_skill", 0 );   // 0 is random, 1 is easy 7 is hard, 8 is custom, 9 is completely random
+		setdvar( "bots_skill", 0 ); // 0 is random, 1 is easy 7 is hard, 8 is custom, 9 is completely random
 	}
 	
 	if ( getdvar( "bots_skill_hard" ) == "" )
 	{
-		setdvar( "bots_skill_hard", 0 );   // amount of hard bots on axis team
+		setdvar( "bots_skill_hard", 0 ); // amount of hard bots on axis team
 	}
 	
 	if ( getdvar( "bots_skill_med" ) == "" )

maps/bots/_bot_internal.gsc

@@ -707,8 +707,8 @@ doBotMovement_loop( data )
 		
 		// rotate our direction according to our angles
 		dir = ( dir[ 0 ] * cosa - dir[ 1 ] * sina,
-		        dir[ 0 ] * sina + dir[ 1 ] * cosa,
+				dir[ 0 ] * sina + dir[ 1 ] * cosa,
-		        0 );
+				0 );
 				
 		// make the length 127
 		dir = vectornormalize( dir ) * 127;
@@ -1025,17 +1025,17 @@ target_loop()
 			traceAnkleRight = bullettrace( myEye, targetAnkleRight, false, enemy );
 			
 			canTargetEnemy = ( ( sighttracepassed( myEye, targetHead, false, enemy ) ||
-			            sighttracepassed( myEye, targetAnkleLeft, false, enemy ) ||
+						sighttracepassed( myEye, targetAnkleLeft, false, enemy ) ||
-			            sighttracepassed( myEye, targetAnkleRight, false, enemy ) )
+						sighttracepassed( myEye, targetAnkleRight, false, enemy ) )
 						
-			        && ( ( traceHead[ "fraction" ] >= 1.0 || traceHead[ "surfacetype" ] == "glass" ) ||
+					&& ( ( traceHead[ "fraction" ] >= 1.0 || traceHead[ "surfacetype" ] == "glass" ) ||
-			            ( traceAnkleLeft[ "fraction" ] >= 1.0 || traceAnkleLeft[ "surfacetype" ] == "glass" ) ||
+						( traceAnkleLeft[ "fraction" ] >= 1.0 || traceAnkleLeft[ "surfacetype" ] == "glass" ) ||
-			            ( traceAnkleRight[ "fraction" ] >= 1.0 || traceAnkleRight[ "surfacetype" ] == "glass" ) )
+						( traceAnkleRight[ "fraction" ] >= 1.0 || traceAnkleRight[ "surfacetype" ] == "glass" ) )
 						
-			        && ( getConeDot( enemy.origin, self.origin, myAngles ) >= myFov ||
+					&& ( getConeDot( enemy.origin, self.origin, myAngles ) >= myFov ||
-			            ( isObjDef && obj.trace_time ) )
+						( isObjDef && obj.trace_time ) )
 						
-			        && ( !isdefined( enemy.magic_bullet_shield ) || !enemy.magic_bullet_shield ) );
+					&& ( !isdefined( enemy.magic_bullet_shield ) || !enemy.magic_bullet_shield ) );
 					
 			if ( isdefined( self.bot.target_this_frame ) && self.bot.target_this_frame == enemy )
 			{
@@ -1234,8 +1234,8 @@ updateAimOffset( obj )
 		if ( diffAimAmount > 0 )
 		{
 			obj.aim_offset_base = ( randomfloatrange( 0 - diffAimAmount, diffAimAmount ),
-			        randomfloatrange( 0 - diffAimAmount, diffAimAmount ),
+						randomfloatrange( 0 - diffAimAmount, diffAimAmount ),
-			        randomfloatrange( 0 - diffAimAmount, diffAimAmount ) );
+						randomfloatrange( 0 - diffAimAmount, diffAimAmount ) );
 		}
 		else
 		{

maps/bots/objectives/_treasurechest.gsc

@@ -233,7 +233,7 @@ GoDoTreasureChest( eObj )
 	
 	ret = weapon_spawn_org waittill_any_timeout( 5, "randomization_done" );
 	
-	if (ret == "timeout")
+	if ( ret == "timeout" )
 	{
 		eObj.sreason = "randomization_done timed out";
 		return;