formatting update

.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]

.vscode/settings.json

@@ -13,687 +13,3 @@
 		},
 		"vscode-codscript.use_builtin_completionItems": false
 }
-
-// use below to verify no single line blocks with no braces
-// /^\s*(if|while|for|switch|else)(?!\w).*\s*[\r\n]+\s*[^\s{]/gm
-
-// use below to verify array indexing spacing style
-// $ egrep -ron "(\[\S|\S\])" --include \*.gsc ./ | egrep -v "\[\[" | egrep -v "\]\]" | egrep -v "\[\]" | egrep -v "\[\{" | egrep -v "\}\]"
-
-// python script for casing fixes i did
-/*
-import sys
-import re
-
-builtins = """
-assert
-isdefined
-println
-getentitynumber
-delete
-spawnstruct
-getdvar
-setdvar
-visionsetnaked
-visionsetnight
-int
-setsunlight
-gettime
-assertex
-isalive
-assertmsg
-issubstr
-istouching
-savegame~
-getdebugdvar
-getarraykeys
-print3d
-getentarray
-spawn
-getorigin
-setmodel
-distance
-vectortoangles
-anglestoforward
-vectordot
-getaiarray
-distancesquared
-bloodimpact
-isai
-issentient
-randomint
-radiusdamage
-activateclientexploder
-deactivateclientexploder
-playloopsound
-connectpaths
-hide
-notsolid
-show
-solid
-disconnectpaths
-getent
-physicslaunch
-rotatevelocity
-movegravity
-ambientplay
-getnode
-shellshock
-iswaitingonsound
-linkto
-playsound
-stopsounds
-stoploopsound
-playsoundasmaster
-iprintlnbold
-useanimtree
-getaispeciesarray
-line
-anglestoright
-anglestoup
-clearenemy
-setfriendlychain
-strtok
-getvehiclenode
-soundexists
-newhudelem
-setclock
-missionfailed
-randomfloatrange
-clearfixednodesafevolume
-tolower
-playrumbleonentity
-setflashbanged
-getthreatbiasgroup
-getentnum
-createthreatbiasgroup
-setthreatbiasgroup
-setthreatbias
-bullettrace
-playerphysicstrace
-unlink
-precachestring
-vectornormalize
-settext
-destroy
-setshader
-threatbiasgroupexists
-setignoremegroup
-getcurrentweapon
-getfractionmaxammo
-givemaxammo
-getspawnerarray
-isplayer
-dodamage
-dospawn
-getdvarfloat
-getspeedmph
-setgoalentity
-getplayerangles
-playerlinkto
-rotateto
-playerlinktodelta
-gettagorigin
-gettagangles
-stalingradspawn
-setblur
-setgoalnode
-setgoalpos
-objective_state
-setanimrestart
-getdvarint
-fadeovertime
-getplayerviewheight
-setsaveddvar
-stopanimscripted
-setlightintensity
-playerads
-geteye
-earthquake
-getvelocity
-playfx
-setsoundblend
-getweaponslist
-getweaponammoclip
-iscoopepd
-giveachievement
-issplitscreen
-detach
-musicplay
-setvolfog
-setculldist
-splitviewallowed
-getplayers
-freezecontrols
-setdoublevision
-visionsetnaked
-clientsysregister
-clientsyssetstate
-clientsyssetstate
-getsnapshotindexarray
-snapshotacknowledged
-oktospawn
-getturretowner
-useby
-stopusingturret
-setorigin
-setplayerangles
-setvolfog
-enableinvulnerability
-disableweapons
-newclienthudelem
-enableweapons
-disableinvulnerability
-setprintchannel
-randomfloat
-openfile
-fprintln
-closefile
-spawnfx
-triggerfx
-playfxontag
-moveovertime
-scaleovertime
-clearanim
-setanim
-setproneanimnodes
-setanimknoball
-getattachsize
-getattachmodelname
-weaponclass
-localtoworldcoords
-getshootatpos
-canshoot
-getdebugdvarint
-angleclamp180
-isstanceallowed
-getweaponmodel
-nearnode
-floor
-cos
-sin
-setflaggedanimknoballrestart
-getanimlength
-getdebugeye
-orientmode
-isingoal
-useturret
-setmode
-shoot
-randomintrange
-stopshoot
-bulletspread
-issuppressed
-cansee
-sighttracepassed
-abs
-canattackenemynode
-length
-weaponisboltaction
-weaponisgasweapon
-weaponcliptype
-enterprone
-exitprone
-isarray
-getmovedelta
-startragdoll
-physicsexplosionsphere
-setflaggedanimknoball
-setanimknoblimited
-setanimknob
-getmotionangle
-maymovetopoint
-animhasnotetrack
-setflaggedanimknob
-setanimlimited
-updateplayersightaccuracy
-absangleclamp180
-getanimtime
-weaponclipsize
-getclosestenemysqdist
-setflaggedanimknobrestart
-hidepart
-updateprone
-getthreatbias
-max
-physicstrace
-checkgrenadethrowpos
-checkgrenadethrow
-min
-getattachtagname
-throwgrenade
-print
-attach
-magicgrenademanual
-findbestcovernode
-usecovernode
-findreacquiredirectpath
-findreacquireproximatepath
-reacquiremove
-badplace_cylinder
-badplace_delete
-getcurrentweaponclipammo
-getflashbangedstrength
-setflaggedanimknoblimitedrestart
-logstring
-setburn
-startfadingblur
-setnormalhealth
-iprintln
-changefontscaleovertime
-getkeybinding
-getscoremultiplier
-setclientdvars
-newscorehudelem
-ban
-coopinfo
-setvalue
-setscoremultiplier
-playlocalsound
-closemenu
-closeingamemenu
-setdepthoffield
-resettimeout
-stopshellshock
-stoprumble
-spawn
-getcurrentarcadehighscore
-uploadscore
-loadfx
-setcollectible
-hascollectible
-tablelookup
-sethintstring
-usetriggerrequirelookat
-takeallweapons
-giveweapon
-allowsprint
-setmovespeedscale
-setclientdvar
-visionsetberserker
-disableberserker
-enableberserker
-unsetcollectible
-switchtoweapon
-getweaponammostock
-setweaponammoclip
-setweaponammostock
-getweaponslistprimaries
-takeweapon
-switchtooffhand
-precacheitem
-allowjump
-visionsetlaststand
-weapontype
-isthrowinggrenade
-setcursorhint
-enablelinkto
-depthinwater
-disableweaponcycling
-disableoffhandweapons
-enableweaponcycling
-enableoffhandweapons
-bullettracepassed
-usebuttonpressed
-hasperk
-startrevive
-stoprevive
-reviveplayer
-setrank
-precacheshader
-getstat
-setstat
-tablelookupistring
-setstatbit
-getsubstr
-iprintlnbold
-setpulsefx
-weaponissemiauto
-weaponfiretime
-getweaponclipmodel
-precachemodel
-createprintchannel
-precacheheadicon
-precacheshellshock
-precacherumble
-watersimenable
-getnodearray
-detachall
-itemweaponsetammo
-setexploderid
-transmittargetname
-isweapondetonationtimed
-allowprone
-allowcrouch
-allowstand
-getallnodes
-buttonpressed
-changelevel
-newdebughudelem
-eqoff
-eqon
-allowads
-setspreadoverride
-resetspreadoverride
-setmapcenter
-numremoteclients
-getspawnerteamarray
-settimescale
-getnumconnectedplayers
-getnumexpectedplayers
-dropweapon
-animmode
-asin
-geteyeapprox
-lengthsquared
-getanglestolikelyenemypath
-showpart
-teleport
-trackscriptstate
-setflaggedanimlimited
-setanimknoballrestart
-sqrt
-reacquirestep
-findreacquirenode
-getreacquirenode
-usereacquirenode
-flagenemyunattackable
-getstance
-animcustom
-getnorthyaw
-stopsound
-getnotetracktimes
-vectorcross
-isgodmode
-viewkick
-getpersistentprofilevar
-setpersistentprofilevar
-updategamerprofile
-meleebuttonpressed
-setcandamage
-clearpitchorient
-setstance
-playerlinktoabsolute
-allowlean
-allowmelee
-enablehealthshield
-hideviewmodel
-showviewmodel
-acos
-findpath
-settargetentity
-cleartargetentity
-isfiringturret
-shootturret
-stopfiring
-startfiring
-isturretactive
-canuseturret
-getdifficulty
-getturrettarget
-restoredefaultdroppitch
-stopuseturret
-getstartorigin
-setruntopos
-animscripted
-maketurretunusable
-setdefaultdroppitch
-maketurretusable
-isturretfiring
-pushplayer
-setgoalvolume
-makefakeai
-getstartangles
-setanimknobrestart
-setflaggedanim
-setanimtime
-setflaggedanimrestart
-getvehicleowner
-allowedstances
-magicgrenade
-weaponfightdist
-getangledelta
-playrumbleonposition
-canspawnturret
-spawnturret
-getnegotiationstartnode
-startcoverarrival
-atan
-checkcoverexitposwithpath
-maymovefrompointtopoint
-issaverecentlyloaded
-musicstop
-setexpfog
-setswitchnode
-setwaitnode
-setspeed
-clearlookatent
-sethoverparams
-setneargoalnotifydist
-setairresistance
-cleartargetyaw
-setgoalyaw
-cleargoalyaw
-settargetyaw
-attachpath
-setspeedimmediate
-startpath
-spawnvehicle
-setvehicleteam
-freevehicle
-clearturrettarget
-setvehgoalpos
-getspeed
-resumespeed
-getallvehiclenodes
-setshadowhint
-setturretteam
-precacheturret
-playrumblelooponentity
-badplace_arc
-fireweapon
-addvehicletocompass
-removevehiclefromcompass
-getattachpos
-dontinterpolate
-precachevehicle
-setlookatent
-setturrettargetent
-setenginevolume
-joltbody
-isragdoll
-setwaitspeed
-setturretignoregoals
-getturret
-makevehicleunusable
-isturretready
-setvehiclelookattext
-clearalltextafterhudelem
-devaddpitch
-devaddyaw
-devaddroll
-isstring
-playloopedfx
-precachemenu
-playerpositionvalid
-allowspectateteam
-finishplayerdamage
-openmenu
-reportclientdisconnected
-setactionslot
-setviewmodel
-getcurrentoffhand
-damageconetrace
-detonate
-distance2d
-rotateyaw
-modelhasphyspreset
-launchragdoll
-beginprediction
-endprediction
-getpartname
-createdynentandlaunch
-starttanning
-weaponmountable
-playsoundatposition
-isbeingwatched
-pointonsegmentnearesttopoint
-predictanim
-predictoriginandangles
-gethitenttype
-gethityaw
-isdeflected
-lerpposition
-getvisionsetnaked
-savegamenocommit
-commitsave
-issavesuccessful
-ismeleeing
-isfiring
-deactivatereverb
-setreverb
-forcelevelend
-makedvarserverinfo
-exitlevel
-getreflectionlocs
-getreflectionorigin
-setdebugangles
-setdebugorigin
-weaponbayonetinfo
-hasusedweapon
-getnumrestarts
-setuinextlevel
-missionsuccess
-setmissiondvar
-attackbuttonpressed
-rotateroll
-getlightintensity
-setcontents
-radiusdamage
-vibrate
-disableaimassist
-enableaimassist
-setfixednodesafevolume
-isknownenemyinradius
-isknownenemyinvolume
-setlightcolor
-getlightcolor
-vectorlerp
-pickupgrenade
-startscriptedanim
-spawncollision
-rotatepitch
-setelectrified
-movez
-isnotarget
-hasweapon
-setvisibletoplayer
-bbprint
-setvisibletoall
-setinvisibletoplayer
-weaponmaxammo
-getammocount
-isswitchingweapons
-setperk
-unsetperk
-forceteleport
-iprintln
-cleargoalvolume
-settalktospecies
-setailimit
-disablegrenadesuicide
-adsbuttonpressed
-playersetgroundreferenceent
-isonground
-resetmissiledetonationtime
-settransported
-setengagementmindist
-setengagementmaxdist
-setspawnerteam
-traversemode
-getnegotiationendnode
-getnormalhealth
-animrelative
-getaivelocity
-finishactordamage
-isdedicated
-getfunction
-replacefunc
-disabledetouronce
-cmdexec
-getguid
-logprint
-printconsole
-isweaponcliponly
-botaction
-botstop
-botmovement
-botmeleeparams
-generatepath
-getmins
-getmaxs
-setallowedtraversals
-setignoredlinks
-getnodenumber
-getlinkednodes
-addtestclient
-notifyonplayercommand
-ishost
-closer
-""".split()
-
-if sys.argv[1] == '1': # checks for capitals in builtins
-	for fn in sys.argv[2:]:
-		whole_file = ''
-
-		with open(fn, 'r') as file:
-			whole_file = file.read()
-
-			seen = {}
-			file.seek(0)
-			for line in file:
-				toks = line.split()
-
-				for tok in toks:
-					matches = re.findall(r'\w+', tok)
-
-					for match in matches:
-						if any(char.isupper() for char in match) and match.lower() in builtins:
-							print(match, match.lower())
-							whole_file = whole_file.replace(match, match.lower())
-
-		with open(fn, 'w') as file:
-			file.write(whole_file)
-elif sys.argv[1] == '2': # checks for capital letters for field names
-	for fn in sys.argv[2:]:
-		whole_file = ''
-
-		with open(fn, 'r') as file:
-			whole_file = file.read()
-			file.seek(0)
-
-			for line in file:
-				toks = line.split()
-
-				for tok in toks:
-					matches = re.findall(r'(\S+(\.\w+)+)', tok)
-
-					for match in matches:
-						toks2 = match[0].split('.')
-						left = toks2[0]
-
-						if left.isnumeric():
-							continue
-
-						right = '.'.join(toks2[1:])
-
-						if not any(char.isupper() for char in right):
-							continue
-
-						print(match[0], left + '.' + right.lower())
-						whole_file = whole_file.replace(match[0], left + '.' + right.lower())
-
-		with open(fn, 'w') as file:
-			file.write(whole_file)
-
-*/

maps/mp/bots/_bot.gsc

@@ -28,77 +28,77 @@ init()
 	
 	if ( getcvar( "bots_main_GUIDs" ) == "" )
 	{
-		setcvar( "bots_main_GUIDs", "" );   // guids of players who will be given host powers, comma seperated
+		setcvar( "bots_main_GUIDs", "" ); // guids of players who will be given host powers, comma seperated
 	}
 	
 	if ( getcvar( "bots_main_firstIsHost" ) == "" )
 	{
-		setcvar( "bots_main_firstIsHost", true );   // first player to connect is a host
+		setcvar( "bots_main_firstIsHost", true ); // first player to connect is a host
 	}
 	
 	if ( getcvar( "bots_main_waitForHostTime" ) == "" )
 	{
-		setcvar( "bots_main_waitForHostTime", 10.0 );   // how long to wait to wait for the host player
+		setcvar( "bots_main_waitForHostTime", 10.0 ); // how long to wait to wait for the host player
 	}
 	
 	if ( getcvar( "bots_main_kickBotsAtEnd" ) == "" )
 	{
-		setcvar( "bots_main_kickBotsAtEnd", false );   // kicks the bots at game end
+		setcvar( "bots_main_kickBotsAtEnd", false ); // kicks the bots at game end
 	}
 	
 	if ( getcvar( "bots_manage_add" ) == "" )
 	{
-		setcvar( "bots_manage_add", 0 );   // amount of bots to add to the game
+		setcvar( "bots_manage_add", 0 ); // amount of bots to add to the game
 	}
 	
 	if ( getcvar( "bots_manage_fill" ) == "" )
 	{
-		setcvar( "bots_manage_fill", 0 );   // amount of bots to maintain
+		setcvar( "bots_manage_fill", 0 ); // amount of bots to maintain
 	}
 	
 	if ( getcvar( "bots_manage_fill_spec" ) == "" )
 	{
-		setcvar( "bots_manage_fill_spec", true );   // to count for fill if player is on spec team
+		setcvar( "bots_manage_fill_spec", true ); // to count for fill if player is on spec team
 	}
 	
 	if ( getcvar( "bots_manage_fill_mode" ) == "" )
 	{
-		setcvar( "bots_manage_fill_mode", 0 );   // fill mode, 0 adds everyone, 1 just bots, 2 maintains at maps, 3 is 2 with 1
+		setcvar( "bots_manage_fill_mode", 0 ); // fill mode, 0 adds everyone, 1 just bots, 2 maintains at maps, 3 is 2 with 1
 	}
 	
 	if ( getcvar( "bots_manage_fill_kick" ) == "" )
 	{
-		setcvar( "bots_manage_fill_kick", false );   // kick bots if too many
+		setcvar( "bots_manage_fill_kick", false ); // kick bots if too many
 	}
 	
 	if ( getcvar( "bots_team" ) == "" )
 	{
-		setcvar( "bots_team", "autoassign" );   // which team for bots to join
+		setcvar( "bots_team", "autoassign" ); // which team for bots to join
 	}
 	
 	if ( getcvar( "bots_team_amount" ) == "" )
 	{
-		setcvar( "bots_team_amount", 0 );   // amount of bots on axis team
+		setcvar( "bots_team_amount", 0 ); // amount of bots on axis team
 	}
 	
 	if ( getcvar( "bots_team_force" ) == "" )
 	{
-		setcvar( "bots_team_force", false );   // force bots on team
+		setcvar( "bots_team_force", false ); // force bots on team
 	}
 	
 	if ( getcvar( "bots_team_mode" ) == "" )
 	{
-		setcvar( "bots_team_mode", 0 );   // counts just bots when 1
+		setcvar( "bots_team_mode", 0 ); // counts just bots when 1
 	}
 	
 	if ( getcvar( "bots_skill" ) == "" )
 	{
-		setcvar( "bots_skill", 0 );   // 0 is random, 1 is easy 7 is hard, 8 is custom, 9 is completely random
+		setcvar( "bots_skill", 0 ); // 0 is random, 1 is easy 7 is hard, 8 is custom, 9 is completely random
 	}
 	
 	if ( getcvar( "bots_skill_axis_hard" ) == "" )
 	{
-		setcvar( "bots_skill_axis_hard", 0 );   // amount of hard bots on axis team
+		setcvar( "bots_skill_axis_hard", 0 ); // amount of hard bots on axis team
 	}
 	
 	if ( getcvar( "bots_skill_axis_med" ) == "" )

maps/mp/bots/_bot_internal.gsc

@@ -208,8 +208,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 = vector_scale( vectornormalize( dir ), 127 );
@@ -663,8 +663,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
 		{
@@ -849,18 +849,18 @@ target_loop()
 			traceAnkleRight = bullettrace( myEye, targetAnkleRight, false, undefined );
 			
 			canTargetPlayer = ( ( sighttracepassed( myEye, targetHead, false, undefined ) ||
-			            sighttracepassed( myEye, targetAnkleLeft, false, undefined ) ||
+						sighttracepassed( myEye, targetAnkleLeft, false, undefined ) ||
-			            sighttracepassed( myEye, targetAnkleRight, false, undefined ) )
+						sighttracepassed( myEye, targetAnkleRight, false, undefined ) )
 						
-			        && ( ( 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" ) )
 						
-			        && ( SmokeTrace( myEye, player.origin, level.smokeradius ) ||
+					&& ( SmokeTrace( myEye, player.origin, level.smokeradius ) ||
-			            daDist < level.bots_maxknifedistance * 4 )
+						daDist < level.bots_maxknifedistance * 4 )
 						
-			        && ( getConeDot( player.origin, self.origin, myAngles ) >= myFov ||
+					&& ( getConeDot( player.origin, self.origin, myAngles ) >= myFov ||
-			            ( isObjDef && obj.trace_time ) ) );
+						( isObjDef && obj.trace_time ) ) );
 						
 			if ( isdefined( self.bot.target_this_frame ) && self.bot.target_this_frame == player )
 			{

maps/mp/bots/_bot_script.gsc

@@ -509,7 +509,7 @@ teamWatch()
 	
 	for ( ;; )
 	{
-		while ( !isdefined( self.pers[ "team" ] )  || !allowTeamChoice() )
+		while ( !isdefined( self.pers[ "team" ] ) || !allowTeamChoice() )
 		{
 			wait .05;
 		}

maps/mp/bots/_bot_utility.gsc

@@ -2574,7 +2574,7 @@ AStarSearch( start, goal, team, greedy_path )
 				
 				if ( isdefined( level.waypointusage[ team ][ child + "" ] ) )
 				{
-					temppen = level.waypointusage[ team ][ child + "" ];   // consider how many bots are taking this path
+					temppen = level.waypointusage[ team ][ child + "" ]; // consider how many bots are taking this path
 				}
 				
 				if ( temppen > 1 )

maps/mp/bots/waypoints/_custom_map.gsc

@@ -1,4 +1,4 @@
-main(mapname)
+main( mapname )
 {
 }
 

maps/mp/gametypes/_clientids.gsc

@@ -11,9 +11,9 @@ init()
 
 onPlayerConnect()
 {
-	for(;;)
+	for ( ;; )
 	{
-		level waittill("connecting", player);
+		level waittill( "connecting", player );
 		
 		player.clientid = level.clientid;
 		level.clientid++;	// Is this safe? What if a server runs for a long time and many people join/leave