[MP] Added remaining MP GSCs.

Multiplayer Core/common_mp/character/c_mp_german_shepherd_vest.gsc

@@ -1,3 +1,5 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
 main()
 {

Multiplayer Core/common_mp/character/c_mp_german_shepherd_vest_black.gsc

@@ -1,3 +1,5 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
 main()
 {

Multiplayer Core/common_mp/maps/mp/_serverfaceanim_mp.gsc

@@ -1,11 +1,14 @@
-#include common_scripts/utility;
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\_utility;
+#include common_scripts\utility;
 
 init()
 {
     for (;;)
     {
         level waittill( "connecting", player );
+
         player thread onplayerspawned();
     }
 }
@@ -13,9 +16,11 @@ init()
 onplayerspawned()
 {
     self endon( "disconnect" );
+
     for (;;)
     {
         self waittill( "spawned_player" );
+
         self thread init_serverfaceanim();
     }
 }
@@ -23,7 +28,8 @@ onplayerspawned()
 init_serverfaceanim()
 {
     self.do_face_anims = 1;
-	if ( !isDefined( level.face_event_handler ) )
+
+    if ( !isdefined( level.face_event_handler ) )
     {
         level.face_event_handler = spawnstruct();
         level.face_event_handler.events = [];
@@ -42,15 +48,14 @@ init_serverfaceanim()
 
 wait_for_face_event()
 {
-	while ( 1 )
+    while ( true )
     {
         level waittill( "face", face_notify, ent );
-		if ( isDefined( ent ) && isDefined( ent.do_face_anims ) && ent.do_face_anims )
+
-		{
+        if ( isdefined( ent ) && isdefined( ent.do_face_anims ) && ent.do_face_anims )
-			if ( isDefined( level.face_event_handler.events[ face_notify ] ) )
         {
+            if ( isdefined( level.face_event_handler.events[face_notify] ) )
                 ent sendfaceevent( level.face_event_handler.events[face_notify] );
         }
     }
 }
-}

Multiplayer Core/common_mp/maps/mp/animscripts/dog_combat.gsc

@@ -1,6 +1,8 @@
-#include maps/mp/animscripts/utility;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/shared;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include common_scripts\utility;
+#include maps\mp\animscripts\shared;
+#include maps\mp\animscripts\utility;
 
 main()
 {
@@ -12,26 +14,25 @@ main()
     {
         combatidle();
         return;
-#/
     }
-	if ( isDefined( level.hostmigrationtimer ) )
+#/
+    if ( isdefined( level.hostmigrationtimer ) )
     {
         combatidle();
         return;
     }
 /#
-	assert( isDefined( self.enemy ) );
+    assert( isdefined( self.enemy ) );
 #/
     if ( !isalive( self.enemy ) )
     {
         combatidle();
         return;
     }
+
     if ( isplayer( self.enemy ) )
-	{
         self meleebiteattackplayer( self.enemy );
 }
-}
 
 combatidle()
 {
@@ -44,7 +45,7 @@ combatidle()
     idleanim = random( idleanims );
     debug_anim_print( "dog_combat::combatIdle() - Setting " + idleanim );
     self setanimstate( idleanim );
-	self maps/mp/animscripts/shared::donotetracks( "done" );
+    self maps\mp\animscripts\shared::donotetracks( "done" );
     debug_anim_print( "dog_combat::combatIdle() - " + idleanim + " notify done." );
 }
 
@@ -53,21 +54,23 @@ meleebiteattackplayer( player )
     self set_orient_mode( "face enemy" );
     self animmode( "gravity", 0 );
     self.safetochangescript = 0;
+
     if ( use_low_attack() )
     {
         self animmode( "angle deltas", 0 );
         self setanimstate( "combat_attack_player_close_range" );
-		self maps/mp/animscripts/shared::donotetracksfortime( 1,4, "done" );
+        self maps\mp\animscripts\shared::donotetracksfortime( 1.4, "done" );
         self animmode( "gravity", 0 );
     }
     else
     {
-		attack_time = 1,2 + randomfloat( 0,4 );
+        attack_time = 1.2 + randomfloat( 0.4 );
         debug_anim_print( "dog_combat::meleeBiteAttackPlayer() - Setting  combat_run_attack" );
         self setanimstate( "combat_attack_run" );
-		self maps/mp/animscripts/shared::donotetracksfortime( attack_time, "done", ::handlemeleebiteattacknotetracks, player );
+        self maps\mp\animscripts\shared::donotetracksfortime( attack_time, "done", ::handlemeleebiteattacknotetracks, player );
         debug_anim_print( "dog_combat::meleeBiteAttackPlayer() - combat_attack_run notify done." );
     }
+
     self.safetochangescript = 1;
     self animmode( "none", 0 );
 }
@@ -75,9 +78,7 @@ meleebiteattackplayer( player )
 handlemeleebiteattacknotetracks( note, player )
 {
     if ( note == "dog_melee" )
-	{
+        self melee( anglestoforward( self.angles ) );
-		self melee( anglesToForward( self.angles ) );
-	}
 }
 
 use_low_attack( player )

Multiplayer Core/common_mp/maps/mp/animscripts/dog_death.gsc

@@ -1,12 +1,15 @@
-#include maps/mp/animscripts/shared;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\utility;
+#include maps\mp\animscripts\shared;
 
 main()
 {
     debug_anim_print( "dog_death::main()" );
     self setaimanimweights( 0, 0 );
     self endon( "killanimscript" );
-	if ( isDefined( self.a.nodeath ) )
+
+    if ( isdefined( self.a.nodeath ) )
     {
 /#
         assert( self.a.nodeath, "Nodeath needs to be set to true or undefined." );
@@ -14,11 +17,12 @@ main()
         wait 3;
         return;
     }
+
     self unlink();
-	if ( isDefined( self.enemy ) && isDefined( self.enemy.syncedmeleetarget ) && self.enemy.syncedmeleetarget == self )
+
-	{
+    if ( isdefined( self.enemy ) && isdefined( self.enemy.syncedmeleetarget ) && self.enemy.syncedmeleetarget == self )
         self.enemy.syncedmeleetarget = undefined;
-	}
+
     death_anim = "death_" + getanimdirection( self.damageyaw );
 /#
     println( death_anim );
@@ -26,5 +30,5 @@ main()
     self animmode( "gravity", 0 );
     debug_anim_print( "dog_death::main() - Setting " + death_anim );
     self setanimstate( death_anim );
-	self maps/mp/animscripts/shared::donotetracks( "done" );
+    self maps\mp\animscripts\shared::donotetracks( "done" );
 }

Multiplayer Core/common_mp/maps/mp/animscripts/dog_flashed.gsc

@@ -1,13 +1,15 @@
-#include maps/mp/animscripts/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\shared;
 
 main()
 {
     self endon( "killanimscript" );
     self endon( "stop_flashbang_effect" );
-	wait randomfloatrange( 0, 0,4 );
+    wait( randomfloatrange( 0, 0.4 ) );
-	duration = self startflashbanged() * 0,001;
+    duration = self startflashbanged() * 0.001;
     self setanimstate( "flashed" );
-	self maps/mp/animscripts/shared::donotetracks( "done" );
+    self maps\mp\animscripts\shared::donotetracks( "done" );
     self setflashbanged( 0 );
     self.flashed = 0;
     self notify( "stop_flashbang_effect" );
@@ -15,15 +17,12 @@ main()
 
 startflashbanged()
 {
-	if ( isDefined( self.flashduration ) )
+    if ( isdefined( self.flashduration ) )
-	{
         duration = self.flashduration;
-	}
     else
-	{
         duration = self getflashbangedstrength() * 1000;
-	}
+
-	self.flashendtime = getTime() + duration;
+    self.flashendtime = gettime() + duration;
     self notify( "flashed" );
     return duration;
 }

Multiplayer Core/common_mp/maps/mp/animscripts/dog_init.gsc

@@ -1,6 +1,8 @@
-#include maps/mp/animscripts/dog_move;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/animscripts/shared;
+#include maps\mp\animscripts\shared;
+#include maps\mp\animscripts\utility;
+#include maps\mp\animscripts\dog_move;
 
 main()
 {
@@ -9,7 +11,7 @@ main()
     level.dog_debug_anims_ent = 0;
     level.dog_debug_turns = 0;
     debug_anim_print( "dog_init::main() " );
-	maps/mp/animscripts/dog_move::setup_sound_variables();
+    maps\mp\animscripts\dog_move::setup_sound_variables();
     anim_get_dvar_int( "debug_dog_sound", "0" );
     anim_get_dvar_int( "debug_dog_notetracks", "0" );
     anim_get_dvar_int( "dog_force_walk", 0 );
@@ -30,49 +32,44 @@ main()
     set_anim_playback_rate();
     self.suppressionthreshold = 1;
     self.disablearrivals = 0;
-	level.dogstoppingdistsq = 3416,82;
+    level.dogstoppingdistsq = 3416.82;
     self.stopanimdistsq = level.dogstoppingdistsq;
     self.pathenemyfightdist = 512;
     self settalktospecies( "dog" );
     level.lastdogmeleeplayertime = 0;
     level.dogmeleeplayercounter = 0;
-	if ( !isDefined( level.dog_hits_before_kill ) )
+
-	{
+    if ( !isdefined( level.dog_hits_before_kill ) )
         level.dog_hits_before_kill = 1;
 }
-}
 
 set_anim_playback_rate()
 {
-	self.animplaybackrate = 0,9 + randomfloat( 0,2 );
+    self.animplaybackrate = 0.9 + randomfloat( 0.2 );
     self.moveplaybackrate = 1;
 }
 
 setmeleeattackdist()
 {
     self endon( "death" );
-	while ( 1 )
+
+    while ( true )
     {
-		if ( isDefined( self.enemy ) )
+        if ( isdefined( self.enemy ) )
         {
             if ( isplayer( self.enemy ) )
             {
                 stance = self.enemy getstance();
+
                 if ( stance == "prone" )
-				{
                     self.meleeattackdist = level.dogattackplayercloserangedist;
-				}
                 else
-				{
                     self.meleeattackdist = level.dogattackplayerdist;
             }
-				break;
-			}
             else
-			{
                 self.meleeattackdist = level.dogattackplayerdist;
         }
-		}
+
         wait 1;
     }
 }

Multiplayer Core/common_mp/maps/mp/animscripts/dog_jump.gsc

@@ -1,5 +1,7 @@
-#include maps/mp/animscripts/shared;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\utility;
+#include maps\mp\animscripts\shared;
 
 main()
 {
@@ -8,6 +10,6 @@ main()
     self setaimanimweights( 0, 0 );
     self.safetochangescript = 0;
     self setanimstate( "traverse_wallhop" );
-	maps/mp/animscripts/shared::donotetracks( "done" );
+    maps\mp\animscripts\shared::donotetracks( "done" );
     self.safetochangescript = 1;
 }

Multiplayer Core/common_mp/maps/mp/animscripts/dog_move.gsc

@@ -1,6 +1,8 @@
-#include maps/mp/animscripts/dog_stop;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/shared;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/animscripts/utility;
+#include maps\mp\animscripts\utility;
+#include maps\mp\animscripts\shared;
+#include maps\mp\animscripts\dog_stop;
 
 setup_sound_variables()
 {
@@ -9,17 +11,17 @@ setup_sound_variables()
     level.dog_sounds["close"].minrange = 0;
     level.dog_sounds["close"].maxrange = 500;
     level.dog_sounds["close"].sound = "aml_dog_bark_close";
-	level.dog_sounds[ "close" ].soundlengthplaceholder = 0,2;
+    level.dog_sounds["close"].soundlengthplaceholder = 0.2;
-	level.dog_sounds[ "close" ].aftersoundwaitmin = 0,1;
+    level.dog_sounds["close"].aftersoundwaitmin = 0.1;
-	level.dog_sounds[ "close" ].aftersoundwaitmax = 0,3;
+    level.dog_sounds["close"].aftersoundwaitmax = 0.3;
     level.dog_sounds["close"].minrangesqr = level.dog_sounds["close"].minrange * level.dog_sounds["close"].minrange;
     level.dog_sounds["close"].maxrangesqr = level.dog_sounds["close"].maxrange * level.dog_sounds["close"].maxrange;
     level.dog_sounds["far"].minrange = 500;
     level.dog_sounds["far"].maxrange = 0;
     level.dog_sounds["far"].sound = "aml_dog_bark";
-	level.dog_sounds[ "far" ].soundlengthplaceholder = 0,2;
+    level.dog_sounds["far"].soundlengthplaceholder = 0.2;
-	level.dog_sounds[ "far" ].aftersoundwaitmin = 0,1;
+    level.dog_sounds["far"].aftersoundwaitmin = 0.1;
-	level.dog_sounds[ "far" ].aftersoundwaitmax = 0,3;
+    level.dog_sounds["far"].aftersoundwaitmax = 0.3;
     level.dog_sounds["far"].minrangesqr = level.dog_sounds["far"].minrange * level.dog_sounds["far"].minrange;
     level.dog_sounds["far"].maxrangesqr = level.dog_sounds["far"].maxrange * level.dog_sounds["far"].maxrange;
 }
@@ -32,51 +34,50 @@ main()
     do_movement = 1;
 /#
     if ( !debug_allow_movement() )
-	{
         do_movement = 0;
 #/
-	}
+    if ( isdefined( level.hostmigrationtimer ) )
-	if ( isDefined( level.hostmigrationtimer ) )
-	{
         do_movement = 0;
-	}
+
-	if ( !isDefined( self.traversecomplete ) && !isDefined( self.skipstartmove ) && self.a.movement == "run" && do_movement )
+    if ( !isdefined( self.traversecomplete ) && !isdefined( self.skipstartmove ) && self.a.movement == "run" && do_movement )
     {
         self startmove();
         blendtime = 0;
     }
     else
-	{
+        blendtime = 0.2;
-		blendtime = 0,2;
+
-	}
     self.traversecomplete = undefined;
     self.skipstartmove = undefined;
+
     if ( do_movement )
     {
         if ( shouldrun() )
         {
             debug_anim_print( "dog_move::main() - Setting move_run" );
             self setanimstate( "move_run" );
-			maps/mp/animscripts/shared::donotetracksfortime( 0,1, "done" );
+            maps\mp\animscripts\shared::donotetracksfortime( 0.1, "done" );
             debug_anim_print( "dog_move::main() - move_run wait 0.1 done " );
         }
         else
         {
             debug_anim_print( "dog_move::main() - Setting move_start " );
             self setanimstate( "move_walk" );
-			maps/mp/animscripts/shared::donotetracksfortime( 0,1, "done" );
+            maps\mp\animscripts\shared::donotetracksfortime( 0.1, "done" );
         }
     }
-	self thread maps/mp/animscripts/dog_stop::lookattarget( "normal" );
+
-	while ( 1 )
+    self thread maps\mp\animscripts\dog_stop::lookattarget( "normal" );
+
+    while ( true )
     {
         self moveloop();
+
         if ( self.a.movement == "run" )
         {
             if ( self.disablearrivals == 0 )
-			{
                 self thread stopmove();
-			}
+
             self waittill( "run" );
         }
     }
@@ -86,46 +87,42 @@ moveloop()
 {
     self endon( "killanimscript" );
     self endon( "stop_soon" );
-	while ( 1 )
+
+    while ( true )
     {
         do_movement = 1;
 /#
         if ( !debug_allow_movement() )
-		{
             do_movement = 0;
 #/
-		}
+        if ( isdefined( level.hostmigrationtimer ) )
-		if ( isDefined( level.hostmigrationtimer ) )
-		{
             do_movement = 0;
-		}
+
-		while ( !do_movement )
+        if ( !do_movement )
         {
             self setaimanimweights( 0, 0 );
             self setanimstate( "stop_idle" );
-			maps/mp/animscripts/shared::donotetracks( "done" );
+            maps\mp\animscripts\shared::donotetracks( "done" );
+            continue;
         }
+
         if ( self.disablearrivals )
-		{
             self.stopanimdistsq = 0;
-		}
         else
-		{
             self.stopanimdistsq = level.dogstoppingdistsq;
-		}
+
         if ( shouldrun() )
         {
             debug_anim_print( "dog_move::moveLoop() - Setting move_run" );
             self setanimstate( "move_run" );
-			maps/mp/animscripts/shared::donotetracksfortime( 0,2, "done" );
+            maps\mp\animscripts\shared::donotetracksfortime( 0.2, "done" );
             debug_anim_print( "dog_move::moveLoop() - move_run wait 0.2 done " );
-			continue;
         }
         else
         {
             debug_anim_print( "dog_move::moveLoop() - Setting move_walk " );
             self setanimstate( "move_walk" );
-			maps/mp/animscripts/shared::donotetracksfortime( 0,2, "done" );
+            maps\mp\animscripts\shared::donotetracksfortime( 0.2, "done" );
             debug_anim_print( "dog_move::moveLoop() - move_walk wait 0.2 done " );
         }
     }
@@ -135,7 +132,7 @@ startmove()
 {
     debug_anim_print( "dog_move::startMove() - Setting move_start " );
     self setanimstate( "move_start" );
-	maps/mp/animscripts/shared::donotetracks( "done" );
+    maps\mp\animscripts\shared::donotetracks( "done" );
     debug_anim_print( "dog_move::startMove() - move_start notify done." );
     self animmode( "none", 0 );
     self set_orient_mode( "face motion" );
@@ -147,39 +144,30 @@ stopmove()
     self endon( "run" );
     debug_anim_print( "dog_move::stopMove() - Setting move_stop" );
     self setanimstate( "move_stop" );
-	maps/mp/animscripts/shared::donotetracks( "done" );
+    maps\mp\animscripts\shared::donotetracks( "done" );
     debug_anim_print( "dog_move::stopMove() - move_stop notify done." );
 }
 
 shouldrun()
 {
 /#
-	if ( getDvarInt( #"DFB12081" ) != 0 )
+    if ( getdvarint( _hash_DFB12081 ) != 0 )
-	{
+        return true;
-		return 1;
+    else if ( getdvarint( _hash_D5D7999B ) != 0 )
-	}
+        return false;
-	else
-	{
-		if ( getDvarInt( #"D5D7999B" ) != 0 )
-		{
-			return 0;
 #/
-		}
+    if ( isdefined( self.enemy ) )
-	}
+        return true;
-	if ( isDefined( self.enemy ) )
+
-	{
-		return 1;
-	}
     if ( self.lookaheaddist <= 90 )
-	{
+        return false;
-		return 0;
+
-	}
+    angles = vectortoangles( self.lookaheaddir );
-	angles = vectorToAngle( self.lookaheaddir );
     yaw_desired = absangleclamp180( angles[1] );
     yaw = absangleclamp180( self.angles[1] );
+
     if ( abs( yaw_desired - yaw ) >= 8 )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }

Multiplayer Core/common_mp/maps/mp/animscripts/dog_pain.gsc

@@ -1,26 +1,28 @@
-#include maps/mp/animscripts/shared;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\utility;
+#include maps\mp\animscripts\shared;
 
 main()
 {
     debug_anim_print( "dog_pain::main() " );
     self endon( "killanimscript" );
     self setaimanimweights( 0, 0 );
-	if ( isDefined( self.enemy ) && isDefined( self.enemy.syncedmeleetarget ) && self.enemy.syncedmeleetarget == self )
+
+    if ( isdefined( self.enemy ) && isdefined( self.enemy.syncedmeleetarget ) && self.enemy.syncedmeleetarget == self )
     {
         self unlink();
         self.enemy.syncedmeleetarget = undefined;
     }
+
     speed = length( self getvelocity() );
     pain_anim = getanimdirection( self.damageyaw );
+
     if ( speed > level.dogrunpainspeed )
-	{
         pain_anim = "pain_run_" + pain_anim;
-	}
     else
-	{
         pain_anim = "pain_" + pain_anim;
-	}
+
     self setanimstate( pain_anim );
-	self maps/mp/animscripts/shared::donotetracksfortime( 0,2, "done" );
+    self maps\mp\animscripts\shared::donotetracksfortime( 0.2, "done" );
 }

Multiplayer Core/common_mp/maps/mp/animscripts/dog_stop.gsc

@@ -1,5 +1,7 @@
-#include maps/mp/animscripts/utility;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/shared;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\shared;
+#include maps\mp\animscripts\utility;
 
 main()
 {
@@ -7,12 +9,13 @@ main()
     self endon( "killanimscript" );
     self setaimanimweights( 0, 0 );
     self thread lookattarget( "attackIdle" );
-	while ( 1 )
+
+    while ( true )
     {
         if ( shouldattackidle() )
         {
             self randomattackidle();
-			maps/mp/animscripts/shared::donotetracks( "done" );
+            maps\mp\animscripts\shared::donotetracks( "done" );
         }
         else
         {
@@ -21,9 +24,10 @@ main()
             self notify( "stop tracking" );
             self setaimanimweights( 0, 0 );
             self setanimstate( "stop_idle" );
-			maps/mp/animscripts/shared::donotetracks( "done" );
+            maps\mp\animscripts\shared::donotetracks( "done" );
             self thread lookattarget( "attackIdle" );
         }
+
         debug_anim_print( "dog_stop::main() - stop idle loop notify done." );
     }
 }
@@ -31,55 +35,53 @@ main()
 isfacingenemy( tolerancecosangle )
 {
 /#
-	assert( isDefined( self.enemy ) );
+    assert( isdefined( self.enemy ) );
 #/
     vectoenemy = self.enemy.origin - self.origin;
     disttoenemy = length( vectoenemy );
+
     if ( disttoenemy < 1 )
-	{
         return 1;
-	}
+
-	forward = anglesToForward( self.angles );
+    forward = anglestoforward( self.angles );
-	val1 = ( forward[ 0 ] * vectoenemy[ 0 ] ) + ( forward[ 1 ] * vectoenemy[ 1 ] );
+    val1 = forward[0] * vectoenemy[0] + forward[1] * vectoenemy[1];
-	val2 = ( ( forward[ 0 ] * vectoenemy[ 0 ] ) + ( forward[ 1 ] * vectoenemy[ 1 ] ) ) / disttoenemy;
+    val2 = ( forward[0] * vectoenemy[0] + forward[1] * vectoenemy[1] ) / disttoenemy;
-	return ( ( ( forward[ 0 ] * vectoenemy[ 0 ] ) + ( forward[ 1 ] * vectoenemy[ 1 ] ) ) / disttoenemy ) > tolerancecosangle;
+    return ( forward[0] * vectoenemy[0] + forward[1] * vectoenemy[1] ) / disttoenemy > tolerancecosangle;
 }
 
 randomattackidle()
 {
-	if ( isfacingenemy( -0,5 ) )
+    if ( isfacingenemy( -0.5 ) )
-	{
         self set_orient_mode( "face current" );
-	}
     else
-	{
         self set_orient_mode( "face enemy" );
-	}
+
     if ( should_growl() )
     {
         debug_anim_print( "dog_stop::main() - Setting stop_attackidle_growl" );
         self setanimstate( "stop_attackidle_growl" );
         return;
     }
+
     idlechance = 33;
     barkchance = 66;
-	if ( isDefined( self.mode ) )
+
+    if ( isdefined( self.mode ) )
     {
         if ( self.mode == "growl" )
         {
             idlechance = 15;
             barkchance = 30;
         }
-		else
+        else if ( self.mode == "bark" )
-		{
-			if ( self.mode == "bark" )
         {
             idlechance = 15;
             barkchance = 85;
         }
     }
-	}
+
     rand = randomint( 100 );
+
     if ( rand < idlechance )
     {
         debug_anim_print( "dog_stop::main() - Setting stop_attackidle" );
@@ -99,22 +101,17 @@ randomattackidle()
 
 shouldattackidle()
 {
-	if ( isDefined( self.enemy ) && isalive( self.enemy ) )
+    return isdefined( self.enemy ) && isalive( self.enemy ) && distancesquared( self.origin, self.enemy.origin ) < 1000000;
-	{
-		return distancesquared( self.origin, self.enemy.origin ) < 1000000;
-	}
 }
 
 should_growl()
 {
-	if ( isDefined( self.script_growl ) )
+    if ( isdefined( self.script_growl ) )
-	{
         return 1;
-	}
+
     if ( !isalive( self.enemy ) )
-	{
         return 1;
-	}
+
     return !self cansee( self.enemy );
 }
 
@@ -127,6 +124,6 @@ lookattarget( lookposeset )
     self.leftaimlimit = -90;
     self.upaimlimit = 45;
     self.downaimlimit = -45;
-	self maps/mp/animscripts/shared::setanimaimweight( 1, 0,2 );
+    self maps\mp\animscripts\shared::setanimaimweight( 1, 0.2 );
-	self maps/mp/animscripts/shared::trackloop();
+    self maps\mp\animscripts\shared::trackloop();
 }

Multiplayer Core/common_mp/maps/mp/animscripts/dog_turn.gsc

@@ -1,5 +1,7 @@
-#include maps/mp/animscripts/shared;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\utility;
+#include maps\mp\animscripts\shared;
 
 main()
 {
@@ -8,14 +10,12 @@ main()
     self setaimanimweights( 0, 0 );
     self.safetochangescript = 0;
     deltayaw = self getdeltaturnyaw();
+
     if ( need_to_turn_around( deltayaw ) )
-	{
         turn_180( deltayaw );
-	}
     else
-	{
         turn_90( deltayaw );
-	}
+
     move_out_of_turn();
     self.skipstartmove = 1;
     self.safetochangescript = 1;
@@ -23,49 +23,53 @@ main()
 
 need_to_turn_around( deltayaw )
 {
-	angle = getDvarFloat( "dog_turn180_angle" );
+    angle = getdvarfloat( "dog_turn180_angle" );
-	if ( deltayaw >= angle || deltayaw <= ( -1 * angle ) )
+
+    if ( deltayaw >= angle || deltayaw <= -1 * angle )
     {
         debug_turn_print( "dog_turn::need_to_turn_around(): " + deltayaw + " YES" );
-		return 1;
+        return true;
     }
+
     debug_turn_print( "dog_turn::need_to_turn_around(): " + deltayaw + " NO" );
-	return 0;
+    return false;
 }
 
 do_turn_anim( stopped_anim, run_anim, wait_time, run_wait_time )
 {
     speed = length( self getvelocity() );
     do_anim = stopped_anim;
+
     if ( level.dogrunturnspeed < speed )
     {
         do_anim = run_anim;
         wait_time = run_wait_time;
     }
+
     debug_turn_print( "dog_turn::do_turn_anim() - Setting " + do_anim );
     self setanimstate( do_anim );
-	maps/mp/animscripts/shared::donotetracksfortime( run_wait_time, "done" );
+    maps\mp\animscripts\shared::donotetracksfortime( run_wait_time, "done" );
     debug_turn_print( "dog_turn::do_turn_anim() - done with " + do_anim + " wait time " + run_wait_time );
 }
 
 turn_left()
 {
-	self do_turn_anim( "move_turn_left", "move_run_turn_left", 0,5, 0,5 );
+    self do_turn_anim( "move_turn_left", "move_run_turn_left", 0.5, 0.5 );
 }
 
 turn_right()
 {
-	self do_turn_anim( "move_turn_right", "move_run_turn_right", 0,5, 0,5 );
+    self do_turn_anim( "move_turn_right", "move_run_turn_right", 0.5, 0.5 );
 }
 
 turn_180_left()
 {
-	self do_turn_anim( "move_turn_around_left", "move_run_turn_around_left", 0,5, 0,7 );
+    self do_turn_anim( "move_turn_around_left", "move_run_turn_around_left", 0.5, 0.7 );
 }
 
 turn_180_right()
 {
-	self do_turn_anim( "move_turn_around_right", "move_run_turn_around_right", 0,5, 0,7 );
+    self do_turn_anim( "move_turn_around_right", "move_run_turn_around_right", 0.5, 0.7 );
 }
 
 move_out_of_turn()
@@ -74,7 +78,7 @@ move_out_of_turn()
     {
         debug_turn_print( "dog_turn::move_out_of_turn() - Setting move_run" );
         self setanimstate( "move_run" );
-		maps/mp/animscripts/shared::donotetracksfortime( 0,1, "done" );
+        maps\mp\animscripts\shared::donotetracksfortime( 0.1, "done" );
         debug_turn_print( "dog_turn::move_out_of_turn() - move_run wait 0.1 done " );
     }
     else
@@ -88,6 +92,7 @@ turn_90( deltayaw )
 {
     self animmode( "zonly_physics", 0 );
     debug_turn_print( "dog_turn::turn_90() deltaYaw: " + deltayaw );
+
     if ( deltayaw > 0 )
     {
         debug_turn_print( "dog_turn::turn_90() left", 1 );
@@ -104,6 +109,7 @@ turn_180( deltayaw )
 {
     self animmode( "zonly_physics", 0 );
     debug_turn_print( "dog_turn::turn_180() deltaYaw: " + deltayaw );
+
     if ( deltayaw > 0 )
     {
         debug_turn_print( "dog_turn::turn_180() left", 1 );

Multiplayer Core/common_mp/maps/mp/animscripts/shared.gsc

@@ -1,60 +1,55 @@
-#include maps/mp/_utility;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include common_scripts\utility;
+#include maps\mp\animscripts\utility;
+#include maps\mp\_utility;
 
 handledogsoundnotetracks( note )
 {
     if ( note == "sound_dogstep_run_default" )
-	{
+        return true;
-		return 1;
+
-	}
     prefix = getsubstr( note, 0, 5 );
+
     if ( prefix != "sound" )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 growling()
 {
-	return isDefined( self.script_growl );
+    return isdefined( self.script_growl );
 }
 
 handlenotetrack( note, flagname, customfunction, var1 )
 {
 /#
-	if ( getDvarInt( #"6EBEB982" ) )
+    if ( getdvarint( _hash_6EBEB982 ) )
-	{
+        println( "dog notetrack: " + flagname + " " + note + " " + gettime() );
-		println( "dog notetrack: " + flagname + " " + note + " " + getTime() );
 #/
-	}
     if ( isai( self ) && self.type == "dog" )
     {
         if ( handledogsoundnotetracks( note ) )
-		{
             return;
     }
-	}
+
     switch ( note )
     {
-		case "end":
-		case "finish":
         case "undefined":
+        case "finish":
+        case "end":
             return note;
         default:
-			if ( isDefined( customfunction ) )
+            if ( isdefined( customfunction ) )
-			{
-				if ( !isDefined( var1 ) )
             {
+                if ( !isdefined( var1 ) )
                     return [[ customfunction ]]( note );
-				}
                 else
-				{
                     return [[ customfunction ]]( note, var1 );
             }
-			}
+
-		}
+            break;
     }
 }
 
@@ -63,41 +58,42 @@ donotetracks( flagname, customfunction, var1 )
     for (;;)
     {
         self waittill( flagname, note );
-		if ( !isDefined( note ) )
+
-		{
+        if ( !isdefined( note ) )
             note = "undefined";
-		}
+
         val = self handlenotetrack( note, flagname, customfunction, var1 );
-		if ( isDefined( val ) )
+
-		{
+        if ( isdefined( val ) )
             return val;
     }
 }
-}
 
 donotetracksforeverproc( notetracksfunc, flagname, killstring, customfunction, var1 )
 {
-	if ( isDefined( killstring ) )
+    if ( isdefined( killstring ) )
-	{
         self endon( killstring );
-	}
+
     self endon( "killanimscript" );
+
     for (;;)
     {
-		time = getTime();
+        time = gettime();
         returnednote = [[ notetracksfunc ]]( flagname, customfunction, var1 );
-		timetaken = getTime() - time;
+        timetaken = gettime() - time;
-		if ( timetaken < 0,05 )
+
+        if ( timetaken < 0.05 )
         {
-			time = getTime();
+            time = gettime();
             returnednote = [[ notetracksfunc ]]( flagname, customfunction, var1 );
-			timetaken = getTime() - time;
+            timetaken = gettime() - time;
-			if ( timetaken < 0,05 )
+
+            if ( timetaken < 0.05 )
             {
 /#
-				println( getTime() + " mapsmpanimscriptsshared::DoNoteTracksForever is trying to cause an infinite loop on anim " + flagname + ", returned " + returnednote + "." );
+                println( gettime() + " mapsmpanimscriptsshared::DoNoteTracksForever is trying to cause an infinite loop on anim " + flagname + ", returned " + returnednote + "." );
 #/
-				wait ( 0,05 - timetaken );
+                wait( 0.05 - timetaken );
             }
         }
     }
@@ -123,7 +119,7 @@ donotetracksfortime( time, flagname, customfunction, var1 )
 
 donotetracksfortimeendnotify( time )
 {
-	wait time;
+    wait( time );
     self notify( "stop_notetracks" );
 }
 
@@ -131,14 +127,15 @@ trackloop()
 {
     players = get_players();
     deltachangeperframe = 5;
-	aimblendtime = 0,05;
+    aimblendtime = 0.05;
     prevyawdelta = 0;
     prevpitchdelta = 0;
     maxyawdeltachange = 5;
     maxpitchdeltachange = 5;
     pitchadd = 0;
     yawadd = 0;
-	if ( self.type != "dog" || self.type == "zombie" && self.type == "zombie_dog" )
+
+    if ( self.type == "dog" || self.type == "zombie" || self.type == "zombie_dog" )
     {
         domaxanglecheck = 0;
         self.shootent = self.enemy;
@@ -146,28 +143,28 @@ trackloop()
     else
     {
         domaxanglecheck = 1;
-		if ( self.a.script == "cover_crouch" && isDefined( self.a.covermode ) && self.a.covermode == "lean" )
+
-		{
+        if ( self.a.script == "cover_crouch" && isdefined( self.a.covermode ) && self.a.covermode == "lean" )
             pitchadd = -1 * anim.covercrouchleanpitch;
-		}
+
-		if ( self.a.script != "cover_left" && self.a.script == "cover_right" && isDefined( self.a.cornermode ) && self.a.cornermode == "lean" )
+        if ( ( self.a.script == "cover_left" || self.a.script == "cover_right" ) && isdefined( self.a.cornermode ) && self.a.cornermode == "lean" )
-		{
             yawadd = self.covernode.angles[1] - self.angles[1];
     }
-	}
+
     yawdelta = 0;
     pitchdelta = 0;
     firstframe = 1;
+
     for (;;)
     {
         incranimaimweight();
         selfshootatpos = ( self.origin[0], self.origin[1], self geteye()[2] );
         shootpos = undefined;
-		if ( isDefined( self.enemy ) )
+
-		{
+        if ( isdefined( self.enemy ) )
             shootpos = self.enemy getshootatpos();
-		}
+
-		if ( !isDefined( shootpos ) )
+        if ( !isdefined( shootpos ) )
         {
             yawdelta = 0;
             pitchdelta = 0;
@@ -175,13 +172,14 @@ trackloop()
         else
         {
             vectortoshootpos = shootpos - selfshootatpos;
-			anglestoshootpos = vectorToAngle( vectortoshootpos );
+            anglestoshootpos = vectortoangles( vectortoshootpos );
             pitchdelta = 360 - anglestoshootpos[0];
-			pitchdelta = angleClamp180( pitchdelta + pitchadd );
+            pitchdelta = angleclamp180( pitchdelta + pitchadd );
             yawdelta = self.angles[1] - anglestoshootpos[1];
-			yawdelta = angleClamp180( yawdelta + yawadd );
+            yawdelta = angleclamp180( yawdelta + yawadd );
         }
-		if ( domaxanglecheck || abs( yawdelta ) > 60 && abs( pitchdelta ) > 60 )
+
+        if ( domaxanglecheck && ( abs( yawdelta ) > 60 || abs( pitchdelta ) > 60 ) )
         {
             yawdelta = 0;
             pitchdelta = 0;
@@ -189,96 +187,78 @@ trackloop()
         else
         {
             if ( yawdelta > self.rightaimlimit )
-			{
                 yawdelta = self.rightaimlimit;
-			}
+            else if ( yawdelta < self.leftaimlimit )
-			else
-			{
-				if ( yawdelta < self.leftaimlimit )
-				{
                 yawdelta = self.leftaimlimit;
-				}
+
-			}
             if ( pitchdelta > self.upaimlimit )
-			{
                 pitchdelta = self.upaimlimit;
-				break;
+            else if ( pitchdelta < self.downaimlimit )
-			}
-			else
-			{
-				if ( pitchdelta < self.downaimlimit )
-				{
                 pitchdelta = self.downaimlimit;
         }
-			}
+
-		}
         if ( firstframe )
-		{
             firstframe = 0;
-		}
         else
         {
             yawdeltachange = yawdelta - prevyawdelta;
+
             if ( abs( yawdeltachange ) > maxyawdeltachange )
-			{
+                yawdelta = prevyawdelta + maxyawdeltachange * sign( yawdeltachange );
-				yawdelta = prevyawdelta + ( maxyawdeltachange * sign( yawdeltachange ) );
+
-			}
             pitchdeltachange = pitchdelta - prevpitchdelta;
+
             if ( abs( pitchdeltachange ) > maxpitchdeltachange )
-			{
+                pitchdelta = prevpitchdelta + maxpitchdeltachange * sign( pitchdeltachange );
-				pitchdelta = prevpitchdelta + ( maxpitchdeltachange * sign( pitchdeltachange ) );
-			}
         }
+
         prevyawdelta = yawdelta;
         prevpitchdelta = pitchdelta;
         updown = 0;
         leftright = 0;
+
         if ( yawdelta > 0 )
         {
 /#
             assert( yawdelta <= self.rightaimlimit );
 #/
-			weight = ( yawdelta / self.rightaimlimit ) * self.a.aimweight;
+            weight = yawdelta / self.rightaimlimit * self.a.aimweight;
             leftright = weight;
         }
-		else
+        else if ( yawdelta < 0 )
-		{
-			if ( yawdelta < 0 )
         {
 /#
             assert( yawdelta >= self.leftaimlimit );
 #/
-				weight = ( yawdelta / self.leftaimlimit ) * self.a.aimweight;
+            weight = yawdelta / self.leftaimlimit * self.a.aimweight;
             leftright = -1 * weight;
         }
-		}
+
         if ( pitchdelta > 0 )
         {
 /#
             assert( pitchdelta <= self.upaimlimit );
 #/
-			weight = ( pitchdelta / self.upaimlimit ) * self.a.aimweight;
+            weight = pitchdelta / self.upaimlimit * self.a.aimweight;
             updown = weight;
         }
-		else
+        else if ( pitchdelta < 0 )
-		{
-			if ( pitchdelta < 0 )
         {
 /#
             assert( pitchdelta >= self.downaimlimit );
 #/
-				weight = ( pitchdelta / self.downaimlimit ) * self.a.aimweight;
+            weight = pitchdelta / self.downaimlimit * self.a.aimweight;
             updown = -1 * weight;
         }
-		}
+
         self setaimanimweights( updown, leftright );
-		wait 0,05;
+        wait 0.05;
     }
 }
 
 setanimaimweight( goalweight, goaltime )
 {
-	if ( !isDefined( goaltime ) || goaltime <= 0 )
+    if ( !isdefined( goaltime ) || goaltime <= 0 )
     {
         self.a.aimweight = goalweight;
         self.a.aimweight_start = goalweight;
@@ -292,6 +272,7 @@ setanimaimweight( goalweight, goaltime )
         self.a.aimweight_end = goalweight;
         self.a.aimweight_transframes = int( goaltime * 20 );
     }
+
     self.a.aimweight_t = 0;
 }
 
@@ -300,7 +281,7 @@ incranimaimweight()
     if ( self.a.aimweight_t < self.a.aimweight_transframes )
     {
         self.a.aimweight_t++;
-		t = ( 1 * self.a.aimweight_t ) / self.a.aimweight_transframes;
+        t = 1.0 * self.a.aimweight_t / self.a.aimweight_transframes;
-		self.a.aimweight = ( self.a.aimweight_start * ( 1 - t ) ) + ( self.a.aimweight_end * t );
+        self.a.aimweight = self.a.aimweight_start * ( 1 - t ) + self.a.aimweight_end * t;
     }
 }

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/jump_down_40.gsc

@@ -1,9 +1,9 @@
-#include maps/mp/animscripts/traverse/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\traverse\shared;
 
 main()
 {
     if ( self.type == "dog" )
-	{
         dog_jump_down( 40, 3 );
 }
-}

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/jump_down_56.gsc

@@ -1,9 +1,9 @@
-#include maps/mp/animscripts/traverse/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\traverse\shared;
 
 main()
 {
     if ( self.type == "dog" )
-	{
         dog_jump_down( 56, 7 );
 }
-}

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/jump_down_96.gsc

@@ -1,9 +1,9 @@
-#include maps/mp/animscripts/traverse/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\traverse\shared;
 
 main()
 {
     if ( self.type == "dog" )
-	{
+        dog_jump_down_far( 96, 11, 0.65 );
-		dog_jump_down_far( 96, 11, 0,65 );
-	}
 }

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/mantle_on_40.gsc

@@ -1,9 +1,9 @@
-#include maps/mp/animscripts/traverse/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\traverse\shared;
 
 main()
 {
     if ( self.type == "dog" )
-	{
         dog_jump_up( 40, 3 );
 }
-}

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/mantle_on_56.gsc

@@ -1,9 +1,9 @@
-#include maps/mp/animscripts/traverse/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\traverse\shared;
 
 main()
 {
     if ( self.type == "dog" )
-	{
+        dog_jump_up( 56.0, 5 );
-		dog_jump_up( 56, 5 );
-	}
 }

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/mantle_on_80.gsc

@@ -1,9 +1,9 @@
-#include maps/mp/animscripts/traverse/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\traverse\shared;
 
 main()
 {
     if ( self.type == "dog" )
-	{
+        dog_jump_up_high( 80.0, 8 );
-		dog_jump_up_high( 80, 8 );
-	}
 }

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/mantle_on_96.gsc

@@ -1,9 +1,9 @@
-#include maps/mp/animscripts/traverse/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\traverse\shared;
 
 main()
 {
     if ( self.type == "dog" )
-	{
+        dog_jump_up_high( 96.0, 9 );
-		dog_jump_up_high( 96, 9 );
-	}
 }

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/mantle_over_40.gsc

@@ -1,9 +1,9 @@
-#include maps/mp/animscripts/traverse/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\traverse\shared;
 
 main()
 {
     if ( self.type == "dog" )
-	{
         dog_wall_and_window_hop( "traverse_window", 40 );
 }
-}

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/mantle_window_36.gsc

@@ -1,9 +1,9 @@
-#include maps/mp/animscripts/traverse/shared;
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\animscripts\traverse\shared;
 
 main()
 {
     if ( self.type == "dog" )
-	{
         dog_wall_and_window_hop( "traverse_window", 36 );
 }
-}

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/shared.gsc

@@ -1,12 +1,15 @@
-#include maps/mp/animscripts/shared;
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include maps\mp\animscripts\utility;
-#include maps/mp/animscripts/utility;
+#include maps\mp\_utility;
+#include common_scripts\utility;
+#include maps\mp\animscripts\shared;
 
 init_traverse()
 {
     point = getent( self.target, "targetname" );
-	if ( isDefined( point ) )
+
+    if ( isdefined( point ) )
     {
         self.traverse_height = point.origin[2];
         point delete();
@@ -14,12 +17,11 @@ init_traverse()
     else
     {
         point = getstruct( self.target, "targetname" );
-		if ( isDefined( point ) )
+
-		{
+        if ( isdefined( point ) )
             self.traverse_height = point.origin[2];
     }
 }
-}
 
 teleportthread( verticaloffset )
 {
@@ -28,12 +30,11 @@ teleportthread( verticaloffset )
     self endon( "endTeleportThread" );
     reps = 5;
     offset = ( 0, 0, verticaloffset / reps );
-	i = 0;
+
-	while ( i < reps )
+    for ( i = 0; i < reps; i++ )
     {
         self teleport( self.origin + offset );
-		wait 0,05;
+        wait 0.05;
-		i++;
     }
 }
 
@@ -42,30 +43,24 @@ teleportthreadex( verticaloffset, delay, frames )
     self endon( "killanimscript" );
     self notify( "endTeleportThread" );
     self endon( "endTeleportThread" );
+
     if ( verticaloffset == 0 )
-	{
         return;
-	}
+
-	wait delay;
+    wait( delay );
     amount = verticaloffset / frames;
-	if ( amount > 10 )
+
-	{
+    if ( amount > 10.0 )
-		amount = 10;
+        amount = 10.0;
-	}
+    else if ( amount < -10.0 )
-	else
+        amount = -10.0;
-	{
+
-		if ( amount < -10 )
-		{
-			amount = -10;
-		}
-	}
     offset = ( 0, 0, amount );
-	i = 0;
+
-	while ( i < frames )
+    for ( i = 0; i < frames; i++ )
     {
         self teleport( self.origin + offset );
-		wait 0,05;
+        wait 0.05;
-		i++;
     }
 }
 
@@ -76,24 +71,21 @@ dog_wall_and_window_hop( traversename, height )
     self traversemode( "noclip" );
     startnode = self getnegotiationstartnode();
 /#
-	assert( isDefined( startnode ) );
+    assert( isdefined( startnode ) );
 #/
     self orientmode( "face angle", startnode.angles[1] );
-	if ( isDefined( startnode.traverse_height ) )
+
+    if ( isdefined( startnode.traverse_height ) )
     {
         realheight = startnode.traverse_height - startnode.origin[2];
         self thread teleportthread( realheight - height );
     }
-	else
+    else if ( height != 36.0 )
-	{
+        self thread teleportthreadex( height - 36.0, 0.2, 7 );
-		if ( height != 36 )
+
-		{
-			self thread teleportthreadex( height - 36, 0,2, 7 );
-		}
-	}
     debug_anim_print( "traverse::dog_wall_and_window_hop() - Setting " + traversename );
     self setanimstate( traversename );
-	maps/mp/animscripts/shared::donotetracksfortime( 1, "done" );
+    maps\mp\animscripts\shared::donotetracksfortime( 1.0, "done" );
     debug_anim_print( "traverse::dog_wall_and_window_hop() - " + traversename );
     self.traversecomplete = 1;
 }
@@ -102,30 +94,27 @@ dog_jump_down( height, frames, time )
 {
     self endon( "killanimscript" );
     self traversemode( "noclip" );
-	if ( !isDefined( time ) )
+
-	{
+    if ( !isdefined( time ) )
-		time = 0,3;
+        time = 0.3;
-	}
+
     startnode = self getnegotiationstartnode();
 /#
-	assert( isDefined( startnode ) );
+    assert( isdefined( startnode ) );
 #/
     self orientmode( "face angle", startnode.angles[1] );
-	if ( isDefined( startnode.traverse_height ) )
+
+    if ( isdefined( startnode.traverse_height ) )
     {
         realheight = startnode.traverse_height - startnode.origin[2];
         self thread teleportthread( realheight - height );
     }
-	else
+    else if ( height != 40.0 )
-	{
+        self thread teleportthreadex( height - 40.0, 0.1, frames );
-		if ( height != 40 )
+
-		{
-			self thread teleportthreadex( height - 40, 0,1, frames );
-		}
-	}
     debug_anim_print( "traverse::dog_jump_down() - Setting traverse_jump_down_40" );
     self setanimstate( "traverse_jump_down_40" );
-	maps/mp/animscripts/shared::donotetracksfortime( time, "done" );
+    maps\mp\animscripts\shared::donotetracksfortime( time, "done" );
     debug_anim_print( "traverse::dog_jump_down() - traverse_jump_down_40 " );
     self traversemode( "gravity" );
     self.traversecomplete = 1;
@@ -135,30 +124,27 @@ dog_jump_down_far( height, frames, time )
 {
     self endon( "killanimscript" );
     self traversemode( "noclip" );
-	if ( !isDefined( time ) )
+
-	{
+    if ( !isdefined( time ) )
-		time = 0,3;
+        time = 0.3;
-	}
+
     startnode = self getnegotiationstartnode();
 /#
-	assert( isDefined( startnode ) );
+    assert( isdefined( startnode ) );
 #/
     self orientmode( "face angle", startnode.angles[1] );
-	if ( isDefined( startnode.traverse_height ) )
+
+    if ( isdefined( startnode.traverse_height ) )
     {
         realheight = startnode.traverse_height - startnode.origin[2];
         self thread teleportthread( realheight - height );
     }
-	else
+    else if ( height != 80.0 )
-	{
+        self thread teleportthreadex( 80.0 - height, 0.1, frames );
-		if ( height != 80 )
+
-		{
-			self thread teleportthreadex( 80 - height, 0,1, frames );
-		}
-	}
     debug_anim_print( "traverse::dog_jump_down() - Setting traverse_jump_down_80" );
     self setanimstate( "traverse_jump_down_80" );
-	maps/mp/animscripts/shared::donotetracksfortime( time, "done" );
+    maps\mp\animscripts\shared::donotetracksfortime( time, "done" );
     debug_anim_print( "traverse::dog_jump_down() - traverse_jump_down_80 " );
     self traversemode( "gravity" );
     self.traversecomplete = 1;
@@ -170,24 +156,21 @@ dog_jump_up( height, frames )
     self traversemode( "noclip" );
     startnode = self getnegotiationstartnode();
 /#
-	assert( isDefined( startnode ) );
+    assert( isdefined( startnode ) );
 #/
     self orientmode( "face angle", startnode.angles[1] );
-	if ( isDefined( startnode.traverse_height ) )
+
+    if ( isdefined( startnode.traverse_height ) )
     {
         realheight = startnode.traverse_height - startnode.origin[2];
         self thread teleportthread( realheight - height );
     }
-	else
+    else if ( height != 40.0 )
-	{
+        self thread teleportthreadex( height - 40.0, 0.2, frames );
-		if ( height != 40 )
+
-		{
-			self thread teleportthreadex( height - 40, 0,2, frames );
-		}
-	}
     debug_anim_print( "traverse::dog_jump_up() - Setting traverse_jump_up_40" );
     self setanimstate( "traverse_jump_up_40" );
-	maps/mp/animscripts/shared::donotetracksfortime( 0,5, "done" );
+    maps\mp\animscripts\shared::donotetracksfortime( 0.5, "done" );
     debug_anim_print( "traverse::dog_jump_up() - traverse_jump_up_40  " );
     self traversemode( "gravity" );
     self.traversecomplete = 1;
@@ -203,24 +186,21 @@ dog_jump_up_high( height, frames )
     self traversemode( "noclip" );
     startnode = self getnegotiationstartnode();
 /#
-	assert( isDefined( startnode ) );
+    assert( isdefined( startnode ) );
 #/
     self orientmode( "face angle", startnode.angles[1] );
-	if ( isDefined( startnode.traverse_height ) )
+
+    if ( isdefined( startnode.traverse_height ) )
     {
         realheight = startnode.traverse_height - startnode.origin[2];
-		self thread teleportthreadex( height - 80, 0,2, frames );
+        self thread teleportthreadex( height - 80, 0.2, frames );
-	}
-	else
-	{
-		if ( height != 80 )
-		{
-			self thread teleportthreadex( height - 80, 0,2, frames );
-		}
     }
+    else if ( height != 80.0 )
+        self thread teleportthreadex( height - 80.0, 0.2, frames );
+
     debug_anim_print( "traverse::dog_jump_up_80() - Setting traverse_jump_up_80" );
     self setanimstate( "traverse_jump_up_80" );
-	maps/mp/animscripts/shared::donotetracksfortime( 0,6, "done" );
+    maps\mp\animscripts\shared::donotetracksfortime( 0.6, "done" );
     debug_anim_print( "traverse::dog_jump_up_80() - traverse_jump_up_80 " );
     self traversemode( "gravity" );
     self.traversecomplete = 1;

Multiplayer Core/common_mp/maps/mp/animscripts/traverse/through_hole_42.gsc

@@ -1,6 +1,8 @@
-#include maps/mp/animscripts/shared;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/animscripts/traverse/shared;
+#include maps\mp\animscripts\traverse\shared;
+#include maps\mp\animscripts\utility;
+#include maps\mp\animscripts\shared;
 
 main()
 {
@@ -9,17 +11,19 @@ main()
     self traversemode( "noclip" );
     startnode = self getnegotiationstartnode();
 /#
-	assert( isDefined( startnode ) );
+    assert( isdefined( startnode ) );
 #/
     self orientmode( "face angle", startnode.angles[1] );
-	if ( isDefined( startnode.traverse_height ) )
+
+    if ( isdefined( startnode.traverse_height ) )
     {
         realheight = startnode.traverse_height - startnode.origin[2];
         self thread teleportthread( realheight );
     }
+
     debug_anim_print( "traverse::through_hole()" );
     self setanimstate( "traverse_through_hole_42" );
-	maps/mp/animscripts/shared::donotetracksfortime( 1, "done" );
+    maps\mp\animscripts\shared::donotetracksfortime( 1.0, "done" );
     debug_anim_print( "traverse::through_hole()" );
     self.traversecomplete = 1;
 }

Multiplayer Core/common_mp/maps/mp/animscripts/utility.gsc

@@ -1,3 +1,5 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
 anim_get_dvar_int( dvar, def )
 {
@@ -6,10 +8,8 @@ anim_get_dvar_int( dvar, def )
 
 anim_get_dvar( dvar, def )
 {
-	if ( getDvar( dvar ) != "" )
+    if ( getdvar( dvar ) != "" )
-	{
+        return getdvarfloat( dvar );
-		return getDvarFloat( dvar );
-	}
     else
     {
         setdvar( dvar, def );
@@ -22,39 +22,28 @@ set_orient_mode( mode, val1 )
 /#
     if ( level.dog_debug_orient == self getentnum() )
     {
-		if ( isDefined( val1 ) )
+        if ( isdefined( val1 ) )
-		{
+            println( "DOG:  Setting orient mode: " + mode + " " + val1 + " " + gettime() );
-			println( "DOG:  Setting orient mode: " + mode + " " + val1 + " " + getTime() );
-		}
         else
-		{
+            println( "DOG:  Setting orient mode: " + mode + " " + gettime() );
-			println( "DOG:  Setting orient mode: " + mode + " " + getTime() );
+    }
 #/
-		}
+    if ( isdefined( val1 ) )
-	}
-	if ( isDefined( val1 ) )
-	{
         self orientmode( mode, val1 );
-	}
     else
-	{
         self orientmode( mode );
 }
-}
 
 debug_anim_print( text )
 {
 /#
     if ( level.dog_debug_anims )
-	{
+        println( text + " " + gettime() );
-		println( ( text + " " ) + getTime() );
+
-	}
     if ( level.dog_debug_anims_ent == self getentnum() )
-	{
+        println( text + " " + gettime() );
-		println( ( text + " " ) + getTime() );
 #/
 }
-}
 
 debug_turn_print( text, line )
 {
@@ -62,17 +51,17 @@ debug_turn_print( text, line )
     if ( level.dog_debug_turns == self getentnum() )
     {
         duration = 200;
-		currentyawcolor = ( 1, 0, 1 );
+        currentyawcolor = ( 1, 1, 1 );
-		lookaheadyawcolor = ( 1, 0, 1 );
+        lookaheadyawcolor = ( 1, 0, 0 );
-		desiredyawcolor = ( 1, 0, 1 );
+        desiredyawcolor = ( 1, 1, 0 );
-		currentyaw = angleClamp180( self.angles[ 1 ] );
+        currentyaw = angleclamp180( self.angles[1] );
-		desiredyaw = angleClamp180( self.desiredangle );
+        desiredyaw = angleclamp180( self.desiredangle );
         lookaheaddir = self.lookaheaddir;
-		lookaheadangles = vectorToAngle( lookaheaddir );
+        lookaheadangles = vectortoangles( lookaheaddir );
-		lookaheadyaw = angleClamp180( lookaheadangles[ 1 ] );
+        lookaheadyaw = angleclamp180( lookaheadangles[1] );
-		println( ( text + " " ) + getTime() + " cur: " + currentyaw + " look: " + lookaheadyaw + " desired: " + desiredyaw );
+        println( text + " " + gettime() + " cur: " + currentyaw + " look: " + lookaheadyaw + " desired: " + desiredyaw );
-#/
     }
+#/
 }
 
 debug_allow_movement()
@@ -95,72 +84,55 @@ current_yaw_line_debug( duration )
 {
 /#
     currentyawcolor = [];
-	currentyawcolor[ 0 ] = ( 1, 0, 1 );
+    currentyawcolor[0] = ( 0, 0, 1 );
     currentyawcolor[1] = ( 1, 0, 1 );
     current_color_index = 0;
-	start_time = getTime();
+    start_time = gettime();
-	if ( !isDefined( level.lastdebugheight ) )
+
-	{
+    if ( !isdefined( level.lastdebugheight ) )
         level.lastdebugheight = 15;
-	}
+
-	while ( ( getTime() - start_time ) < 1000 )
+    while ( gettime() - start_time < 1000 )
     {
         pos1 = ( self.origin[0], self.origin[1], self.origin[2] + level.lastdebugheight );
-		pos2 = pos1 + vectorScale( anglesToForward( self.angles ), ( current_color_index + 1 ) * 10 );
+        pos2 = pos1 + vectorscale( anglestoforward( self.angles ), ( current_color_index + 1 ) * 10 );
-		line( pos1, pos2, currentyawcolor[ current_color_index ], 0,3, 1, duration );
+        line( pos1, pos2, currentyawcolor[current_color_index], 0.3, 1, duration );
         current_color_index = ( current_color_index + 1 ) % currentyawcolor.size;
-		wait 0,05;
+        wait 0.05;
     }
+
     if ( level.lastdebugheight == 15 )
-	{
         level.lastdebugheight = 30;
-	}
     else
-	{
         level.lastdebugheight = 15;
 #/
 }
-}
 
 getanimdirection( damageyaw )
 {
     if ( damageyaw > 135 || damageyaw <= -135 )
-	{
         return "front";
-	}
+    else if ( damageyaw > 45 && damageyaw <= 135 )
-	else
-	{
-		if ( damageyaw > 45 && damageyaw <= 135 )
-		{
         return "right";
-		}
+    else if ( damageyaw > -45 && damageyaw <= 45 )
-		else
-		{
-			if ( damageyaw > -45 && damageyaw <= 45 )
-			{
         return "back";
-			}
     else
-			{
         return "left";
-			}
+
-		}
-	}
     return "front";
 }
 
 setfootstepeffect( name, fx )
 {
 /#
-	assert( isDefined( name ), "Need to define the footstep surface type." );
+    assert( isdefined( name ), "Need to define the footstep surface type." );
 #/
 /#
-	assert( isDefined( fx ), "Need to define the mud footstep effect." );
+    assert( isdefined( fx ), "Need to define the mud footstep effect." );
 #/
-	if ( !isDefined( anim.optionalstepeffects ) )
+    if ( !isdefined( anim.optionalstepeffects ) )
-	{
         anim.optionalstepeffects = [];
-	}
+
     anim.optionalstepeffects[anim.optionalstepeffects.size] = name;
     level._effect["step_" + name] = fx;
 }

Multiplayer Core/patch_mp/codescripts/character_mp.gsc

@@ -1,20 +1,19 @@
-//checked includes matches cerberus output
+// T6 GSC SOURCE
-#include codescripts/character;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include codescripts\character;
 
-setmodelfromarray( a ) //checked matches cerberus output
+setmodelfromarray( a )
 {
     self setmodel( a[randomint( a.size )] );
 }
 
-precachemodelarray( a ) //checked changed to match cerberus output
+precachemodelarray( a )
 {
     for ( i = 0; i < a.size; i++ )
-	{
         precachemodel( a[i] );
 }
-}
 
-attachfromarray( a ) //checked matches cerberus output
+attachfromarray( a )
 {
-	self attach( codescripts/character::randomelement( a ), "", 1 );
+    self attach( codescripts\character::randomelement( a ), "", 1 );
 }

Multiplayer Core/patch_mp/codescripts/delete.gsc

@@ -1,27 +1,26 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
-main() //checked changed to match cerberus output
+main()
 {
-	/*
 /#
-	assert( isDefined( self ) );
+    assert( isdefined( self ) );
 #/
-	*/
     wait 0;
-	if ( isDefined( self ) )
+
+    if ( isdefined( self ) )
     {
-		/*
 /#
-		if ( isDefined( self.classname ) )
+        if ( isdefined( self.classname ) )
         {
             if ( self.classname == "trigger_once" || self.classname == "trigger_radius" || self.classname == "trigger_multiple" )
             {
                 println( "" );
                 println( "*** trigger debug: delete.gsc is deleting trigger with ent#: " + self getentitynumber() + " at origin: " + self.origin );
                 println( "" );
+            }
+        }
 #/
-			}
-		}
-		*/
         self delete();
     }
 }

Multiplayer Core/patch_mp/codescripts/struct.gsc

@@ -1,29 +1,29 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
-initstructs() //checked matches cerberus output
+initstructs()
 {
     level.struct = [];
 }
 
-createstruct() //checked matches cerberus output
+createstruct()
 {
     struct = spawnstruct();
     level.struct[level.struct.size] = struct;
     return struct;
 }
 
-findstruct( position ) //checked changed to match cerberus output see info.md
+findstruct( position )
 {
-	foreach ( key in level.struct_class_names )
+    foreach ( key, _ in level.struct_class_names )
     {
-		foreach ( s_array in level.struct_class_names[ key ] )
+        foreach ( val, s_array in level.struct_class_names[key] )
         {
             foreach ( struct in s_array )
             {
                 if ( distancesquared( struct.origin, position ) < 1 )
-				{
                     return struct;
             }
         }
     }
 }
-}

Multiplayer Core/patch_mp/maps/mp/_acousticsensor.gsc

@@ -1,159 +1,149 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_damagefeedback;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/gametypes/_globallogic_player;
+#include common_scripts\utility;
-#include maps/mp/_scoreevents;
+#include maps\mp\gametypes\_weaponobjects;
-#include maps/mp/_challenges;
+#include maps\mp\_utility;
-#include maps/mp/killstreaks/_emp;
+#include maps\mp\killstreaks\_emp;
-#include maps/mp/_utility;
+#include maps\mp\_challenges;
-#include maps/mp/gametypes/_weaponobjects;
+#include maps\mp\_scoreevents;
-#include common_scripts/utility;
+#include maps\mp\gametypes\_globallogic_player;
+#include maps\mp\gametypes\_damagefeedback;
 
-init() //checked matches cerberus output
+init()
 {
     level._effect["acousticsensor_enemy_light"] = loadfx( "misc/fx_equip_light_red" );
     level._effect["acousticsensor_friendly_light"] = loadfx( "misc/fx_equip_light_green" );
 }
 
-createacousticsensorwatcher() //checked matches cerberus output
+createacousticsensorwatcher()
 {
-	watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "acoustic_sensor", "acoustic_sensor_mp", self.team );
+    watcher = self maps\mp\gametypes\_weaponobjects::createuseweaponobjectwatcher( "acoustic_sensor", "acoustic_sensor_mp", self.team );
     watcher.onspawn = ::onspawnacousticsensor;
     watcher.detonate = ::acousticsensordetonate;
-	watcher.stun = maps/mp/gametypes/_weaponobjects::weaponstun;
+    watcher.stun = maps\mp\gametypes\_weaponobjects::weaponstun;
     watcher.stuntime = 5;
     watcher.reconmodel = "t5_weapon_acoustic_sensor_world_detect";
     watcher.hackable = 1;
     watcher.ondamage = ::watchacousticsensordamage;
 }
 
-onspawnacousticsensor( watcher, player ) //checked matches cerberus output
+onspawnacousticsensor( watcher, player )
 {
     self endon( "death" );
-	self thread maps/mp/gametypes/_weaponobjects::onspawnuseweaponobject( watcher, player );
+    self thread maps\mp\gametypes\_weaponobjects::onspawnuseweaponobject( watcher, player );
     player.acousticsensor = self;
     self setowner( player );
     self setteam( player.team );
     self.owner = player;
     self playloopsound( "fly_acoustic_sensor_lp" );
-	if ( !self maps/mp/_utility::ishacked() )
+
-	{
+    if ( !self maps\mp\_utility::ishacked() )
         player addweaponstat( "acoustic_sensor_mp", "used", 1 );
-	}
+
     self thread watchshutdown( player, self.origin );
 }
 
-acousticsensordetonate( attacker, weaponname ) //checked matches cerberus output
+acousticsensordetonate( attacker, weaponname )
 {
-	from_emp = maps/mp/killstreaks/_emp::isempweapon( weaponname );
+    from_emp = maps\mp\killstreaks\_emp::isempweapon( weaponname );
+
     if ( !from_emp )
-	{
         playfx( level._equipment_explode_fx, self.origin );
-	}
+
-	if ( isDefined( attacker ) )
+    if ( isdefined( attacker ) )
     {
         if ( self.owner isenemyplayer( attacker ) )
         {
-			attacker maps/mp/_challenges::destroyedequipment( weaponname );
+            attacker maps\mp\_challenges::destroyedequipment( weaponname );
-			maps/mp/_scoreevents::processscoreevent( "destroyed_motion_sensor", attacker, self.owner, weaponname );
+            maps\mp\_scoreevents::processscoreevent( "destroyed_motion_sensor", attacker, self.owner, weaponname );
         }
     }
+
     playsoundatposition( "dst_equipment_destroy", self.origin );
     self destroyent();
 }
 
-destroyent() //checked matches cerberus output
+destroyent()
 {
     self delete();
 }
 
-watchshutdown( player, origin ) //checked matches cerberus output
+watchshutdown( player, origin )
 {
     self waittill_any( "death", "hacked" );
-	if ( isDefined( player ) )
+
-	{
+    if ( isdefined( player ) )
         player.acousticsensor = undefined;
 }
-}
 
-watchacousticsensordamage( watcher ) //checked changed to match cerberus output
+watchacousticsensordamage( watcher )
 {
     self endon( "death" );
     self endon( "hacked" );
     self setcandamage( 1 );
     damagemax = 100;
-	if ( !self maps/mp/_utility::ishacked() )
+
-	{
+    if ( !self maps\mp\_utility::ishacked() )
         self.damagetaken = 0;
-	}
+
-	while ( 1 )
+    while ( true )
     {
         self.maxhealth = 100000;
         self.health = self.maxhealth;
+
         self waittill( "damage", damage, attacker, direction, point, type, tagname, modelname, partname, weaponname, idflags );
-		if ( !isDefined( attacker ) || !isplayer( attacker ) )
+
-		{
+        if ( !isdefined( attacker ) || !isplayer( attacker ) )
             continue;
-		}
+
         if ( level.teambased && attacker.team == self.owner.team && attacker != self.owner )
-		{
             continue;
-		}
+
-		if ( isDefined( weaponname ) )
+        if ( isdefined( weaponname ) )
         {
             switch ( weaponname )
             {
-				case "concussion_grenade_mp":
                 case "flash_grenade_mp":
+                case "concussion_grenade_mp":
                     if ( watcher.stuntime > 0 )
-					{
+                        self thread maps\mp\gametypes\_weaponobjects::stunstart( watcher, watcher.stuntime );
-						self thread maps/mp/gametypes/_weaponobjects::stunstart( watcher, watcher.stuntime );
+
-					}
                     if ( level.teambased && self.owner.team != attacker.team )
                     {
-						if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-						{
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-							attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
-						}
                     }
                     else if ( !level.teambased && self.owner != attacker )
                     {
-						if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-						{
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-							attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
-						}
                     }
+
                     continue;
                 case "emp_grenade_mp":
                     damage = damagemax;
                 default:
-					if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                    if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-					{
+                        attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-						attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
+
-					}
                     break;
             }
         }
         else
-		{
             weaponname = "";
-		}
+
-		if ( isplayer( attacker ) && level.teambased && isDefined( attacker.team ) && self.owner.team == attacker.team && attacker != self.owner )
+        if ( isplayer( attacker ) && level.teambased && isdefined( attacker.team ) && self.owner.team == attacker.team && attacker != self.owner )
-		{
             continue;
-		}
+
         if ( type == "MOD_MELEE" )
-		{
             self.damagetaken = damagemax;
-		}
         else
-		{
             self.damagetaken += damage;
-		}
+
         if ( self.damagetaken >= damagemax )
         {
-			watcher thread maps/mp/gametypes/_weaponobjects::waitanddetonate( self, 0, attacker, weaponname );
+            watcher thread maps\mp\gametypes\_weaponobjects::waitanddetonate( self, 0.0, attacker, weaponname );
             return;
         }
     }
 }
-

Multiplayer Core/patch_mp/maps/mp/_ambientpackage.gsc

@@ -0,0 +1,3 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+

Multiplayer Core/patch_mp/maps/mp/_art.gsc

@@ -1,37 +1,32 @@
-#include maps/mp/_utility;
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include common_scripts\utility;
+#include maps\mp\_utility;
 
 main()
 {
 /#
-	if ( getDvar( "scr_art_tweak" ) == "" || getDvar( "scr_art_tweak" ) == "0" )
+    if ( getdvar( "scr_art_tweak" ) == "" || getdvar( "scr_art_tweak" ) == "0" )
-	{
         setdvar( "scr_art_tweak", 0 );
-	}
+
-	if ( getDvar( "scr_dof_enable" ) == "" )
+    if ( getdvar( "scr_dof_enable" ) == "" )
-	{
         setdvar( "scr_dof_enable", "1" );
-	}
+
-	if ( getDvar( "scr_cinematic_autofocus" ) == "" )
+    if ( getdvar( "scr_cinematic_autofocus" ) == "" )
-	{
         setdvar( "scr_cinematic_autofocus", "1" );
-	}
+
-	if ( getDvar( "scr_art_visionfile" ) == "" && isDefined( level.script ) )
+    if ( getdvar( "scr_art_visionfile" ) == "" && isdefined( level.script ) )
-	{
         setdvar( "scr_art_visionfile", level.script );
-	}
+
-	if ( getDvar( "debug_reflection" ) == "" )
+    if ( getdvar( "debug_reflection" ) == "" )
-	{
         setdvar( "debug_reflection", "0" );
-	}
+
-	if ( getDvar( "debug_reflection_matte" ) == "" )
+    if ( getdvar( "debug_reflection_matte" ) == "" )
-	{
         setdvar( "debug_reflection_matte", "0" );
-	}
+
-	if ( getDvar( "debug_color_pallete" ) == "" )
+    if ( getdvar( "debug_color_pallete" ) == "" )
-	{
         setdvar( "debug_color_pallete", "0" );
-	}
+
     precachemodel( "test_sphere_lambert" );
     precachemodel( "test_macbeth_chart" );
     precachemodel( "test_macbeth_chart_unlit" );
@@ -40,7 +35,7 @@ main()
     level thread debug_reflection_matte();
     level thread debug_color_pallete();
 #/
-	if ( !isDefined( level.dofdefault ) )
+    if ( !isdefined( level.dofdefault ) )
     {
         level.dofdefault["nearStart"] = 0;
         level.dofdefault["nearEnd"] = 1;
@@ -49,23 +44,21 @@ main()
         level.dofdefault["nearBlur"] = 6;
         level.dofdefault["farBlur"] = 0;
     }
+
     level.curdof = ( level.dofdefault["farStart"] - level.dofdefault["nearEnd"] ) / 2;
 /#
     thread tweakart();
 #/
-	if ( !isDefined( level.script ) )
+    if ( !isdefined( level.script ) )
-	{
+        level.script = tolower( getdvar( "mapname" ) );
-		level.script = tolower( getDvar( "mapname" ) );
-	}
 }
 
 artfxprintln( file, string )
 {
 /#
     if ( file == -1 )
-	{
         return;
-	}
+
     fprintln( file, string );
 #/
 }
@@ -74,38 +67,35 @@ strtok_loc( string, par1 )
 {
     stringlist = [];
     indexstring = "";
-	i = 0;
+
-	while ( i < string.size )
+    for ( i = 0; i < string.size; i++ )
     {
         if ( string[i] == " " )
         {
             stringlist[stringlist.size] = indexstring;
             indexstring = "";
-			i++;
             continue;
         }
-		else
+
-		{
         indexstring += string[i];
     }
-		i++;
+
-	}
     if ( indexstring.size )
-	{
         stringlist[stringlist.size] = indexstring;
-	}
+
     return stringlist;
 }
 
 setfogsliders()
 {
-	fogall = strtok_loc( getDvar( "g_fogColorReadOnly" ), " " );
+    fogall = strtok_loc( getdvar( "g_fogColorReadOnly" ), " " );
     red = fogall[0];
     green = fogall[1];
     blue = fogall[2];
-	halfplane = getDvar( "g_fogHalfDistReadOnly" );
+    halfplane = getdvar( "g_fogHalfDistReadOnly" );
-	nearplane = getDvar( "g_fogStartDistReadOnly" );
+    nearplane = getdvar( "g_fogStartDistReadOnly" );
-	if ( isDefined( red ) && isDefined( green ) || !isDefined( blue ) && !isDefined( halfplane ) )
+
+    if ( !isdefined( red ) || !isdefined( green ) || !isdefined( blue ) || !isdefined( halfplane ) )
     {
         red = 1;
         green = 1;
@@ -113,25 +103,26 @@ setfogsliders()
         halfplane = 10000001;
         nearplane = 10000000;
     }
+
     setdvar( "scr_fog_exp_halfplane", halfplane );
     setdvar( "scr_fog_nearplane", nearplane );
-	setdvar( "scr_fog_color", ( red + " " ) + green + " " + blue );
+    setdvar( "scr_fog_color", red + " " + green + " " + blue );
 }
 
 tweakart()
 {
 /#
-	if ( !isDefined( level.tweakfile ) )
+    if ( !isdefined( level.tweakfile ) )
-	{
         level.tweakfile = 0;
-	}
+
-	if ( getDvar( "scr_fog_baseheight" ) == "" )
+    if ( getdvar( "scr_fog_baseheight" ) == "" )
     {
         setdvar( "scr_fog_exp_halfplane", "500" );
         setdvar( "scr_fog_exp_halfheight", "500" );
         setdvar( "scr_fog_nearplane", "0" );
         setdvar( "scr_fog_baseheight", "0" );
     }
+
     setdvar( "scr_fog_fraction", "1.0" );
     setdvar( "scr_art_dump", "0" );
     setdvar( "scr_art_sun_fog_dir_set", "0" );
@@ -144,13 +135,15 @@ tweakart()
     file = undefined;
     filename = undefined;
     tweak_toggle = 1;
+
     for (;;)
     {
-		while ( getDvarInt( "scr_art_tweak" ) == 0 )
+        while ( getdvarint( "scr_art_tweak" ) == 0 )
         {
             tweak_toggle = 1;
-			wait 0,05;
+            wait 0.05;
         }
+
         if ( tweak_toggle )
         {
             tweak_toggle = 0;
@@ -170,52 +163,56 @@ tweakart()
             setdvar( "scr_sun_fog_end_angle", fogsettings[15] );
             setdvar( "scr_fog_max_opacity", fogsettings[16] );
         }
-		level.fogexphalfplane = getDvarFloat( "scr_fog_exp_halfplane" );
+
-		level.fogexphalfheight = getDvarFloat( "scr_fog_exp_halfheight" );
+        level.fogexphalfplane = getdvarfloat( "scr_fog_exp_halfplane" );
-		level.fognearplane = getDvarFloat( "scr_fog_nearplane" );
+        level.fogexphalfheight = getdvarfloat( "scr_fog_exp_halfheight" );
-		level.fogbaseheight = getDvarFloat( "scr_fog_baseheight" );
+        level.fognearplane = getdvarfloat( "scr_fog_nearplane" );
-		level.fogcolorred = getDvarColorRed( "scr_fog_color" );
+        level.fogbaseheight = getdvarfloat( "scr_fog_baseheight" );
-		level.fogcolorgreen = getDvarColorGreen( "scr_fog_color" );
+        level.fogcolorred = getdvarcolorred( "scr_fog_color" );
-		level.fogcolorblue = getDvarColorBlue( "scr_fog_color" );
+        level.fogcolorgreen = getdvarcolorgreen( "scr_fog_color" );
-		level.fogcolorscale = getDvarFloat( "scr_fog_color_scale" );
+        level.fogcolorblue = getdvarcolorblue( "scr_fog_color" );
-		level.sunfogcolorred = getDvarColorRed( "scr_sun_fog_color" );
+        level.fogcolorscale = getdvarfloat( "scr_fog_color_scale" );
-		level.sunfogcolorgreen = getDvarColorGreen( "scr_sun_fog_color" );
+        level.sunfogcolorred = getdvarcolorred( "scr_sun_fog_color" );
-		level.sunfogcolorblue = getDvarColorBlue( "scr_sun_fog_color" );
+        level.sunfogcolorgreen = getdvarcolorgreen( "scr_sun_fog_color" );
-		level.sunstartangle = getDvarFloat( "scr_sun_fog_start_angle" );
+        level.sunfogcolorblue = getdvarcolorblue( "scr_sun_fog_color" );
-		level.sunendangle = getDvarFloat( "scr_sun_fog_end_angle" );
+        level.sunstartangle = getdvarfloat( "scr_sun_fog_start_angle" );
-		level.fogmaxopacity = getDvarFloat( "scr_fog_max_opacity" );
+        level.sunendangle = getdvarfloat( "scr_sun_fog_end_angle" );
-		if ( getDvarInt( "scr_art_sun_fog_dir_set" ) )
+        level.fogmaxopacity = getdvarfloat( "scr_fog_max_opacity" );
+
+        if ( getdvarint( "scr_art_sun_fog_dir_set" ) )
         {
             setdvar( "scr_art_sun_fog_dir_set", "0" );
             println( "Setting sun fog direction to facing of player" );
             players = get_players();
-			dir = vectornormalize( anglesToForward( players[ 0 ] getplayerangles() ) );
+            dir = vectornormalize( anglestoforward( players[0] getplayerangles() ) );
             level.fogsundir = [];
             level.fogsundir[0] = dir[0];
             level.fogsundir[1] = dir[1];
             level.fogsundir[2] = dir[2];
         }
+
         fovslidercheck();
         dumpsettings();
-		if ( !getDvarInt( "scr_fog_disable" ) )
+
+        if ( !getdvarint( _hash_DBBD8F3B ) )
         {
-			if ( !isDefined( level.fogsundir ) )
+            if ( !isdefined( level.fogsundir ) )
             {
                 level.fogsundir = [];
                 level.fogsundir[0] = 1;
                 level.fogsundir[1] = 0;
                 level.fogsundir[2] = 0;
             }
+
             setvolfog( level.fognearplane, level.fogexphalfplane, level.fogexphalfheight, level.fogbaseheight, level.fogcolorred, level.fogcolorgreen, level.fogcolorblue, level.fogcolorscale, level.sunfogcolorred, level.sunfogcolorgreen, level.sunfogcolorblue, level.fogsundir[0], level.fogsundir[1], level.fogsundir[2], level.sunstartangle, level.sunendangle, 0, level.fogmaxopacity );
         }
         else
-		{
             setexpfog( 100000000, 100000001, 0, 0, 0, 0 );
+
+        wait 0.1;
     }
-		wait 0,1;
 #/
 }
-}
 
 fovslidercheck()
 {
@@ -224,26 +221,31 @@ fovslidercheck()
         level.dofdefault["nearStart"] = level.dofdefault["nearEnd"] - 1;
         setdvar( "scr_dof_nearStart", level.dofdefault["nearStart"] );
     }
+
     if ( level.dofdefault["nearEnd"] <= level.dofdefault["nearStart"] )
     {
         level.dofdefault["nearEnd"] = level.dofdefault["nearStart"] + 1;
         setdvar( "scr_dof_nearEnd", level.dofdefault["nearEnd"] );
     }
+
     if ( level.dofdefault["farStart"] >= level.dofdefault["farEnd"] )
     {
         level.dofdefault["farStart"] = level.dofdefault["farEnd"] - 1;
         setdvar( "scr_dof_farStart", level.dofdefault["farStart"] );
     }
+
     if ( level.dofdefault["farEnd"] <= level.dofdefault["farStart"] )
     {
         level.dofdefault["farEnd"] = level.dofdefault["farStart"] + 1;
         setdvar( "scr_dof_farEnd", level.dofdefault["farEnd"] );
     }
+
     if ( level.dofdefault["farBlur"] >= level.dofdefault["nearBlur"] )
     {
-		level.dofdefault[ "farBlur" ] = level.dofdefault[ "nearBlur" ] - 0,1;
+        level.dofdefault["farBlur"] = level.dofdefault["nearBlur"] - 0.1;
         setdvar( "scr_dof_farBlur", level.dofdefault["farBlur"] );
     }
+
     if ( level.dofdefault["farStart"] <= level.dofdefault["nearEnd"] )
     {
         level.dofdefault["farStart"] = level.dofdefault["nearEnd"] + 1;
@@ -254,7 +256,7 @@ fovslidercheck()
 dumpsettings()
 {
 /#
-	if ( getDvar( "scr_art_dump" ) != "0" )
+    if ( getdvar( "scr_art_dump" ) != "0" )
     {
         println( "\tstart_dist = " + level.fognearplane + ";" );
         println( "\thalf_dist = " + level.fogexphalfplane + ";" );
@@ -279,110 +281,84 @@ dumpsettings()
         println( "\t\tsun_col_r, sun_col_g, sun_col_b, sun_dir_x, sun_dir_y, sun_dir_z, sun_start_ang, " );
         println( "\t\tsun_stop_ang, time, max_fog_opacity);" );
         setdvar( "scr_art_dump", "0" );
-#/
     }
+#/
 }
 
 debug_reflection()
 {
 /#
-	level.debug_reflection = 0;
+    for ( level.debug_reflection = 0; 1; level.debug_reflection = 0 )
-	while ( 1 )
-	{
-		wait 0,1;
-		if ( getDvar( "debug_reflection" ) == "2" || level.debug_reflection != 2 && getDvar( "debug_reflection" ) == "3" && level.debug_reflection != 3 )
     {
+        wait 0.1;
+        asm_cond( getdvar( "debug_reflection" ) == "2" && level.debug_reflection != 2 || getdvar( "debug_reflection" ) == "3" && level.debug_reflection != 3, loc_1498 );
         remove_reflection_objects();
-			if ( getDvar( "debug_reflection" ) == "2" )
+        asm_cond( getdvar( "debug_reflection" ) == "2", loc_147C );
-			{
         create_reflection_objects();
         level.debug_reflection = 2;
-			}
+        asm_jump( loc_1495 );
-			else
-			{
         create_reflection_objects();
         create_reflection_object();
         level.debug_reflection = 3;
-			}
+        asm_jump( loc_1517 );
-			continue;
+        asm_cond( getdvar( "debug_reflection" ) == "1" && level.debug_reflection != 1, loc_14EC );
-		}
-		else
-		{
-			if ( getDvar( "debug_reflection" ) == "1" && level.debug_reflection != 1 )
-			{
         setdvar( "debug_reflection_matte", "0" );
         setdvar( "debug_color_pallete", "0" );
         remove_reflection_objects();
         create_reflection_object();
         level.debug_reflection = 1;
-				break;
+        asm_jump( loc_1517 );
-			}
+        asm_cond( getdvar( "debug_reflection" ) == "0" && level.debug_reflection != 0, loc_1517 );
-			else
-			{
-				if ( getDvar( "debug_reflection" ) == "0" && level.debug_reflection != 0 )
-				{
         remove_reflection_objects();
-					level.debug_reflection = 0;
-				}
-			}
     }
 #/
 }
-}
 
 remove_reflection_objects()
 {
 /#
-	if ( level.debug_reflection != 2 && level.debug_reflection == 3 && isDefined( level.debug_reflection_objects ) )
+    if ( ( level.debug_reflection == 2 || level.debug_reflection == 3 ) && isdefined( level.debug_reflection_objects ) )
-	{
-		i = 0;
-		while ( i < level.debug_reflection_objects.size )
     {
+        for ( i = 0; i < level.debug_reflection_objects.size; i++ )
             level.debug_reflection_objects[i] delete();
-			i++;
+
-		}
         level.debug_reflection_objects = undefined;
     }
-	if ( level.debug_reflection != 1 && level.debug_reflection != 3 && level.debug_reflection_matte != 1 || level.debug_color_pallete == 1 && level.debug_color_pallete == 2 )
+
-	{
+    if ( level.debug_reflection == 1 || level.debug_reflection == 3 || level.debug_reflection_matte == 1 || level.debug_color_pallete == 1 || level.debug_color_pallete == 2 )
-		if ( isDefined( level.debug_reflectionobject ) )
     {
+        if ( isdefined( level.debug_reflectionobject ) )
             level.debug_reflectionobject delete();
+    }
 #/
 }
-	}
-}
 
 create_reflection_objects()
 {
 /#
     reflection_locs = getreflectionlocs();
-	i = 0;
+
-	while ( i < reflection_locs.size )
+    for ( i = 0; i < reflection_locs.size; i++ )
     {
         level.debug_reflection_objects[i] = spawn( "script_model", reflection_locs[i] );
         level.debug_reflection_objects[i] setmodel( "test_sphere_silver" );
-		i++;
-#/
     }
+#/
 }
 
 create_reflection_object( model )
 {
-	if ( !isDefined( model ) )
+    if ( !isdefined( model ) )
-	{
         model = "test_sphere_silver";
-	}
 /#
-	if ( isDefined( level.debug_reflectionobject ) )
+    if ( isdefined( level.debug_reflectionobject ) )
-	{
         level.debug_reflectionobject delete();
-	}
+
     players = get_players();
     player = players[0];
-	level.debug_reflectionobject = spawn( "script_model", player geteye() + vectorScale( anglesToForward( player.angles ), 100 ) );
+    level.debug_reflectionobject = spawn( "script_model", player geteye() + vectorscale( anglestoforward( player.angles ), 100 ) );
     level.debug_reflectionobject setmodel( model );
-	level.debug_reflectionobject.origin = player geteye() + vectorScale( anglesToForward( player getplayerangles() ), 100 );
+    level.debug_reflectionobject.origin = player geteye() + vectorscale( anglestoforward( player getplayerangles() ), 100 );
     level.debug_reflectionobject linkto( player );
     thread debug_reflection_buttons();
 #/
@@ -396,102 +372,76 @@ debug_reflection_buttons()
     level.debug_reflectionobject endon( "death" );
     offset = 100;
     lastoffset = offset;
-	while ( getDvar( "debug_reflection" ) != "1" && getDvar( "debug_reflection" ) != "3" && getDvar( "debug_reflection_matte" ) != "1" || getDvar( "debug_color_pallete" ) == "1" && getDvar( "debug_color_pallete" ) == "2" )
+
+    while ( getdvar( "debug_reflection" ) == "1" || getdvar( "debug_reflection" ) == "3" || getdvar( "debug_reflection_matte" ) == "1" || getdvar( "debug_color_pallete" ) == "1" || getdvar( "debug_color_pallete" ) == "2" )
     {
         players = get_players();
+
         if ( players[0] buttonpressed( "BUTTON_X" ) )
-		{
             offset += 50;
-		}
+
         if ( players[0] buttonpressed( "BUTTON_Y" ) )
-		{
             offset -= 50;
-		}
+
         if ( offset > 1000 )
-		{
             offset = 1000;
-		}
+
         if ( offset < 64 )
-		{
             offset = 64;
-		}
+
         level.debug_reflectionobject unlink();
-		level.debug_reflectionobject.origin = players[ 0 ] geteye() + vectorScale( anglesToForward( players[ 0 ] getplayerangles() ), offset );
+        level.debug_reflectionobject.origin = players[0] geteye() + vectorscale( anglestoforward( players[0] getplayerangles() ), offset );
-		temp_angles = vectorToAngle( players[ 0 ].origin - level.debug_reflectionobject.origin );
+        temp_angles = vectortoangles( players[0].origin - level.debug_reflectionobject.origin );
         level.debug_reflectionobject.angles = ( 0, temp_angles[1], 0 );
         lastoffset = offset;
         line( level.debug_reflectionobject.origin, getreflectionorigin( level.debug_reflectionobject.origin ), ( 1, 0, 0 ), 1, 1 );
-		wait 0,05;
+        wait 0.05;
-		if ( isDefined( level.debug_reflectionobject ) )
+
-		{
+        if ( isdefined( level.debug_reflectionobject ) )
             level.debug_reflectionobject linkto( players[0] );
     }
 #/
 }
-}
 
 debug_reflection_matte()
 {
 /#
-	level.debug_reflection_matte = 0;
+    for ( level.debug_reflection_matte = 0; 1; level.debug_reflection_matte = 0 )
-	while ( 1 )
-	{
-		wait 0,1;
-		if ( getDvar( "debug_reflection_matte" ) == "1" && level.debug_reflection_matte != 1 )
     {
+        wait 0.1;
+        asm_cond( getdvar( "debug_reflection_matte" ) == "1" && level.debug_reflection_matte != 1, loc_18DC );
         setdvar( "debug_reflection", "0" );
         setdvar( "debug_color_pallete", "0" );
         remove_reflection_objects();
         create_reflection_object( "test_sphere_lambert" );
         level.debug_reflection_matte = 1;
-			continue;
+        asm_jump( loc_1907 );
-		}
+        asm_cond( getdvar( "debug_reflection_matte" ) == "0" && level.debug_reflection_matte != 0, loc_1907 );
-		else
-		{
-			if ( getDvar( "debug_reflection_matte" ) == "0" && level.debug_reflection_matte != 0 )
-			{
         remove_reflection_objects();
-				level.debug_reflection_matte = 0;
-			}
     }
 #/
 }
-}
 
 debug_color_pallete()
 {
 /#
-	level.debug_color_pallete = 0;
+    for ( level.debug_color_pallete = 0; 1; level.debug_color_pallete = 0 )
-	while ( 1 )
-	{
-		wait 0,1;
-		if ( getDvar( "debug_color_pallete" ) == "1" && level.debug_color_pallete != 1 )
     {
+        wait 0.1;
+        asm_cond( getdvar( "debug_color_pallete" ) == "1" && level.debug_color_pallete != 1, loc_1980 );
         setdvar( "debug_reflection", "0" );
         setdvar( "debug_reflection_matte", "0" );
         remove_reflection_objects();
         create_reflection_object( "test_macbeth_chart" );
         level.debug_color_pallete = 1;
-			continue;
+        asm_jump( loc_19E7 );
-		}
+        asm_cond( getdvar( "debug_color_pallete" ) == "2" && level.debug_color_pallete != 2, loc_19BC );
-		else
-		{
-			if ( getDvar( "debug_color_pallete" ) == "2" && level.debug_color_pallete != 2 )
-			{
         remove_reflection_objects();
         create_reflection_object( "test_macbeth_chart_unlit" );
         level.debug_color_pallete = 2;
-				break;
+        asm_jump( loc_19E7 );
-			}
+        asm_cond( getdvar( "debug_color_pallete" ) == "0" && level.debug_color_pallete != 0, loc_19E7 );
-			else
-			{
-				if ( getDvar( "debug_color_pallete" ) == "0" && level.debug_color_pallete != 0 )
-				{
         remove_reflection_objects();
-					level.debug_color_pallete = 0;
-				}
-			}
     }
 #/
 }
-}

Multiplayer Core/patch_mp/maps/mp/_audio.gsc

@@ -1,143 +1,139 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include maps\mp\_utility;
+#include common_scripts\utility;
 
-init() //checked matches cerberus output
+init()
 {
+
 }
 
-wait_until_first_player() //checked changed to match cerberus output
+wait_until_first_player()
 {
     players = get_players();
-	if ( !isDefined( players[ 0 ] ) )
+
-	{
+    if ( !isdefined( players[0] ) )
         level waittill( "first_player_ready" );
-	}
+
     players = get_players();
+
     for ( i = 0; i < players.size; i++ )
-	{
         players[i] thread monitor_player_sprint();
 }
-}
 
-stand_think( trig ) //checked matches cerberus output
+stand_think( trig )
 {
     killtext = "kill_stand_think" + trig getentitynumber();
     self endon( "disconnect" );
     self endon( "death" );
     self endon( killtext );
-	while ( 1 )
+
+    while ( true )
     {
         if ( self.player_is_moving )
-		{
             trig playsound( trig.script_label );
-		}
+
         wait 1;
     }
 }
 
-monitor_player_sprint() //checked matches cerberus output
+monitor_player_sprint()
 {
     self endon( "disconnect" );
     self thread monitor_player_movement();
-	self._is_sprinting = 0;
+
-	while ( 1 )
+    for ( self._is_sprinting = 0; 1; self._is_sprinting = 0 )
     {
         self waittill( "sprint_begin" );
+
         self._is_sprinting = 1;
+
         self waittill( "sprint_end" );
-		self._is_sprinting = 0;
     }
 }
 
-monitor_player_movement() //checked matches cerberus output
+monitor_player_movement()
 {
     self endon( "disconnect" );
-	while ( 1 )
+
+    while ( true )
     {
         org_1 = self.origin;
-		wait 1;
+        wait 1.0;
         org_2 = self.origin;
         distancemoved = distancesquared( org_1, org_2 );
+
         if ( distancemoved > 4096 )
-		{
             self.player_is_moving = 1;
-			continue;
-		}
         else
-		{
             self.player_is_moving = 0;
     }
 }
-}
 
-thread_enter_exit_sound( trig ) //checked matches cerberus output
+thread_enter_exit_sound( trig )
 {
     self endon( "death" );
     self endon( "disconnect" );
     trig.touchingplayers[self getentitynumber()] = 1;
-	if ( isDefined( trig.script_sound ) && trig.script_activated && self._is_sprinting )
+
-	{
+    if ( isdefined( trig.script_sound ) && trig.script_activated && self._is_sprinting )
         self playsound( trig.script_sound );
-	}
+
     self thread stand_think( trig );
+
     while ( self istouching( trig ) )
-	{
         wait 0.1;
-	}
+
     self notify( "kill_stand_think" + trig getentitynumber() );
     self playsound( trig.script_noteworthy );
     trig.touchingplayers[self getentitynumber()] = 0;
 }
 
-thread_step_trigger() //checked changed to match cerberus output
+thread_step_trigger()
-{
-	if ( !isDefined( self.script_activated ) )
 {
+    if ( !isdefined( self.script_activated ) )
         self.script_activated = 1;
-	}
+
-	if ( !isDefined( self.touchingplayers ) )
+    if ( !isdefined( self.touchingplayers ) )
     {
         self.touchingplayers = [];
+
         for ( i = 0; i < 4; i++ )
-		{
             self.touchingplayers[i] = 0;
     }
-	}
+
-	while ( 1 )
+    while ( true )
     {
         self waittill( "trigger", who );
+
         if ( self.touchingplayers[who getentitynumber()] == 0 )
-		{
             who thread thread_enter_exit_sound( self );
     }
 }
-}
 
-disable_bump_trigger( triggername ) //checked changed to match cerberus output
+disable_bump_trigger( triggername )
 {
     triggers = getentarray( "audio_bump_trigger", "targetname" );
-	if ( isDefined( triggers ) )
+
+    if ( isdefined( triggers ) )
     {
         for ( i = 0; i < triggers.size; i++ )
         {
-			if ( isDefined( triggers[ i ].script_label ) && triggers[ i ].script_label == triggername )
+            if ( isdefined( triggers[i].script_label ) && triggers[i].script_label == triggername )
-			{
                 triggers[i].script_activated = 0;
         }
     }
 }
-}
 
-get_player_index_number( player ) //checked changed to match cerberus output
+get_player_index_number( player )
 {
     players = get_players();
+
     for ( i = 0; i < players.size; i++ )
     {
         if ( players[i] == player )
-		{
             return i;
     }
-	}
+
     return 1;
 }

Multiplayer Core/patch_mp/maps/mp/_ballistic_knife.gsc

@@ -1,22 +1,26 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/_challenges;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include maps\mp\_utility;
-#include maps/mp/_utility;
+#include common_scripts\utility;
+#include maps\mp\_challenges;
 
-init() //checked matches cerberus output
+init()
 {
     precachemodel( "t6_wpn_ballistic_knife_projectile" );
     precachemodel( "t6_wpn_ballistic_knife_blade_retrieve" );
 }
 
-onspawn( watcher, player ) //checked changed to match cerberus output
+onspawn( watcher, player )
 {
     player endon( "death" );
     player endon( "disconnect" );
     level endon( "game_ended" );
+
     self waittill( "stationary", endpos, normal, angles, attacker, prey, bone );
+
     isfriendly = 0;
-	if ( isDefined( endpos ) )
+
+    if ( isdefined( endpos ) )
     {
         retrievable_model = spawn( "script_model", endpos );
         retrievable_model setmodel( "t6_wpn_ballistic_knife_projectile" );
@@ -26,52 +30,45 @@ onspawn( watcher, player ) //checked changed to match cerberus output
         retrievable_model.angles = angles;
         retrievable_model.name = watcher.weapon;
         retrievable_model.targetname = "sticky_weapon";
-		if ( isDefined( prey ) )
+
+        if ( isdefined( prey ) )
         {
             if ( level.teambased && isplayer( prey ) && player.team == prey.team )
-			{
                 isfriendly = 1;
-			}
             else if ( level.teambased && isai( prey ) && player.team == prey.aiteam )
-			{
                 isfriendly = 1;
-			}
+
             if ( !isfriendly )
             {
                 if ( isalive( prey ) )
-				{
                     retrievable_model droptoground( retrievable_model.origin, 80 );
-				}
                 else
-				{
                     retrievable_model linkto( prey, bone );
             }
-			}
             else if ( isfriendly )
             {
                 retrievable_model physicslaunch( normal, ( randomint( 10 ), randomint( 10 ), randomint( 10 ) ) );
                 normal = ( 0, 0, 1 );
             }
         }
+
         watcher.objectarray[watcher.objectarray.size] = retrievable_model;
+
         if ( isfriendly )
-		{
             retrievable_model waittill( "stationary" );
-		}
+
         retrievable_model thread dropknivestoground();
+
         if ( isfriendly )
-		{
+            player notify( "ballistic_knife_stationary", retrievable_model, normal );
-			player notify( "ballistic_knife_stationary" );
-		}
         else
-		{
+            player notify( "ballistic_knife_stationary", retrievable_model, normal, prey );
-			player notify( "ballistic_knife_stationary" );
+
-		}
         retrievable_model thread wait_to_show_glowing_model( prey );
     }
 }
 
-wait_to_show_glowing_model( prey ) //checked matches cerberus output
+wait_to_show_glowing_model( prey )
 {
     level endon( "game_ended" );
     self endon( "death" );
@@ -79,41 +76,42 @@ wait_to_show_glowing_model( prey ) //checked matches cerberus output
     self.glowing_model = glowing_retrievable_model;
     glowing_retrievable_model.angles = self.angles;
     glowing_retrievable_model linkto( self );
-	if ( !is_true( prey ) )
+
-	{
+    if ( isdefined( prey ) && !isalive( prey ) )
         wait 2;
-	}
+
     glowing_retrievable_model setmodel( "t6_wpn_ballistic_knife_blade_retrieve" );
 }
 
-watch_shutdown() //checked matches cerberus output
+watch_shutdown()
 {
     pickuptrigger = self.pickuptrigger;
     glowing_model = self.glowing_model;
+
     self waittill( "death" );
-	if ( isDefined( pickuptrigger ) )
+
-	{
+    if ( isdefined( pickuptrigger ) )
         pickuptrigger delete();
-	}
+
-	if ( isDefined( glowing_model ) )
+    if ( isdefined( glowing_model ) )
-	{
         glowing_model delete();
 }
-}
 
-onspawnretrievetrigger( watcher, player ) //checked matches cerberus output
+onspawnretrievetrigger( watcher, player )
 {
     player endon( "death" );
     player endon( "disconnect" );
     level endon( "game_ended" );
+
     player waittill( "ballistic_knife_stationary", retrievable_model, normal, prey );
-	if ( !isDefined( retrievable_model ) )
+
-	{
+    if ( !isdefined( retrievable_model ) )
         return;
-	}
+
     vec_scale = 10;
     trigger_pos = [];
-	if ( isDefined( prey ) || isplayer( prey ) && isai( prey ) )
+
+    if ( isdefined( prey ) && ( isplayer( prey ) || isai( prey ) ) )
     {
         trigger_pos[0] = prey.origin[0];
         trigger_pos[1] = prey.origin[1];
@@ -121,94 +119,87 @@ onspawnretrievetrigger( watcher, player ) //checked matches cerberus output
     }
     else
     {
-		trigger_pos[ 0 ] = retrievable_model.origin[ 0 ] + ( vec_scale * normal[ 0 ] );
+        trigger_pos[0] = retrievable_model.origin[0] + vec_scale * normal[0];
-		trigger_pos[ 1 ] = retrievable_model.origin[ 1 ] + ( vec_scale * normal[ 1 ] );
+        trigger_pos[1] = retrievable_model.origin[1] + vec_scale * normal[1];
-		trigger_pos[ 2 ] = retrievable_model.origin[ 2 ] + ( vec_scale * normal[ 2 ] );
+        trigger_pos[2] = retrievable_model.origin[2] + vec_scale * normal[2];
     }
-	trigger_pos[ 2 ] -= 50;
+
+    trigger_pos[2] -= 50.0;
     pickup_trigger = spawn( "trigger_radius", ( trigger_pos[0], trigger_pos[1], trigger_pos[2] ), 0, 50, 100 );
     pickup_trigger.owner = player;
     retrievable_model.pickuptrigger = pickup_trigger;
     pickup_trigger enablelinkto();
-	if ( isDefined( prey ) )
+
-	{
+    if ( isdefined( prey ) )
         pickup_trigger linkto( prey );
-	}
     else
-	{
         pickup_trigger linkto( retrievable_model );
-	}
+
     retrievable_model thread watch_use_trigger( pickup_trigger, retrievable_model, ::pick_up, watcher.pickupsoundplayer, watcher.pickupsound );
     retrievable_model thread watch_shutdown();
 }
 
-watch_use_trigger( trigger, model, callback, playersoundonuse, npcsoundonuse ) //checked changed to match cerberus output
+watch_use_trigger( trigger, model, callback, playersoundonuse, npcsoundonuse )
 {
     self endon( "death" );
     self endon( "delete" );
     level endon( "game_ended" );
     max_ammo = weaponmaxammo( "knife_ballistic_mp" ) + 1;
-	while ( 1 )
+
+    while ( true )
     {
         trigger waittill( "trigger", player );
+
         if ( !isalive( player ) )
-		{
             continue;
-		}
+
         if ( !player isonground() )
-		{
             continue;
-		}
+
-		if ( isDefined( trigger.triggerteam ) && player.team != trigger.triggerteam )
+        if ( isdefined( trigger.triggerteam ) && player.team != trigger.triggerteam )
-		{
             continue;
-		}
+
-		if ( isDefined( trigger.claimedby ) && player != trigger.claimedby )
+        if ( isdefined( trigger.claimedby ) && player != trigger.claimedby )
-		{
             continue;
-		}
+
         if ( !player hasweapon( "knife_ballistic_mp" ) )
-		{
             continue;
-		}
+
         ammo_stock = player getweaponammostock( "knife_ballistic_mp" );
         ammo_clip = player getweaponammoclip( "knife_ballistic_mp" );
         current_weapon = player getcurrentweapon();
         total_ammo = ammo_stock + ammo_clip;
         hasreloaded = 1;
+
         if ( total_ammo > 0 && ammo_stock == total_ammo && current_weapon == "knife_ballistic_mp" )
-		{
             hasreloaded = 0;
-		}
+
         if ( total_ammo >= max_ammo || !hasreloaded )
-		{
             continue;
-		}
+
-		if ( isDefined( playersoundonuse ) )
+        if ( isdefined( playersoundonuse ) )
-		{
             player playlocalsound( playersoundonuse );
-		}
+
-		if ( isDefined( npcsoundonuse ) )
+        if ( isdefined( npcsoundonuse ) )
-		{
             player playsound( npcsoundonuse );
-		}
+
         self thread [[ callback ]]( player );
         break;
     }
 }
 
-pick_up( player ) //checked matches cerberus output
+pick_up( player )
 {
     self destroy_ent();
     current_weapon = player getcurrentweapon();
-	player maps/mp/_challenges::pickedupballisticknife();
+    player maps\mp\_challenges::pickedupballisticknife();
+
     if ( current_weapon != "knife_ballistic_mp" )
     {
         clip_ammo = player getweaponammoclip( "knife_ballistic_mp" );
+
         if ( !clip_ammo )
-		{
             player setweaponammoclip( "knife_ballistic_mp", 1 );
-		}
         else
         {
             new_ammo_stock = player getweaponammostock( "knife_ballistic_mp" ) + 1;
@@ -222,48 +213,50 @@ pick_up( player ) //checked matches cerberus output
     }
 }
 
-destroy_ent() //checked matches cerberus output
+destroy_ent()
 {
-	if ( isDefined( self ) )
+    if ( isdefined( self ) )
     {
         pickuptrigger = self.pickuptrigger;
-		if ( isDefined( pickuptrigger ) )
+
-		{
+        if ( isdefined( pickuptrigger ) )
             pickuptrigger delete();
-		}
+
-		if ( isDefined( self.glowing_model ) )
+        if ( isdefined( self.glowing_model ) )
-		{
             self.glowing_model delete();
-		}
+
         self delete();
     }
 }
 
-dropknivestoground() //checked matches cerberus output
+dropknivestoground()
 {
     self endon( "death" );
+
     for (;;)
     {
         level waittill( "drop_objects_to_ground", origin, radius );
+
         self droptoground( origin, radius );
     }
 }
 
-droptoground( origin, radius ) //checked changed to match cerberus output
+droptoground( origin, radius )
 {
-	if ( distancesquared( origin, self.origin ) < ( radius * radius ) )
+    if ( distancesquared( origin, self.origin ) < radius * radius )
     {
-		self physicslaunch( ( 0, 0, 1 ), vectorScale( ( 1, 1, 1 ), 5 ) );
+        self physicslaunch( ( 0, 0, 1 ), vectorscale( ( 1, 1, 1 ), 5.0 ) );
         self thread updateretrievetrigger();
     }
 }
 
-updateretrievetrigger() //checked matches cerberus output
+updateretrievetrigger()
 {
     self endon( "death" );
+
     self waittill( "stationary" );
+
     trigger = self.pickuptrigger;
     trigger.origin = ( self.origin[0], self.origin[1], self.origin[2] + 10 );
     trigger linkto( self );
 }
-

Multiplayer Core/patch_mp/maps/mp/_bb.gsc

@@ -1,92 +1,91 @@
-//includes match cerberus output
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include maps\mp\_utility;
+#include common_scripts\utility;
 
-init() //checked matches cerberus output
+init()
 {
     level thread onplayerconnect();
 }
 
-onplayerconnect() //checked matches cerberus output
+onplayerconnect()
 {
     for (;;)
     {
         level waittill( "connected", player );
+
         player thread onplayerspawned();
         player thread onplayerdeath();
     }
 }
 
-onplayerspawned() //checked matches cerberus output
+onplayerspawned()
 {
     self endon( "disconnect" );
     self._bbdata = [];
+
     for (;;)
     {
         self waittill( "spawned_player" );
+
         self._bbdata["score"] = 0;
         self._bbdata["momentum"] = 0;
-		self._bbdata[ "spawntime" ] = getTime();
+        self._bbdata["spawntime"] = gettime();
         self._bbdata["shots"] = 0;
         self._bbdata["hits"] = 0;
     }
 }
 
-onplayerdisconnect() //checked changed to match beta dump
+onplayerdisconnect()
 {
     for (;;)
     {
         self waittill( "disconnect" );
+
         self commitspawndata();
         break;
     }
 }
 
-onplayerdeath() //checked matches cerberus output
+onplayerdeath()
 {
     self endon( "disconnect" );
+
     for (;;)
     {
         self waittill( "death" );
+
         self commitspawndata();
     }
 }
 
-commitspawndata() //checked matches cerberus output
+commitspawndata()
 {
-	/*
 /#
-	assert( isDefined( self._bbdata ) );
+    assert( isdefined( self._bbdata ) );
 #/
-	*/
+    if ( !isdefined( self._bbdata ) )
-	if ( !isDefined( self._bbdata ) )
-	{
         return;
-	}
+
-	bbprint( "mpplayerlives", "gametime %d spawnid %d lifescore %d lifemomentum %d lifetime %d name %s", getTime(), getplayerspawnid( self ), self._bbdata[ "score" ], self._bbdata[ "momentum" ], getTime() - self._bbdata[ "spawntime" ], self.name );
+    bbprint( "mpplayerlives", "gametime %d spawnid %d lifescore %d lifemomentum %d lifetime %d name %s", gettime(), getplayerspawnid( self ), self._bbdata["score"], self._bbdata["momentum"], gettime() - self._bbdata["spawntime"], self.name );
 }
 
-commitweapondata( spawnid, currentweapon, time0 ) //checked matches cerberus output
+commitweapondata( spawnid, currentweapon, time0 )
 {
-	/*
 /#
-	assert( isDefined( self._bbdata ) );
+    assert( isdefined( self._bbdata ) );
 #/
-	*/
+    if ( !isdefined( self._bbdata ) )
-	if ( !isDefined( self._bbdata ) )
-	{
         return;
-	}
+
-	time1 = getTime();
+    time1 = gettime();
     bbprint( "mpweapons", "spawnid %d name %s duration %d shots %d hits %d", spawnid, currentweapon, time1 - time0, self._bbdata["shots"], self._bbdata["hits"] );
     self._bbdata["shots"] = 0;
     self._bbdata["hits"] = 0;
 }
 
-bbaddtostat( statname, delta ) //checked matches cerberus output
+bbaddtostat( statname, delta )
-{
-	if ( isDefined( self._bbdata ) && isDefined( self._bbdata[ statname ] ) )
 {
+    if ( isdefined( self._bbdata ) && isdefined( self._bbdata[statname] ) )
         self._bbdata[statname] += delta;
 }
-}

Multiplayer Core/patch_mp/maps/mp/_bouncingbetty.gsc

@@ -1,11 +1,12 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/_scoreevents;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_challenges;
+#include maps\mp\_utility;
-#include maps/mp/gametypes/_weaponobjects;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\gametypes\_weaponobjects;
-#include maps/mp/_utility;
+#include maps\mp\_challenges;
+#include maps\mp\_scoreevents;
 
-init() //checked matches cerberus output
+init()
 {
     precachemodel( "t6_wpn_bouncing_betty_world" );
     level.bettyexplosionfx = loadfx( "weapon/bouncing_betty/fx_betty_explosion" );
@@ -26,7 +27,7 @@ init() //checked matches cerberus output
     level.bettyactivationdelay = 0.1;
 }
 
-createbouncingbettywatcher() //checked matches cerberus output
+createbouncingbettywatcher()
 {
     watcher = self createproximityweaponobjectwatcher( "bouncingbetty", "bouncingbetty_mp", self.team );
     watcher.onspawn = ::onspawnbouncingbetty;
@@ -47,7 +48,7 @@ createbouncingbettywatcher() //checked matches cerberus output
     watcher.activationdelay = level.bettyactivationdelay;
 }
 
-onspawnbouncingbetty( watcher, owner ) //checked matches cerberus output
+onspawnbouncingbetty( watcher, owner )
 {
     onspawnproximityweaponobject( watcher, owner );
     self thread spawnminemover();
@@ -60,7 +61,7 @@ spawnminemover()
     minemover.angles = self.angles;
     minemover setmodel( "tag_origin" );
     minemover.owner = self.owner;
-	minemover.killcamoffset = ( 0, 0, getdvarfloatdefault( "scr_bouncing_betty_killcam_offset", 8 ) );
+    minemover.killcamoffset = ( 0, 0, getdvarfloatdefault( "scr_bouncing_betty_killcam_offset", 8.0 ) );
     killcament = spawn( "script_model", minemover.origin + minemover.killcamoffset );
     killcament.angles = ( 0, 0, 0 );
     killcament setmodel( "tag_origin" );
@@ -70,72 +71,70 @@ spawnminemover()
     self thread killminemoveronpickup();
 }
 
-killminemoveronpickup() //checked matches cerberus output
+killminemoveronpickup()
 {
     self.minemover endon( "death" );
     self waittill_any( "picked_up", "hacked" );
     self killminemover();
 }
 
-killminemover() //checked matches cerberus output
+killminemover()
 {
-	if ( isDefined( self.minemover ) )
+    if ( isdefined( self.minemover ) )
-	{
-		if ( isDefined( self.minemover.killcament ) )
     {
+        if ( isdefined( self.minemover.killcament ) )
             self.minemover.killcament delete();
-		}
+
         self.minemover delete();
     }
 }
 
-bouncingbettydetonate( attacker, weaponname ) //checked matches cerberus output
+bouncingbettydetonate( attacker, weaponname )
 {
-	if ( isDefined( weaponname ) )
+    if ( isdefined( weaponname ) )
     {
-		if ( isDefined( attacker ) )
+        if ( isdefined( attacker ) )
         {
             if ( self.owner isenemyplayer( attacker ) )
             {
-				attacker maps/mp/_challenges::destroyedexplosive( weaponname );
+                attacker maps\mp\_challenges::destroyedexplosive( weaponname );
-				maps/mp/_scoreevents::processscoreevent( "destroyed_bouncingbetty", attacker, self.owner, weaponname );
+                maps\mp\_scoreevents::processscoreevent( "destroyed_bouncingbetty", attacker, self.owner, weaponname );
             }
         }
+
         self bouncingbettydestroyed();
     }
-	else if ( isDefined( self.minemover ) )
+    else if ( isdefined( self.minemover ) )
     {
         self.minemover setmodel( self.model );
         self.minemover thread bouncingbettyjumpandexplode();
         self delete();
     }
     else
-	{
         self bouncingbettydestroyed();
 }
-}
 
-bouncingbettydestroyed() //checked matches cerberus output
+bouncingbettydestroyed()
 {
     playfx( level.bettydestroyedfx, self.origin );
     playsoundatposition( "dst_equipment_destroy", self.origin );
-	if ( isDefined( self.trigger ) )
+
-	{
+    if ( isdefined( self.trigger ) )
         self.trigger delete();
-	}
+
-	if ( isDefined( self.minemover ) )
+    if ( isdefined( self.minemover ) )
-	{
-		if ( isDefined( self.minemover.killcament ) )
     {
+        if ( isdefined( self.minemover.killcament ) )
             self.minemover.killcament delete();
-		}
+
         self.minemover delete();
     }
+
     self radiusdamage( self.origin, 128, 110, 10, self.owner, "MOD_EXPLOSIVE", "bouncingbetty_mp" );
     self delete();
 }
 
-bouncingbettyjumpandexplode() //checked matches cerberus output
+bouncingbettyjumpandexplode()
 {
     explodepos = self.origin + ( 0, 0, level.bettyjumpheight );
     self moveto( explodepos, level.bettyjumptime, level.bettyjumptime, 0 );
@@ -143,35 +142,32 @@ bouncingbettyjumpandexplode() //checked matches cerberus output
     playfx( level.bettylaunchfx, self.origin );
     self rotatevelocity( level.bettyrotatevelocity, level.bettyjumptime, 0, level.bettyjumptime );
     self playsound( "fly_betty_jump" );
-	wait level.bettyjumptime;
+    wait( level.bettyjumptime );
     self thread mineexplode();
 }
 
-mineexplode() //checked matches cerberus output
+mineexplode()
-{
-	if ( !isDefined( self ) || !isDefined( self.owner ) )
 {
+    if ( !isdefined( self ) || !isdefined( self.owner ) )
         return;
-	}
+
     self playsound( "fly_betty_explo" );
     wait 0.05;
-	if ( !isDefined( self ) || !isDefined( self.owner ) )
+
-	{
+    if ( !isdefined( self ) || !isdefined( self.owner ) )
         return;
-	}
+
     self hide();
     self radiusdamage( self.origin, level.bettydamageradius, level.bettydamagemax, level.bettydamagemin, self.owner, "MOD_EXPLOSIVE", "bouncingbetty_mp" );
     playfx( level.bettyexplosionfx, self.origin );
     wait 0.2;
-	if ( !isDefined( self ) || !isDefined( self.owner ) )
+
-	{
+    if ( !isdefined( self ) || !isdefined( self.owner ) )
         return;
-	}
+
-	if ( isDefined( self.trigger ) )
+    if ( isdefined( self.trigger ) )
-	{
         self.trigger delete();
-	}
+
     self.killcament delete();
     self delete();
 }
-

Multiplayer Core/patch_mp/maps/mp/_burnplayer.gsc

@@ -1,21 +1,21 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_damagefeedback;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/gametypes/_globallogic_player;
+#include common_scripts\utility;
-#include maps/mp/_utility;
+#include maps\mp\_utility;
-#include common_scripts/utility;
+#include maps\mp\gametypes\_globallogic_player;
+#include maps\mp\gametypes\_damagefeedback;
 
-initburnplayer() //checked matches cerberus output
+initburnplayer()
 {
     level.flamedamage = 15;
     level.flameburntime = 1.5;
 }
 
-hitwithincendiary( attacker, inflictor, mod ) //checked changed to match cerberus output
+hitwithincendiary( attacker, inflictor, mod )
-{
-	if ( isDefined( self.burning ) )
 {
+    if ( isdefined( self.burning ) )
         return;
-	}
+
     self starttanning();
     self thread waitthenstoptanning( level.flameburntime );
     self endon( "disconnect" );
@@ -24,6 +24,7 @@ hitwithincendiary( attacker, inflictor, mod ) //checked changed to match cerberu
     self.burning = 1;
     self thread burn_blocker();
     tagarray = [];
+
     if ( isai( self ) )
     {
         tagarray[tagarray.size] = "J_Wrist_RI";
@@ -45,30 +46,25 @@ hitwithincendiary( attacker, inflictor, mod ) //checked changed to match cerberu
         tagarray[tagarray.size] = "J_Knee_LE";
         tagarray[tagarray.size] = "J_Ankle_RI";
         tagarray[tagarray.size] = "J_Ankle_LE";
+
         if ( isplayer( self ) && self.health > 0 )
-		{
+            self setburn( 3.0 );
-			self setburn( 3 );
     }
-	}
+
-	if ( isDefined( level._effect[ "character_fire_death_torso" ] ) )
+    if ( isdefined( level._effect["character_fire_death_torso"] ) )
-	{
-		for ( arrayIndex = 0; arrayIndex < tagArray.size;  arrayIndex++ )
     {
+        for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
             playfxontag( level._effect["character_fire_death_sm"], self, tagarray[arrayindex] );
     }
-	}
+
     if ( isai( self ) )
-	{
         playfxontag( level._effect["character_fire_death_torso"], self, "J_Spine1" );
-	}
     else
-	{
         playfxontag( level._effect["character_fire_death_torso"], self, "J_SpineLower" );
-	}
+
     if ( !isalive( self ) )
-	{
         return;
-	}
+
     if ( isplayer( self ) )
     {
         self thread watchforwater( 7 );
@@ -76,26 +72,26 @@ hitwithincendiary( attacker, inflictor, mod ) //checked changed to match cerberu
     }
 }
 
-hitwithnapalmstrike( attacker, inflictor, mod ) //checked changed to match cerberus output
+hitwithnapalmstrike( attacker, inflictor, mod )
-{
-	if ( isDefined( self.burning ) || self hasperk( "specialty_fireproof" ) )
 {
+    if ( isdefined( self.burning ) || self hasperk( "specialty_fireproof" ) )
         return;
-	}
+
     self starttanning();
     self thread waitthenstoptanning( level.flameburntime );
     self endon( "disconnect" );
     attacker endon( "disconnect" );
     self endon( "death" );
-	if ( isDefined( self.burning ) )
+
-	{
+    if ( isdefined( self.burning ) )
         return;
-	}
+
     self thread burn_blocker();
     waittillframeend;
     self.burning = 1;
     self thread burn_blocker();
     tagarray = [];
+
     if ( isai( self ) )
     {
         tagarray[tagarray.size] = "J_Wrist_RI";
@@ -117,28 +113,25 @@ hitwithnapalmstrike( attacker, inflictor, mod ) //checked changed to match cerbe
         tagarray[tagarray.size] = "J_Knee_LE";
         tagarray[tagarray.size] = "J_Ankle_RI";
         tagarray[tagarray.size] = "J_Ankle_LE";
+
         if ( isplayer( self ) )
-		{
+            self setburn( 3.0 );
-			self setburn( 3 );
     }
-	}
+
-	if ( isDefined( level._effect[ "character_fire_death_sm" ] ) )
+    if ( isdefined( level._effect["character_fire_death_sm"] ) )
     {
         for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
-		{
             playfxontag( level._effect["character_fire_death_sm"], self, tagarray[arrayindex] );
-			arrayindex++;
     }
-	}
+
-	if ( isDefined( level._effect[ "character_fire_death_torso" ] ) )
+    if ( isdefined( level._effect["character_fire_death_torso"] ) )
-	{
         playfxontag( level._effect["character_fire_death_torso"], self, "J_SpineLower" );
-	}
+
     if ( !isalive( self ) )
-	{
         return;
-	}
+
     self thread donapalmstrikedamage( attacker, inflictor, mod );
+
     if ( isplayer( self ) )
     {
         self thread watchforwater( 7 );
@@ -146,12 +139,11 @@ hitwithnapalmstrike( attacker, inflictor, mod ) //checked changed to match cerbe
     }
 }
 
-walkedthroughflames( attacker, inflictor, weapon ) //checked changed to match cerberus output
+walkedthroughflames( attacker, inflictor, weapon )
-{
-	if ( isDefined( self.burning ) || self hasperk( "specialty_fireproof" ) )
 {
+    if ( isdefined( self.burning ) || self hasperk( "specialty_fireproof" ) )
         return;
-	}
+
     self starttanning();
     self thread waitthenstoptanning( level.flameburntime );
     self endon( "disconnect" );
@@ -159,6 +151,7 @@ walkedthroughflames( attacker, inflictor, weapon ) //checked changed to match ce
     self.burning = 1;
     self thread burn_blocker();
     tagarray = [];
+
     if ( isai( self ) )
     {
         tagarray[tagarray.size] = "J_Wrist_RI";
@@ -177,18 +170,18 @@ walkedthroughflames( attacker, inflictor, weapon ) //checked changed to match ce
         tagarray[tagarray.size] = "J_Ankle_RI";
         tagarray[tagarray.size] = "J_Ankle_LE";
     }
-	if ( isDefined( level._effect[ "character_fire_player_sm" ] ) )
+
+    if ( isdefined( level._effect["character_fire_player_sm"] ) )
     {
         for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
-		{
             playfxontag( level._effect["character_fire_player_sm"], self, tagarray[arrayindex] );
     }
-	}
+
     if ( !isalive( self ) )
-	{
         return;
-	}
+
-	self thread doflamedamage( attacker, inflictor, weapon, 1 );
+    self thread doflamedamage( attacker, inflictor, weapon, 1.0 );
+
     if ( isplayer( self ) )
     {
         self thread watchforwater( 7 );
@@ -196,12 +189,11 @@ walkedthroughflames( attacker, inflictor, weapon ) //checked changed to match ce
     }
 }
 
-burnedwithflamethrower( attacker, inflictor, weapon ) //checked changed to match cerberus output
+burnedwithflamethrower( attacker, inflictor, weapon )
-{
-	if ( isDefined( self.burning ) )
 {
+    if ( isdefined( self.burning ) )
         return;
-	}
+
     self starttanning();
     self thread waitthenstoptanning( level.flameburntime );
     self endon( "disconnect" );
@@ -209,6 +201,7 @@ burnedwithflamethrower( attacker, inflictor, weapon ) //checked changed to match
     self.burning = 1;
     self thread burn_blocker();
     tagarray = [];
+
     if ( isai( self ) )
     {
         tagarray[0] = "J_Spine1";
@@ -223,31 +216,29 @@ burnedwithflamethrower( attacker, inflictor, weapon ) //checked changed to match
         tagarray[0] = "J_Elbow_RI";
         tagarray[1] = "j_knee_ri";
         tagarray[2] = "j_knee_le";
+
         if ( isplayer( self ) && self.health > 0 )
-		{
+            self setburn( 3.0 );
-			self setburn( 3 );
-		}
     }
+
     if ( isplayer( self ) && isalive( self ) )
     {
         self thread watchforwater( 7 );
         self thread watchfordeath();
     }
-	if ( isDefined( level._effect[ "character_fire_player_sm" ] ) )
+
+    if ( isdefined( level._effect["character_fire_player_sm"] ) )
     {
         for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
-		{
             playfxontag( level._effect["character_fire_player_sm"], self, tagarray[arrayindex] );
     }
 }
-}
 
-burnedwithdragonsbreath( attacker, inflictor, weapon ) //checked changed to match cerberus output
+burnedwithdragonsbreath( attacker, inflictor, weapon )
-{
-	if ( isDefined( self.burning ) )
 {
+    if ( isdefined( self.burning ) )
         return;
-	}
+
     self starttanning();
     self thread waitthenstoptanning( level.flameburntime );
     self endon( "disconnect" );
@@ -255,6 +246,7 @@ burnedwithdragonsbreath( attacker, inflictor, weapon ) //checked changed to matc
     self.burning = 1;
     self thread burn_blocker();
     tagarray = [];
+
     if ( isai( self ) )
     {
         tagarray[0] = "J_Spine1";
@@ -270,27 +262,26 @@ burnedwithdragonsbreath( attacker, inflictor, weapon ) //checked changed to matc
         tagarray[1] = "J_Elbow_RI";
         tagarray[2] = "j_knee_ri";
         tagarray[3] = "j_knee_le";
+
         if ( isplayer( self ) && self.health > 0 )
-		{
+            self setburn( 3.0 );
-			self setburn( 3 );
-		}
     }
+
     if ( isplayer( self ) && isalive( self ) )
     {
         self thread watchforwater( 7 );
         self thread watchfordeath();
         return;
     }
-	if ( isDefined( level._effect[ "character_fire_player_sm" ] ) )
+
+    if ( isdefined( level._effect["character_fire_player_sm"] ) )
     {
         for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
-		{
             playfxontag( level._effect["character_fire_player_sm"], self, tagarray[arrayindex] );
     }
 }
-}
 
-burnedtodeath() //checked matches cerberus output
+burnedtodeath()
 {
     self.burning = 1;
     self thread burn_blocker();
@@ -299,39 +290,43 @@ burnedtodeath() //checked matches cerberus output
     self thread waitthenstoptanning( level.flameburntime );
 }
 
-watchfordeath() //checked matches cerberus output
+watchfordeath()
 {
     self endon( "disconnect" );
     self notify( "watching for death while on fire" );
     self endon( "watching for death while on fire" );
+
     self waittill( "death" );
+
     if ( isplayer( self ) )
-	{
         self _stopburning();
-	}
+
     self.burning = undefined;
 }
 
-watchforwater( time ) //checked matches cerberus output
+watchforwater( time )
 {
     self endon( "disconnect" );
     self notify( "watching for water" );
     self endon( "watching for water" );
     wait 0.1;
     looptime = 0.1;
+
     while ( time > 0 )
     {
-		wait looptime;
+        wait( looptime );
+
         if ( self depthofplayerinwater() > 0 )
         {
             finish_burn();
             time = 0;
         }
+
         time -= looptime;
     }
 }
 
-finish_burn() //checked changed to match cerberus output
+finish_burn()
 {
     self notify( "stop burn damage" );
     tagarray = [];
@@ -340,129 +335,126 @@ finish_burn() //checked changed to match cerberus output
     tagarray[2] = "J_Head";
     tagarray[3] = "j_knee_ri";
     tagarray[4] = "j_knee_le";
-	if ( isDefined( level._effect[ "fx_fire_player_sm_smk_2sec" ] ) )
+
+    if ( isdefined( level._effect["fx_fire_player_sm_smk_2sec"] ) )
     {
         for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
-		{
             playfxontag( level._effect["fx_fire_player_sm_smk_2sec"], self, tagarray[arrayindex] );
     }
-	}
+
     self.burning = undefined;
     self _stopburning();
     self.ingroundnapalm = 0;
 }
 
-donapalmstrikedamage( attacker, inflictor, mod ) //checked matches cerberus output
+donapalmstrikedamage( attacker, inflictor, mod )
 {
     if ( isai( self ) )
     {
         dodognapalmstrikedamage( attacker, inflictor, mod );
         return;
     }
+
     self endon( "death" );
     self endon( "disconnect" );
     attacker endon( "disconnect" );
     self endon( "stop burn damage" );
-	while ( isDefined( level.napalmstrikedamage ) && isDefined( self ) && self depthofplayerinwater() < 1 )
+
+    while ( isdefined( level.napalmstrikedamage ) && isdefined( self ) && self depthofplayerinwater() < 1 )
     {
         self dodamage( level.napalmstrikedamage, self.origin, attacker, attacker, "none", mod, 0, "napalm_mp" );
         wait 1;
     }
 }
 
-donapalmgrounddamage( attacker, inflictor, mod ) //checked changed to match cerberus output dvars taken from beta dump
+donapalmgrounddamage( attacker, inflictor, mod )
 {
     if ( self hasperk( "specialty_fireproof" ) )
-	{
         return;
-	}
+
     if ( level.teambased )
     {
         if ( attacker != self && attacker.team == self.team )
-		{
             return;
     }
-	}
+
     if ( isai( self ) )
     {
         dodognapalmgrounddamage( attacker, inflictor, mod );
         return;
     }
-	if ( isDefined( self.burning ) )
+
-	{
+    if ( isdefined( self.burning ) )
         return;
-	}
+
     self thread burn_blocker();
     self endon( "death" );
     self endon( "disconnect" );
     attacker endon( "disconnect" );
     self endon( "stop burn damage" );
-	if ( isDefined( level.groundburntime ) )
+
-	{
+    if ( isdefined( level.groundburntime ) )
-		if ( getDvar( "scr_groundBurnTime" ) == "" )
     {
+        if ( getdvar( _hash_6EC13261 ) == "" )
             waittime = level.groundburntime;
+        else
+            waittime = getdvarfloat( _hash_6EC13261 );
     }
     else
-		{
-			waittime = getDvarFloat( "scr_groundBurnTime" );
-		}
-	}
-	else
-	{
         waittime = 100;
-	}
+
     self walkedthroughflames( attacker, inflictor, "napalm_mp" );
     self.ingroundnapalm = 1;
-	while ( isDefined( level.napalmgrounddamage ) )
+
-	{
+    if ( isdefined( level.napalmgrounddamage ) )
-		if ( getDvar( "scr_napalmGroundDamage" ) == "" )
     {
+        if ( getdvar( _hash_3FFA6673 ) == "" )
             napalmgrounddamage = level.napalmgrounddamage;
-		}
         else
-		{
+            napalmgrounddamage = getdvarfloat( _hash_3FFA6673 );
-			napalmgrounddamage = getDvarFloat( "scr_napalmGroundDamage" );
+
-		}
+        while ( isdefined( self ) && isdefined( inflictor ) && self depthofplayerinwater() < 1 && waittime > 0 )
-		while ( isDefined( self ) && isDefined( inflictor ) && self depthofplayerinwater() < 1 && waittime > 0 )
         {
             self dodamage( level.napalmgrounddamage, self.origin, attacker, inflictor, "none", mod, 0, "napalm_mp" );
+
             if ( isplayer( self ) )
-			{
                 self setburn( 1.1 );
-			}
+
             wait 1;
             waittime -= 1;
         }
     }
+
     self.ingroundnapalm = 0;
 }
 
-dodognapalmstrikedamage( attacker, inflictor, mod ) //checked matches cerberus output
+dodognapalmstrikedamage( attacker, inflictor, mod )
 {
     attacker endon( "disconnect" );
     self endon( "death" );
     self endon( "stop burn damage" );
-	while ( isDefined( level.napalmstrikedamage ) && isDefined( self ) )
+
+    while ( isdefined( level.napalmstrikedamage ) && isdefined( self ) )
     {
         self dodamage( level.napalmstrikedamage, self.origin, attacker, attacker, "none", mod );
         wait 1;
     }
 }
 
-dodognapalmgrounddamage( attacker, inflictor, mod ) //checked matches cerberus output
+dodognapalmgrounddamage( attacker, inflictor, mod )
 {
     attacker endon( "disconnect" );
     self endon( "death" );
     self endon( "stop burn damage" );
-	while ( isDefined( level.napalmgrounddamage ) && isDefined( self ) )
+
+    while ( isdefined( level.napalmgrounddamage ) && isdefined( self ) )
     {
         self dodamage( level.napalmgrounddamage, self.origin, attacker, attacker, "none", mod, 0, "napalm_mp" );
         wait 1;
     }
 }
 
-burn_blocker() //checked matches cerberus output
+burn_blocker()
 {
     self endon( "disconnect" );
     self endon( "death" );
@@ -470,71 +462,71 @@ burn_blocker() //checked matches cerberus output
     self.burning = undefined;
 }
 
-doflamedamage( attacker, inflictor, weapon, time ) //checked matches cerberus output
+doflamedamage( attacker, inflictor, weapon, time )
 {
     if ( isai( self ) )
     {
         dodogflamedamage( attacker, inflictor, weapon, time );
         return;
     }
-	if ( isDefined( attacker ) )
+
-	{
+    if ( isdefined( attacker ) )
         attacker endon( "disconnect" );
-	}
+
     self endon( "death" );
     self endon( "disconnect" );
     self endon( "stop burn damage" );
     self thread doburningsound();
     self notify( "snd_burn_scream" );
-	wait_time = 1;
+    wait_time = 1.0;
-	while ( isDefined( level.flamedamage ) && isDefined( self ) && self depthofplayerinwater() < 1 && time > 0 )
+
+    while ( isdefined( level.flamedamage ) && isdefined( self ) && self depthofplayerinwater() < 1 && time > 0 )
     {
-		if ( isDefined( attacker ) && isDefined( inflictor ) && isDefined( weapon ) )
+        if ( isdefined( attacker ) && isdefined( inflictor ) && isdefined( weapon ) )
         {
-			if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weapon, attacker ) )
+            if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weapon, attacker ) )
-			{
+                attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-				attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
+
-			}
             self dodamage( level.flamedamage, self.origin, attacker, inflictor, "none", "MOD_BURNED", 0, weapon );
         }
         else
-		{
             self dodamage( level.flamedamage, self.origin );
-		}
+
-		wait wait_time;
+        wait( wait_time );
         time -= wait_time;
     }
+
     self thread finish_burn();
 }
 
-dodogflamedamage( attacker, inflictor, weapon, time ) //checked changed to match cerberus output
+dodogflamedamage( attacker, inflictor, weapon, time )
-{
-	if ( isDefined( attacker ) || !isDefined( inflictor ) || !isDefined( weapon ) )
 {
+    if ( !isdefined( attacker ) || !isdefined( inflictor ) || !isdefined( weapon ) )
         return;
-	}
+
     attacker endon( "disconnect" );
     self endon( "death" );
     self endon( "stop burn damage" );
     self thread doburningsound();
-	wait_time = 1;
+    wait_time = 1.0;
-	while ( isDefined( level.flamedamage ) && isDefined( self ) && time > 0 )
+
+    while ( isdefined( level.flamedamage ) && isdefined( self ) && time > 0 )
     {
         self dodamage( level.flamedamage, self.origin, attacker, inflictor, "none", "MOD_BURNED", 0, weapon );
-		wait wait_time;
+        wait( wait_time );
         time -= wait_time;
     }
 }
 
-waitthenstoptanning( time ) //checked matches cerberus output
+waitthenstoptanning( time )
 {
     self endon( "disconnect" );
     self endon( "death" );
-	wait time;
+    wait( time );
     self _stopburning();
 }
 
-doburningsound() //checked matches cerberus output
+doburningsound()
 {
     self endon( "disconnect" );
     self endon( "death" );
@@ -542,41 +534,36 @@ doburningsound() //checked matches cerberus output
     fire_sound_ent linkto( self, "tag_origin", ( 0, 0, 0 ), ( 0, 0, 0 ) );
     fire_sound_ent playloopsound( "mpl_player_burn_loop" );
     self thread firesounddeath( fire_sound_ent );
+
     self waittill( "StopBurnSound" );
-	if ( isDefined( fire_sound_ent ) )
+
-	{
+    if ( isdefined( fire_sound_ent ) )
         fire_sound_ent stoploopsound( 0.5 );
-	}
+
     wait 0.5;
-	if ( isDefined( fire_sound_ent ) )
+
-	{
+    if ( isdefined( fire_sound_ent ) )
         fire_sound_ent delete();
-	}
-	/*
 /#
     println( "sound stop burning" );
 #/
-	*/
 }
 
-_stopburning() //checked matches cerberus output
+_stopburning()
 {
     self endon( "disconnect" );
     self notify( "StopBurnSound" );
-	if ( isDefined( self ) )
+
-	{
+    if ( isdefined( self ) )
         self stopburning();
 }
-}
 
-firesounddeath( ent ) //checked matches cerberus output
+firesounddeath( ent )
 {
     ent endon( "death" );
     self waittill_any( "death", "disconnect" );
     ent delete();
-	/*
 /#
     println( "sound delete burning" );
 #/
-	*/
 }

Multiplayer Core/patch_mp/maps/mp/_busing.gsc

@@ -1,22 +1,20 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\_utility;
 
-businit() //checked matches cerberus output
+businit()
 {
-	/*
 /#
     assert( level.clientscripts );
 #/
-	*/
     level.busstate = "";
     registerclientsys( "busCmd" );
 }
 
-setbusstate( state ) //checked matches cerberus output
+setbusstate( state )
 {
     if ( level.busstate != state )
-	{
         setclientsysstate( "busCmd", state );
-	}
+
     level.busstate = state;
 }

Multiplayer Core/patch_mp/maps/mp/_compass.gsc

@@ -1,22 +1,25 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
-setupminimap( material ) //checked matches cerberus output
+setupminimap( material )
 {
-	requiredmapaspectratio = getDvarFloat( "scr_RequiredMapAspectratio" );
+    requiredmapaspectratio = getdvarfloat( "scr_RequiredMapAspectratio" );
     corners = getentarray( "minimap_corner", "targetname" );
+
     if ( corners.size != 2 )
     {
-		/*
 /#
-		println( "^1Error: There are not exactly two "minimap_corner" entities in the map. Could not set up minimap." );
+        println( "^1Error: There are not exactly two \"minimap_corner\" entities in the map. Could not set up minimap." );
 #/
-		*/
         return;
     }
+
     corner0 = ( corners[0].origin[0], corners[0].origin[1], 0 );
     corner1 = ( corners[1].origin[0], corners[1].origin[1], 0 );
     cornerdiff = corner1 - corner0;
     north = ( cos( getnorthyaw() ), sin( getnorthyaw() ), 0 );
     west = ( 0 - north[1], north[0], 0 );
+
     if ( vectordot( cornerdiff, west ) > 0 )
     {
         if ( vectordot( cornerdiff, north ) > 0 )
@@ -42,11 +45,13 @@ setupminimap( material ) //checked matches cerberus output
         northwest = corner0;
         southeast = corner1;
     }
+
     if ( requiredmapaspectratio > 0 )
     {
         northportion = vectordot( northwest - southeast, north );
         westportion = vectordot( northwest - southeast, west );
         mapaspectratio = westportion / northportion;
+
         if ( mapaspectratio < requiredmapaspectratio )
         {
             incr = requiredmapaspectratio / mapaspectratio;
@@ -57,13 +62,15 @@ setupminimap( material ) //checked matches cerberus output
             incr = mapaspectratio / requiredmapaspectratio;
             addvec = vecscale( north, northportion * ( incr - 1 ) * 0.5 );
         }
+
         northwest += addvec;
         southeast -= addvec;
     }
+
     setminimap( material, northwest[0], northwest[1], southeast[0], southeast[1] );
 }
 
-vecscale( vec, scalar ) //checked matches cerberus output
+vecscale( vec, scalar )
 {
     return ( vec[0] * scalar, vec[1] * scalar, vec[2] * scalar );
 }

Multiplayer Core/patch_mp/maps/mp/_createfxundo.gsc

@@ -1,36 +1,36 @@
-#include maps/mp/_createfxmenu;
+// T6 GSC SOURCE
-#include maps/mp/_createfx;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\_utility;
+#include maps\mp\_createfx;
+#include maps\mp\_createfxmenu;
 
 store_undo_state( change_type, ents )
 {
-	if ( !isDefined( level.cfx_undo_states ) )
+    if ( !isdefined( level.cfx_undo_states ) )
     {
         level.cfx_undo_states = [];
         level.cfx_redo_states = [];
         level.cfx_limbo_state = spawnstruct();
         level.cfx_max_states = 10;
     }
+
     if ( !isarray( ents ) )
-	{
         ents = array( ents );
-	}
+
     temp_array = [];
-	i = 0;
+
-	while ( i < ents.size )
+    for ( i = 0; i < ents.size; i++ )
-	{
         temp_array[i] = copy_fx_ent( ents[i] );
-		i++;
+
-	}
     state = spawnstruct();
     state.operation = change_type;
     state.last_action = level.cfx_last_action;
     state.ent_array = temp_array;
+
     if ( level.cfx_undo_states.size >= level.cfx_max_states )
-	{
         level.cfx_undo_states = array_drop( level.cfx_undo_states );
-	}
+
     level.cfx_undo_states[level.cfx_undo_states.size] = state;
     level.cfx_redo_states = [];
     level.cfx_limbo_state = undefined;
@@ -39,11 +39,11 @@ store_undo_state( change_type, ents )
 
 undo()
 {
-	if ( isDefined( level.createfxent ) || !isDefined( level.cfx_undo_states ) && level.cfx_undo_states.size < 1 )
+    if ( !isdefined( level.createfxent ) || !isdefined( level.cfx_undo_states ) || level.cfx_undo_states.size < 1 )
-	{
         return;
-	}
+
     revert_state = level.cfx_undo_states[level.cfx_undo_states.size - 1];
+
     if ( level.cfx_last_action != "none" )
     {
         store_undo_state( "edit", level.selected_fx_ents );
@@ -53,14 +53,17 @@ undo()
         move_undo_state_to_limbo();
         level.cfx_last_action = "none";
     }
-	else clear_entity_selection( "skip_undo" );
+    else
+    {
+        clear_entity_selection( "skip_undo" );
+
         if ( revert_state.operation != "edit" )
         {
             apply_state_change( "undo", revert_state );
             move_undo_state_to_redo();
             level.cfx_last_action = "none";
         }
-	else if ( isDefined( level.cfx_limbo_state ) )
+        else if ( isdefined( level.cfx_limbo_state ) )
         {
             move_limbo_state_to_redo();
             apply_state_change( "undo", revert_state );
@@ -74,10 +77,12 @@ undo()
                 move_undo_state_to_redo();
                 revert_state = level.cfx_undo_states[level.cfx_undo_states.size - 1];
             }
+
             apply_state_change( "undo", revert_state );
             move_undo_state_to_limbo();
         }
     }
+}
 
 apply_state_change( type, revert_state )
 {
@@ -87,47 +92,31 @@ apply_state_change( type, revert_state )
         println( "^2CreateFX: Undo operation" );
 #/
         if ( revert_state.operation == "edit" )
-		{
             undo_edit( revert_state.ent_array );
-		}
         else if ( revert_state.operation == "add" )
-		{
             undo_add( revert_state.ent_array );
+        else if ( revert_state.operation == "delete" )
+            undo_delete( revert_state.ent_array );
     }
     else
     {
-			if ( revert_state.operation == "delete" )
+/#
-			{
-				undo_delete( revert_state.ent_array );
-			}
-		}
-	}
-	else /#
         println( "^2CreateFX: Redo operation" );
 #/
         if ( revert_state.operation == "edit" )
-	{
             undo_edit( revert_state.ent_array );
-	}
         else if ( revert_state.operation == "add" )
-	{
             undo_delete( revert_state.ent_array );
-	}
+        else if ( revert_state.operation == "delete" )
-	else
-	{
-		if ( revert_state.operation == "delete" )
-		{
             undo_add( revert_state.ent_array );
     }
 }
-}
 
 move_undo_state_to_redo()
 {
     if ( level.cfx_redo_states.size >= level.cfx_max_states )
-	{
         level.cfx_redo_states = array_drop( level.cfx_redo_states );
-	}
+
     level.cfx_redo_states[level.cfx_redo_states.size] = level.cfx_undo_states[level.cfx_undo_states.size - 1];
     level.cfx_undo_states = array_pop( level.cfx_undo_states );
     debug_print_latest_state( "undo" );
@@ -137,9 +126,8 @@ move_undo_state_to_redo()
 move_redo_state_to_undo()
 {
     if ( level.cfx_undo_states.size >= level.cfx_max_states )
-	{
         level.cfx_undo_states = array_drop( level.cfx_undo_states );
-	}
+
     level.cfx_undo_states[level.cfx_undo_states.size] = level.cfx_redo_states[level.cfx_redo_states.size - 1];
     level.cfx_redo_states = array_pop( level.cfx_redo_states );
     debug_print_latest_state( "undo" );
@@ -165,9 +153,8 @@ move_redo_state_to_limbo()
 move_limbo_state_to_undo()
 {
     if ( level.cfx_undo_states.size >= level.cfx_max_states )
-	{
         level.cfx_undo_states = array_drop( level.cfx_undo_states );
-	}
+
     level.cfx_undo_states[level.cfx_undo_states.size] = level.cfx_limbo_state;
     level.cfx_limbo_state = undefined;
     debug_print_latest_state( "undo" );
@@ -177,9 +164,8 @@ move_limbo_state_to_undo()
 move_limbo_state_to_redo()
 {
     if ( level.cfx_redo_states.size >= level.cfx_max_states )
-	{
         level.cfx_redo_states = array_drop( level.cfx_redo_states );
-	}
+
     level.cfx_redo_states[level.cfx_redo_states.size] = level.cfx_limbo_state;
     level.cfx_limbo_state = undefined;
     debug_print_latest_state( "redo" );
@@ -194,16 +180,17 @@ undo_edit( ent_array )
     debug_print_ent_array( level.createfxent, "level.createFXent[]" );
 #/
     last_id = ent_array[ent_array.size - 1].uniqueid;
-	if ( last_id > ( level.createfxent.size - 1 ) )
+
-	{
+    if ( last_id > level.createfxent.size - 1 )
         last_id = level.createfxent.size - 1;
-	}
+
     j = ent_array.size - 1;
     source_ent = ent_array[j];
-	i = last_id;
+
-	while ( i >= 0 )
+    for ( i = last_id; i >= 0; i-- )
     {
         target_ent = level.createfxent[i];
+
         if ( source_ent.uniqueid == target_ent.uniqueid )
         {
             copy_values_between_fx_ents( source_ent, target_ent );
@@ -211,17 +198,12 @@ undo_edit( ent_array )
             j--;
 
             if ( j < 0 )
-			{
                 break;
-			}
+
-			else
-			{
             source_ent = ent_array[j];
         }
-			i--;
+    }
 
-		}
-	}
     update_selected_entities();
 /#
     println( "^1CreateFX: Finished edit" );
@@ -238,35 +220,30 @@ undo_add( ent_array )
     debug_print_ent_array( level.createfxent, "level.createFXent[]" );
 #/
     last_id = ent_array[ent_array.size - 1].uniqueid;
-	if ( last_id > ( level.createfxent.size - 1 ) )
+
-	{
+    if ( last_id > level.createfxent.size - 1 )
         last_id = level.createfxent.size - 1;
-	}
+
     j = ent_array.size - 1;
     source_ent = ent_array[j];
-	i = last_id;
+
-	while ( i >= 0 )
+    for ( i = last_id; i >= 0; i-- )
     {
         target_ent = level.createfxent[i];
+
         if ( source_ent.uniqueid == target_ent.uniqueid )
         {
-			if ( isDefined( target_ent.looper ) )
+            if ( isdefined( target_ent.looper ) )
-			{
                 target_ent.looper delete();
-			}
+
             target_ent notify( "stop_loop" );
+            level.createfxent[i] = undefined;
             j--;
 
             if ( j < 0 )
-			{
                 break;
-			}
-			else
-			{
-				source_ent = ent_array[ j ];
-			}
-			i--;
 
+            source_ent = ent_array[j];
         }
     }
 /#
@@ -289,64 +266,64 @@ undo_delete( ent_array )
     debug_print_ent_array( level.createfxent, "level.createFXent[]" );
 #/
     ent_array = reorder_ent_array_by_uniqueid( ent_array );
+
     if ( level.createfxent.size == 0 )
     {
-		i = 0;
+        for ( i = 0; i < ent_array.size; i++ )
-		while ( i < ent_array.size )
-		{
             level.createfxent[i] = copy_fx_ent( ent_array[i] );
-			i++;
-		}
-	}
-	else temp_array = [];
-	i = 0;
-	j = 0;
-	while ( j < level.createfxent.size )
-	{
-		target_ent = level.createfxent[ j ];
-		if ( i >= ent_array.size )
-		{
-			temp_array[ temp_array.size ] = target_ent;
-			j++;
-			continue;
-		}
-		else source_ent = ent_array[ i ];
-		if ( target_ent.uniqueid < source_ent.uniqueid )
-		{
-			temp_array[ temp_array.size ] = target_ent;
-			j++;
-			continue;
     }
     else
     {
+        temp_array = [];
+        i = 0;
+
+        for ( j = 0; j < level.createfxent.size; j++ )
+        {
+            target_ent = level.createfxent[j];
+
+            if ( i >= ent_array.size )
+            {
+                temp_array[temp_array.size] = target_ent;
+                continue;
+            }
+
+            source_ent = ent_array[i];
+
+            if ( target_ent.uniqueid < source_ent.uniqueid )
+            {
+                temp_array[temp_array.size] = target_ent;
+                continue;
+            }
+
             temp_array[temp_array.size] = copy_fx_ent( source_ent );
             j--;
-
             i++;
         }
-		j++;
+
-	}
         while ( i < ent_array.size )
         {
             temp_array[temp_array.size] = ent_array[i];
             i++;
         }
+
         level.createfxent = temp_array;
+    }
 /#
     println( "^1Createfx: Finished undoing delete, pre-selection" );
     debug_print_ent_array( level.createfxent, "level.createFXent[]" );
 #/
     last_id = ent_array[ent_array.size - 1].uniqueid;
-	if ( last_id > ( level.createfxent.size - 1 ) )
+
-	{
+    if ( last_id > level.createfxent.size - 1 )
         last_id = level.createfxent.size - 1;
-	}
+
     j = ent_array.size - 1;
     source_ent = ent_array[j];
-	i = last_id;
+
-	while ( i >= 0 )
+    for ( i = last_id; i >= 0; i-- )
     {
         target_ent = level.createfxent[i];
+
         if ( source_ent.uniqueid == target_ent.uniqueid )
         {
             target_ent post_entity_creation_function();
@@ -354,58 +331,52 @@ undo_delete( ent_array )
             j--;
 
             if ( j < 0 )
-			{
                 break;
-			}
+
-			else
-			{
             source_ent = ent_array[j];
         }
-			i--;
+    }
 
-		}
-	}
     update_selected_entities();
 }
 
 redo()
 {
-	if ( isDefined( level.createfxent ) || !isDefined( level.cfx_redo_states ) && level.cfx_redo_states.size < 1 )
+    if ( !isdefined( level.createfxent ) || !isdefined( level.cfx_redo_states ) || level.cfx_redo_states.size < 1 )
-	{
         return;
-	}
+
     clear_entity_selection( "skip_undo" );
-	if ( isDefined( level.cfx_limbo_state ) )
+
+    if ( isdefined( level.cfx_limbo_state ) )
     {
         move_limbo_state_to_undo();
         move_redo_state_to_limbo();
         apply_state_change( "redo", level.cfx_limbo_state );
     }
-	else revert_state = level.cfx_redo_states[ level.cfx_redo_states.size - 1 ];
-	apply_state_change( "redo", revert_state );
-	if ( revert_state.operation == "edit" )
-	{
-		move_redo_state_to_limbo();
-	}
     else
     {
+        revert_state = level.cfx_redo_states[level.cfx_redo_states.size - 1];
+        apply_state_change( "redo", revert_state );
+
+        if ( revert_state.operation == "edit" )
+            move_redo_state_to_limbo();
+        else
             move_redo_state_to_undo();
     }
+
     level.cfx_last_action = "none";
 }
 
 reorder_ent_array_by_uniqueid( ent_array )
 {
     if ( ent_array.size <= 1 )
-	{
         return ent_array;
-	}
+
     array_size = ent_array.size;
-	i = 0;
+
-	while ( i < ( array_size - 1 ) )
+    for ( i = 0; i < array_size - 1; i++ )
     {
-		j = i + 1;
+        for ( j = i + 1; j < array_size; j++ )
-		while ( j < array_size )
         {
             if ( ent_array[i].uniqueid > ent_array[j].uniqueid )
             {
@@ -413,10 +384,9 @@ reorder_ent_array_by_uniqueid( ent_array )
                 ent_array[i] = ent_array[j];
                 ent_array[j] = temp_ent;
             }
-			j++;
         }
-		i++;
     }
+
     return ent_array;
 }
 
@@ -446,16 +416,13 @@ array_pop( array )
 {
     array_size = array.size - 1;
     temp_array = [];
+
     if ( array_size <= 0 )
-	{
         return temp_array;
-	}
+
-	i = 0;
+    for ( i = 0; i < array_size; i++ )
-	while ( i < array_size )
-	{
         temp_array[i] = array[i];
-		i++;
+
-	}
     array = temp_array;
     return array;
 }
@@ -465,80 +432,76 @@ array_drop( array )
     if ( array.size > 0 )
     {
         temp_array = [];
-		i = 1;
+
-		while ( i < array.size )
+        for ( i = 1; i < array.size; i++ )
-		{
             temp_array[i - 1] = array[i];
-			i++;
+
-		}
         array = temp_array;
     }
+
     return array;
 }
 
 debug_print_ent_array( array, name )
 {
 /#
-	if ( isDefined( name ) )
+    if ( isdefined( name ) )
-	{
         println( "Printing out " + name );
-	}
     else
-	{
         println( "Printing out some array" );
-	}
+
-	i = 0;
+    for ( i = 0; i < array.size; i++ )
-	while ( i < array.size )
     {
-		if ( !isDefined( array[ i ] ) )
+        if ( !isdefined( array[i] ) )
         {
             println( "" + i + ": deleted effect" );
-			i++;
             continue;
         }
-		else
+
-		{
         println( "" + i + ": uniqueid: " + array[i].uniqueid + "  fxid: " + array[i].v["fxid"] );
     }
-		i++;
 #/
 }
-}
 
 debug_print_latest_state( type )
 {
 /#
     println( "^3Saving " + type + " state" );
+
     if ( type == "undo" )
     {
-		if ( !isDefined( level.cfx_undo_states[ level.cfx_undo_states.size - 1 ] ) )
+        if ( !isdefined( level.cfx_undo_states[level.cfx_undo_states.size - 1] ) )
         {
             println( "There are no undo states." );
             return;
         }
+
         state = level.cfx_undo_states[level.cfx_undo_states.size - 1];
         size = level.cfx_undo_states.size - 1;
     }
     else if ( type == "redo" )
     {
-		if ( !isDefined( level.cfx_redo_states[ level.cfx_redo_states.size - 1 ] ) )
+        if ( !isdefined( level.cfx_redo_states[level.cfx_redo_states.size - 1] ) )
         {
             println( "There are no redo states." );
             return;
         }
+
         state = level.cfx_redo_states[level.cfx_redo_states.size - 1];
         size = level.cfx_redo_states.size - 1;
     }
     else
     {
-		if ( !isDefined( level.cfx_limbo_state ) )
+        if ( !isdefined( level.cfx_limbo_state ) )
         {
             println( "There is no limbo state." );
             return;
         }
+
         state = level.cfx_limbo_state;
         size = 0;
     }
+
     println( "State " + size + " - " + state.operation + ": " + state.last_action );
     debug_print_ent_array( state.ent_array, "save state ent_array" );
 #/

Multiplayer Core/patch_mp/maps/mp/_decoy.gsc

@@ -1,7 +1,9 @@
-#include maps/mp/_entityheadicons;
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_weaponobjects;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_weaponobjects;
+#include maps\mp\_entityheadicons;
 
 init()
 {
@@ -17,7 +19,7 @@ init()
 
 createdecoywatcher()
 {
-	watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "nightingale", "nightingale_mp", self.team );
+    watcher = self maps\mp\gametypes\_weaponobjects::createuseweaponobjectwatcher( "nightingale", "nightingale_mp", self.team );
     watcher.onspawn = ::onspawndecoy;
     watcher.detonate = ::decoydetonate;
     watcher.deleteondifferentobjectspawn = 0;
@@ -28,22 +30,24 @@ onspawndecoy( watcher, owner )
 {
     owner endon( "disconnect" );
     self endon( "death" );
-	maps/mp/gametypes/_weaponobjects::onspawnuseweaponobject( watcher, owner );
+    maps\mp\gametypes\_weaponobjects::onspawnuseweaponobject( watcher, owner );
     self.initial_velocity = self getvelocity();
     delay = 1;
-	wait delay;
+    wait( delay );
     decoy_time = 30;
-	spawn_time = getTime();
+    spawn_time = gettime();
     owner addweaponstat( "nightingale_mp", "used", 1 );
     self thread simulateweaponfire( owner );
-	while ( 1 )
+
+    while ( true )
     {
-		if ( getTime() > ( spawn_time + ( decoy_time * 1000 ) ) )
+        if ( gettime() > spawn_time + decoy_time * 1000 )
         {
             self destroydecoy( watcher, owner );
             return;
         }
-		wait 0,05;
+
+        wait 0.05;
     }
 }
 
@@ -51,43 +55,42 @@ movedecoy( owner, count, fire_time, main_dir, max_offset_angle )
 {
     self endon( "death" );
     self endon( "done" );
+
     if ( !self isonground() )
-	{
         return;
-	}
+
     min_speed = 100;
     max_speed = 200;
     min_up_speed = 100;
     max_up_speed = 200;
     current_main_dir = randomintrange( main_dir - max_offset_angle, main_dir + max_offset_angle );
-	avel = ( randomfloatrange( 800, 1800 ) * ( ( randomintrange( 0, 2 ) * 2 ) - 1 ), 0, randomfloatrange( 580, 940 ) * ( ( randomintrange( 0, 2 ) * 2 ) - 1 ) );
+    avel = ( randomfloatrange( 800, 1800 ) * ( randomintrange( 0, 2 ) * 2 - 1 ), 0, randomfloatrange( 580, 940 ) * ( randomintrange( 0, 2 ) * 2 - 1 ) );
     intial_up = randomfloatrange( min_up_speed, max_up_speed );
-	start_time = getTime();
+    start_time = gettime();
-	gravity = getDvarInt( "bg_gravity" );
+    gravity = getdvarint( "bg_gravity" );
-	i = 0;
+
-	while ( i < 1 )
+    for ( i = 0; i < 1; i++ )
     {
         angles = ( 0, randomintrange( current_main_dir - max_offset_angle, current_main_dir + max_offset_angle ), 0 );
-		dir = anglesToForward( angles );
+        dir = anglestoforward( angles );
-		dir = vectorScale( dir, randomfloatrange( min_speed, max_speed ) );
+        dir = vectorscale( dir, randomfloatrange( min_speed, max_speed ) );
-		deltatime = ( getTime() - start_time ) * 0,001;
+        deltatime = ( gettime() - start_time ) * 0.001;
-		up = ( 0, 0, intial_up - ( 800 * deltatime ) );
+        up = ( 0, 0, intial_up - 800 * deltatime );
         self launch( dir + up, avel );
-		wait fire_time;
+        wait( fire_time );
-		i++;
     }
 }
 
 destroydecoy( watcher, owner )
 {
     self notify( "done" );
-	self maps/mp/_entityheadicons::setentityheadicon( "none" );
+    self maps\mp\_entityheadicons::setentityheadicon( "none" );
 }
 
 decoydetonate( attacker )
 {
     self notify( "done" );
-	self maps/mp/_entityheadicons::setentityheadicon( "none" );
+    self maps\mp\_entityheadicons::setentityheadicon( "none" );
 }
 
 getweaponfordecoy( owner )
@@ -102,21 +105,22 @@ simulateweaponfire( owner )
     self endon( "death" );
     self endon( "done" );
     weapon = getweaponfordecoy( owner );
+
     if ( weapon == "none" )
-	{
         return;
-	}
+
     self thread watchforexplosion( owner, weapon );
     self thread trackmaindirection();
     self.max_offset_angle = 30;
     weapon_class = getweaponclass( weapon );
+
     switch ( weapon_class )
     {
-		case "weapon_assault":
-		case "weapon_cqb":
-		case "weapon_hmg":
-		case "weapon_lmg":
         case "weapon_smg":
+        case "weapon_lmg":
+        case "weapon_hmg":
+        case "weapon_cqb":
+        case "weapon_assault":
             simulateweaponfiremachinegun( owner, weapon );
             break;
         case "weapon_sniper":
@@ -137,14 +141,10 @@ simulateweaponfire( owner )
 simulateweaponfiremachinegun( owner, weapon )
 {
     if ( weaponissemiauto( weapon ) )
-	{
         simulateweaponfiremachinegunsemiauto( owner, weapon );
-	}
     else
-	{
         simulateweaponfiremachinegunfullauto( owner, weapon );
 }
-}
 
 simulateweaponfiremachinegunsemiauto( owner, weapon )
 {
@@ -153,16 +153,14 @@ simulateweaponfiremachinegunsemiauto( owner, weapon )
     reloadtime = weaponreloadtime( weapon );
     burst_spacing_min = 4;
     burst_spacing_max = 10;
-	while ( 1 )
+
+    while ( true )
     {
         if ( clipsize <= 1 )
-		{
             burst_count = 1;
-		}
         else
-		{
             burst_count = randomintrange( 1, clipsize );
-		}
+
         self thread movedecoy( owner, burst_count, firetime, self.main_dir, self.max_offset_angle );
         self fireburst( owner, weapon, firetime, burst_count, 1 );
         finishwhileloop( weapon, reloadtime, burst_spacing_min, burst_spacing_max );
@@ -174,9 +172,10 @@ simulateweaponfirepistol( owner, weapon )
     firetime = weaponfiretime( weapon );
     clipsize = weaponclipsize( weapon );
     reloadtime = weaponreloadtime( weapon );
-	burst_spacing_min = 0,5;
+    burst_spacing_min = 0.5;
     burst_spacing_max = 4;
-	while ( 1 )
+
+    while ( true )
     {
         burst_count = randomintrange( 1, clipsize );
         self thread movedecoy( owner, burst_count, firetime, self.main_dir, self.max_offset_angle );
@@ -190,13 +189,14 @@ simulateweaponfireshotgun( owner, weapon )
     firetime = weaponfiretime( weapon );
     clipsize = weaponclipsize( weapon );
     reloadtime = weaponreloadtime( weapon );
+
     if ( clipsize > 2 )
-	{
         clipsize = 2;
-	}
+
-	burst_spacing_min = 0,5;
+    burst_spacing_min = 0.5;
     burst_spacing_max = 4;
-	while ( 1 )
+
+    while ( true )
     {
         burst_count = randomintrange( 1, clipsize );
         self thread movedecoy( owner, burst_count, firetime, self.main_dir, self.max_offset_angle );
@@ -210,15 +210,16 @@ simulateweaponfiremachinegunfullauto( owner, weapon )
     firetime = weaponfiretime( weapon );
     clipsize = weaponclipsize( weapon );
     reloadtime = weaponreloadtime( weapon );
+
     if ( clipsize > 30 )
-	{
         clipsize = 30;
-	}
+
     burst_spacing_min = 2;
     burst_spacing_max = 6;
-	while ( 1 )
+
+    while ( true )
     {
-		burst_count = randomintrange( int( clipsize * 0,6 ), clipsize );
+        burst_count = randomintrange( int( clipsize * 0.6 ), clipsize );
         interrupt = 0;
         self thread movedecoy( owner, burst_count, firetime, self.main_dir, self.max_offset_angle );
         self fireburst( owner, weapon, firetime, burst_count, interrupt );
@@ -231,13 +232,14 @@ simulateweaponfiresniper( owner, weapon )
     firetime = weaponfiretime( weapon );
     clipsize = weaponclipsize( weapon );
     reloadtime = weaponreloadtime( weapon );
+
     if ( clipsize > 2 )
-	{
         clipsize = 2;
-	}
+
     burst_spacing_min = 3;
     burst_spacing_max = 5;
-	while ( 1 )
+
+    while ( true )
     {
         burst_count = randomintrange( 1, clipsize );
         self thread movedecoy( owner, burst_count, firetime, self.main_dir, self.max_offset_angle );
@@ -249,12 +251,13 @@ simulateweaponfiresniper( owner, weapon )
 fireburst( owner, weapon, firetime, count, interrupt )
 {
     interrupt_shot = count;
+
     if ( interrupt )
-	{
+        interrupt_shot = int( count * randomfloatrange( 0.6, 0.8 ) );
-		interrupt_shot = int( count * randomfloatrange( 0,6, 0,8 ) );
+
-	}
     self fakefire( owner, self.origin, weapon, interrupt_shot );
     wait( firetime * interrupt_shot );
+
     if ( interrupt )
     {
         self fakefire( owner, self.origin, weapon, count - interrupt_shot );
@@ -265,23 +268,19 @@ fireburst( owner, weapon, firetime, count, interrupt )
 finishwhileloop( weapon, reloadtime, burst_spacing_min, burst_spacing_max )
 {
     if ( shouldplayreloadsound() )
-	{
         playreloadsounds( weapon, reloadtime );
-	}
     else
-	{
+        wait( randomfloatrange( burst_spacing_min, burst_spacing_max ) );
-		wait randomfloatrange( burst_spacing_min, burst_spacing_max );
-	}
 }
 
 playreloadsounds( weapon, reloadtime )
 {
-	divy_it_up = ( reloadtime - 0,1 ) / 2;
+    divy_it_up = ( reloadtime - 0.1 ) / 2;
-	wait 0,1;
+    wait 0.1;
     self playsound( "fly_assault_reload_npc_mag_out" );
-	wait divy_it_up;
+    wait( divy_it_up );
     self playsound( "fly_assault_reload_npc_mag_in" );
-	wait divy_it_up;
+    wait( divy_it_up );
 }
 
 watchforexplosion( owner, weapon )
@@ -289,14 +288,17 @@ watchforexplosion( owner, weapon )
     self thread watchfordeathbeforeexplosion();
     owner endon( "disconnect" );
     self endon( "death_before_explode" );
+
     self waittill( "explode", pos );
+
     level thread doexplosion( owner, pos, weapon, randomintrange( 5, 10 ) );
 }
 
 watchfordeathbeforeexplosion()
 {
     self waittill( "death" );
-	wait 0,1;
+
+    wait 0.1;
     self notify( "death_before_explode" );
 }
 
@@ -304,23 +306,22 @@ doexplosion( owner, pos, weapon, count )
 {
     min_offset = 100;
     max_offset = 500;
-	i = 0;
+
-	while ( i < count )
+    for ( i = 0; i < count; i++ )
     {
-		wait randomfloatrange( 0,1, 0,5 );
+        wait( randomfloatrange( 0.1, 0.5 ) );
-		offset = ( randomfloatrange( min_offset, max_offset ) * ( ( randomintrange( 0, 2 ) * 2 ) - 1 ), randomfloatrange( min_offset, max_offset ) * ( ( randomintrange( 0, 2 ) * 2 ) - 1 ), 0 );
+        offset = ( randomfloatrange( min_offset, max_offset ) * ( randomintrange( 0, 2 ) * 2 - 1 ), randomfloatrange( min_offset, max_offset ) * ( randomintrange( 0, 2 ) * 2 - 1 ), 0 );
         owner fakefire( owner, pos + offset, weapon, 1 );
-		i++;
     }
 }
 
 pickrandomweapon()
 {
     type = "fullauto";
+
     if ( randomintrange( 0, 10 ) < 3 )
-	{
         type = "semiauto";
-	}
+
     randomval = randomintrange( 0, level.decoyweapons[type].size );
 /#
     println( "Decoy type: " + type + " weapon: " + level.decoyweapons[type][randomval] );
@@ -331,25 +332,25 @@ pickrandomweapon()
 shouldplayreloadsound()
 {
     if ( randomintrange( 0, 5 ) == 1 )
-	{
+        return true;
-		return 1;
+
-	}
+    return false;
-	return 0;
 }
 
 trackmaindirection()
 {
     self endon( "death" );
     self endon( "done" );
-	self.main_dir = int( vectorToAngle( ( self.initial_velocity[ 0 ], self.initial_velocity[ 1 ], 0 ) )[ 1 ] );
+    self.main_dir = int( vectortoangles( ( self.initial_velocity[0], self.initial_velocity[1], 0 ) )[1] );
     up = ( 0, 0, 1 );
-	while ( 1 )
+
+    while ( true )
     {
         self waittill( "grenade_bounce", pos, normal );
+
         dot = vectordot( normal, up );
-		if ( dot < 0,5 && dot > -0,5 )
+
-		{
+        if ( dot < 0.5 && dot > -0.5 )
-			self.main_dir = int( vectorToAngle( ( normal[ 0 ], normal[ 1 ], 0 ) )[ 1 ] );
+            self.main_dir = int( vectortoangles( ( normal[0], normal[1], 0 ) )[1] );
-		}
     }
 }

Multiplayer Core/patch_mp/maps/mp/_demo.gsc

@@ -1,5 +1,7 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
-init() //checked matches cerberus output
+init()
 {
     level.bookmark["kill"] = 0;
     level.bookmark["event"] = 1;
@@ -28,13 +30,11 @@ init() //checked matches cerberus output
     level.bookmark["zm_player_grenade_special_long"] = 24;
 }
 
-bookmark( type, time, clientent1, clientent2, eventpriority, inflictorent, overrideentitycamera, actorent ) //checked matches cerberus output
+bookmark( type, time, clientent1, clientent2, eventpriority, inflictorent, overrideentitycamera, actorent )
 {
-	/*
 /#
-	assert( isDefined( level.bookmark[ type ] ), "Unable to find a bookmark type for type - " + type );
+    assert( isdefined( level.bookmark[type] ), "Unable to find a bookmark type for type - " + type );
 #/
-	*/
     client1 = 255;
     client2 = 255;
     inflictorentnum = -1;
@@ -42,45 +42,39 @@ bookmark( type, time, clientent1, clientent2, eventpriority, inflictorent, overr
     inflictorbirthtime = 0;
     actorentnum = undefined;
     scoreeventpriority = 0;
-	if ( isDefined( clientent1 ) )
+
-	{
+    if ( isdefined( clientent1 ) )
         client1 = clientent1 getentitynumber();
-	}
+
-	if ( isDefined( clientent2 ) )
+    if ( isdefined( clientent2 ) )
-	{
         client2 = clientent2 getentitynumber();
-	}
+
-	if ( isDefined( eventpriority ) )
+    if ( isdefined( eventpriority ) )
-	{
         scoreeventpriority = eventpriority;
-	}
+
-	if ( isDefined( inflictorent ) )
+    if ( isdefined( inflictorent ) )
     {
         inflictorentnum = inflictorent getentitynumber();
         inflictorenttype = inflictorent getentitytype();
-		if ( isDefined( inflictorent.birthtime ) )
+
-		{
+        if ( isdefined( inflictorent.birthtime ) )
             inflictorbirthtime = inflictorent.birthtime;
     }
-	}
+
-	if ( !isDefined( overrideentitycamera ) )
+    if ( !isdefined( overrideentitycamera ) )
-	{
         overrideentitycamera = 0;
-	}
+
-	if ( isDefined( actorent ) )
+    if ( isdefined( actorent ) )
-	{
         actorentnum = actorent getentitynumber();
-	}
+
     adddemobookmark( level.bookmark[type], time, client1, client2, scoreeventpriority, inflictorentnum, inflictorenttype, inflictorbirthtime, overrideentitycamera, actorentnum );
 }
 
-gameresultbookmark( type, winningteamindex, losingteamindex ) //checked matches cerberus output
+gameresultbookmark( type, winningteamindex, losingteamindex )
 {
-	/*
 /#
-	assert( isDefined( level.bookmark[ type ] ), "Unable to find a bookmark type for type - " + type );
+    assert( isdefined( level.bookmark[type] ), "Unable to find a bookmark type for type - " + type );
 #/
-	*/
     client1 = 255;
     client2 = 255;
     scoreeventpriority = 0;
@@ -89,14 +83,12 @@ gameresultbookmark( type, winningteamindex, losingteamindex ) //checked matches
     inflictorbirthtime = 0;
     overrideentitycamera = 0;
     actorentnum = undefined;
-	if ( isDefined( winningteamindex ) )
-	{
-		client1 = winningteamindex;
-	}
-	if ( isDefined( losingteamindex ) )
-	{
-		client2 = losingteamindex;
-	}
-	adddemobookmark( level.bookmark[ type ], getTime(), client1, client2, scoreeventpriority, inflictorentnum, inflictorenttype, inflictorbirthtime, overrideentitycamera, actorentnum );
-}
 
+    if ( isdefined( winningteamindex ) )
+        client1 = winningteamindex;
+
+    if ( isdefined( losingteamindex ) )
+        client2 = losingteamindex;
+
+    adddemobookmark( level.bookmark[type], gettime(), client1, client2, scoreeventpriority, inflictorentnum, inflictorenttype, inflictorbirthtime, overrideentitycamera, actorentnum );
+}

Multiplayer Core/patch_mp/maps/mp/_destructible.gsc

@@ -1,7 +1,9 @@
-#include maps/mp/_challenges;
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_globallogic_player;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include maps\mp\_utility;
-#include maps/mp/_utility;
+#include common_scripts\utility;
+#include maps\mp\gametypes\_globallogic_player;
+#include maps\mp\_challenges;
 
 #using_animtree("mp_vehicles");
 
@@ -9,43 +11,38 @@ init()
 {
     level.destructible_callbacks = [];
     destructibles = getentarray( "destructible", "targetname" );
+
     if ( destructibles.size <= 0 )
-	{
         return;
-	}
+
     precacheitem( "destructible_car_mp" );
     precacheitem( "explodable_barrel_mp" );
-	i = 0;
+
-	while ( i < destructibles.size )
+    for ( i = 0; i < destructibles.size; i++ )
     {
         if ( getsubstr( destructibles[i].destructibledef, 0, 4 ) == "veh_" )
         {
             destructibles[i] thread destructible_car_death_think();
             destructibles[i] thread destructible_car_grenade_stuck_think();
-			i++;
             continue;
         }
-		else if ( issubstr( destructibles[ i ].destructibledef, "barrel" ) )
+
+        if ( issubstr( destructibles[i].destructibledef, "barrel" ) )
         {
             destructibles[i] thread destructible_barrel_death_think();
-			i++;
             continue;
         }
-		else if ( issubstr( destructibles[ i ].destructibledef, "gaspump" ) )
+
+        if ( issubstr( destructibles[i].destructibledef, "gaspump" ) )
         {
             destructibles[i] thread destructible_barrel_death_think();
-			i++;
             continue;
         }
-		else
+
-		{
         if ( destructibles[i].destructibledef == "fxdest_upl_metal_tank_01" )
-			{
             destructibles[i] thread destructible_tank_grenade_stuck_think();
     }
-		}
+
-		i++;
-	}
     destructible_anims = [];
     destructible_anims["car"] = %veh_car_destroy;
 }
@@ -53,44 +50,43 @@ init()
 destructible_event_callback( destructible_event, attacker, weapon )
 {
     explosion_radius = 0;
+
     if ( issubstr( destructible_event, "explode" ) && destructible_event != "explode" )
     {
         tokens = strtok( destructible_event, "_" );
         explosion_radius = tokens[1];
+
         if ( explosion_radius == "sm" )
-		{
             explosion_radius = 150;
-		}
         else if ( explosion_radius == "lg" )
-		{
             explosion_radius = 450;
-		}
         else
-		{
             explosion_radius = int( explosion_radius );
-		}
+
         destructible_event = "explode_complex";
     }
+
     if ( issubstr( destructible_event, "simple_timed_explosion" ) )
     {
         self thread simple_timed_explosion( destructible_event, attacker );
         return;
     }
+
     switch ( destructible_event )
     {
         case "destructible_car_explosion":
             self destructible_car_explosion( attacker );
-			if ( isDefined( weapon ) )
+
-			{
+            if ( isdefined( weapon ) )
                 self.destroyingweapon = weapon;
-			}
+
             break;
         case "destructible_car_fire":
             self thread destructible_car_fire_think( attacker );
-			if ( isDefined( weapon ) )
+
-			{
+            if ( isdefined( weapon ) )
                 self.destroyingweapon = weapon;
-			}
+
             break;
         case "destructible_barrel_fire":
             self thread destructible_barrel_fire_think( attacker );
@@ -105,33 +101,28 @@ destructible_event_callback( destructible_event, attacker, weapon )
             self thread complex_explosion( attacker, explosion_radius );
             break;
         default:
+            break;
     }
-		if ( isDefined( level.destructible_callbacks[ destructible_event ] ) )
+
-		{
+    if ( isdefined( level.destructible_callbacks[destructible_event] ) )
         self thread [[ level.destructible_callbacks[destructible_event] ]]( destructible_event, attacker );
 }
-	}
-}
 
 simple_explosion( attacker )
 {
     if ( is_true( self.exploded ) )
-	{
         return;
-	}
+
     self.exploded = 1;
-	offset = vectorScale( ( 0, 0, 1 ), 5 );
+    offset = vectorscale( ( 0, 0, 1 ), 5.0 );
     self radiusdamage( self.origin + offset, 256, 300, 75, attacker, "MOD_EXPLOSIVE", "explodable_barrel_mp" );
-	physicsexplosionsphere( self.origin, 255, 254, 0,3, 400, 25 );
+    physicsexplosionsphere( self.origin, 255, 254, 0.3, 400, 25 );
-	if ( isDefined( attacker ) )
+
-	{
+    if ( isdefined( attacker ) )
         self dodamage( self.health + 10000, self.origin + offset, attacker );
-	}
     else
-	{
         self dodamage( self.health + 10000, self.origin + offset );
 }
-}
 
 simple_timed_explosion( destructible_event, attacker )
 {
@@ -139,110 +130,90 @@ simple_timed_explosion( destructible_event, attacker )
     wait_times = [];
     str = getsubstr( destructible_event, 23 );
     tokens = strtok( str, "_" );
-	i = 0;
+
-	while ( i < tokens.size )
+    for ( i = 0; i < tokens.size; i++ )
-	{
         wait_times[wait_times.size] = int( tokens[i] );
-		i++;
+
-	}
     if ( wait_times.size <= 0 )
     {
         wait_times[0] = 5;
         wait_times[1] = 10;
     }
-	wait randomintrange( wait_times[ 0 ], wait_times[ 1 ] );
+
+    wait( randomintrange( wait_times[0], wait_times[1] ) );
     simple_explosion( attacker );
 }
 
 complex_explosion( attacker, max_radius )
 {
-	offset = vectorScale( ( 0, 0, 1 ), 5 );
+    offset = vectorscale( ( 0, 0, 1 ), 5.0 );
-	if ( isDefined( attacker ) )
+
-	{
+    if ( isdefined( attacker ) )
         self radiusdamage( self.origin + offset, max_radius, 300, 100, attacker );
-	}
     else
-	{
         self radiusdamage( self.origin + offset, max_radius, 300, 100 );
-	}
+
     playrumbleonposition( "grenade_rumble", self.origin );
-	earthquake( 0,5, 0,5, self.origin, max_radius );
+    earthquake( 0.5, 0.5, self.origin, max_radius );
-	physicsexplosionsphere( self.origin + offset, max_radius, max_radius - 1, 0,3 );
+    physicsexplosionsphere( self.origin + offset, max_radius, max_radius - 1, 0.3 );
-	if ( isDefined( attacker ) )
+
-	{
+    if ( isdefined( attacker ) )
         self dodamage( 20000, self.origin + offset, attacker );
-	}
     else
-	{
         self dodamage( 20000, self.origin + offset );
 }
-}
 
 destructible_car_explosion( attacker, physics_explosion )
 {
     if ( self.car_dead )
-	{
         return;
-	}
+
-	if ( !isDefined( physics_explosion ) )
+    if ( !isdefined( physics_explosion ) )
-	{
         physics_explosion = 1;
-	}
+
     players = get_players();
-	i = 0;
+
-	while ( i < players.size )
+    for ( i = 0; i < players.size; i++ )
     {
         body = players[i].body;
-		if ( !isDefined( body ) )
+
-		{
+        if ( !isdefined( body ) )
-			i++;
             continue;
-		}
+
-		else if ( distancesquared( body.origin, self.origin ) > 9216 )
+        if ( distancesquared( body.origin, self.origin ) > 9216 )
-		{
-			i++;
             continue;
-		}
+
-		else
+        if ( body.origin[2] - self.origin[2] + 32 > 0 )
-		{
-			if ( ( body.origin[ 2 ] - ( self.origin[ 2 ] + 32 ) ) > 0 )
-			{
             body.origin = ( body.origin[0], body.origin[1], body.origin[2] + 16 );
+
+        body maps\mp\gametypes\_globallogic_player::start_explosive_ragdoll();
     }
-			body maps/mp/gametypes/_globallogic_player::start_explosive_ragdoll();
+
-		}
-		i++;
-	}
     self notify( "car_dead" );
     self.car_dead = 1;
     self thread destructible_car_explosion_animate();
-	if ( isDefined( attacker ) )
+
-	{
+    if ( isdefined( attacker ) )
         self radiusdamage( self.origin, 256, 300, 75, attacker, "MOD_EXPLOSIVE", "destructible_car_mp" );
-	}
     else
-	{
         self radiusdamage( self.origin, 256, 300, 75 );
-	}
+
     playrumbleonposition( "grenade_rumble", self.origin );
-	earthquake( 0,5, 0,5, self.origin, 800 );
+    earthquake( 0.5, 0.5, self.origin, 800 );
+
     if ( physics_explosion )
-	{
+        physicsexplosionsphere( self.origin, 255, 254, 0.3, 400, 25 );
-		physicsexplosionsphere( self.origin, 255, 254, 0,3, 400, 25 );
+
-	}
+    if ( isdefined( attacker ) )
-	if ( isDefined( attacker ) )
+        attacker thread maps\mp\_challenges::destroyed_car();
-	{
+
-		attacker thread maps/mp/_challenges::destroyed_car();
-	}
     level.globalcarsdestroyed++;
-	if ( isDefined( attacker ) )
+
-	{
+    if ( isdefined( attacker ) )
         self dodamage( self.health + 10000, self.origin + ( 0, 0, 1 ), attacker );
-	}
     else
-	{
         self dodamage( self.health + 10000, self.origin + ( 0, 0, 1 ) );
-	}
+
     self setclientflag( 3 );
 }
 
@@ -250,52 +221,49 @@ destructible_tank_grenade_stuck_think()
 {
     self endon( "destructible_base_piece_death" );
     self endon( "death" );
+
     for (;;)
     {
         self waittill( "grenade_stuck", missile );
-		if ( !isDefined( missile ) || !isDefined( missile.model ) )
+
-		{
+        if ( !isdefined( missile ) || !isdefined( missile.model ) )
             continue;
-		}
+
-		else
+        if ( missile.model == "t5_weapon_crossbow_bolt" || missile.model == "t6_wpn_grenade_semtex_projectile" || missile.model == "t6_wpn_c4_world" )
-		{
-			if ( missile.model != "t5_weapon_crossbow_bolt" || missile.model == "t6_wpn_grenade_semtex_projectile" && missile.model == "t6_wpn_c4_world" )
-			{
             self thread destructible_tank_grenade_stuck_explode( missile );
     }
 }
-	}
-}
 
 destructible_tank_grenade_stuck_explode( missile )
 {
     self endon( "destructible_base_piece_death" );
     self endon( "death" );
     owner = getmissileowner( missile );
-	if ( isDefined( owner ) && missile.model == "t6_wpn_c4_world" )
+
+    if ( isdefined( owner ) && missile.model == "t6_wpn_c4_world" )
     {
         owner endon( "disconnect" );
         owner endon( "weapon_object_destroyed" );
         missile endon( "picked_up" );
         missile thread destructible_tank_hacked_c4( self );
     }
+
     missile waittill( "explode" );
-	if ( isDefined( owner ) )
+
-	{
+    if ( isdefined( owner ) )
         self dodamage( self.health + 10000, self.origin + ( 0, 0, 1 ), owner );
-	}
     else
-	{
         self dodamage( self.health + 10000, self.origin + ( 0, 0, 1 ) );
 }
-}
 
 destructible_tank_hacked_c4( tank )
 {
     tank endon( "destructible_base_piece_death" );
     tank endon( "death" );
     self endon( "death" );
+
     self waittill( "hacked" );
+
     self notify( "picked_up" );
     tank thread destructible_tank_grenade_stuck_explode( self );
 }
@@ -305,34 +273,30 @@ destructible_car_death_think()
     self endon( "car_dead" );
     self.car_dead = 0;
     self thread destructible_car_death_notify();
+
     self waittill( "destructible_base_piece_death", attacker );
-	if ( isDefined( self ) )
+
-	{
+    if ( isdefined( self ) )
         self thread destructible_car_explosion( attacker, 0 );
 }
-}
 
 destructible_car_grenade_stuck_think()
 {
     self endon( "destructible_base_piece_death" );
     self endon( "car_dead" );
     self endon( "death" );
+
     for (;;)
     {
         self waittill( "grenade_stuck", missile );
-		if ( !isDefined( missile ) || !isDefined( missile.model ) )
+
-		{
+        if ( !isdefined( missile ) || !isdefined( missile.model ) )
             continue;
-		}
+
-		else
+        if ( missile.model == "t5_weapon_crossbow_bolt" || missile.model == "t6_wpn_grenade_semtex_projectile" || missile.model == "t6_wpn_c4_world" )
-		{
-			if ( missile.model != "t5_weapon_crossbow_bolt" || missile.model == "t6_wpn_grenade_semtex_projectile" && missile.model == "t6_wpn_c4_world" )
-			{
             self thread destructible_car_grenade_stuck_explode( missile );
     }
 }
-	}
-}
 
 destructible_car_grenade_stuck_explode( missile )
 {
@@ -340,23 +304,22 @@ destructible_car_grenade_stuck_explode( missile )
     self endon( "car_dead" );
     self endon( "death" );
     owner = getmissileowner( missile );
-	if ( isDefined( owner ) && missile.model == "t6_wpn_c4_world" )
+
+    if ( isdefined( owner ) && missile.model == "t6_wpn_c4_world" )
     {
         owner endon( "disconnect" );
         owner endon( "weapon_object_destroyed" );
         missile endon( "picked_up" );
         missile thread destructible_car_hacked_c4( self );
     }
+
     missile waittill( "explode" );
-	if ( isDefined( owner ) )
+
-	{
+    if ( isdefined( owner ) )
         self dodamage( self.health + 10000, self.origin + ( 0, 0, 1 ), owner );
-	}
     else
-	{
         self dodamage( self.health + 10000, self.origin + ( 0, 0, 1 ) );
 }
-}
 
 destructible_car_hacked_c4( car )
 {
@@ -364,7 +327,9 @@ destructible_car_hacked_c4( car )
     car endon( "car_dead" );
     car endon( "death" );
     self endon( "death" );
+
     self waittill( "hacked" );
+
     self notify( "picked_up" );
     car thread destructible_car_grenade_stuck_explode( self );
 }
@@ -372,8 +337,10 @@ destructible_car_hacked_c4( car )
 destructible_car_death_notify()
 {
     self endon( "car_dead" );
+
     self waittill( "death", attacker );
-	self notify( "destructible_base_piece_death" );
+
+    self notify( "destructible_base_piece_death", attacker );
 }
 
 destructible_car_explosion_animate()
@@ -381,28 +348,26 @@ destructible_car_explosion_animate()
     self setclientflag( 12 );
     end_origin = self.origin;
     self.origin = ( self.origin[0], self.origin[1], self.origin[2] + 16 );
-	wait 0,3;
+    wait 0.3;
     items = getdroppedweapons();
-	i = 0;
+
-	while ( i < items.size )
+    for ( i = 0; i < items.size; i++ )
     {
         if ( distancesquared( end_origin, items[i].origin ) < 16384 )
         {
-			if ( ( items[ i ].origin[ 2 ] - ( end_origin[ 2 ] + 32 ) ) > 0 )
+            if ( items[i].origin[2] - end_origin[2] + 32 > 0 )
-			{
                 items[i] delete();
         }
     }
-		i++;
+
-	}
+    self moveto( end_origin, 0.3, 0.15 );
-	self moveto( end_origin, 0,3, 0,15 );
     self clearclientflag( 12 );
 }
 
 destructible_car_fire_think( attacker )
 {
     self endon( "death" );
-	wait randomintrange( 7, 10 );
+    wait( randomintrange( 7, 10 ) );
     self thread destructible_car_explosion( attacker );
 }
 
@@ -414,11 +379,9 @@ codecallback_destructibleevent( event, param1, param2, param3 )
         attacker = param2;
         weapon = param3;
         destructible_event_callback( notify_type, attacker, weapon );
-		self notify( event );
+        self notify( event, notify_type, attacker );
     }
-	else
+    else if ( event == "breakafter" )
-	{
-		if ( event == "breakafter" )
     {
         piece = param1;
         time = param2;
@@ -426,54 +389,54 @@ codecallback_destructibleevent( event, param1, param2, param3 )
         self thread breakafter( time, damage, piece );
     }
 }
-}
 
 breakafter( time, damage, piece )
 {
     self notify( "breakafter" );
     self endon( "breakafter" );
-	wait time;
+    wait( time );
     self dodamage( damage, self.origin, undefined, undefined );
 }
 
 destructible_barrel_death_think()
 {
     self endon( "barrel_dead" );
+
     self waittill( "death", attacker );
-	if ( isDefined( self ) )
+
-	{
+    if ( isdefined( self ) )
         self thread destructible_barrel_explosion( attacker, 0 );
 }
-}
 
 destructible_barrel_fire_think( attacker )
 {
     self endon( "barrel_dead" );
     self endon( "explode" );
     self endon( "death" );
-	wait randomintrange( 7, 10 );
+    wait( randomintrange( 7, 10 ) );
     self thread destructible_barrel_explosion( attacker );
 }
 
 destructible_barrel_explosion( attacker, physics_explosion )
 {
-	if ( !isDefined( physics_explosion ) )
+    if ( !isdefined( physics_explosion ) )
-	{
         physics_explosion = 1;
-	}
+
     self notify( "barrel_dead" );
-	if ( isDefined( self.target ) )
+
+    if ( isdefined( self.target ) )
     {
         dest_clip = getent( self.target, "targetname" );
         dest_clip delete();
     }
+
     self radiusdamage( self.origin, 256, 300, 75, attacker, "MOD_EXPLOSIVE", "explodable_barrel_mp" );
     playrumbleonposition( "grenade_rumble", self.origin );
-	earthquake( 0,5, 0,5, self.origin, 800 );
+    earthquake( 0.5, 0.5, self.origin, 800 );
+
     if ( physics_explosion )
-	{
+        physicsexplosionsphere( self.origin, 255, 254, 0.3, 400, 25 );
-		physicsexplosionsphere( self.origin, 255, 254, 0,3, 400, 25 );
+
-	}
     level.globalbarrelsdestroyed++;
     self dodamage( self.health + 10000, self.origin + ( 0, 0, 1 ), attacker );
     self setclientflag( 3 );

Multiplayer Core/patch_mp/maps/mp/_development_dvars.gsc

@@ -1,7 +1,9 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include common_scripts\utility;
+#include maps\mp\_utility;
 
-init() //checked matches cerberus output
+init()
 {
+
 }

Multiplayer Core/patch_mp/maps/mp/_empgrenade.gsc

@@ -1,60 +1,59 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/killstreaks/_emp;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include maps\mp\_utility;
-#include maps/mp/_utility;
+#include common_scripts\utility;
+#include maps\mp\killstreaks\_emp;
 
-init() //checked matches cerberus output
+init()
 {
     precacheshellshock( "flashbang" );
     thread onplayerconnect();
 }
 
-onplayerconnect() //checked matches cerberus output
+onplayerconnect()
 {
     for (;;)
     {
         level waittill( "connected", player );
+
         player thread onplayerspawned();
     }
 }
 
-onplayerspawned() //checked matches cerberus output
+onplayerspawned()
 {
     self endon( "disconnect" );
+
     for (;;)
     {
         self waittill( "spawned_player" );
+
         self thread monitorempgrenade();
     }
 }
 
-monitorempgrenade() //checked changed to match cerberus output
+monitorempgrenade()
 {
     self endon( "disconnect" );
     self endon( "death" );
     self.empendtime = 0;
-	for ( ;; )
+
-	{
+    while ( true )
-		while ( 1 )
     {
         self waittill( "emp_grenaded", attacker );
+
         if ( !isalive( self ) || self hasperk( "specialty_immuneemp" ) )
-			{
             continue;
-			}
+
         hurtvictim = 1;
         hurtattacker = 0;
-			/*
 /#
-			assert( isDefined( self.team ) );
+        assert( isdefined( self.team ) );
 #/
-			*/
+        if ( level.teambased && isdefined( attacker ) && isdefined( attacker.team ) && attacker.team == self.team && attacker != self )
-			if ( level.teambased && isDefined( attacker ) && isDefined( attacker.team ) && attacker.team == self.team && attacker != self )
         {
             if ( level.friendlyfire == 0 )
-				{
                 continue;
-				}
             else if ( level.friendlyfire == 1 )
             {
                 hurtattacker = 0;
@@ -71,110 +70,107 @@ monitorempgrenade() //checked changed to match cerberus output
                 hurtvictim = 1;
             }
         }
-		}
+
-		if ( hurtvictim && isDefined( self ) )
+        if ( hurtvictim && isdefined( self ) )
-		{
             self thread applyemp( attacker );
-		}
+
-		if ( hurtattacker && isDefined( attacker ) )
+        if ( hurtattacker && isdefined( attacker ) )
-		{
             attacker thread applyemp( attacker );
     }
 }
-}
 
-applyemp( attacker ) //checked matches cerberus output
+applyemp( attacker )
 {
     self notify( "applyEmp" );
     self endon( "applyEmp" );
     self endon( "disconnect" );
     self endon( "death" );
     wait 0.05;
+
     if ( self == attacker )
     {
-		if ( isDefined( self.empendtime ) )
+        if ( isdefined( self.empendtime ) )
         {
-			emp_time_left_ms = self.empendtime - getTime();
+            emp_time_left_ms = self.empendtime - gettime();
+
             if ( emp_time_left_ms > 1000 )
-			{
                 self.empduration = emp_time_left_ms / 1000;
-			}
             else
-			{
                 self.empduration = 1;
         }
-		}
         else
-		{
             self.empduration = 1;
     }
-	}
     else
-	{
         self.empduration = 12;
-	}
+
     self.empgrenaded = 1;
     self shellshock( "flashbang", 1 );
-	self.empendtime = getTime() + ( self.empduration * 1000 );
+    self.empendtime = gettime() + self.empduration * 1000;
     self thread emprumbleloop( 0.75 );
     self setempjammed( 1 );
     self thread empgrenadedeathwaiter();
-	wait self.empduration;
+    wait( self.empduration );
     self notify( "empGrenadeTimedOut" );
     self checktoturnoffemp();
 }
 
-empgrenadedeathwaiter() //checked matches cerberus output
+empgrenadedeathwaiter()
 {
     self notify( "empGrenadeDeathWaiter" );
     self endon( "empGrenadeDeathWaiter" );
     self endon( "empGrenadeTimedOut" );
+
     self waittill( "death" );
+
     self checktoturnoffemp();
 }
 
-checktoturnoffemp() //checked changed to match cerberus output
+checktoturnoffemp()
 {
     self.empgrenaded = 0;
-	if ( level.teambased && maps/mp/killstreaks/_emp::emp_isteamemped( self.team ) || !level.teambased && isDefined( level.empplayer ) && level.empplayer != self )
+
-	{
+    if ( level.teambased && maps\mp\killstreaks\_emp::emp_isteamemped( self.team ) || !level.teambased && isdefined( level.empplayer ) && level.empplayer != self )
         return;
-	}
+
     self setempjammed( 0 );
 }
 
-emprumbleloop( duration ) //checked matches cerberus output
+emprumbleloop( duration )
 {
     self endon( "emp_rumble_loop" );
     self notify( "emp_rumble_loop" );
-	goaltime = getTime() + ( duration * 1000 );
+    goaltime = gettime() + duration * 1000;
-	while ( getTime() < goaltime )
+
+    while ( gettime() < goaltime )
     {
         self playrumbleonentity( "damage_heavy" );
         wait 0.05;
     }
 }
 
-watchempexplosion( owner, weaponname ) //checked changed to match cerberus output
+watchempexplosion( owner, weaponname )
 {
     owner endon( "disconnect" );
     owner endon( "team_changed" );
     self endon( "shutdown_empgrenade" );
     self thread watchempgrenadeshutdown();
     owner addweaponstat( weaponname, "used", 1 );
+
     self waittill( "explode", origin, surface );
+
     ents = getdamageableentarray( origin, 512 );
+
     foreach ( ent in ents )
-	{
         ent dodamage( 1, origin, owner, owner, "none", "MOD_GRENADE_SPLASH", 0, weaponname );
 }
-}
 
-watchempgrenadeshutdown() //checked matches cerberus output
+watchempgrenadeshutdown()
 {
     self endon( "explode" );
+
     self waittill( "death" );
+
     wait 0.05;
     self notify( "shutdown_empgrenade" );
 }
-

Multiplayer Core/patch_mp/maps/mp/_entityheadicons.gsc

@@ -1,102 +1,92 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include common_scripts\utility;
 
-init() //checked matches cerberus output
+init()
-{
-	if ( isDefined( level.initedentityheadicons ) )
 {
+    if ( isdefined( level.initedentityheadicons ) )
         return;
-	}
+
     if ( level.createfx_enabled )
-	{
         return;
-	}
+
     level.initedentityheadicons = 1;
-	/*
 /#
-	assert( isDefined( game[ "entity_headicon_allies" ] ), "Allied head icons are not defined.  Check the team set for the level." );
+    assert( isdefined( game["entity_headicon_allies"] ), "Allied head icons are not defined.  Check the team set for the level." );
 #/
 /#
-	assert( isDefined( game[ "entity_headicon_axis" ] ), "Axis head icons are not defined.  Check the team set for the level." );
+    assert( isdefined( game["entity_headicon_axis"] ), "Axis head icons are not defined.  Check the team set for the level." );
 #/
-	*/
     precacheshader( game["entity_headicon_allies"] );
     precacheshader( game["entity_headicon_axis"] );
+
     if ( !level.teambased )
-	{
         return;
-	}
+
     level.entitieswithheadicons = [];
 }
 
-setentityheadicon( team, owner, offset, icon, constant_size ) //checked changed to match cerberus output
+setentityheadicon( team, owner, offset, icon, constant_size )
-{
-	if ( !level.teambased && !isDefined( owner ) )
 {
+    if ( !level.teambased && !isdefined( owner ) )
         return;
-	}
+
-	if ( !isDefined( constant_size ) )
+    if ( !isdefined( constant_size ) )
-	{
         constant_size = 0;
-	}
+
-	if ( !isDefined( self.entityheadiconteam ) )
+    if ( !isdefined( self.entityheadiconteam ) )
     {
         self.entityheadiconteam = "none";
         self.entityheadicons = [];
     }
-	if ( level.teambased && !isDefined( owner ) )
+
+    if ( level.teambased && !isdefined( owner ) )
     {
         if ( team == self.entityheadiconteam )
-		{
             return;
-		}
+
         self.entityheadiconteam = team;
     }
-	if ( isDefined( offset ) )
+
-	{
+    if ( isdefined( offset ) )
         self.entityheadiconoffset = offset;
-	}
     else
-	{
         self.entityheadiconoffset = ( 0, 0, 0 );
-	}
+
-	if ( isDefined( self.entityheadicons ) )
+    if ( isdefined( self.entityheadicons ) )
     {
         for ( i = 0; i < self.entityheadicons.size; i++ )
         {
-			if ( isDefined( self.entityheadicons[ i ] ) )
+            if ( isdefined( self.entityheadicons[i] ) )
-			{
                 self.entityheadicons[i] destroy();
         }
     }
-	}
+
     self.entityheadicons = [];
     self notify( "kill_entity_headicon_thread" );
-	if ( !isDefined( icon ) )
+
-	{
+    if ( !isdefined( icon ) )
         icon = game["entity_headicon_" + team];
-	}
+
-	if ( isDefined( owner ) && !level.teambased )
+    if ( isdefined( owner ) && !level.teambased )
     {
         if ( !isplayer( owner ) )
         {
-			/*
 /#
-			assert( isDefined( owner.owner ), "entity has to have an owner if it's not a player" );
+            assert( isdefined( owner.owner ), "entity has to have an owner if it's not a player" );
 #/
-			*/
             owner = owner.owner;
         }
+
         owner updateentityheadclienticon( self, icon, constant_size );
     }
-	else if ( isDefined( owner ) && team != "none" )
+    else if ( isdefined( owner ) && team != "none" )
-	{
         owner updateentityheadteamicon( self, team, icon, constant_size );
-	}
+
     self thread destroyheadiconsondeath();
 }
 
-updateentityheadteamicon( entity, team, icon, constant_size ) //checked matches cerberus output
+updateentityheadteamicon( entity, team, icon, constant_size )
 {
     headicon = newteamhudelem( team );
     headicon.archived = 1;
@@ -110,7 +100,7 @@ updateentityheadteamicon( entity, team, icon, constant_size ) //checked matches
     entity.entityheadicons[entity.entityheadicons.size] = headicon;
 }
 
-updateentityheadclienticon( entity, icon, constant_size ) //checked matches cerberus output
+updateentityheadclienticon( entity, icon, constant_size )
 {
     headicon = newclienthudelem( self );
     headicon.archived = 1;
@@ -124,36 +114,32 @@ updateentityheadclienticon( entity, icon, constant_size ) //checked matches cerb
     entity.entityheadicons[entity.entityheadicons.size] = headicon;
 }
 
-destroyheadiconsondeath() //checked changed to match cerberus output
+destroyheadiconsondeath()
 {
     self waittill_any( "death", "hacked" );
+
     for ( i = 0; i < self.entityheadicons.size; i++ )
     {
-		if ( isDefined( self.entityheadicons[ i ] ) )
+        if ( isdefined( self.entityheadicons[i] ) )
+            self.entityheadicons[i] destroy();
+    }
+}
+
+destroyentityheadicons()
 {
+    if ( isdefined( self.entityheadicons ) )
+    {
+        for ( i = 0; i < self.entityheadicons.size; i++ )
+        {
+            if ( isdefined( self.entityheadicons[i] ) )
                 self.entityheadicons[i] destroy();
         }
     }
 }
 
-destroyentityheadicons() //checked changed to match cerberus output
+updateentityheadiconpos( headicon )
-{
-	if ( isDefined( self.entityheadicons ) )
-	{
-		for ( i = 0; i < self.entityheadicons.size; i++ )
-		{
-			if ( isDefined( self.entityheadicons[ i ] ) )
-			{
-				self.entityheadicons[ i ] destroy();
-			}
-		}
-	}
-}
-
-updateentityheadiconpos( headicon ) //checked matches cerberus output
 {
     headicon.x = self.origin[0] + self.entityheadiconoffset[0];
     headicon.y = self.origin[1] + self.entityheadiconoffset[1];
     headicon.z = self.origin[2] + self.entityheadiconoffset[2];
 }
-

Multiplayer Core/patch_mp/maps/mp/_explosive_bolt.gsc

@@ -1,13 +1,15 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include maps\mp\_utility;
+#include common_scripts\utility;
 
-init() //checked matches cerberus output
+init()
 {
     loadfx( "weapon/crossbow/fx_trail_crossbow_blink_grn_os" );
     loadfx( "weapon/crossbow/fx_trail_crossbow_blink_red_os" );
 }
 
-watch_bolt_detonation( owner ) //checked matches cerberus output
+watch_bolt_detonation( owner )
 {
+
 }

Multiplayer Core/patch_mp/maps/mp/_flashgrenades.gsc

@@ -1,7 +1,8 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\_utility;
 
-main() //checked matches cerberus output
+main()
 {
     precacheshellshock( "flashbang" );
     level.sound_flash_start = "";
@@ -9,72 +10,64 @@ main() //checked matches cerberus output
     level.sound_flash_stop = "";
 }
 
-startmonitoringflash() //checked matches cerberus output
+startmonitoringflash()
 {
     self thread monitorflash();
 }
 
-stopmonitoringflash( disconnected ) //checked matches cerberus output
+stopmonitoringflash( disconnected )
 {
     self notify( "stop_monitoring_flash" );
 }
 
-flashrumbleloop( duration ) //checked matches cerberus output
+flashrumbleloop( duration )
 {
     self endon( "stop_monitoring_flash" );
     self endon( "flash_rumble_loop" );
     self notify( "flash_rumble_loop" );
-	goaltime = getTime() + ( duration * 1000 );
+    goaltime = gettime() + duration * 1000;
-	while ( getTime() < goaltime )
+
+    while ( gettime() < goaltime )
     {
         self playrumbleonentity( "damage_heavy" );
         wait 0.05;
     }
 }
 
-monitorflash_internal( amount_distance, amount_angle, attacker, direct_on_player ) //checked changed to match cerberus output
+monitorflash_internal( amount_distance, amount_angle, attacker, direct_on_player )
 {
     hurtattacker = 0;
     hurtvictim = 1;
+
     if ( amount_angle < 0.5 )
-	{
         amount_angle = 0.5;
-	}
     else if ( amount_angle > 0.8 )
-	{
         amount_angle = 1;
-	}
+
-	if ( isDefined( attacker ) && attacker == self )
+    if ( isdefined( attacker ) && attacker == self )
-	{
         amount_distance *= 0.5;
-	}
+
     duration = amount_distance * amount_angle * 6;
+
     if ( duration < 0.25 )
-	{
         return;
-	}
+
     rumbleduration = undefined;
+
     if ( duration > 2 )
-	{
         rumbleduration = 0.75;
-	}
     else
-	{
         rumbleduration = 0.25;
-	}
-	/*
 /#
-	assert( isDefined( self.team ) );
+    assert( isdefined( self.team ) );
 #/
-	*/
+    if ( level.teambased && isdefined( attacker ) && isdefined( attacker.team ) && attacker.team == self.team && attacker != self )
-	if ( level.teambased && isDefined( attacker ) && isDefined( attacker.team ) && attacker.team == self.team && attacker != self )
     {
         if ( level.friendlyfire == 0 )
-		{
             return;
-		}
         else if ( level.friendlyfire == 1 )
         {
+
         }
         else if ( level.friendlyfire == 2 )
         {
@@ -90,11 +83,13 @@ monitorflash_internal( amount_distance, amount_angle, attacker, direct_on_player
             hurtattacker = 1;
         }
     }
+
     if ( self hasperk( "specialty_flashprotection" ) )
     {
         duration *= 0.1;
         rumbleduration *= 0.1;
     }
+
     if ( hurtvictim )
     {
         if ( self mayapplyscreeneffect() || !direct_on_player && self isremotecontrolling() )
@@ -104,76 +99,78 @@ monitorflash_internal( amount_distance, amount_angle, attacker, direct_on_player
                 attacker addweaponstat( "flash_grenade_mp", "hits", 1 );
                 attacker addweaponstat( "flash_grenade_mp", "used", 1 );
             }
+
             self thread applyflash( duration, rumbleduration, attacker );
         }
     }
+
     if ( hurtattacker )
     {
         if ( attacker mayapplyscreeneffect() )
-		{
             attacker thread applyflash( duration, rumbleduration, attacker );
     }
 }
-}
 
-monitorflash() //checked changed to match cerberus output
+monitorflash()
 {
     self endon( "disconnect" );
     self.flashendtime = 0;
-	while ( 1 )
+
+    while ( true )
     {
         self waittill( "flashbang", amount_distance, amount_angle, attacker );
+
         if ( !isalive( self ) )
-		{
             continue;
-		}
+
         self monitorflash_internal( amount_distance, amount_angle, attacker, 1 );
     }
 }
 
-monitorrcbombflash() //checked matches cerberus output
+monitorrcbombflash()
 {
     self endon( "death" );
     self.flashendtime = 0;
-	while ( 1 )
+
+    while ( true )
     {
         self waittill( "flashbang", amount_distance, amount_angle, attacker );
+
         driver = self getseatoccupant( 0 );
-		if ( !isDefined( driver ) || !isalive( driver ) )
+
-		{
+        if ( !isdefined( driver ) || !isalive( driver ) )
             continue;
-		}
+
         driver monitorflash_internal( amount_distance, amount_angle, attacker, 0 );
     }
 }
 
-applyflash( duration, rumbleduration, attacker ) //checked matches cerberus output
+applyflash( duration, rumbleduration, attacker )
-{
-	if ( !isDefined( self.flashduration ) || duration > self.flashduration )
 {
+    if ( !isdefined( self.flashduration ) || duration > self.flashduration )
         self.flashduration = duration;
-	}
+
-	if ( !isDefined( self.flashrumbleduration ) || rumbleduration > self.flashrumbleduration )
+    if ( !isdefined( self.flashrumbleduration ) || rumbleduration > self.flashrumbleduration )
-	{
         self.flashrumbleduration = rumbleduration;
-	}
+
     self thread playflashsound( duration );
     wait 0.05;
-	if ( isDefined( self.flashduration ) )
+
+    if ( isdefined( self.flashduration ) )
     {
         self shellshock( "flashbang", self.flashduration, 0 );
-		self.flashendtime = getTime() + ( self.flashduration * 1000 );
+        self.flashendtime = gettime() + self.flashduration * 1000;
         self.lastflashedby = attacker;
     }
-	if ( isDefined( self.flashrumbleduration ) )
+
-	{
+    if ( isdefined( self.flashrumbleduration ) )
         self thread flashrumbleloop( self.flashrumbleduration );
-	}
+
     self.flashduration = undefined;
     self.flashrumbleduration = undefined;
 }
 
-playflashsound( duration ) //checked matches cerberus output
+playflashsound( duration )
 {
     self endon( "death" );
     self endon( "disconnect" );
@@ -183,10 +180,10 @@ playflashsound( duration ) //checked matches cerberus output
     flashsound thread deleteentonownerdeath( self );
     flashsound playsound( level.sound_flash_start );
     flashsound playloopsound( level.sound_flash_loop );
+
     if ( duration > 0.5 )
-	{
         wait( duration - 0.5 );
-	}
+
     flashsound playsound( level.sound_flash_start );
     flashsound stoploopsound( 0.5 );
     wait 0.5;
@@ -194,10 +191,11 @@ playflashsound( duration ) //checked matches cerberus output
     flashsound delete();
 }
 
-deleteentonownerdeath( owner ) //checked matches cerberus output
+deleteentonownerdeath( owner )
 {
     self endon( "delete" );
+
     owner waittill( "death" );
+
     self delete();
 }
-

Multiplayer Core/patch_mp/maps/mp/_fx.gsc

@@ -1,35 +1,38 @@
-#include maps/mp/_createfx;
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\_createfx;
 
 print_org( fxcommand, fxid, fxpos, waittime )
 {
 /#
-	if ( getDvar( "debug" ) == "1" )
+    if ( getdvar( _hash_F49A52C ) == "1" )
     {
         println( "{" );
-		println( ""origin" "" + fxpos[ 0 ] + " " + fxpos[ 1 ] + " " + fxpos[ 2 ] + """ );
+        println( "\"origin\" \"" + fxpos[0] + " " + fxpos[1] + " " + fxpos[2] + "\"" );
-		println( ""classname" "script_model"" );
+        println( "\"classname\" \"script_model\"" );
-		println( ""model" "fx"" );
+        println( "\"model\" \"fx\"" );
-		println( ""script_fxcommand" "" + fxcommand + """ );
+        println( "\"script_fxcommand\" \"" + fxcommand + "\"" );
-		println( ""script_fxid" "" + fxid + """ );
+        println( "\"script_fxid\" \"" + fxid + "\"" );
-		println( ""script_delay" "" + waittime + """ );
+        println( "\"script_delay\" \"" + waittime + "\"" );
         println( "}" );
-#/
     }
+#/
 }
 
 oneshotfx( fxid, fxpos, waittime, fxpos2 )
 {
+
 }
 
 oneshotfxthread()
 {
-	wait 0,05;
+    wait 0.05;
+
     if ( self.v["delay"] > 0 )
-	{
+        wait( self.v["delay"] );
-		wait self.v[ "delay" ];
+
-	}
     create_triggerfx();
 }
 
@@ -47,17 +50,18 @@ exploderfx( num, fxid, fxpos, waittime, fxpos2, firefx, firefxdelay, firefxsound
         ent = createexploder( fxid );
         ent.v["origin"] = fxpos;
         ent.v["angles"] = ( 0, 0, 0 );
-		if ( isDefined( fxpos2 ) )
+
-		{
+        if ( isdefined( fxpos2 ) )
-			ent.v[ "angles" ] = vectorToAngle( fxpos2 - fxpos );
+            ent.v["angles"] = vectortoangles( fxpos2 - fxpos );
-		}
+
         ent.v["delay"] = waittime;
         ent.v["exploder"] = num;
         return;
     }
+
     fx = spawn( "script_origin", ( 0, 0, 0 ) );
     fx.origin = fxpos;
-	fx.angles = vectorToAngle( fxpos2 - fxpos );
+    fx.angles = vectortoangles( fxpos2 - fxpos );
     fx.script_exploder = num;
     fx.script_fxid = fxid;
     fx.script_delay = waittime;
@@ -74,15 +78,15 @@ exploderfx( num, fxid, fxpos, waittime, fxpos2, firefx, firefxdelay, firefxsound
     fx.script_delay_min = delay_min;
     fx.script_delay_max = delay_max;
     fx.script_exploder_group = exploder_group;
-	forward = anglesToForward( fx.angles );
+    forward = anglestoforward( fx.angles );
-	forward = vectorScale( forward, 150 );
+    forward = vectorscale( forward, 150 );
     fx.targetpos = fxpos + forward;
-	if ( !isDefined( level._script_exploders ) )
+
-	{
+    if ( !isdefined( level._script_exploders ) )
         level._script_exploders = [];
-	}
+
     level._script_exploders[level._script_exploders.size] = fx;
-	maps/mp/_createfx::createfx_showorigin( fxid, fxpos, waittime, fxpos2, "exploderfx", fx, undefined, firefx, firefxdelay, firefxsound, fxsound, fxquake, fxdamage, soundalias, repeat, delay_min, delay_max, damage_radius, firefxtimeout );
+    maps\mp\_createfx::createfx_showorigin( fxid, fxpos, waittime, fxpos2, "exploderfx", fx, undefined, firefx, firefxdelay, firefxsound, fxsound, fxquake, fxdamage, soundalias, repeat, delay_min, delay_max, damage_radius, firefxtimeout );
 }
 
 loopfx( fxid, fxpos, waittime, fxpos2, fxstart, fxstop, timeout )
@@ -93,10 +97,10 @@ loopfx( fxid, fxpos, waittime, fxpos2, fxstart, fxstop, timeout )
     ent = createloopeffect( fxid );
     ent.v["origin"] = fxpos;
     ent.v["angles"] = ( 0, 0, 0 );
-	if ( isDefined( fxpos2 ) )
+
-	{
+    if ( isdefined( fxpos2 ) )
-		ent.v[ "angles" ] = vectorToAngle( fxpos2 - fxpos );
+        ent.v["angles"] = vectortoangles( fxpos2 - fxpos );
-	}
+
     ent.v["delay"] = waittime;
 }
 
@@ -109,17 +113,13 @@ create_looper()
 create_loopsound()
 {
     self notify( "stop_loop" );
-	if ( isDefined( self.v[ "soundalias" ] ) && self.v[ "soundalias" ] != "nil" )
+
+    if ( isdefined( self.v["soundalias"] ) && self.v["soundalias"] != "nil" )
     {
-		if ( isDefined( self.looper ) )
+        if ( isdefined( self.looper ) )
-		{
+            self.looper thread maps\mp\_utility::loop_fx_sound( self.v["soundalias"], self.v["origin"], "death" );
-			self.looper thread maps/mp/_utility::loop_fx_sound( self.v[ "soundalias" ], self.v[ "origin" ], "death" );
-			return;
-		}
         else
-		{
+            thread maps\mp\_utility::loop_fx_sound( self.v["soundalias"], self.v["origin"], "stop_loop" );
-			thread maps/mp/_utility::loop_fx_sound( self.v[ "soundalias" ], self.v[ "origin" ], "stop_loop" );
-		}
     }
 }
 
@@ -130,54 +130,48 @@ stop_loopsound()
 
 loopfxthread()
 {
-	wait 0,05;
+    wait 0.05;
-	if ( isDefined( self.fxstart ) )
+
-	{
+    if ( isdefined( self.fxstart ) )
         level waittill( "start fx" + self.fxstart );
-	}
+
-	while ( 1 )
+    while ( true )
     {
         create_looper();
-		if ( isDefined( self.timeout ) )
+
-		{
+        if ( isdefined( self.timeout ) )
             thread loopfxstop( self.timeout );
-		}
+
-		if ( isDefined( self.fxstop ) )
+        if ( isdefined( self.fxstop ) )
-		{
             level waittill( "stop fx" + self.fxstop );
-		}
         else
-		{
             return;
-		}
+
-		if ( isDefined( self.looper ) )
+        if ( isdefined( self.looper ) )
-		{
             self.looper delete();
-		}
+
-		if ( isDefined( self.fxstart ) )
+        if ( isdefined( self.fxstart ) )
-		{
             level waittill( "start fx" + self.fxstart );
-			continue;
-		}
         else
-		{
             return;
     }
 }
-}
 
 loopfxchangeid( ent )
 {
     self endon( "death" );
+
     ent waittill( "effect id changed", change );
 }
 
 loopfxchangeorg( ent )
 {
     self endon( "death" );
+
     for (;;)
     {
         ent waittill( "effect org changed", change );
+
         self.origin = change;
     }
 }
@@ -185,20 +179,23 @@ loopfxchangeorg( ent )
 loopfxchangedelay( ent )
 {
     self endon( "death" );
+
     ent waittill( "effect delay changed", change );
 }
 
 loopfxdeletion( ent )
 {
     self endon( "death" );
+
     ent waittill( "effect deleted" );
+
     self delete();
 }
 
 loopfxstop( timeout )
 {
     self endon( "death" );
-	wait timeout;
+    wait( timeout );
     self.looper delete();
 }
 
@@ -222,42 +219,49 @@ gunfireloopfx( fxid, fxpos, shotsmin, shotsmax, shotdelaymin, shotdelaymax, betw
 gunfireloopfxthread( fxid, fxpos, shotsmin, shotsmax, shotdelaymin, shotdelaymax, betweensetsmin, betweensetsmax )
 {
     level endon( "stop all gunfireloopfx" );
-	wait 0,05;
+    wait 0.05;
+
     if ( betweensetsmax < betweensetsmin )
     {
         temp = betweensetsmax;
         betweensetsmax = betweensetsmin;
         betweensetsmin = temp;
     }
+
     betweensetsbase = betweensetsmin;
     betweensetsrange = betweensetsmax - betweensetsmin;
+
     if ( shotdelaymax < shotdelaymin )
     {
         temp = shotdelaymax;
         shotdelaymax = shotdelaymin;
         shotdelaymin = temp;
     }
+
     shotdelaybase = shotdelaymin;
     shotdelayrange = shotdelaymax - shotdelaymin;
+
     if ( shotsmax < shotsmin )
     {
         temp = shotsmax;
         shotsmax = shotsmin;
         shotsmin = temp;
     }
+
     shotsbase = shotsmin;
     shotsrange = shotsmax - shotsmin;
     fxent = spawnfx( level._effect[fxid], fxpos );
+
     for (;;)
     {
         shotnum = shotsbase + randomint( shotsrange );
-		i = 0;
+
-		while ( i < shotnum )
+        for ( i = 0; i < shotnum; i++ )
         {
             triggerfx( fxent );
             wait( shotdelaybase + randomfloat( shotdelayrange ) );
-			i++;
         }
+
         wait( betweensetsbase + randomfloat( betweensetsrange ) );
     }
 }
@@ -270,48 +274,55 @@ gunfireloopfxvec( fxid, fxpos, fxpos2, shotsmin, shotsmax, shotdelaymin, shotdel
 gunfireloopfxvecthread( fxid, fxpos, fxpos2, shotsmin, shotsmax, shotdelaymin, shotdelaymax, betweensetsmin, betweensetsmax )
 {
     level endon( "stop all gunfireloopfx" );
-	wait 0,05;
+    wait 0.05;
+
     if ( betweensetsmax < betweensetsmin )
     {
         temp = betweensetsmax;
         betweensetsmax = betweensetsmin;
         betweensetsmin = temp;
     }
+
     betweensetsbase = betweensetsmin;
     betweensetsrange = betweensetsmax - betweensetsmin;
+
     if ( shotdelaymax < shotdelaymin )
     {
         temp = shotdelaymax;
         shotdelaymax = shotdelaymin;
         shotdelaymin = temp;
     }
+
     shotdelaybase = shotdelaymin;
     shotdelayrange = shotdelaymax - shotdelaymin;
+
     if ( shotsmax < shotsmin )
     {
         temp = shotsmax;
         shotsmax = shotsmin;
         shotsmin = temp;
     }
+
     shotsbase = shotsmin;
     shotsrange = shotsmax - shotsmin;
     fxpos2 = vectornormalize( fxpos2 - fxpos );
     fxent = spawnfx( level._effect[fxid], fxpos, fxpos2 );
+
     for (;;)
     {
         shotnum = shotsbase + randomint( shotsrange );
-		i = 0;
+
-		while ( i < int( shotnum / level.fxfireloopmod ) )
+        for ( i = 0; i < int( shotnum / level.fxfireloopmod ); i++ )
         {
             triggerfx( fxent );
             delay = ( shotdelaybase + randomfloat( shotdelayrange ) ) * level.fxfireloopmod;
-			if ( delay < 0,05 )
+
-			{
+            if ( delay < 0.05 )
-				delay = 0,05;
+                delay = 0.05;
-			}
+
-			wait delay;
+            wait( delay );
-			i++;
         }
+
         wait( shotdelaybase + randomfloat( shotdelayrange ) );
         wait( betweensetsbase + randomfloat( betweensetsrange ) );
     }
@@ -324,105 +335,90 @@ setfireloopmod( value )
 
 setup_fx()
 {
-	if ( isDefined( self.script_fxid ) || !isDefined( self.script_fxcommand ) && !isDefined( self.script_delay ) )
+    if ( !isdefined( self.script_fxid ) || !isdefined( self.script_fxcommand ) || !isdefined( self.script_delay ) )
-	{
         return;
-	}
+
     org = undefined;
-	if ( isDefined( self.target ) )
+
+    if ( isdefined( self.target ) )
     {
         ent = getent( self.target, "targetname" );
-		if ( isDefined( ent ) )
+
-		{
+        if ( isdefined( ent ) )
             org = ent.origin;
     }
-	}
+
     fxstart = undefined;
-	if ( isDefined( self.script_fxstart ) )
+
-	{
+    if ( isdefined( self.script_fxstart ) )
         fxstart = self.script_fxstart;
-	}
+
     fxstop = undefined;
-	if ( isDefined( self.script_fxstop ) )
+
-	{
+    if ( isdefined( self.script_fxstop ) )
         fxstop = self.script_fxstop;
-	}
+
     if ( self.script_fxcommand == "OneShotfx" )
-	{
         oneshotfx( self.script_fxid, self.origin, self.script_delay, org );
-	}
+
     if ( self.script_fxcommand == "loopfx" )
-	{
         loopfx( self.script_fxid, self.origin, self.script_delay, org, fxstart, fxstop );
-	}
+
     if ( self.script_fxcommand == "loopsound" )
-	{
         loopsound( self.script_fxid, self.origin, self.script_delay );
-	}
+
     self delete();
 }
 
 script_print_fx()
 {
 /#
-	if ( isDefined( self.script_fxid ) || !isDefined( self.script_fxcommand ) && !isDefined( self.script_delay ) )
+    if ( !isdefined( self.script_fxid ) || !isdefined( self.script_fxcommand ) || !isdefined( self.script_delay ) )
     {
         println( "Effect at origin ", self.origin, " doesn't have script_fxid/script_fxcommand/script_delay" );
         self delete();
         return;
     }
-	if ( isDefined( self.target ) )
+
-	{
+    if ( isdefined( self.target ) )
         org = getent( self.target, "targetname" ).origin;
-	}
     else
-	{
         org = "undefined";
-	}
+
     if ( self.script_fxcommand == "OneShotfx" )
-	{
+        println( "mapsmp_fx::OneShotfx(\"" + self.script_fxid + "\", " + self.origin + ", " + self.script_delay + ", " + org + ");" );
-		println( "mapsmp_fx::OneShotfx("" + self.script_fxid + "", " + self.origin + ", " + self.script_delay + ", " + org + ");" );
+
-	}
     if ( self.script_fxcommand == "loopfx" )
-	{
+        println( "mapsmp_fx::LoopFx(\"" + self.script_fxid + "\", " + self.origin + ", " + self.script_delay + ", " + org + ");" );
-		println( "mapsmp_fx::LoopFx("" + self.script_fxid + "", " + self.origin + ", " + self.script_delay + ", " + org + ");" );
+
-	}
     if ( self.script_fxcommand == "loopsound" )
-	{
+        println( "mapsmp_fx::LoopSound(\"" + self.script_fxid + "\", " + self.origin + ", " + self.script_delay + ", " + org + ");" );
-		println( "mapsmp_fx::LoopSound("" + self.script_fxid + "", " + self.origin + ", " + self.script_delay + ", " + org + ");" );
 #/
 }
-}
 
 script_playfx( id, pos, pos2 )
 {
     if ( !id )
-	{
         return;
-	}
+
-	if ( isDefined( pos2 ) )
+    if ( isdefined( pos2 ) )
-	{
         playfx( id, pos, pos2 );
-	}
     else
-	{
         playfx( id, pos );
 }
-}
 
 script_playfxontag( id, ent, tag )
 {
     if ( !id )
-	{
         return;
-	}
+
     playfxontag( id, ent, tag );
 }
 
 grenadeexplosionfx( pos )
 {
     playfx( level._effect["mechanical explosion"], pos );
-	earthquake( 0,15, 0,5, pos, 250 );
+    earthquake( 0.15, 0.5, pos, 250 );
 }
 
 soundfx( fxid, fxpos, endonnotify )
@@ -430,28 +426,29 @@ soundfx( fxid, fxpos, endonnotify )
     org = spawn( "script_origin", ( 0, 0, 0 ) );
     org.origin = fxpos;
     org playloopsound( fxid );
-	if ( isDefined( endonnotify ) )
+
-	{
+    if ( isdefined( endonnotify ) )
         org thread soundfxdelete( endonnotify );
 }
-}
 
 soundfxdelete( endonnotify )
 {
     level waittill( endonnotify );
+
     self delete();
 }
 
 blenddelete( blend )
 {
     self waittill( "death" );
+
     blend delete();
 }
 
 spawnfx_wrapper( fx_id, origin, forward, up )
 {
 /#
-	assert( isDefined( level._effect[ fx_id ] ), "Missing level._effect["" + fx_id + ""]. You did not setup the fx before calling it in createFx." );
+    assert( isdefined( level._effect[fx_id] ), "Missing level._effect[\"" + fx_id + "\"]. You did not setup the fx before calling it in createFx." );
 #/
     fx_object = spawnfx( level._effect[fx_id], origin, forward, up );
     return fx_object;

Multiplayer Core/patch_mp/maps/mp/_fxanim.gsc

@@ -1,5 +1,7 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
-init() //checked matches cerberus output
+init()
 {
     level.scr_anim = [];
     level.scr_anim["fxanim_props"] = [];

Multiplayer Core/patch_mp/maps/mp/_gameadvertisement.gsc

@@ -1,6 +1,8 @@
-#include maps/mp/gametypes/_dev;
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_globallogic_utils;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_globallogic_utils;
+#include maps\mp\gametypes\_dev;
 
 init()
 {
@@ -22,25 +24,27 @@ setadvertisedstatus( onoff )
 sessionadvertisementcheck()
 {
     if ( sessionmodeisprivate() )
-	{
         return;
-	}
+
     if ( sessionmodeiszombiesgame() )
     {
         setadvertisedstatus( 0 );
         return;
     }
+
     runrules = getgametyperules();
-	if ( !isDefined( runrules ) )
+
-	{
+    if ( !isdefined( runrules ) )
         return;
-	}
+
     level endon( "game_end" );
+
     level waittill( "prematch_over" );
-	while ( 1 )
+
+    while ( true )
     {
         sessionadvertcheckwait = getdvarintdefault( "sessionAdvertCheckwait", 1 );
-		wait sessionadvertcheckwait;
+        wait( sessionadvertcheckwait );
         advertise = [[ runrules ]]();
         setadvertisedstatus( advertise );
     }
@@ -49,6 +53,7 @@ sessionadvertisementcheck()
 getgametyperules()
 {
     gametype = level.gametype;
+
     switch ( gametype )
     {
         case "dm":
@@ -78,7 +83,6 @@ getgametyperules()
         case "shrp":
             return ::shrp_rules;
     }
-	return;
 }
 
 teamscorelimitcheck( rulescorepercent )
@@ -86,50 +90,49 @@ teamscorelimitcheck( rulescorepercent )
     if ( level.scorelimit )
     {
         minscorepercentageleft = 100;
-		_a100 = level.teams;
+
-		_k100 = getFirstArrayKey( _a100 );
+        foreach ( team in level.teams )
-		while ( isDefined( _k100 ) )
         {
-			team = _a100[ _k100 ];
+            scorepercentageleft = 100 - game["teamScores"][team] / level.scorelimit * 100;
-			scorepercentageleft = 100 - ( ( game[ "teamScores" ][ team ] / level.scorelimit ) * 100 );
+
             if ( minscorepercentageleft > scorepercentageleft )
-			{
                 minscorepercentageleft = scorepercentageleft;
-			}
+
             if ( rulescorepercent >= scorepercentageleft )
             {
 /#
                 updatedebughud( 3, "Score Percentage Left: ", int( scorepercentageleft ) );
 #/
-				return 0;
+                return false;
             }
-			_k100 = getNextArrayKey( _a100, _k100 );
         }
 /#
         updatedebughud( 3, "Score Percentage Left: ", int( minscorepercentageleft ) );
 #/
     }
-	return 1;
+
+    return true;
 }
 
 timelimitcheck( ruletimeleft )
 {
     maxtime = level.timelimit;
+
     if ( maxtime != 0 )
     {
-		timeleft = maps/mp/gametypes/_globallogic_utils::gettimeremaining();
+        timeleft = maps\mp\gametypes\_globallogic_utils::gettimeremaining();
+
         if ( ruletimeleft >= timeleft )
-		{
+            return false;
-			return 0;
     }
-	}
+
-	return 1;
+    return true;
 }
 
 dm_rules()
 {
     rulescorepercent = 35;
-	ruletimeleft = 60000 * 1,5;
+    ruletimeleft = 60000 * 1.5;
 /#
     updatedebughud( 1, "Any player is within percent of score cap: ", rulescorepercent );
     updatedebughud( 2, "Time limit has less than minutes remaining: ", ruletimeleft / 60000 );
@@ -138,54 +141,48 @@ dm_rules()
     {
         highestscore = 0;
         players = get_players();
-		i = 0;
+
-		while ( i < players.size )
+        for ( i = 0; i < players.size; i++ )
         {
             if ( players[i].pointstowin > highestscore )
-			{
                 highestscore = players[i].pointstowin;
         }
-			i++;
+
-		}
+        scorepercentageleft = 100 - highestscore / level.scorelimit * 100;
-		scorepercentageleft = 100 - ( ( highestscore / level.scorelimit ) * 100 );
 /#
         updatedebughud( 3, "Score Percentage Left: ", int( scorepercentageleft ) );
 #/
         if ( rulescorepercent >= scorepercentageleft )
-		{
+            return false;
-			return 0;
-		}
     }
+
     if ( timelimitcheck( ruletimeleft ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 tdm_rules()
 {
     rulescorepercent = 15;
-	ruletimeleft = 60000 * 1,5;
+    ruletimeleft = 60000 * 1.5;
 /#
     updatedebughud( 1, "Any player is within percent of score cap: ", rulescorepercent );
     updatedebughud( 2, "Time limit has less than minutes remaining: ", ruletimeleft / 60000 );
 #/
     if ( teamscorelimitcheck( rulescorepercent ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
     if ( timelimitcheck( ruletimeleft ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 dom_rules()
 {
     rulescorepercent = 15;
-	ruletimeleft = 60000 * 1,5;
+    ruletimeleft = 60000 * 1.5;
     ruleround = 3;
     currentround = game["roundsplayed"] + 1;
 /#
@@ -196,19 +193,16 @@ dom_rules()
     if ( currentround >= 2 )
     {
         if ( teamscorelimitcheck( rulescorepercent ) == 0 )
-		{
+            return false;
-			return 0;
-		}
     }
+
     if ( timelimitcheck( ruletimeleft ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
     if ( ruleround <= currentround )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 hq_rules()
@@ -223,29 +217,26 @@ sd_rules()
     updatedebughud( 1, "Any team has won rounds: ", ruleround );
 #/
     maxroundswon = 0;
-	_a299 = level.teams;
+
-	_k299 = getFirstArrayKey( _a299 );
+    foreach ( team in level.teams )
-	while ( isDefined( _k299 ) )
     {
-		team = _a299[ _k299 ];
         roundswon = game["teamScores"][team];
+
         if ( maxroundswon < roundswon )
-		{
             maxroundswon = roundswon;
-		}
+
         if ( ruleround <= roundswon )
         {
 /#
             updatedebughud( 3, "Max Rounds Won: ", maxroundswon );
 #/
-			return 0;
+            return false;
         }
-		_k299 = getNextArrayKey( _a299, _k299 );
     }
 /#
     updatedebughud( 3, "Max Rounds Won: ", maxroundswon );
 #/
-	return 1;
+    return true;
 }
 
 dem_rules()
@@ -262,29 +253,26 @@ ctf_rules()
     updatedebughud( 3, "Rounds Played: ", roundsplayed );
 #/
     if ( ruleround <= roundsplayed )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 koth_rules()
 {
     rulescorepercent = 20;
-	ruletimeleft = 60000 * 1,5;
+    ruletimeleft = 60000 * 1.5;
 /#
     updatedebughud( 1, "Any player is within percent of score cap: ", rulescorepercent );
     updatedebughud( 2, "Time limit has less than minutes remaining: ", ruletimeleft / 60000 );
 #/
     if ( teamscorelimitcheck( rulescorepercent ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
     if ( timelimitcheck( ruletimeleft ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 conf_rules()
@@ -295,7 +283,7 @@ conf_rules()
 oic_rules()
 {
 /#
-	updatedebughud( 1, "No join in progress, so shouldn’t advertise to matchmaking once the countdown timer ends.", 0 );
+    updatedebughud( 1, "No join in progress, so shouldn’t advertise to matchmaking once the countdown timer ends.", 0 );
 #/
     return 0;
 }
@@ -303,20 +291,18 @@ oic_rules()
 sas_rules()
 {
     rulescorepercent = 35;
-	ruletimeleft = 60000 * 1,5;
+    ruletimeleft = 60000 * 1.5;
 /#
     updatedebughud( 1, "Any player is within percent of score cap: ", rulescorepercent );
     updatedebughud( 2, "Time limit has less than minutes remaining: ", ruletimeleft / 60000 );
 #/
     if ( teamscorelimitcheck( rulescorepercent ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
     if ( timelimitcheck( ruletimeleft ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 gun_rules()
@@ -326,65 +312,60 @@ gun_rules()
     updatedebughud( 1, "Any player is within X weapons from winning: ", ruleweaponsleft );
 #/
     minweaponsleft = level.gunprogression.size;
-	_a455 = level.players;
+
-	_k455 = getFirstArrayKey( _a455 );
+    foreach ( player in level.players )
-	while ( isDefined( _k455 ) )
     {
-		player = _a455[ _k455 ];
         weaponsleft = level.gunprogression.size - player.gunprogress;
+
         if ( minweaponsleft > weaponsleft )
-		{
             minweaponsleft = weaponsleft;
-		}
+
         if ( ruleweaponsleft >= minweaponsleft )
         {
 /#
             updatedebughud( 3, "Weapons Left: ", minweaponsleft );
 #/
-			return 0;
+            return false;
         }
-		_k455 = getNextArrayKey( _a455, _k455 );
     }
 /#
     updatedebughud( 3, "Weapons Left: ", minweaponsleft );
 #/
-	return 1;
+    return true;
 }
 
 shrp_rules()
 {
     rulescorepercent = 35;
-	ruletimeleft = 60000 * 1,5;
+    ruletimeleft = 60000 * 1.5;
 /#
     updatedebughud( 1, "Any player is within percent of score cap: ", rulescorepercent );
     updatedebughud( 2, "Time limit has less than minutes remaining: ", ruletimeleft / 60000 );
 #/
     if ( teamscorelimitcheck( rulescorepercent ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
     if ( timelimitcheck( ruletimeleft ) == 0 )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 sessionadvertismentcreatedebughud( linenum, alignx )
 {
 /#
-	debug_hud = maps/mp/gametypes/_dev::new_hud( "session_advert", "debug_hud", 0, 0, 1 );
+    debug_hud = maps\mp\gametypes\_dev::new_hud( "session_advert", "debug_hud", 0, 0, 1 );
     debug_hud.hidewheninmenu = 1;
     debug_hud.horzalign = "right";
     debug_hud.vertalign = "middle";
     debug_hud.alignx = "right";
     debug_hud.aligny = "middle";
     debug_hud.x = alignx;
-	debug_hud.y = -50 + ( linenum * 15 );
+    debug_hud.y = -50 + linenum * 15;
     debug_hud.foreground = 1;
     debug_hud.font = "default";
-	debug_hud.fontscale = 1,5;
+    debug_hud.fontscale = 1.5;
-	debug_hud.color = ( 1, 0, 0 );
+    debug_hud.color = ( 1, 1, 1 );
     debug_hud.alpha = 1;
     debug_hud settext( "" );
     return debug_hud;
@@ -396,19 +377,19 @@ updatedebughud( hudindex, text, value )
 /#
     switch ( hudindex )
     {
-		case 1:
+        case "1":
             level.sessionadverthud_1a_text = text;
             level.sessionadverthud_1b_text = value;
             break;
-		case 2:
+        case "2":
             level.sessionadverthud_2a_text = text;
             level.sessionadverthud_2b_text = value;
             break;
-		case 3:
+        case "3":
             level.sessionadverthud_3a_text = text;
             level.sessionadverthud_3b_text = value;
             break;
-		case 4:
+        case "4":
             level.sessionadverthud_4a_text = text;
             level.sessionadverthud_4b_text = value;
             break;
@@ -438,22 +419,23 @@ sessionadvertismentupdatedebughud()
     level.sessionadverthud_3b_text = "";
     level.sessionadverthud_4a_text = "";
     level.sessionadverthud_4b_text = "";
-	while ( 1 )
+
+    while ( true )
     {
         wait 1;
         showdebughud = getdvarintdefault( "sessionAdvertShowDebugHud", 0 );
         level.sessionadverthud_0_text = "Session is advertised";
+
         if ( level.sessionadvertstatus == 0 )
-		{
             level.sessionadverthud_0_text = "Session is not advertised";
-		}
+
-		if ( !isDefined( sessionadverthud_0 ) && showdebughud != 0 )
+        if ( !isdefined( sessionadverthud_0 ) && showdebughud != 0 )
         {
             host = gethostplayer();
-			while ( !isDefined( host ) )
+
-			{
+            if ( !isdefined( host ) )
                 continue;
-			}
+
             sessionadverthud_0 = host sessionadvertismentcreatedebughud( 0, 0 );
             sessionadverthud_1a = host sessionadvertismentcreatedebughud( 1, -20 );
             sessionadverthud_1b = host sessionadvertismentcreatedebughud( 1, 0 );
@@ -463,12 +445,13 @@ sessionadvertismentupdatedebughud()
             sessionadverthud_3b = host sessionadvertismentcreatedebughud( 3, 0 );
             sessionadverthud_4a = host sessionadvertismentcreatedebughud( 4, -20 );
             sessionadverthud_4b = host sessionadvertismentcreatedebughud( 4, 0 );
-			sessionadverthud_1a.color = vectorScale( ( 1, 0, 0 ), 0,5 );
+            sessionadverthud_1a.color = vectorscale( ( 0, 1, 0 ), 0.5 );
-			sessionadverthud_1b.color = vectorScale( ( 1, 0, 0 ), 0,5 );
+            sessionadverthud_1b.color = vectorscale( ( 0, 1, 0 ), 0.5 );
-			sessionadverthud_2a.color = vectorScale( ( 1, 0, 0 ), 0,5 );
+            sessionadverthud_2a.color = vectorscale( ( 0, 1, 0 ), 0.5 );
-			sessionadverthud_2b.color = vectorScale( ( 1, 0, 0 ), 0,5 );
+            sessionadverthud_2b.color = vectorscale( ( 0, 1, 0 ), 0.5 );
         }
-		if ( isDefined( sessionadverthud_0 ) )
+
+        if ( isdefined( sessionadverthud_0 ) )
         {
             if ( showdebughud == 0 )
             {
@@ -490,34 +473,34 @@ sessionadvertismentupdatedebughud()
                 sessionadverthud_3b = undefined;
                 sessionadverthud_4a = undefined;
                 sessionadverthud_4b = undefined;
-				break;
             }
             else
             {
                 if ( level.sessionadvertstatus == 1 )
-				{
+                    sessionadverthud_0.color = ( 1, 1, 1 );
-					sessionadverthud_0.color = ( 1, 0, 0 );
-				}
                 else
-				{
+                    sessionadverthud_0.color = vectorscale( ( 1, 0, 0 ), 0.9 );
-					sessionadverthud_0.color = vectorScale( ( 1, 0, 0 ), 0,9 );
+
-				}
                 sessionadverthud_0 settext( level.sessionadverthud_0_text );
+
                 if ( level.sessionadverthud_1a_text != "" )
                 {
                     sessionadverthud_1a settext( level.sessionadverthud_1a_text );
                     sessionadverthud_1b setvalue( level.sessionadverthud_1b_text );
                 }
+
                 if ( level.sessionadverthud_2a_text != "" )
                 {
                     sessionadverthud_2a settext( level.sessionadverthud_2a_text );
                     sessionadverthud_2b setvalue( level.sessionadverthud_2b_text );
                 }
+
                 if ( level.sessionadverthud_3a_text != "" )
                 {
                     sessionadverthud_3a settext( level.sessionadverthud_3a_text );
                     sessionadverthud_3b setvalue( level.sessionadverthud_3b_text );
                 }
+
                 if ( level.sessionadverthud_4a_text != "" )
                 {
                     sessionadverthud_4a settext( level.sessionadverthud_4a_text );
@@ -525,6 +508,6 @@ sessionadvertismentupdatedebughud()
                 }
             }
         }
+    }
 #/
 }
-}

Multiplayer Core/patch_mp/maps/mp/_gamerep.gsc

@@ -1,17 +1,17 @@
-#include maps/mp/bots/_bot;
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_rank;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_rank;
+#include maps\mp\bots\_bot;
 
 init()
 {
     if ( !isgamerepenabled() )
-	{
         return;
-	}
+
     if ( isgamerepinitialized() )
-	{
         return;
-	}
+
     game["gameRepInitialized"] = 1;
     game["gameRep"]["players"] = [];
     game["gameRep"]["playerNames"] = [];
@@ -22,28 +22,24 @@ init()
 
 isgamerepinitialized()
 {
-	if ( !isDefined( game[ "gameRepInitialized" ] ) || !game[ "gameRepInitialized" ] )
+    if ( !isdefined( game["gameRepInitialized"] ) || !game["gameRepInitialized"] )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 isgamerepenabled()
 {
-	if ( maps/mp/bots/_bot::is_bot_ranked_match() )
+    if ( maps\mp\bots\_bot::is_bot_ranked_match() )
-	{
+        return false;
-		return 0;
+
-	}
     if ( sessionmodeiszombiesgame() )
-	{
+        return false;
-		return 0;
+
-	}
     if ( !level.rankedmatch )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 gamerepinitializeparams()
@@ -144,22 +140,22 @@ gamerepinitializeparams()
 gamerepplayerconnected()
 {
     if ( !isgamerepenabled() )
-	{
         return;
-	}
+
     name = self.name;
 /#
+
 #/
-	if ( !isDefined( game[ "gameRep" ][ "players" ][ name ] ) )
+    if ( !isdefined( game["gameRep"]["players"][name] ) )
     {
         game["gameRep"]["players"][name] = [];
-		j = 0;
+
-		while ( j < game[ "gameRep" ][ "params" ].size )
+        for ( j = 0; j < game["gameRep"]["params"].size; j++ )
         {
             paramname = game["gameRep"]["params"][j];
             game["gameRep"]["players"][name][paramname] = 0;
-			j++;
         }
+
         game["gameRep"]["players"][name]["splitscreen"] = self issplitscreen();
         game["gameRep"]["players"][name]["joinAttempts"] = 1;
         game["gameRep"]["players"][name]["connected"] = 1;
@@ -167,29 +163,25 @@ gamerepplayerconnected()
         game["gameRep"]["playerNames"][game["gameRep"]["playerCount"]] = name;
         game["gameRep"]["playerCount"]++;
     }
-	else
+    else if ( !game["gameRep"]["players"][name]["connected"] )
-	{
-		if ( !game[ "gameRep" ][ "players" ][ name ][ "connected" ] )
     {
         game["gameRep"]["players"][name]["joinAttempts"]++;
         game["gameRep"]["players"][name]["connected"] = 1;
         game["gameRep"]["players"][name]["xpStart"] = self getrankxpstat();
     }
 }
-}
 
 gamerepplayerdisconnected()
 {
     if ( !isgamerepenabled() )
-	{
         return;
-	}
+
     name = self.name;
-	if ( !isDefined( game[ "gameRep" ][ "players" ][ name ] ) || !isDefined( self.pers[ "summary" ] ) )
+
-	{
+    if ( !isdefined( game["gameRep"]["players"][name] ) || !isdefined( self.pers["summary"] ) )
         return;
-	}
 /#
+
 #/
     self gamerepupdatenonpersistentplayerinformation();
     self gamerepupdatepersistentplayerinformation();
@@ -199,44 +191,38 @@ gamerepplayerdisconnected()
 gamerepupdatenonpersistentplayerinformation()
 {
     name = self.name;
-	if ( !isDefined( game[ "gameRep" ][ "players" ][ name ] ) )
+
-	{
+    if ( !isdefined( game["gameRep"]["players"][name] ) )
         return;
-	}
+
     game["gameRep"]["players"][name]["totalTimePlayed"] += self.timeplayed["total"];
-	if ( isDefined( self.tacticalinsertioncount ) )
+
-	{
+    if ( isdefined( self.tacticalinsertioncount ) )
         game["gameRep"]["players"][name]["tacticalInsertions"] += self.tacticalinsertioncount;
 }
-}
 
 gamerepupdatepersistentplayerinformation()
 {
     name = self.name;
-	if ( !isDefined( game[ "gameRep" ][ "players" ][ name ] ) )
+
-	{
+    if ( !isdefined( game["gameRep"]["players"][name] ) )
         return;
-	}
+
     if ( game["gameRep"]["players"][name]["totalTimePlayed"] != 0 )
-	{
         timeplayed = game["gameRep"]["players"][name]["totalTimePlayed"];
-	}
     else
-	{
         timeplayed = 1;
-	}
+
     game["gameRep"]["players"][name]["score"] = self.score;
     game["gameRep"]["players"][name]["scorePerMin"] = int( game["gameRep"]["players"][name]["score"] / ( timeplayed / 60 ) );
     game["gameRep"]["players"][name]["kills"] = self.kills;
     game["gameRep"]["players"][name]["deaths"] = self.deaths;
+
     if ( game["gameRep"]["players"][name]["deaths"] != 0 )
-	{
+        game["gameRep"]["players"][name]["killDeathRatio"] = int( game["gameRep"]["players"][name]["kills"] / game["gameRep"]["players"][name]["deaths"] * 100 );
-		game[ "gameRep" ][ "players" ][ name ][ "killDeathRatio" ] = int( ( game[ "gameRep" ][ "players" ][ name ][ "kills" ] / game[ "gameRep" ][ "players" ][ name ][ "deaths" ] ) * 100 );
-	}
     else
-	{
         game["gameRep"]["players"][name]["killDeathRatio"] = game["gameRep"]["players"][name]["kills"] * 100;
-	}
+
     game["gameRep"]["players"][name]["killsPerMin"] = int( game["gameRep"]["players"][name]["kills"] / ( timeplayed / 60 ) );
     game["gameRep"]["players"][name]["plants"] = self.plants;
     game["gameRep"]["players"][name]["defuses"] = self.defuses;
@@ -248,10 +234,8 @@ gamerepupdatepersistentplayerinformation()
 
 getparamvalueforplayer( playername, paramname )
 {
-	if ( isDefined( game[ "gameRep" ][ "players" ][ playername ][ paramname ] ) )
+    if ( isdefined( game["gameRep"]["players"][playername][paramname] ) )
-	{
         return game["gameRep"]["players"][playername][paramname];
-	}
 /#
     assertmsg( "Unknown parameter " + paramname + "for individual player" );
 #/
@@ -260,48 +244,42 @@ getparamvalueforplayer( playername, paramname )
 isgamerepparamvalid( paramname )
 {
     gametype = level.gametype;
-	if ( !isDefined( game[ "gameRep" ] ) )
+
-	{
+    if ( !isdefined( game["gameRep"] ) )
-		return 0;
+        return false;
-	}
+
-	if ( !isDefined( game[ "gameRep" ][ "gameLimit" ] ) )
+    if ( !isdefined( game["gameRep"]["gameLimit"] ) )
-	{
+        return false;
-		return 0;
+
-	}
+    if ( !isdefined( game["gameRep"]["gameLimit"][gametype] ) )
-	if ( !isDefined( game[ "gameRep" ][ "gameLimit" ][ gametype ] ) )
+        return false;
-	{
+
-		return 0;
+    if ( !isdefined( game["gameRep"]["gameLimit"][gametype][paramname] ) && !isdefined( game["gameRep"]["gameLimit"]["default"][paramname] ) )
-	}
+        return false;
-	if ( !isDefined( game[ "gameRep" ][ "gameLimit" ][ gametype ][ paramname ] ) && !isDefined( game[ "gameRep" ][ "gameLimit" ][ "default" ][ paramname ] ) )
+
-	{
+    return true;
-		return 0;
-	}
-	return 1;
 }
 
 isgamerepparamignoredforreporting( paramname )
 {
-	if ( isDefined( game[ "gameRep" ][ "ignoreParams" ][ paramname ] ) )
+    if ( isdefined( game["gameRep"]["ignoreParams"][paramname] ) )
-	{
+        return true;
-		return 1;
+
-	}
+    return false;
-	return 0;
 }
 
 getgamerepparamlimit( paramname )
 {
     gametype = level.gametype;
-	if ( isDefined( game[ "gameRep" ][ "gameLimit" ][ gametype ] ) )
+
-	{
+    if ( isdefined( game["gameRep"]["gameLimit"][gametype] ) )
-		if ( isDefined( game[ "gameRep" ][ "gameLimit" ][ gametype ][ paramname ] ) )
     {
+        if ( isdefined( game["gameRep"]["gameLimit"][gametype][paramname] ) )
             return game["gameRep"]["gameLimit"][gametype][paramname];
     }
-	}
+
-	if ( isDefined( game[ "gameRep" ][ "gameLimit" ][ "default" ][ paramname ] ) )
+    if ( isdefined( game["gameRep"]["gameLimit"]["default"][paramname] ) )
-	{
         return game["gameRep"]["gameLimit"]["default"][paramname];
-	}
 /#
     assertmsg( "Default values for parameter " + paramname + " is not defined." );
 #/
@@ -309,93 +287,84 @@ getgamerepparamlimit( paramname )
 
 setmaximumparamvalueforcurrentgame( paramname, value )
 {
-	if ( !isDefined( game[ "gameRep" ][ "max" ][ paramname ] ) )
+    if ( !isdefined( game["gameRep"]["max"][paramname] ) )
     {
         game["gameRep"]["max"][paramname] = value;
         return;
     }
+
     if ( game["gameRep"]["max"][paramname] < value )
-	{
         game["gameRep"]["max"][paramname] = value;
 }
-}
 
 gamerepupdateinformationforround()
 {
     if ( !isgamerepenabled() )
-	{
         return;
-	}
+
     players = get_players();
-	i = 0;
+
-	while ( i < players.size )
+    for ( i = 0; i < players.size; i++ )
     {
         player = players[i];
         player gamerepupdatenonpersistentplayerinformation();
-		i++;
     }
 }
 
 gamerepanalyzeandreport()
 {
     if ( !isgamerepenabled() )
-	{
         return;
-	}
+
     players = get_players();
-	i = 0;
+
-	while ( i < players.size )
+    for ( i = 0; i < players.size; i++ )
     {
         player = players[i];
         player gamerepupdatepersistentplayerinformation();
-		i++;
     }
+
     splitscreenplayercount = 0;
-	i = 0;
+
-	while ( i < game[ "gameRep" ][ "playerNames" ].size )
+    for ( i = 0; i < game["gameRep"]["playerNames"].size; i++ )
     {
         playername = game["gameRep"]["playerNames"][i];
-		j = 0;
+
-		while ( j < game[ "gameRep" ][ "params" ].size )
+        for ( j = 0; j < game["gameRep"]["params"].size; j++ )
         {
             paramname = game["gameRep"]["params"][j];
+
             if ( isgamerepparamvalid( paramname ) )
-			{
                 setmaximumparamvalueforcurrentgame( paramname, getparamvalueforplayer( playername, paramname ) );
         }
-			j++;
+
-		}
         paramname = "splitscreen";
         splitscreenplayercount += getparamvalueforplayer( playername, paramname );
-		i++;
     }
+
     setmaximumparamvalueforcurrentgame( paramname, splitscreenplayercount );
-	j = 0;
+
-	while ( j < game[ "gameRep" ][ "params" ].size )
+    for ( j = 0; j < game["gameRep"]["params"].size; j++ )
     {
         paramname = game["gameRep"]["params"][j];
+
         if ( isgamerepparamvalid( paramname ) && game["gameRep"]["max"][paramname] >= getgamerepparamlimit( paramname ) )
-		{
             gamerepprepareandreport( paramname );
     }
-		j++;
+
-	}
     paramname = "splitscreen";
+
     if ( game["gameRep"]["max"][paramname] >= getgamerepparamlimit( paramname ) )
-	{
         gamerepprepareandreport( paramname );
 }
-}
 
 gamerepprepareandreport( paramname )
 {
-	if ( !isDefined( game[ "gameRep" ][ "gameLimit" ][ "id" ][ paramname ] ) )
+    if ( !isdefined( game["gameRep"]["gameLimit"]["id"][paramname] ) )
-	{
         return;
-	}
+
     if ( isgamerepparamignoredforreporting( paramname ) )
-	{
         return;
-	}
+
     gamerepthresholdexceeded( game["gameRep"]["gameLimit"]["id"][paramname] );
 }

Multiplayer Core/patch_mp/maps/mp/_global_fx.gsc

@@ -1,8 +1,9 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include common_scripts\utility;
+#include maps\mp\_utility;
 
-main() //checked matches cerberus output
+main()
 {
     randomstartdelay = randomfloatrange( -20, -15 );
     global_fx( "barrel_fireFX_origin", "global_barrel_fire", "fire/firelp_barrel_pm", randomstartdelay, "fire_barrel_small" );
@@ -16,44 +17,37 @@ main() //checked matches cerberus output
     global_fx( "icbm_powerlinetower_FX_origin", "icbm_powerlinetower_FX", "misc/power_tower_light_red_blink", randomstartdelay );
 }
 
-global_fx( targetname, fxname, fxfile, delay, soundalias ) //checked changed to match cerberus output
+global_fx( targetname, fxname, fxfile, delay, soundalias )
 {
     ents = getstructarray( targetname, "targetname" );
-	if ( !isDefined( ents ) )
+
-	{
+    if ( !isdefined( ents ) )
         return;
-	}
+
     if ( ents.size <= 0 )
-	{
         return;
-	}
+
     for ( i = 0; i < ents.size; i++ )
-	{
         ents[i] global_fx_create( fxname, fxfile, delay, soundalias );
 }
-}
 
-global_fx_create( fxname, fxfile, delay, soundalias ) //checked matches cerberus output
+global_fx_create( fxname, fxfile, delay, soundalias )
-{
-	if ( !isDefined( level._effect ) )
 {
+    if ( !isdefined( level._effect ) )
         level._effect = [];
-	}
+
-	if ( !isDefined( level._effect[ fxname ] ) )
+    if ( !isdefined( level._effect[fxname] ) )
-	{
         level._effect[fxname] = loadfx( fxfile );
-	}
+
-	if ( !isDefined( self.angles ) )
+    if ( !isdefined( self.angles ) )
-	{
         self.angles = ( 0, 0, 0 );
-	}
+
     ent = createoneshoteffect( fxname );
     ent.v["origin"] = self.origin;
     ent.v["angles"] = self.angles;
     ent.v["fxid"] = fxname;
     ent.v["delay"] = delay;
-	if ( isDefined( soundalias ) )
+
-	{
+    if ( isdefined( soundalias ) )
         ent.v["soundalias"] = soundalias;
 }
-}

Multiplayer Core/patch_mp/maps/mp/_hacker_tool.gsc

@@ -1,9 +1,11 @@
-#include maps/mp/gametypes/_weaponobjects;
+// T6 GSC SOURCE
-#include maps/mp/killstreaks/_supplydrop;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_heatseekingmissile;
+#include maps\mp\_utility;
-#include maps/mp/gametypes/_hud_util;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\gametypes\_hud_util;
-#include maps/mp/_utility;
+#include maps\mp\_heatseekingmissile;
+#include maps\mp\killstreaks\_supplydrop;
+#include maps\mp\gametypes\_weaponobjects;
 
 init()
 {
@@ -13,7 +15,7 @@ init()
     level.hackertoollostsightlimitms = 450;
     level.hackertoollockonradius = 20;
     level.hackertoollockonfov = 65;
-	level.hackertoolhacktimems = 0,5;
+    level.hackertoolhacktimems = 0.5;
     level.equipmenthackertoolradius = 60;
     level.equipmenthackertooltimems = 50;
     level.carepackagehackertoolradius = 60;
@@ -56,6 +58,7 @@ onplayerconnect()
     for (;;)
     {
         level waittill( "connecting", player );
+
         player thread onplayerspawned();
     }
 }
@@ -63,9 +66,11 @@ onplayerconnect()
 onplayerspawned()
 {
     self endon( "disconnect" );
+
     for (;;)
     {
         self waittill( "spawned_player" );
+
         self clearhackertarget();
         self thread watchhackertooluse();
         self thread watchhackertoolfired();
@@ -81,13 +86,15 @@ clearhackertarget()
     self.hackertoollockstarttime = 0;
     self.hackertoollockstarted = 0;
     self.hackertoollockfinalized = 0;
-	self.hackertoollocktimeelapsed = 0;
+    self.hackertoollocktimeelapsed = 0.0;
-	self setweaponheatpercent( "pda_hack_mp", 0 );
+    self setweaponheatpercent( "pda_hack_mp", 0.0 );
-	if ( isDefined( self.hackertooltarget ) )
+
+    if ( isdefined( self.hackertooltarget ) )
     {
         lockingon( self.hackertooltarget, 0 );
         lockedon( self.hackertooltarget, 0 );
     }
+
     self.hackertooltarget = undefined;
     self weaponlockfree();
     self weaponlocktargettooclose( 0 );
@@ -101,55 +108,48 @@ watchhackertoolfired()
 {
     self endon( "disconnect" );
     self endon( "death" );
-	while ( 1 )
+
+    while ( true )
     {
         self waittill( "hacker_tool_fired", hackertooltarget );
-		if ( isDefined( hackertooltarget ) )
+
+        if ( isdefined( hackertooltarget ) )
         {
             if ( isentityhackablecarepackage( hackertooltarget ) )
             {
-				maps/mp/killstreaks/_supplydrop::givecratecapturemedal( hackertooltarget, self );
+                maps\mp\killstreaks\_supplydrop::givecratecapturemedal( hackertooltarget, self );
-				hackertooltarget notify( "captured" );
+                hackertooltarget notify( "captured", self, 1 );
-			}
-			if ( isentityhackableweaponobject( hackertooltarget ) || isDefined( hackertooltarget.hackertrigger ) )
-			{
-				hackertooltarget.hackertrigger notify( "trigger" );
             }
+
+            if ( isentityhackableweaponobject( hackertooltarget ) || isdefined( hackertooltarget.hackertrigger ) )
+                hackertooltarget.hackertrigger notify( "trigger", self, 1 );
             else
             {
-				if ( isDefined( hackertooltarget.classname ) && hackertooltarget.classname == "grenade" )
+                if ( isdefined( hackertooltarget.classname ) && hackertooltarget.classname == "grenade" )
-				{
                     damage = 1;
-				}
+                else if ( isdefined( hackertooltarget.maxhealth ) )
-				else
-				{
-					if ( isDefined( hackertooltarget.maxhealth ) )
-					{
                     damage = hackertooltarget.maxhealth + 1;
-						break;
-					}
                 else
-					{
                     damage = 999999;
-					}
+
-				}
+                if ( isdefined( hackertooltarget.numflares ) && hackertooltarget.numflares > 0 )
-				if ( isDefined( hackertooltarget.numflares ) && hackertooltarget.numflares > 0 )
                 {
                     damage = 1;
                     hackertooltarget.numflares--;
-
+                    hackertooltarget maps\mp\_heatseekingmissile::missiletarget_playflarefx();
-					hackertooltarget maps/mp/_heatseekingmissile::missiletarget_playflarefx();
                 }
+
                 hackertooltarget dodamage( damage, self.origin, self, self, 0, "MOD_UNKNOWN", 0, "pda_hack_mp" );
             }
+
             self addplayerstat( "hack_enemy_target", 1 );
             self addweaponstat( "pda_hack_mp", "used", 1 );
         }
+
         clearhackertarget();
         self forceoffhandend();
         clip_ammo = self getweaponammoclip( "pda_hack_mp" );
         clip_ammo--;
-
 /#
         assert( clip_ammo >= 0 );
 #/
@@ -162,12 +162,15 @@ watchhackertooluse()
 {
     self endon( "disconnect" );
     self endon( "death" );
+
     for (;;)
     {
         self waittill( "grenade_pullback", weapon );
+
         if ( weapon == "pda_hack_mp" )
         {
-			wait 0,05;
+            wait 0.05;
+
             if ( self isusingoffhand() && self getcurrentoffhand() == "pda_hack_mp" )
             {
                 self thread hackertooltargetloop();
@@ -186,14 +189,15 @@ watchhackertoolinterrupt()
     self endon( "death" );
     self endon( "weapon_change" );
     self endon( "grenade_fire" );
-	while ( 1 )
+
+    while ( true )
     {
         level waittill( "use_interrupt", interrupttarget );
+
         if ( self.hackertooltarget == interrupttarget )
-		{
             clearhackertarget();
-		}
+
-		wait 0,05;
+        wait 0.05;
     }
 }
 
@@ -211,22 +215,23 @@ watchforgrenadefire()
     self endon( "hacker_tool_fired" );
     self endon( "weapon_change" );
     self endon( "death" );
-	while ( 1 )
+
+    while ( true )
     {
         self waittill( "grenade_fire", grenade, grenadename, respawnfromhack );
-		if ( isDefined( respawnfromhack ) && respawnfromhack )
+
-		{
+        if ( isdefined( respawnfromhack ) && respawnfromhack )
             continue;
-		}
+
         clearhackertarget();
         clip_ammo = self getweaponammoclip( "pda_hack_mp" );
         clip_max_ammo = weaponclipsize( "pda_hack_mp" );
+
         if ( clip_ammo < clip_max_ammo )
-		{
             clip_ammo++;
-		}
+
         self setweaponammoclip( "pda_hack_mp", clip_ammo );
-		return;
+        break;
     }
 }
 
@@ -236,87 +241,104 @@ hackertooltargetloop()
     self endon( "death" );
     self endon( "weapon_change" );
     self endon( "grenade_fire" );
-	while ( 1 )
+
+    while ( true )
     {
-		wait 0,05;
+        wait 0.05;
+
         if ( self.hackertoollockfinalized )
         {
-			while ( !self isvalidhackertooltarget( self.hackertooltarget ) )
+            if ( !self isvalidhackertooltarget( self.hackertooltarget ) )
             {
                 self clearhackertarget();
-			}
-			passed = self hackersoftsighttest();
-			while ( !passed )
-			{
                 continue;
             }
+
+            passed = self hackersoftsighttest();
+
+            if ( !passed )
+                continue;
+
             lockingon( self.hackertooltarget, 0 );
             lockedon( self.hackertooltarget, 1 );
-			thread looplocallocksound( game[ "locked_on_sound" ], 0,75 );
+            thread looplocallocksound( game["locked_on_sound"], 0.75 );
-			self notify( "hacker_tool_fired" );
+            self notify( "hacker_tool_fired", self.hackertooltarget );
             return;
         }
-		while ( self.hackertoollockstarted )
+
+        if ( self.hackertoollockstarted )
         {
-			while ( !self isvalidhackertooltarget( self.hackertooltarget ) )
+            if ( !self isvalidhackertooltarget( self.hackertooltarget ) )
             {
                 self clearhackertarget();
+                continue;
             }
+
             locklengthms = self gethacktime( self.hackertooltarget );
-			while ( locklengthms == 0 )
+
+            if ( locklengthms == 0 )
             {
                 self clearhackertarget();
+                continue;
             }
-			if ( self.hackertoollocktimeelapsed == 0 )
+
-			{
+            if ( self.hackertoollocktimeelapsed == 0.0 )
                 self playlocalsound( "evt_hacker_hacking" );
-			}
+
             lockingon( self.hackertooltarget, 1 );
             lockedon( self.hackertooltarget, 0 );
             passed = self hackersoftsighttest();
-			while ( !passed )
+
-			{
+            if ( !passed )
                 continue;
-			}
+
             if ( self.hackertoollostsightlinetime == 0 )
             {
-				self.hackertoollocktimeelapsed += 0,05;
+                self.hackertoollocktimeelapsed += 0.05;
                 hackpercentage = self.hackertoollocktimeelapsed / ( locklengthms / 1000 );
                 self setweaponheatpercent( "pda_hack_mp", hackpercentage );
             }
-			while ( self.hackertoollocktimeelapsed < ( locklengthms / 1000 ) )
+
-			{
+            if ( self.hackertoollocktimeelapsed < locklengthms / 1000 )
                 continue;
-			}
 /#
-			assert( isDefined( self.hackertooltarget ) );
+            assert( isdefined( self.hackertooltarget ) );
 #/
             self notify( "stop_lockon_sound" );
             self.hackertoollockfinalized = 1;
             self weaponlockfinalize( self.hackertooltarget );
+            continue;
         }
+
         besttarget = self getbesthackertooltarget();
-		while ( !isDefined( besttarget ) )
+
+        if ( !isdefined( besttarget ) )
         {
             self destroylockoncanceledmessage();
+            continue;
         }
-		while ( !self locksighttest( besttarget ) && distance2d( self.origin, besttarget.origin ) > level.hackertoolnosighthackdistance )
+
+        if ( !self locksighttest( besttarget ) && distance2d( self.origin, besttarget.origin ) > level.hackertoolnosighthackdistance )
         {
             self destroylockoncanceledmessage();
+            continue;
         }
-		while ( self locksighttest( besttarget ) && isDefined( besttarget.lockondelay ) && besttarget.lockondelay )
+
+        if ( self locksighttest( besttarget ) && isdefined( besttarget.lockondelay ) && besttarget.lockondelay )
         {
             self displaylockoncanceledmessage();
+            continue;
         }
+
         self destroylockoncanceledmessage();
         initlockfield( besttarget );
         self.hackertooltarget = besttarget;
-		self.hackertoollockstarttime = getTime();
+        self.hackertoollockstarttime = gettime();
         self.hackertoollockstarted = 1;
         self.hackertoollostsightlinetime = 0;
-		self.hackertoollocktimeelapsed = 0;
+        self.hackertoollocktimeelapsed = 0.0;
-		self setweaponheatpercent( "pda_hack_mp", 0 );
+        self setweaponheatpercent( "pda_hack_mp", 0.0 );
-		self thread looplocalseeksound( game[ "locking_on_sound" ], 0,6 );
+        self thread looplocalseeksound( game["locking_on_sound"], 0.6 );
     }
 }
 
@@ -325,129 +347,111 @@ getbesthackertooltarget()
     targetsvalid = [];
     targetsall = arraycombine( target_getarray(), level.missileentities, 0, 0 );
     targetsall = arraycombine( targetsall, level.hackertooltargets, 0, 0 );
-	idx = 0;
+
-	while ( idx < targetsall.size )
+    for ( idx = 0; idx < targetsall.size; idx++ )
     {
         target_ent = targetsall[idx];
-		if ( !isDefined( target_ent ) || !isDefined( target_ent.owner ) )
+
-		{
+        if ( !isdefined( target_ent ) || !isdefined( target_ent.owner ) )
-			idx++;
             continue;
-		}
-		else
-		{
 /#
-			if ( getDvar( "scr_freelock" ) == "1" )
+        if ( getdvar( "scr_freelock" ) == "1" )
         {
             if ( self iswithinhackertoolreticle( targetsall[idx] ) )
-				{
                 targetsvalid[targetsvalid.size] = targetsall[idx];
-				}
+
-				idx++;
             continue;
-#/
         }
-			else if ( level.teambased )
+#/
+        if ( level.teambased )
         {
             if ( isentityhackablecarepackage( target_ent ) )
             {
                 if ( self iswithinhackertoolreticle( target_ent ) )
-					{
                     targetsvalid[targetsvalid.size] = target_ent;
             }
-				}
+            else if ( isdefined( target_ent.team ) )
-				else if ( isDefined( target_ent.team ) )
             {
                 if ( target_ent.team != self.team )
                 {
                     if ( self iswithinhackertoolreticle( target_ent ) )
-						{
                         targetsvalid[targetsvalid.size] = target_ent;
                 }
             }
-				}
+            else if ( isdefined( target_ent.owner.team ) )
-				else
-				{
-					if ( isDefined( target_ent.owner.team ) )
             {
                 if ( target_ent.owner.team != self.team )
                 {
                     if ( self iswithinhackertoolreticle( target_ent ) )
-							{
                         targetsvalid[targetsvalid.size] = target_ent;
                 }
             }
-					}
+
-				}
-				idx++;
             continue;
         }
-			else if ( self iswithinhackertoolreticle( target_ent ) )
+
+        if ( self iswithinhackertoolreticle( target_ent ) )
         {
             if ( isentityhackablecarepackage( target_ent ) )
             {
                 targetsvalid[targetsvalid.size] = target_ent;
-					idx++;
                 continue;
             }
-				else
+
-				{
+            if ( isdefined( target_ent.owner ) && self != target_ent.owner )
-					if ( isDefined( target_ent.owner ) && self != target_ent.owner )
-					{
                 targetsvalid[targetsvalid.size] = target_ent;
         }
     }
-			}
+
-		}
-		idx++;
-	}
     chosenent = undefined;
+
     if ( targetsvalid.size != 0 )
-	{
         chosenent = targetsvalid[0];
-	}
+
     return chosenent;
 }
 
 iswithinhackertoolreticle( target )
 {
     radius = gethackertoolradius( target );
-	return target_isincircle( target, self, level.hackertoollockonfov, radius, 0 );
+    return target_isincircle( target, self, level.hackertoollockonfov, radius, 0.0 );
 }
 
 isentityhackableweaponobject( entity )
 {
-	if ( isDefined( entity.classname ) && entity.classname == "grenade" )
+    if ( isdefined( entity.classname ) && entity.classname == "grenade" )
     {
-		if ( isDefined( entity.name ) )
+        if ( isdefined( entity.name ) )
         {
-			watcher = maps/mp/gametypes/_weaponobjects::getweaponobjectwatcherbyweapon( entity.name );
+            watcher = maps\mp\gametypes\_weaponobjects::getweaponobjectwatcherbyweapon( entity.name );
-			if ( isDefined( watcher ) )
+
+            if ( isdefined( watcher ) )
             {
                 if ( watcher.hackable )
                 {
 /#
-					assert( isDefined( watcher.hackertoolradius ) );
+                    assert( isdefined( watcher.hackertoolradius ) );
-					assert( isDefined( watcher.hackertooltimems ) );
+                    assert( isdefined( watcher.hackertooltimems ) );
 #/
-					return 1;
+                    return true;
                 }
             }
         }
     }
-	return 0;
+
+    return false;
 }
 
 getweaponobjecthackerradius( entity )
 {
 /#
-	assert( isDefined( entity.classname ) );
+    assert( isdefined( entity.classname ) );
-	assert( isDefined( entity.name ) );
+    assert( isdefined( entity.name ) );
 #/
-	watcher = maps/mp/gametypes/_weaponobjects::getweaponobjectwatcherbyweapon( entity.name );
+    watcher = maps\mp\gametypes\_weaponobjects::getweaponobjectwatcherbyweapon( entity.name );
 /#
     assert( watcher.hackable );
-	assert( isDefined( watcher.hackertoolradius ) );
+    assert( isdefined( watcher.hackertoolradius ) );
 #/
     return watcher.hackertoolradius;
 }
@@ -455,112 +459,94 @@ getweaponobjecthackerradius( entity )
 getweaponobjecthacktimems( entity )
 {
 /#
-	assert( isDefined( entity.classname ) );
+    assert( isdefined( entity.classname ) );
-	assert( isDefined( entity.name ) );
+    assert( isdefined( entity.name ) );
 #/
-	watcher = maps/mp/gametypes/_weaponobjects::getweaponobjectwatcherbyweapon( entity.name );
+    watcher = maps\mp\gametypes\_weaponobjects::getweaponobjectwatcherbyweapon( entity.name );
 /#
     assert( watcher.hackable );
-	assert( isDefined( watcher.hackertooltimems ) );
+    assert( isdefined( watcher.hackertooltimems ) );
 #/
     return watcher.hackertooltimems;
 }
 
 isentityhackablecarepackage( entity )
 {
-	if ( isDefined( entity.model ) )
+    if ( isdefined( entity.model ) )
-	{
         return entity.model == "t6_wpn_supply_drop_ally";
-	}
     else
-	{
         return 0;
 }
-}
 
 isvalidhackertooltarget( ent )
 {
-	if ( !isDefined( ent ) )
+    if ( !isdefined( ent ) )
-	{
+        return false;
-		return 0;
+
-	}
     if ( self isusingremote() )
-	{
+        return false;
-		return 0;
+
-	}
     if ( self isempjammed() )
-	{
+        return false;
-		return 0;
+
-	}
     if ( !target_istarget( ent ) && !isentityhackableweaponobject( ent ) && !isinarray( level.hackertooltargets, ent ) )
-	{
+        return false;
-		return 0;
+
-	}
     if ( isentityhackableweaponobject( ent ) )
     {
         if ( distancesquared( self.origin, ent.origin ) > level.hackertoolmaxequipmentdistancesq )
-		{
+            return false;
-			return 0;
     }
-	}
+
-	return 1;
+    return true;
 }
 
 hackersoftsighttest()
 {
     passed = 1;
     locklengthms = 0;
-	if ( isDefined( self.hackertooltarget ) )
+
-	{
+    if ( isdefined( self.hackertooltarget ) )
         locklengthms = self gethacktime( self.hackertooltarget );
-	}
+
     if ( self isempjammed() || locklengthms == 0 )
     {
         self clearhackertarget();
         passed = 0;
     }
-	else
+    else if ( iswithinhackertoolreticle( self.hackertooltarget ) )
-	{
-		if ( iswithinhackertoolreticle( self.hackertooltarget ) )
-		{
         self.hackertoollostsightlinetime = 0;
-		}
     else
     {
         if ( self.hackertoollostsightlinetime == 0 )
-			{
+            self.hackertoollostsightlinetime = gettime();
-				self.hackertoollostsightlinetime = getTime();
+
-			}
+        timepassed = gettime() - self.hackertoollostsightlinetime;
-			timepassed = getTime() - self.hackertoollostsightlinetime;
+
         if ( timepassed >= level.hackertoollostsightlimitms )
         {
             self clearhackertarget();
             passed = 0;
         }
     }
-	}
+
     return passed;
 }
 
 registerwithhackertool( radius, hacktimems )
 {
     self endon( "death" );
-	if ( isDefined( radius ) )
+
-	{
+    if ( isdefined( radius ) )
         self.hackertoolradius = radius;
-	}
     else
-	{
         self.hackertoolradius = level.hackertoollockonradius;
-	}
+
-	if ( isDefined( hacktimems ) )
+    if ( isdefined( hacktimems ) )
-	{
         self.hackertooltimems = hacktimems;
-	}
     else
-	{
         self.hackertooltimems = level.hackertoolhacktimems;
-	}
+
     self thread watchhackableentitydeath();
     level.hackertooltargets[level.hackertooltargets.size] = self;
 }
@@ -568,31 +554,29 @@ registerwithhackertool( radius, hacktimems )
 watchhackableentitydeath()
 {
     self waittill( "death" );
+
     arrayremovevalue( level.hackertooltargets, self );
 }
 
 gethackertoolradius( target )
 {
     radius = 20;
+
     if ( isentityhackablecarepackage( target ) )
     {
 /#
-		assert( isDefined( target.hackertoolradius ) );
+        assert( isdefined( target.hackertoolradius ) );
 #/
         radius = target.hackertoolradius;
-		break;
     }
     else if ( isentityhackableweaponobject( target ) )
-{
         radius = getweaponobjecthackerradius( target );
-	break;
+    else if ( isdefined( target.hackertoolradius ) )
-}
-else if ( isDefined( target.hackertoolradius ) )
-{
         radius = target.hackertoolradius;
-break;
+    else
-}
+    {
-else radius = level.vehiclehackertoolradius;
+        radius = level.vehiclehackertoolradius;
+
         switch ( target.model )
         {
             case "veh_t6_drone_uav":
@@ -607,20 +591,20 @@ break;
             case "veh_iw_mh6_littlebird_mp":
                 radius = level.carepackagechopperhackertoolradius;
                 break;
-case "veh_t6_drone_quad_rotor_mp":
             case "veh_t6_drone_quad_rotor_mp_alt":
+            case "veh_t6_drone_quad_rotor_mp":
                 radius = level.qrdronehackertoolradius;
                 break;
-case "veh_t6_drone_tank":
             case "veh_t6_drone_tank_alt":
+            case "veh_t6_drone_tank":
                 radius = level.aitankhackertoolradius;
                 break;
-case "veh_t6_air_attack_heli_mp_dark":
             case "veh_t6_air_attack_heli_mp_light":
+            case "veh_t6_air_attack_heli_mp_dark":
                 radius = level.stealthchopperhackertoolradius;
                 break;
-case "veh_t6_drone_overwatch_dark":
             case "veh_t6_drone_overwatch_light":
+            case "veh_t6_drone_overwatch_dark":
                 radius = level.littlebirdhackertoolradius;
                 break;
             case "veh_t6_drone_pegasus":
@@ -629,50 +613,40 @@ break;
             case "veh_iw_air_apache_killstreak":
                 radius = level.choppergunnerhackertoolradius;
                 break;
-case "veh_t6_air_a10f":
             case "veh_t6_air_a10f_alt":
+            case "veh_t6_air_a10f":
                 radius = level.warthoghackertoolradius;
                 break;
         }
+    }
+
     return radius;
 }
 
 gethacktime( target )
 {
     time = 500;
+
     if ( isentityhackablecarepackage( target ) )
     {
 /#
-		assert( isDefined( target.hackertooltimems ) );
+        assert( isdefined( target.hackertooltimems ) );
 #/
-		if ( isDefined( target.owner ) && target.owner == self )
+        if ( isdefined( target.owner ) && target.owner == self )
-		{
             time = level.carepackageownerhackertooltimems;
-		}
+        else if ( isdefined( target.owner ) && target.owner.team == self.team )
-		else
-		{
-			if ( isDefined( target.owner ) && target.owner.team == self.team )
-			{
             time = level.carepackagefriendlyhackertooltimems;
-			}
         else
-			{
             time = level.carepackagehackertooltimems;
     }
-		}
-		break;
-}
     else if ( isentityhackableweaponobject( target ) )
-{
         time = getweaponobjecthacktimems( target );
-	break;
+    else if ( isdefined( target.hackertooltimems ) )
-}
-else if ( isDefined( target.hackertooltimems ) )
-{
         time = target.hackertooltimems;
-break;
+    else
-}
+    {
-else time = level.vehiclehackertooltimems;
+        time = level.vehiclehackertooltimems;
+
         switch ( target.model )
         {
             case "veh_t6_drone_uav":
@@ -688,46 +662,48 @@ case "veh_t6_drone_supply_alt":
             case "veh_t6_drone_supply_alt":
                 time = level.carepackagechopperhackertooltimems;
                 break;
-case "veh_t6_drone_quad_rotor_mp":
             case "veh_t6_drone_quad_rotor_mp_alt":
+            case "veh_t6_drone_quad_rotor_mp":
                 time = level.qrdronehackertooltimems;
                 break;
-case "veh_t6_drone_tank":
             case "veh_t6_drone_tank_alt":
+            case "veh_t6_drone_tank":
                 time = level.aitankhackertooltimems;
                 break;
-case "veh_t6_air_attack_heli_mp_dark":
             case "veh_t6_air_attack_heli_mp_light":
+            case "veh_t6_air_attack_heli_mp_dark":
                 time = level.stealthchopperhackertooltimems;
                 break;
-case "veh_t6_drone_overwatch_dark":
             case "veh_t6_drone_overwatch_light":
+            case "veh_t6_drone_overwatch_dark":
                 time = level.littlebirdhackertooltimems;
                 break;
             case "veh_t6_drone_pegasus":
                 time = level.lodestarhackertooltimems;
                 break;
-case "veh_t6_air_v78_vtol_killstreak":
             case "veh_t6_air_v78_vtol_killstreak_alt":
+            case "veh_t6_air_v78_vtol_killstreak":
                 time = level.choppergunnerhackertooltimems;
                 break;
-case "veh_t6_air_a10f":
             case "veh_t6_air_a10f_alt":
+            case "veh_t6_air_a10f":
                 time = level.warthoghackertooltimems;
                 break;
         }
+    }
+
     return time;
 }
 
 tunables()
 {
 /#
-	while ( 1 )
+    while ( true )
     {
         level.hackertoollostsightlimitms = weapons_get_dvar_int( "scr_hackerToolLostSightLimitMs", 1000 );
         level.hackertoollockonradius = weapons_get_dvar( "scr_hackerToolLockOnRadius", 20 );
         level.hackertoollockonfov = weapons_get_dvar_int( "scr_hackerToolLockOnFOV", 65 );
-		level.rcxd_time = weapons_get_dvar( "scr_rcxd_time", 1,5 );
+        level.rcxd_time = weapons_get_dvar( "scr_rcxd_time", 1.5 );
         level.uav_time = weapons_get_dvar_int( "scr_uav_time", 4 );
         level.cuav_time = weapons_get_dvar_int( "scr_cuav_time", 4 );
         level.care_package_chopper_time = weapons_get_dvar_int( "scr_care_package_chopper_time", 3 );
@@ -740,7 +716,7 @@ tunables()
         level.warthog_time = weapons_get_dvar_int( "scr_warthog_time", 7 );
         level.lodestar_time = weapons_get_dvar_int( "scr_lodestar_time", 7 );
         level.chopper_gunner_time = weapons_get_dvar_int( "scr_chopper_gunner_time", 7 );
-		wait 1;
+        wait 1.0;
+    }
 #/
 }
-}

Multiplayer Core/patch_mp/maps/mp/_heatseekingmissile.gsc

@@ -1,8 +1,10 @@
-#include maps/mp/killstreaks/_airsupport;
+// T6 GSC SOURCE
-#include maps/mp/killstreaks/_helicopter;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/gametypes/_weapon_utils;
+#include maps\mp\_utility;
-#include common_scripts/utility;
+#include common_scripts\utility;
-#include maps/mp/_utility;
+#include maps\mp\gametypes\_weapon_utils;
+#include maps\mp\killstreaks\_helicopter;
+#include maps\mp\killstreaks\_airsupport;
 
 init()
 {
@@ -22,6 +24,7 @@ onplayerconnect()
     for (;;)
     {
         level waittill( "connecting", player );
+
         player thread onplayerspawned();
     }
 }
@@ -29,9 +32,11 @@ onplayerconnect()
 onplayerspawned()
 {
     self endon( "disconnect" );
+
     for (;;)
     {
         self waittill( "spawned_player" );
+
         self clearirtarget();
         thread stingertoggleloop();
         self thread stingerfirednotify();
@@ -48,11 +53,13 @@ clearirtarget()
     self.stingerlockstarttime = 0;
     self.stingerlockstarted = 0;
     self.stingerlockfinalized = 0;
-	if ( isDefined( self.stingertarget ) )
+
+    if ( isdefined( self.stingertarget ) )
     {
         lockingon( self.stingertarget, 0 );
         lockedon( self.stingertarget, 0 );
     }
+
     self.stingertarget = undefined;
     self weaponlockfree();
     self weaponlocktargettooclose( 0 );
@@ -66,17 +73,18 @@ stingerfirednotify()
 {
     self endon( "disconnect" );
     self endon( "death" );
-	while ( 1 )
+
+    while ( true )
     {
         self waittill( "missile_fire", missile, weap );
-		if ( maps/mp/gametypes/_weapon_utils::isguidedrocketlauncherweapon( weap ) )
+
+        if ( maps\mp\gametypes\_weapon_utils::isguidedrocketlauncherweapon( weap ) )
         {
-			if ( isDefined( self.stingertarget ) && self.stingerlockfinalized )
+            if ( isdefined( self.stingertarget ) && self.stingerlockfinalized )
-			{
+                self.stingertarget notify( "stinger_fired_at_me", missile, weap, self );
-				self.stingertarget notify( "stinger_fired_at_me" );
+
-			}
+            level notify( "missile_fired", self, missile, self.stingertarget, self.stingerlockfinalized );
-			level notify( "missile_fired" );
+            self notify( "stinger_fired", missile, weap );
-			self notify( "stinger_fired" );
         }
     }
 }
@@ -85,33 +93,34 @@ stingertoggleloop()
 {
     self endon( "disconnect" );
     self endon( "death" );
+
     for (;;)
     {
         self waittill( "weapon_change", weapon );
-		while ( maps/mp/gametypes/_weapon_utils::isguidedrocketlauncherweapon( weapon ) )
+
+        while ( maps\mp\gametypes\_weapon_utils::isguidedrocketlauncherweapon( weapon ) )
         {
             abort = 0;
+
             while ( !self playerstingerads() )
             {
-				wait 0,05;
+                wait 0.05;
-				if ( !maps/mp/gametypes/_weapon_utils::isguidedrocketlauncherweapon( self getcurrentweapon() ) )
+
+                if ( !maps\mp\gametypes\_weapon_utils::isguidedrocketlauncherweapon( self getcurrentweapon() ) )
                 {
                     abort = 1;
                     break;
                 }
-				else
-				{
-				}
             }
+
             if ( abort )
-			{
                 break;
-			}
+
-			else self thread stingerirtloop();
+            self thread stingerirtloop();
+
             while ( self playerstingerads() )
-			{
+                wait 0.05;
-				wait 0,05;
+
-			}
             self notify( "stinger_IRT_off" );
             self clearirtarget();
             weapon = self getcurrentweapon();
@@ -125,102 +134,104 @@ stingerirtloop()
     self endon( "death" );
     self endon( "stinger_IRT_off" );
     locklength = self getlockonspeed();
+
     for (;;)
     {
-		wait 0,05;
+        wait 0.05;
+
         if ( self.stingerlockfinalized )
         {
             passed = softsighttest();
+
             if ( !passed )
-			{
                 continue;
-			}
+
-			else if ( !isstillvalidtarget( self.stingertarget ) )
+            if ( !isstillvalidtarget( self.stingertarget ) )
             {
                 self clearirtarget();
                 continue;
             }
-			else if ( !self.stingertarget.locked_on )
+
-			{
+            if ( !self.stingertarget.locked_on )
-				self.stingertarget notify( "missile_lock" );
+                self.stingertarget notify( "missile_lock", self );
-			}
+
             lockingon( self.stingertarget, 0 );
             lockedon( self.stingertarget, 1 );
-			thread looplocallocksound( game[ "locked_on_sound" ], 0,75 );
+            thread looplocallocksound( game["locked_on_sound"], 0.75 );
             continue;
         }
-		else if ( self.stingerlockstarted )
+
+        if ( self.stingerlockstarted )
         {
             if ( !isstillvalidtarget( self.stingertarget ) )
             {
                 self clearirtarget();
                 continue;
             }
-			else lockingon( self.stingertarget, 1 );
+
+            lockingon( self.stingertarget, 1 );
             lockedon( self.stingertarget, 0 );
             passed = softsighttest();
+
             if ( !passed )
-			{
                 continue;
-			}
+
-			else timepassed = getTime() - self.stingerlockstarttime;
+            timepassed = gettime() - self.stingerlockstarttime;
+
             if ( timepassed < locklength )
-			{
                 continue;
-			}
+/#
-			else /#
+            assert( isdefined( self.stingertarget ) );
-			assert( isDefined( self.stingertarget ) );
 #/
             self notify( "stop_lockon_sound" );
             self.stingerlockfinalized = 1;
             self weaponlockfinalize( self.stingertarget );
             continue;
         }
-		else besttarget = self getbeststingertarget();
+
-		if ( !isDefined( besttarget ) )
+        besttarget = self getbeststingertarget();
+
+        if ( !isdefined( besttarget ) )
         {
             self destroylockoncanceledmessage();
             continue;
         }
-		else if ( !self locksighttest( besttarget ) )
+
+        if ( !self locksighttest( besttarget ) )
         {
             self destroylockoncanceledmessage();
             continue;
         }
-		else if ( self locksighttest( besttarget ) && isDefined( besttarget.lockondelay ) && besttarget.lockondelay )
+
+        if ( self locksighttest( besttarget ) && isdefined( besttarget.lockondelay ) && besttarget.lockondelay )
         {
             self displaylockoncanceledmessage();
             continue;
         }
-		else
+
-		{
         self destroylockoncanceledmessage();
         initlockfield( besttarget );
         self.stingertarget = besttarget;
-			self.stingerlockstarttime = getTime();
+        self.stingerlockstarttime = gettime();
         self.stingerlockstarted = 1;
         self.stingerlostsightlinetime = 0;
-			self thread looplocalseeksound( game[ "locking_on_sound" ], 0,6 );
+        self thread looplocalseeksound( game["locking_on_sound"], 0.6 );
-		}
     }
 }
 
 destroylockoncanceledmessage()
 {
-	if ( isDefined( self.lockoncanceledmessage ) )
+    if ( isdefined( self.lockoncanceledmessage ) )
-	{
         self.lockoncanceledmessage destroy();
 }
-}
 
 displaylockoncanceledmessage()
 {
-	if ( isDefined( self.lockoncanceledmessage ) )
+    if ( isdefined( self.lockoncanceledmessage ) )
-	{
         return;
-	}
+
     self.lockoncanceledmessage = newclienthudelem( self );
-	self.lockoncanceledmessage.fontscale = 1,25;
+    self.lockoncanceledmessage.fontscale = 1.25;
     self.lockoncanceledmessage.x = 0;
     self.lockoncanceledmessage.y = 50;
     self.lockoncanceledmessage.alignx = "center";
@@ -231,7 +242,7 @@ displaylockoncanceledmessage()
     self.lockoncanceledmessage.hidewhendead = 0;
     self.lockoncanceledmessage.hidewheninmenu = 1;
     self.lockoncanceledmessage.archived = 0;
-	self.lockoncanceledmessage.alpha = 1;
+    self.lockoncanceledmessage.alpha = 1.0;
     self.lockoncanceledmessage settext( &"MP_CANNOT_LOCKON_TO_TARGET" );
 }
 
@@ -239,52 +250,46 @@ getbeststingertarget()
 {
     targetsall = target_getarray();
     targetsvalid = [];
-	idx = 0;
+
-	while ( idx < targetsall.size )
+    for ( idx = 0; idx < targetsall.size; idx++ )
     {
 /#
-		if ( getDvar( "scr_freelock" ) == "1" )
+        if ( getdvar( "scr_freelock" ) == "1" )
         {
             if ( self insidestingerreticlenolock( targetsall[idx] ) )
-			{
                 targetsvalid[targetsvalid.size] = targetsall[idx];
-			}
+
-			idx++;
             continue;
+        }
 #/
-		}
+        if ( level.teambased )
-		else if ( level.teambased )
         {
-			if ( isDefined( targetsall[ idx ].team ) && targetsall[ idx ].team != self.team )
+            if ( isdefined( targetsall[idx].team ) && targetsall[idx].team != self.team )
             {
                 if ( self insidestingerreticlenolock( targetsall[idx] ) )
-				{
                     targetsvalid[targetsvalid.size] = targetsall[idx];
             }
-			}
+
-			idx++;
             continue;
         }
-		else
+
-		{
         if ( self insidestingerreticlenolock( targetsall[idx] ) )
         {
-				if ( isDefined( targetsall[ idx ].owner ) && self != targetsall[ idx ].owner )
+            if ( isdefined( targetsall[idx].owner ) && self != targetsall[idx].owner )
-				{
                 targetsvalid[targetsvalid.size] = targetsall[idx];
         }
     }
-		}
+
-		idx++;
-	}
     if ( targetsvalid.size == 0 )
-	{
         return undefined;
-	}
+
     chosenent = targetsvalid[0];
+
     if ( targetsvalid.size > 1 )
     {
+
     }
+
     return chosenent;
 }
 
@@ -302,24 +307,21 @@ insidestingerreticlelocked( target )
 
 isstillvalidtarget( ent )
 {
-	if ( !isDefined( ent ) )
+    if ( !isdefined( ent ) )
-	{
+        return false;
-		return 0;
+
-	}
     if ( !target_istarget( ent ) )
-	{
+        return false;
-		return 0;
+
-	}
     if ( !insidestingerreticlelocked( ent ) )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 playerstingerads()
 {
-	return self playerads() == 1;
+    return self playerads() == 1.0;
 }
 
 looplocalseeksound( alias, interval )
@@ -327,6 +329,7 @@ looplocalseeksound( alias, interval )
     self endon( "stop_lockon_sound" );
     self endon( "disconnect" );
     self endon( "death" );
+
     for (;;)
     {
         self playlocalsound( alias );
@@ -340,11 +343,12 @@ looplocallocksound( alias, interval )
     self endon( "stop_locked_sound" );
     self endon( "disconnect" );
     self endon( "death" );
-	if ( isDefined( self.stingerlocksound ) )
+
-	{
+    if ( isdefined( self.stingerlocksound ) )
         return;
-	}
+
     self.stingerlocksound = 1;
+
     for (;;)
     {
         self playlocalsound( alias );
@@ -358,63 +362,66 @@ looplocallocksound( alias, interval )
         wait( interval / 6 );
         self stoprumble( "stinger_lock_rumble" );
     }
+
     self.stingerlocksound = undefined;
 }
 
 locksighttest( target )
 {
     eyepos = self geteye();
-	if ( !isDefined( target ) )
+
-	{
+    if ( !isdefined( target ) )
-		return 0;
+        return false;
-	}
+
     passed = bullettracepassed( eyepos, target.origin, 0, target );
+
     if ( passed )
-	{
+        return true;
-		return 1;
+
-	}
     front = target getpointinbounds( 1, 0, 0 );
     passed = bullettracepassed( eyepos, front, 0, target );
+
     if ( passed )
-	{
+        return true;
-		return 1;
+
-	}
     back = target getpointinbounds( -1, 0, 0 );
     passed = bullettracepassed( eyepos, back, 0, target );
+
     if ( passed )
-	{
+        return true;
-		return 1;
+
-	}
+    return false;
-	return 0;
 }
 
 softsighttest()
 {
     lost_sight_limit = 500;
+
     if ( self locksighttest( self.stingertarget ) )
     {
         self.stingerlostsightlinetime = 0;
-		return 1;
+        return true;
     }
+
     if ( self.stingerlostsightlinetime == 0 )
-	{
+        self.stingerlostsightlinetime = gettime();
-		self.stingerlostsightlinetime = getTime();
+
-	}
+    timepassed = gettime() - self.stingerlostsightlinetime;
-	timepassed = getTime() - self.stingerlostsightlinetime;
+
     if ( timepassed >= lost_sight_limit )
     {
         self clearirtarget();
-		return 0;
+        return false;
     }
-	return 1;
+
+    return true;
 }
 
 initlockfield( target )
 {
-	if ( isDefined( target.locking_on ) )
+    if ( isdefined( target.locking_on ) )
-	{
         return;
-	}
+
     target.locking_on = 0;
     target.locked_on = 0;
 }
@@ -422,9 +429,10 @@ initlockfield( target )
 lockingon( target, lock )
 {
 /#
-	assert( isDefined( target.locking_on ) );
+    assert( isdefined( target.locking_on ) );
 #/
     clientnum = self getentitynumber();
+
     if ( lock )
     {
         target notify( "locking on" );
@@ -434,7 +442,7 @@ lockingon( target, lock )
     else
     {
         self notify( "locking_on_cleared" );
-		target.locking_on &= 1 << clientnum;
+        target.locking_on &= ~( 1 << clientnum );
     }
 }
 
@@ -443,15 +451,16 @@ watchclearlockingon( target, clientnum )
     target endon( "death" );
     self endon( "locking_on_cleared" );
     self waittill_any( "death", "disconnect" );
-	target.locking_on &= 1 << clientnum;
+    target.locking_on &= ~( 1 << clientnum );
 }
 
 lockedon( target, lock )
 {
 /#
-	assert( isDefined( target.locked_on ) );
+    assert( isdefined( target.locked_on ) );
 #/
     clientnum = self getentitynumber();
+
     if ( lock )
     {
         target.locked_on |= 1 << clientnum;
@@ -460,7 +469,7 @@ lockedon( target, lock )
     else
     {
         self notify( "locked_on_cleared" );
-		target.locked_on &= 1 << clientnum;
+        target.locked_on &= ~( 1 << clientnum );
     }
 }
 
@@ -468,38 +477,37 @@ watchclearlockedon( target, clientnum )
 {
     self endon( "locked_on_cleared" );
     self waittill_any( "death", "disconnect" );
-	if ( isDefined( target ) )
+
-	{
+    if ( isdefined( target ) )
-		target.locked_on &= 1 << clientnum;
+        target.locked_on &= ~( 1 << clientnum );
-	}
 }
 
 missiletarget_lockonmonitor( player, endon1, endon2 )
 {
     self endon( "death" );
-	if ( isDefined( endon1 ) )
+
-	{
+    if ( isdefined( endon1 ) )
         self endon( endon1 );
-	}
+
-	if ( isDefined( endon2 ) )
+    if ( isdefined( endon2 ) )
-	{
         self endon( endon2 );
-	}
+
     for (;;)
     {
         if ( target_istarget( self ) )
         {
+
         }
-		wait 0,1;
+
+        wait 0.1;
     }
 }
 
 _incomingmissile( missile )
 {
-	if ( !isDefined( self.incoming_missile ) )
+    if ( !isdefined( self.incoming_missile ) )
-	{
         self.incoming_missile = 0;
-	}
+
     self.incoming_missile++;
     self thread _incomingmissiletracker( missile );
 }
@@ -507,9 +515,10 @@ _incomingmissile( missile )
 _incomingmissiletracker( missile )
 {
     self endon( "death" );
-	missile waittill( "death" );
-	self.incoming_missile--;
 
+    missile waittill( "death" );
+
+    self.incoming_missile--;
 /#
     assert( self.incoming_missile >= 0 );
 #/
@@ -517,39 +526,36 @@ _incomingmissiletracker( missile )
 
 missiletarget_ismissileincoming()
 {
-	if ( !isDefined( self.incoming_missile ) )
+    if ( !isdefined( self.incoming_missile ) )
-	{
+        return false;
-		return 0;
+
-	}
     if ( self.incoming_missile )
-	{
+        return true;
-		return 1;
+
-	}
+    return false;
-	return 0;
 }
 
 missiletarget_handleincomingmissile( responsefunc, endon1, endon2 )
 {
     level endon( "game_ended" );
     self endon( "death" );
-	if ( isDefined( endon1 ) )
+
-	{
+    if ( isdefined( endon1 ) )
         self endon( endon1 );
-	}
+
-	if ( isDefined( endon2 ) )
+    if ( isdefined( endon2 ) )
-	{
         self endon( endon2 );
-	}
+
     for (;;)
     {
         self waittill( "stinger_fired_at_me", missile, weap, attacker );
+
         _incomingmissile( missile );
-		if ( isDefined( responsefunc ) )
+
-		{
+        if ( isdefined( responsefunc ) )
             [[ responsefunc ]]( missile, attacker, weap, endon1, endon2 );
     }
 }
-}
 
 missiletarget_proximitydetonateincomingmissile( endon1, endon2 )
 {
@@ -560,9 +566,9 @@ _missiledetonate( attacker, weapon )
 {
     self endon( "death" );
     radiusdamage( self.origin, 500, 600, 600, attacker, undefined, weapon );
-	wait 0,05;
+    wait 0.05;
     self detonate();
-	wait 0,05;
+    wait 0.05;
     self delete();
 }
 
@@ -570,109 +576,101 @@ missiletarget_proximitydetonate( missile, attacker, weapon, endon1, endon2 )
 {
     level endon( "game_ended" );
     missile endon( "death" );
-	if ( isDefined( endon1 ) )
+
-	{
+    if ( isdefined( endon1 ) )
         self endon( endon1 );
-	}
+
-	if ( isDefined( endon2 ) )
+    if ( isdefined( endon2 ) )
-	{
         self endon( endon2 );
-	}
+
     mindist = distance( missile.origin, self.origin );
     lastcenter = self.origin;
     missile missile_settarget( self );
+
     for (;;)
     {
-		if ( !isDefined( self ) )
+        if ( !isdefined( self ) )
-		{
             center = lastcenter;
-		}
         else
-		{
             center = self.origin;
-		}
+
         lastcenter = center;
         curdist = distance( missile.origin, center );
-		if ( curdist < 3500 && isDefined( self.numflares ) && self.numflares > 0 )
+
+        if ( curdist < 3500 && isdefined( self.numflares ) && self.numflares > 0 )
         {
             self.numflares--;
-
             self thread missiletarget_playflarefx();
-			self maps/mp/killstreaks/_helicopter::trackassists( attacker, 0, 1 );
+            self maps\mp\killstreaks\_helicopter::trackassists( attacker, 0, 1 );
             newtarget = self missiletarget_deployflares( missile.origin, missile.angles );
             missile missile_settarget( newtarget );
             missiletarget = newtarget;
             return;
         }
+
         if ( curdist < mindist )
-		{
             mindist = curdist;
-		}
+
         if ( curdist > mindist )
         {
             if ( curdist > 500 )
-			{
                 return;
-			}
+
             missile thread _missiledetonate( attacker, weapon );
         }
-		wait 0,05;
+
+        wait 0.05;
     }
 }
 
 missiletarget_playflarefx()
 {
-	if ( !isDefined( self ) )
+    if ( !isdefined( self ) )
-	{
         return;
-	}
+
     flare_fx = level.fx_flare;
-	if ( isDefined( self.fx_flare ) )
+
-	{
+    if ( isdefined( self.fx_flare ) )
         flare_fx = self.fx_flare;
-	}
+
-	if ( isDefined( self.flare_ent ) )
+    if ( isdefined( self.flare_ent ) )
-	{
         playfxontag( flare_fx, self.flare_ent, "tag_origin" );
-	}
     else
-	{
         playfxontag( flare_fx, self, "tag_origin" );
-	}
+
-	if ( isDefined( self.owner ) )
+    if ( isdefined( self.owner ) )
-	{
         self playsoundtoplayer( "veh_huey_chaff_drop_plr", self.owner );
-	}
+
     self playsound( "veh_huey_chaff_explo_npc" );
 }
 
 missiletarget_deployflares( origin, angles )
 {
-	vec_toforward = anglesToForward( self.angles );
+    vec_toforward = anglestoforward( self.angles );
-	vec_toright = anglesToRight( self.angles );
+    vec_toright = anglestoright( self.angles );
-	vec_tomissileforward = anglesToForward( angles );
+    vec_tomissileforward = anglestoforward( angles );
     delta = self.origin - origin;
     dot = vectordot( vec_tomissileforward, vec_toright );
     sign = 1;
+
     if ( dot > 0 )
-	{
         sign = -1;
-	}
+
-	flare_dir = vectornormalize( vectorScale( vec_toforward, -0,5 ) + vectorScale( vec_toright, sign ) );
+    flare_dir = vectornormalize( vectorscale( vec_toforward, -0.5 ) + vectorscale( vec_toright, sign ) );
-	velocity = vectorScale( flare_dir, randomintrange( 200, 400 ) );
+    velocity = vectorscale( flare_dir, randomintrange( 200, 400 ) );
     velocity = ( velocity[0], velocity[1], velocity[2] - randomintrange( 10, 100 ) );
     flareorigin = self.origin;
-	flareorigin += vectorScale( flare_dir, randomintrange( 500, 700 ) );
+    flareorigin += vectorscale( flare_dir, randomintrange( 500, 700 ) );
-	flareorigin += vectorScale( ( 1, 0, 0 ), 500 );
+    flareorigin += vectorscale( ( 0, 0, 1 ), 500.0 );
-	if ( isDefined( self.flareoffset ) )
+
-	{
+    if ( isdefined( self.flareoffset ) )
         flareorigin += self.flareoffset;
-	}
+
     flareobject = spawn( "script_origin", flareorigin );
     flareobject.angles = self.angles;
     flareobject setmodel( "tag_origin" );
-	flareobject movegravity( velocity, 5 );
+    flareobject movegravity( velocity, 5.0 );
-	flareobject thread deleteaftertime( 5 );
+    flareobject thread deleteaftertime( 5.0 );
     self thread debug_tracker( flareobject );
     return flareobject;
 }
@@ -680,9 +678,10 @@ missiletarget_deployflares( origin, angles )
 debug_tracker( target )
 {
     target endon( "death" );
-	while ( 1 )
+
+    while ( true )
     {
-		maps/mp/killstreaks/_airsupport::debug_sphere( target.origin, 10, ( 1, 0, 0 ), 1, 1 );
+        maps\mp\killstreaks\_airsupport::debug_sphere( target.origin, 10, ( 1, 0, 0 ), 1, 1 );
-		wait 0,05;
+        wait 0.05;
     }
 }

Multiplayer Core/patch_mp/maps/mp/_interactive_objects.gsc

@@ -1,5 +1,7 @@
-#include common_scripts/utility;
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\_utility;
+#include common_scripts\utility;
 
 init()
 {
@@ -7,27 +9,25 @@ init()
     qbarrels = 0;
     all_barrels = [];
     barrels = getentarray( "explodable_barrel", "targetname" );
-	while ( isDefined( barrels ) && barrels.size > 0 )
+
+    if ( isdefined( barrels ) && barrels.size > 0 )
     {
         qbarrels = 1;
-		i = 0;
+
-		while ( i < barrels.size )
+        for ( i = 0; i < barrels.size; i++ )
-		{
             all_barrels[all_barrels.size] = barrels[i];
-			i++;
-		}
     }
+
     barrels = getentarray( "explodable_barrel", "script_noteworthy" );
-	while ( isDefined( barrels ) && barrels.size > 0 )
+
+    if ( isdefined( barrels ) && barrels.size > 0 )
     {
         qbarrels = 1;
-		i = 0;
+
-		while ( i < barrels.size )
+        for ( i = 0; i < barrels.size; i++ )
-		{
             all_barrels[all_barrels.size] = barrels[i];
-			i++;
-		}
     }
+
     if ( qbarrels )
     {
         precachemodel( "global_explosive_barrel" );
@@ -40,30 +40,29 @@ init()
         level.breakables_fx["barrel"]["explode"] = loadfx( "destructibles/fx_dest_barrelexp" );
         array_thread( all_barrels, ::explodable_barrel_think );
     }
+
     qcrates = 0;
     all_crates = [];
     crates = getentarray( "flammable_crate", "targetname" );
-	while ( isDefined( crates ) && crates.size > 0 )
+
+    if ( isdefined( crates ) && crates.size > 0 )
     {
         qcrates = 1;
-		i = 0;
+
-		while ( i < crates.size )
+        for ( i = 0; i < crates.size; i++ )
-		{
             all_crates[all_crates.size] = crates[i];
-			i++;
-		}
     }
+
     crates = getentarray( "flammable_crate", "script_noteworthy" );
-	while ( isDefined( crates ) && crates.size > 0 )
+
+    if ( isdefined( crates ) && crates.size > 0 )
     {
         qcrates = 1;
-		i = 0;
+
-		while ( i < crates.size )
+        for ( i = 0; i < crates.size; i++ )
-		{
             all_crates[all_crates.size] = crates[i];
-			i++;
-		}
     }
+
     if ( qcrates )
     {
         precachemodel( "global_flammable_crate_jap_piece01_d" );
@@ -76,27 +75,25 @@ init()
         level.crateexpsound = "Explo_ammocrate";
         array_thread( all_crates, ::flammable_crate_think );
     }
+
     if ( !qbarrels && !qcrates )
-	{
         return;
 }
-}
 
 explodable_barrel_think()
 {
     if ( self.classname != "script_model" )
-	{
         return;
-	}
+
     self endon( "exploding" );
     self breakable_clip();
     self.health = level.barrelhealth;
     self setcandamage( 1 );
     self.targetname = "explodable_barrel";
+
     if ( sessionmodeiszombiesgame() )
-	{
         self.removeexplodable = 1;
-	}
+
     for (;;)
     {
         self waittill( "damage", amount, attacker, direction_vec, p, type );
@@ -104,49 +101,39 @@ explodable_barrel_think()
         println( "BARRELDAMAGE: " + type );
 #/
         if ( type == "MOD_MELEE" || type == "MOD_IMPACT" )
-		{
             continue;
-		}
+
-		else
+        if ( isdefined( self.script_requires_player ) && self.script_requires_player && !isplayer( attacker ) )
-		{
+            continue;
-			if ( isDefined( self.script_requires_player ) && self.script_requires_player && !isplayer( attacker ) )
+
-			{
+        if ( isdefined( self.script_selfisattacker ) && self.script_selfisattacker )
-				break;
-			}
-			else
-			{
-				if ( isDefined( self.script_selfisattacker ) && self.script_selfisattacker )
-				{
             self.damageowner = self;
-				}
         else
-				{
             self.damageowner = attacker;
-				}
+
         self.health -= amount;
+
         if ( self.health <= level.barrelburn )
-				{
             self thread explodable_barrel_burn();
     }
 }
-		}
-	}
-}
 
 explodable_barrel_burn()
 {
     count = 0;
     startedfx = 0;
-	up = anglesToUp( vectorScale( ( 0, 0, 1 ), 90 ) );
+    up = anglestoup( vectorscale( ( 0, 1, 0 ), 90.0 ) );
-	worldup = anglesToUp( vectorScale( ( 0, 0, 1 ), 90 ) );
+    worldup = anglestoup( vectorscale( ( 0, 1, 0 ), 90.0 ) );
     dot = vectordot( up, worldup );
-	offset1 = ( 0, 0, 1 );
+    offset1 = ( 0, 0, 0 );
-	offset2 = up * vectorScale( ( 0, 0, 1 ), 44 );
+    offset2 = up * vectorscale( ( 0, 0, 1 ), 44.0 );
-	if ( dot < 0,5 )
+
+    if ( dot < 0.5 )
     {
-		offset1 = ( up * vectorScale( ( 0, 0, 1 ), 22 ) ) - vectorScale( ( 0, 0, 1 ), 30 );
+        offset1 = up * vectorscale( ( 0, 0, 1 ), 22.0 ) - vectorscale( ( 0, 0, 1 ), 30.0 );
-		offset2 = ( up * vectorScale( ( 0, 0, 1 ), 22 ) ) + vectorScale( ( 0, 0, 1 ), 14 );
+        offset2 = up * vectorscale( ( 0, 0, 1 ), 22.0 ) + vectorscale( ( 0, 0, 1 ), 14.0 );
     }
+
     while ( self.health > 0 )
     {
         if ( !startedfx )
@@ -155,19 +142,20 @@ explodable_barrel_burn()
             level thread play_sound_in_space( level.barrelingsound, self.origin );
             startedfx = 1;
         }
+
         if ( count > 20 )
-		{
             count = 0;
-		}
+
         playfx( level.breakables_fx["barrel"]["burn"], self.origin + offset2 );
         self playloopsound( "barrel_fuse" );
+
         if ( count == 0 )
-		{
             self.health -= 10 + randomint( 10 );
-		}
+
         count++;
-		wait 0,05;
+        wait 0.05;
     }
+
     level notify( "explosion_started" );
     self thread explodable_barrel_explode();
 }
@@ -176,18 +164,20 @@ explodable_barrel_explode()
 {
     self notify( "exploding" );
     self death_notify_wrapper();
-	up = anglesToUp( vectorScale( ( 0, 0, 1 ), 90 ) );
+    up = anglestoup( vectorscale( ( 0, 1, 0 ), 90.0 ) );
-	worldup = anglesToUp( vectorScale( ( 0, 0, 1 ), 90 ) );
+    worldup = anglestoup( vectorscale( ( 0, 1, 0 ), 90.0 ) );
     dot = vectordot( up, worldup );
-	offset = ( 0, 0, 1 );
+    offset = ( 0, 0, 0 );
-	if ( dot < 0,5 )
+
+    if ( dot < 0.5 )
     {
-		start = self.origin + vectorScale( up, 22 );
+        start = self.origin + vectorscale( up, 22 );
-		trace = physicstrace( start, start + vectorScale( ( 0, 0, 1 ), 64 ) );
+        trace = physicstrace( start, start + vectorscale( ( 0, 0, -1 ), 64.0 ) );
         end = trace["position"];
         offset = end - self.origin;
     }
-	offset += vectorScale( ( 0, 0, 1 ), 4 );
+
+    offset += vectorscale( ( 0, 0, 1 ), 4.0 );
     mindamage = 1;
     maxdamage = 250;
     blastradius = 250;
@@ -195,96 +185,88 @@ explodable_barrel_explode()
     playfx( level.breakables_fx["barrel"]["explode"], self.origin + offset );
     physicsexplosionsphere( self.origin + offset, 100, 80, 1, maxdamage, mindamage );
     level.barrelexplodingthisframe = 1;
-	if ( isDefined( self.remove ) )
+
-	{
+    if ( isdefined( self.remove ) )
         self.remove delete();
-	}
+
-	if ( isDefined( self.radius ) )
+    if ( isdefined( self.radius ) )
-	{
         blastradius = self.radius;
-	}
+
-	self radiusdamage( self.origin + vectorScale( ( 0, 0, 1 ), 56 ), blastradius, maxdamage, mindamage, self.damageowner );
+    self radiusdamage( self.origin + vectorscale( ( 0, 0, 1 ), 56.0 ), blastradius, maxdamage, mindamage, self.damageowner );
     attacker = undefined;
-	if ( isDefined( self.damageowner ) )
+
-	{
+    if ( isdefined( self.damageowner ) )
         attacker = self.damageowner;
-	}
+
-	level.lastexplodingbarrel[ "time" ] = getTime();
+    level.lastexplodingbarrel["time"] = gettime();
-	level.lastexplodingbarrel[ "origin" ] = self.origin + vectorScale( ( 0, 0, 1 ), 30 );
+    level.lastexplodingbarrel["origin"] = self.origin + vectorscale( ( 0, 0, 1 ), 30.0 );
-	if ( isDefined( self.removeexplodable ) )
+
-	{
+    if ( isdefined( self.removeexplodable ) )
         self hide();
-	}
     else
-	{
         self setmodel( "global_explosive_barrel" );
-	}
+
-	if ( dot < 0,5 )
+    if ( dot < 0.5 )
     {
-		start = self.origin + vectorScale( up, 22 );
+        start = self.origin + vectorscale( up, 22 );
-		trace = physicstrace( start, start + vectorScale( ( 0, 0, 1 ), 64 ) );
+        trace = physicstrace( start, start + vectorscale( ( 0, 0, -1 ), 64.0 ) );
         pos = trace["position"];
         self.origin = pos;
-		self.angles += vectorScale( ( 0, 0, 1 ), 90 );
+        self.angles += vectorscale( ( 0, 0, 1 ), 90.0 );
     }
-	wait 0,05;
+
+    wait 0.05;
     level.barrelexplodingthisframe = 0;
 }
 
 flammable_crate_think()
 {
     if ( self.classname != "script_model" )
-	{
         return;
-	}
+
     self endon( "exploding" );
     self breakable_clip();
     self.health = level.cratehealth;
     self setcandamage( 1 );
+
     for (;;)
     {
         self waittill( "damage", amount, attacker, direction_vec, p, type );
-		if ( isDefined( self.script_requires_player ) && self.script_requires_player && !isplayer( attacker ) )
+
-		{
+        if ( isdefined( self.script_requires_player ) && self.script_requires_player && !isplayer( attacker ) )
             continue;
-		}
+
-		else
+        if ( isdefined( self.script_selfisattacker ) && self.script_selfisattacker )
-		{
-			if ( isDefined( self.script_selfisattacker ) && self.script_selfisattacker )
-			{
             self.damageowner = self;
-			}
         else
-			{
             self.damageowner = attacker;
-			}
+
         if ( level.barrelexplodingthisframe )
-			{
+            wait( randomfloat( 1 ) );
-				wait randomfloat( 1 );
+
-			}
         self.health -= amount;
+
         if ( self.health <= level.crateburn )
-			{
             self thread flammable_crate_burn();
     }
 }
-	}
-}
 
 flammable_crate_burn()
 {
     count = 0;
     startedfx = 0;
-	up = anglesToUp( vectorScale( ( 0, 0, 1 ), 90 ) );
+    up = anglestoup( vectorscale( ( 0, 1, 0 ), 90.0 ) );
-	worldup = anglesToUp( vectorScale( ( 0, 0, 1 ), 90 ) );
+    worldup = anglestoup( vectorscale( ( 0, 1, 0 ), 90.0 ) );
     dot = vectordot( up, worldup );
-	offset1 = ( 0, 0, 1 );
+    offset1 = ( 0, 0, 0 );
-	offset2 = up * vectorScale( ( 0, 0, 1 ), 44 );
+    offset2 = up * vectorscale( ( 0, 0, 1 ), 44.0 );
-	if ( dot < 0,5 )
+
+    if ( dot < 0.5 )
     {
-		offset1 = ( up * vectorScale( ( 0, 0, 1 ), 22 ) ) - vectorScale( ( 0, 0, 1 ), 30 );
+        offset1 = up * vectorscale( ( 0, 0, 1 ), 22.0 ) - vectorscale( ( 0, 0, 1 ), 30.0 );
-		offset2 = ( up * vectorScale( ( 0, 0, 1 ), 22 ) ) + vectorScale( ( 0, 0, 1 ), 14 );
+        offset2 = up * vectorscale( ( 0, 0, 1 ), 22.0 ) + vectorscale( ( 0, 0, 1 ), 14.0 );
     }
+
     while ( self.health > 0 )
     {
         if ( !startedfx )
@@ -293,18 +275,19 @@ flammable_crate_burn()
             level thread play_sound_in_space( level.crateignsound, self.origin );
             startedfx = 1;
         }
+
         if ( count > 20 )
-		{
             count = 0;
-		}
+
         playfx( level.breakables_fx["ammo_crate"]["burn"], self.origin );
+
         if ( count == 0 )
-		{
             self.health -= 10 + randomint( 10 );
-		}
+
         count++;
-		wait 0,05;
+        wait 0.05;
     }
+
     self thread flammable_crate_explode();
 }
 
@@ -312,18 +295,20 @@ flammable_crate_explode()
 {
     self notify( "exploding" );
     self death_notify_wrapper();
-	up = anglesToUp( vectorScale( ( 0, 0, 1 ), 90 ) );
+    up = anglestoup( vectorscale( ( 0, 1, 0 ), 90.0 ) );
-	worldup = anglesToUp( vectorScale( ( 0, 0, 1 ), 90 ) );
+    worldup = anglestoup( vectorscale( ( 0, 1, 0 ), 90.0 ) );
     dot = vectordot( up, worldup );
-	offset = ( 0, 0, 1 );
+    offset = ( 0, 0, 0 );
-	if ( dot < 0,5 )
+
+    if ( dot < 0.5 )
     {
-		start = self.origin + vectorScale( up, 22 );
+        start = self.origin + vectorscale( up, 22 );
-		trace = physicstrace( start, start + vectorScale( ( 0, 0, 1 ), 64 ) );
+        trace = physicstrace( start, start + vectorscale( ( 0, 0, -1 ), 64.0 ) );
         end = trace["position"];
         offset = end - self.origin;
     }
-	offset += vectorScale( ( 0, 0, 1 ), 4 );
+
+    offset += vectorscale( ( 0, 0, 1 ), 4.0 );
     mindamage = 1;
     maxdamage = 250;
     blastradius = 250;
@@ -331,77 +316,72 @@ flammable_crate_explode()
     playfx( level.breakables_fx["ammo_crate"]["explode"], self.origin );
     physicsexplosionsphere( self.origin + offset, 100, 80, 1, maxdamage, mindamage );
     level.barrelexplodingthisframe = 1;
-	if ( isDefined( self.remove ) )
+
-	{
+    if ( isdefined( self.remove ) )
         self.remove delete();
-	}
+
-	if ( isDefined( self.radius ) )
+    if ( isdefined( self.radius ) )
-	{
         blastradius = self.radius;
-	}
+
     attacker = undefined;
-	if ( isDefined( self.damageowner ) )
+
-	{
+    if ( isdefined( self.damageowner ) )
         attacker = self.damageowner;
-	}
+
-	self radiusdamage( self.origin + vectorScale( ( 0, 0, 1 ), 30 ), blastradius, maxdamage, mindamage, attacker );
+    self radiusdamage( self.origin + vectorscale( ( 0, 0, 1 ), 30.0 ), blastradius, maxdamage, mindamage, attacker );
     self setmodel( "global_flammable_crate_jap_piece01_d" );
-	if ( dot < 0,5 )
+
+    if ( dot < 0.5 )
     {
-		start = self.origin + vectorScale( up, 22 );
+        start = self.origin + vectorscale( up, 22 );
-		trace = physicstrace( start, start + vectorScale( ( 0, 0, 1 ), 64 ) );
+        trace = physicstrace( start, start + vectorscale( ( 0, 0, -1 ), 64.0 ) );
         pos = trace["position"];
         self.origin = pos;
-		self.angles += vectorScale( ( 0, 0, 1 ), 90 );
+        self.angles += vectorscale( ( 0, 0, 1 ), 90.0 );
     }
-	wait 0,05;
+
+    wait 0.05;
     level.barrelexplodingthisframe = 0;
 }
 
 breakable_clip()
 {
-	if ( isDefined( self.target ) )
+    if ( isdefined( self.target ) )
     {
         targ = getent( self.target, "targetname" );
+
         if ( targ.classname == "script_brushmodel" )
         {
             self.remove = targ;
             return;
         }
     }
-	if ( isDefined( level.breakables_clip ) && level.breakables_clip.size > 0 )
+
-	{
+    if ( isdefined( level.breakables_clip ) && level.breakables_clip.size > 0 )
         self.remove = getclosestent( self.origin, level.breakables_clip );
-	}
+
-	if ( isDefined( self.remove ) )
+    if ( isdefined( self.remove ) )
-	{
         arrayremovevalue( level.breakables_clip, self.remove );
 }
-}
 
 getclosestent( org, array )
 {
     if ( array.size < 1 )
-	{
         return;
-	}
+
     dist = 256;
     ent = undefined;
-	i = 0;
+
-	while ( i < array.size )
+    for ( i = 0; i < array.size; i++ )
     {
         newdist = distance( array[i] getorigin(), org );
+
         if ( newdist >= dist )
-		{
-			i++;
             continue;
-		}
+
-		else
-		{
         dist = newdist;
         ent = array[i];
     }
-		i++;
+
-	}
     return ent;
 }

Multiplayer Core/patch_mp/maps/mp/_load.gsc

@@ -1,80 +1,93 @@
-#include maps/mp/gametypes/_spawnlogic;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/traverse/shared;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/animscripts/utility;
+#include common_scripts\utility;
-#include maps/mp/_load;
+#include maps\mp\_utility;
-#include maps/mp/_createfx;
+#include maps\mp\_script_gen;
-#include maps/mp/_music;
+#include maps\mp\gametypes\_spawning;
-#include maps/mp/_busing;
+#include maps\mp\gametypes\_tweakables;
-#include maps/mp/_script_gen;
+#include maps\mp\_destructible;
-#include maps/mp/_utility;
+#include maps\mp\_riotshield;
-#include common_scripts/utility;
+#include maps\mp\_vehicles;
+#include maps\mp\killstreaks\_dogs;
+#include maps\mp\killstreaks\_ai_tank;
+#include maps\mp\killstreaks\_rcbomb;
+#include maps\mp\killstreaks\_helicopter_guard;
+#include maps\mp\_trophy_system;
+#include maps\mp\_proximity_grenade;
+#include maps\mp\_audio;
+#include maps\mp\_busing;
+#include maps\mp\_music;
+#include maps\mp\_fxanim;
+#include maps\mp\_interactive_objects;
+#include maps\mp\_serverfaceanim_mp;
+#include maps\mp\_art;
+#include maps\mp\_createfx;
+#include maps\mp\_global_fx;
+#include maps\mp\_demo;
+#include maps\mp\_development_dvars;
+#include maps\mp\_load;
+#include maps\mp\animscripts\utility;
+#include maps\mp\animscripts\traverse\shared;
+#include maps\mp\gametypes\_spawnlogic;
 
 main( bscriptgened, bcsvgened, bsgenabled )
 {
-	if ( !isDefined( level.script_gen_dump_reasons ) )
+    if ( !isdefined( level.script_gen_dump_reasons ) )
-	{
         level.script_gen_dump_reasons = [];
-	}
+
-	if ( !isDefined( bsgenabled ) )
+    if ( !isdefined( bsgenabled ) )
-	{
         level.script_gen_dump_reasons[level.script_gen_dump_reasons.size] = "First run";
-	}
+
-	if ( !isDefined( bcsvgened ) )
+    if ( !isdefined( bcsvgened ) )
-	{
         bcsvgened = 0;
-	}
+
     level.bcsvgened = bcsvgened;
-	if ( !isDefined( bscriptgened ) )
+
-	{
+    if ( !isdefined( bscriptgened ) )
         bscriptgened = 0;
-	}
     else
-	{
         bscriptgened = 1;
-	}
+
     level.bscriptgened = bscriptgened;
     level._loadstarted = 1;
     struct_class_init();
-	level.clientscripts = getDvar( "cg_usingClientScripts" ) != "";
+    level.clientscripts = getdvar( "cg_usingClientScripts" ) != "";
     level._client_exploders = [];
     level._client_exploder_ids = [];
-	if ( !isDefined( level.flag ) )
+
+    if ( !isdefined( level.flag ) )
     {
         level.flag = [];
         level.flags_lock = [];
     }
-	if ( !isDefined( level.timeofday ) )
+
-	{
+    if ( !isdefined( level.timeofday ) )
         level.timeofday = "day";
-	}
+
     flag_init( "scriptgen_done" );
     level.script_gen_dump_reasons = [];
-	if ( !isDefined( level.script_gen_dump ) )
+
+    if ( !isdefined( level.script_gen_dump ) )
     {
         level.script_gen_dump = [];
         level.script_gen_dump_reasons[0] = "First run";
     }
-	if ( !isDefined( level.script_gen_dump2 ) )
+
-	{
+    if ( !isdefined( level.script_gen_dump2 ) )
         level.script_gen_dump2 = [];
-	}
+
-	if ( isDefined( level.createfxent ) )
+    if ( isdefined( level.createfxent ) )
-	{
+        script_gen_dump_addline( "maps\mp\createfx\" + level.script + "_fx::main();", level.script + "_fx" );
-		script_gen_dump_addline( "maps\\mp\\createfx\\" + level.script + "_fx::main();", level.script + "_fx" );
+
-	}
+    if ( isdefined( level.script_gen_dump_preload ) )
-	while ( isDefined( level.script_gen_dump_preload ) )
-	{
-		i = 0;
-		while ( i < level.script_gen_dump_preload.size )
     {
+        for ( i = 0; i < level.script_gen_dump_preload.size; i++ )
             script_gen_dump_addline( level.script_gen_dump_preload[i].string, level.script_gen_dump_preload[i].signature );
-			i++;
     }
-	}
+
-	if ( getDvar( "scr_RequiredMapAspectratio" ) == "" )
+    if ( getdvar( "scr_RequiredMapAspectratio" ) == "" )
-	{
         setdvar( "scr_RequiredMapAspectratio", "1" );
-	}
+
     setdvar( "r_waterFogTest", 0 );
     setdvar( "tu6_player_shallowWaterHeight", "0.0" );
     precacherumble( "reload_small" );
@@ -94,87 +107,90 @@ main( bscriptgened, bcsvgened, bsgenabled )
     level.physicstracemaskwater = 4;
     level.physicstracemaskclip = 8;
     level.physicstracecontentsvehicleclip = 16;
-	level.createfx_enabled = getDvar( "createfx" ) != "";
+    level.createfx_enabled = getdvar( "createfx" ) != "";
+
     if ( !sessionmodeiszombiesgame() )
     {
-		thread maps/mp/gametypes/_spawning::init();
+        thread maps\mp\gametypes\_spawning::init();
-		thread maps/mp/gametypes/_tweakables::init();
+        thread maps\mp\gametypes\_tweakables::init();
-		thread maps/mp/_destructible::init();
+        thread maps\mp\_destructible::init();
-		thread maps/mp/_riotshield::register();
+        thread maps\mp\_riotshield::register();
-		thread maps/mp/_vehicles::init();
+        thread maps\mp\_vehicles::init();
-		thread maps/mp/killstreaks/_dogs::init();
+        thread maps\mp\killstreaks\_dogs::init();
-		thread maps/mp/killstreaks/_ai_tank::register();
+        thread maps\mp\killstreaks\_ai_tank::register();
-		thread maps/mp/killstreaks/_rcbomb::register();
+        thread maps\mp\killstreaks\_rcbomb::register();
-		thread maps/mp/killstreaks/_helicopter_guard::register();
+        thread maps\mp\killstreaks\_helicopter_guard::register();
-		thread maps/mp/_trophy_system::register();
+        thread maps\mp\_trophy_system::register();
-		thread maps/mp/_proximity_grenade::register();
+        thread maps\mp\_proximity_grenade::register();
-		maps/mp/_audio::init();
+        maps\mp\_audio::init();
-		thread maps/mp/_busing::businit();
+        thread maps\mp\_busing::businit();
-		thread maps/mp/_music::music_init();
+        thread maps\mp\_music::music_init();
-		thread maps/mp/_fxanim::init();
+        thread maps\mp\_fxanim::init();
     }
     else
     {
         level thread start_intro_screen_zm();
-		thread maps/mp/_interactive_objects::init();
+        thread maps\mp\_interactive_objects::init();
-		maps/mp/_audio::init();
+        maps\mp\_audio::init();
-		thread maps/mp/_busing::businit();
+        thread maps\mp\_busing::businit();
-		thread maps/mp/_music::music_init();
+        thread maps\mp\_music::music_init();
-		thread maps/mp/_fxanim::init();
+        thread maps\mp\_fxanim::init();
-		thread maps/mp/_serverfaceanim_mp::init();
+        thread maps\mp\_serverfaceanim_mp::init();
+
         if ( level.createfx_enabled )
-		{
             setinitialplayersconnected();
     }
-	}
+
     visionsetnight( "default_night" );
     setup_traversals();
-	maps/mp/_art::main();
+    maps\mp\_art::main();
     setupexploders();
     parse_structs();
+
     if ( sessionmodeiszombiesgame() )
-	{
         thread footsteps();
-	}
 /#
     level thread level_notify_listener();
     level thread client_notify_listener();
 #/
-	thread maps/mp/_createfx::fx_init();
+    thread maps\mp\_createfx::fx_init();
+
     if ( level.createfx_enabled )
     {
         calculate_map_center();
-		maps/mp/_createfx::createfx();
+        maps\mp\_createfx::createfx();
     }
-	if ( getDvar( #"F7B30924" ) == "1" )
+
+    if ( getdvar( "r_reflectionProbeGenerate" ) == "1" )
     {
-		maps/mp/_global_fx::main();
+        maps\mp\_global_fx::main();
+
         level waittill( "eternity" );
     }
-	thread maps/mp/_global_fx::main();
+
-	maps/mp/_demo::init();
+    thread maps\mp\_global_fx::main();
+    maps\mp\_demo::init();
+
     if ( !sessionmodeiszombiesgame() )
-	{
+        thread maps\mp\_development_dvars::init();
-		thread maps/mp/_development_dvars::init();
+
-	}
+    for ( p = 0; p < 6; p++ )
-	p = 0;
-	while ( p < 6 )
     {
         switch ( p )
         {
-			case 0:
+            case "0":
                 triggertype = "trigger_multiple";
                 break;
-			case 1:
+            case "1":
                 triggertype = "trigger_once";
                 break;
-			case 2:
+            case "2":
                 triggertype = "trigger_use";
                 break;
-			case 3:
+            case "3":
                 triggertype = "trigger_radius";
                 break;
-			case 4:
+            case "4":
                 triggertype = "trigger_lookat";
                 break;
             default:
@@ -184,79 +200,78 @@ main( bscriptgened, bcsvgened, bsgenabled )
                 triggertype = "trigger_damage";
                 break;
         }
+
         triggers = getentarray( triggertype, "classname" );
-		i = 0;
+
-		while ( i < triggers.size )
+        for ( i = 0; i < triggers.size; i++ )
-		{
-			if ( isDefined( triggers[ i ].script_prefab_exploder ) )
         {
+            if ( isdefined( triggers[i].script_prefab_exploder ) )
                 triggers[i].script_exploder = triggers[i].script_prefab_exploder;
+
+            if ( isdefined( triggers[i].script_exploder ) )
+                level thread maps\mp\_load::exploder_load( triggers[i] );
         }
-			if ( isDefined( triggers[ i ].script_exploder ) )
-			{
-				level thread maps/mp/_load::exploder_load( triggers[ i ] );
-			}
-			i++;
-		}
-		p++;
     }
 }
 
 level_notify_listener()
 {
-	while ( 1 )
+    while ( true )
     {
-		val = getDvar( "level_notify" );
+        val = getdvar( "level_notify" );
+
         if ( val != "" )
         {
             level notify( val );
             setdvar( "level_notify", "" );
         }
-		wait 0,2;
+
+        wait 0.2;
     }
 }
 
 client_notify_listener()
 {
-	while ( 1 )
+    while ( true )
     {
-		val = getDvar( "client_notify" );
+        val = getdvar( "client_notify" );
+
         if ( val != "" )
         {
             clientnotify( val );
             setdvar( "client_notify", "" );
         }
-		wait 0,2;
+
+        wait 0.2;
     }
 }
 
 footsteps()
 {
-	maps/mp/animscripts/utility::setfootstepeffect( "asphalt", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "asphalt", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "brick", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "brick", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "carpet", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "carpet", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "cloth", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "cloth", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "concrete", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "concrete", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "dirt", loadfx( "bio/player/fx_footstep_sand" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "dirt", loadfx( "bio/player/fx_footstep_sand" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "foliage", loadfx( "bio/player/fx_footstep_sand" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "foliage", loadfx( "bio/player/fx_footstep_sand" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "gravel", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "gravel", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "grass", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "grass", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "metal", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "metal", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "mud", loadfx( "bio/player/fx_footstep_mud" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "mud", loadfx( "bio/player/fx_footstep_mud" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "paper", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "paper", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "plaster", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "plaster", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "rock", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "rock", loadfx( "bio/player/fx_footstep_dust" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "sand", loadfx( "bio/player/fx_footstep_sand" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "sand", loadfx( "bio/player/fx_footstep_sand" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "water", loadfx( "bio/player/fx_footstep_water" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "water", loadfx( "bio/player/fx_footstep_water" ) );
-	maps/mp/animscripts/utility::setfootstepeffect( "wood", loadfx( "bio/player/fx_footstep_dust" ) );
+    maps\mp\animscripts\utility::setfootstepeffect( "wood", loadfx( "bio/player/fx_footstep_dust" ) );
 }
 
 parse_structs()
 {
-	i = 0;
+    for ( i = 0; i < level.struct.size; i++ )
-	while ( i < level.struct.size )
     {
-		if ( isDefined( level.struct[ i ].targetname ) )
+        if ( isdefined( level.struct[i].targetname ) )
         {
             if ( level.struct[i].targetname == "flak_fire_fx" )
             {
@@ -265,37 +280,34 @@ parse_structs()
                 level._effect["flak_cloudflash_night"] = loadfx( "weapon/flak/fx_flak_cloudflash_night" );
                 level._effect["flak_burst_single"] = loadfx( "weapon/flak/fx_flak_single_day_dist" );
             }
+
             if ( level.struct[i].targetname == "fake_fire_fx" )
-			{
                 level._effect["distant_muzzleflash"] = loadfx( "weapon/muzzleflashes/heavy" );
-			}
+
             if ( level.struct[i].targetname == "spotlight_fx" )
-			{
                 level._effect["spotlight_beam"] = loadfx( "env/light/fx_ray_spotlight_md" );
         }
     }
-		i++;
-	}
 }
 
 exploder_load( trigger )
 {
     level endon( "killexplodertridgers" + trigger.script_exploder );
+
     trigger waittill( "trigger" );
-	if ( isDefined( trigger.script_chance ) && randomfloat( 1 ) > trigger.script_chance )
+
+    if ( isdefined( trigger.script_chance ) && randomfloat( 1 ) > trigger.script_chance )
     {
-		if ( isDefined( trigger.script_delay ) )
+        if ( isdefined( trigger.script_delay ) )
-		{
+            wait( trigger.script_delay );
-			wait trigger.script_delay;
-		}
         else
-		{
             wait 4;
-		}
+
         level thread exploder_load( trigger );
         return;
     }
-	maps/mp/_utility::exploder( trigger.script_exploder );
+
+    maps\mp\_utility::exploder( trigger.script_exploder );
     level notify( "killexplodertridgers" + trigger.script_exploder );
 }
 
@@ -303,101 +315,81 @@ setupexploders()
 {
     ents = getentarray( "script_brushmodel", "classname" );
     smodels = getentarray( "script_model", "classname" );
-	i = 0;
+
-	while ( i < smodels.size )
+    for ( i = 0; i < smodels.size; i++ )
-	{
         ents[ents.size] = smodels[i];
-		i++;
+
-	}
+    for ( i = 0; i < ents.size; i++ )
-	i = 0;
-	while ( i < ents.size )
-	{
-		if ( isDefined( ents[ i ].script_prefab_exploder ) )
     {
+        if ( isdefined( ents[i].script_prefab_exploder ) )
             ents[i].script_exploder = ents[i].script_prefab_exploder;
-		}
+
-		if ( isDefined( ents[ i ].script_exploder ) )
+        if ( isdefined( ents[i].script_exploder ) )
         {
-			if ( ents[ i ].model == "fx" || !isDefined( ents[ i ].targetname ) && ents[ i ].targetname != "exploderchunk" )
+            if ( ents[i].model == "fx" && ( !isdefined( ents[i].targetname ) || ents[i].targetname != "exploderchunk" ) )
             {
                 ents[i] hide();
-				i++;
                 continue;
             }
-			else
+
-			{
+            if ( isdefined( ents[i].targetname ) && ents[i].targetname == "exploder" )
-				if ( isDefined( ents[ i ].targetname ) && ents[ i ].targetname == "exploder" )
             {
                 ents[i] hide();
                 ents[i] notsolid();
-					i++;
                 continue;
             }
-				else
+
-				{
+            if ( isdefined( ents[i].targetname ) && ents[i].targetname == "exploderchunk" )
-					if ( isDefined( ents[ i ].targetname ) && ents[ i ].targetname == "exploderchunk" )
             {
                 ents[i] hide();
                 ents[i] notsolid();
             }
         }
     }
-		}
+
-		i++;
-	}
     script_exploders = [];
     potentialexploders = getentarray( "script_brushmodel", "classname" );
-	i = 0;
+
-	while ( i < potentialexploders.size )
+    for ( i = 0; i < potentialexploders.size; i++ )
-	{
-		if ( isDefined( potentialexploders[ i ].script_prefab_exploder ) )
     {
+        if ( isdefined( potentialexploders[i].script_prefab_exploder ) )
             potentialexploders[i].script_exploder = potentialexploders[i].script_prefab_exploder;
-		}
+
-		if ( isDefined( potentialexploders[ i ].script_exploder ) )
+        if ( isdefined( potentialexploders[i].script_exploder ) )
-		{
             script_exploders[script_exploders.size] = potentialexploders[i];
     }
-		i++;
+
-	}
     potentialexploders = getentarray( "script_model", "classname" );
-	i = 0;
+
-	while ( i < potentialexploders.size )
+    for ( i = 0; i < potentialexploders.size; i++ )
-	{
-		if ( isDefined( potentialexploders[ i ].script_prefab_exploder ) )
     {
+        if ( isdefined( potentialexploders[i].script_prefab_exploder ) )
             potentialexploders[i].script_exploder = potentialexploders[i].script_prefab_exploder;
-		}
+
-		if ( isDefined( potentialexploders[ i ].script_exploder ) )
+        if ( isdefined( potentialexploders[i].script_exploder ) )
-		{
             script_exploders[script_exploders.size] = potentialexploders[i];
     }
-		i++;
+
-	}
     potentialexploders = getentarray( "item_health", "classname" );
-	i = 0;
+
-	while ( i < potentialexploders.size )
+    for ( i = 0; i < potentialexploders.size; i++ )
-	{
-		if ( isDefined( potentialexploders[ i ].script_prefab_exploder ) )
     {
+        if ( isdefined( potentialexploders[i].script_prefab_exploder ) )
             potentialexploders[i].script_exploder = potentialexploders[i].script_prefab_exploder;
-		}
+
-		if ( isDefined( potentialexploders[ i ].script_exploder ) )
+        if ( isdefined( potentialexploders[i].script_exploder ) )
-		{
             script_exploders[script_exploders.size] = potentialexploders[i];
     }
-		i++;
+
-	}
+    if ( !isdefined( level.createfxent ) )
-	if ( !isDefined( level.createfxent ) )
-	{
         level.createfxent = [];
-	}
+
     acceptabletargetnames = [];
     acceptabletargetnames["exploderchunk visible"] = 1;
     acceptabletargetnames["exploderchunk"] = 1;
     acceptabletargetnames["exploder"] = 1;
-	i = 0;
+
-	while ( i < script_exploders.size )
+    for ( i = 0; i < script_exploders.size; i++ )
     {
         exploder = script_exploders[i];
         ent = createexploder( exploder.script_fxid );
@@ -419,88 +411,77 @@ setupexploders()
         ent.v["target"] = exploder.target;
         ent.v["ender"] = exploder.script_ender;
         ent.v["type"] = "exploder";
-		if ( !isDefined( exploder.script_fxid ) )
+
-		{
+        if ( !isdefined( exploder.script_fxid ) )
             ent.v["fxid"] = "No FX";
-		}
         else
-		{
             ent.v["fxid"] = exploder.script_fxid;
-		}
+
         ent.v["exploder"] = exploder.script_exploder;
 /#
-		assert( isDefined( exploder.script_exploder ), "Exploder at origin " + exploder.origin + " has no script_exploder" );
+        assert( isdefined( exploder.script_exploder ), "Exploder at origin " + exploder.origin + " has no script_exploder" );
 #/
-		if ( !isDefined( ent.v[ "delay" ] ) )
+        if ( !isdefined( ent.v["delay"] ) )
-		{
             ent.v["delay"] = 0;
-		}
+
-		if ( isDefined( exploder.target ) )
+        if ( isdefined( exploder.target ) )
         {
             org = getent( ent.v["target"], "targetname" ).origin;
-			ent.v[ "angles" ] = vectorToAngle( org - ent.v[ "origin" ] );
+            ent.v["angles"] = vectortoangles( org - ent.v["origin"] );
         }
-		if ( exploder.classname == "script_brushmodel" || isDefined( exploder.model ) )
+
+        if ( exploder.classname == "script_brushmodel" || isdefined( exploder.model ) )
         {
             ent.model = exploder;
             ent.model.disconnect_paths = exploder.script_disconnectpaths;
         }
-		if ( isDefined( exploder.targetname ) && isDefined( acceptabletargetnames[ exploder.targetname ] ) )
+
-		{
+        if ( isdefined( exploder.targetname ) && isdefined( acceptabletargetnames[exploder.targetname] ) )
             ent.v["exploder_type"] = exploder.targetname;
-		}
         else
-		{
             ent.v["exploder_type"] = "normal";
+
+        ent maps\mp\_createfx::post_entity_creation_function();
     }
-		ent maps/mp/_createfx::post_entity_creation_function();
+
-		i++;
-	}
     level.createfxexploders = [];
-	i = 0;
+
-	while ( i < level.createfxent.size )
+    for ( i = 0; i < level.createfxent.size; i++ )
     {
         ent = level.createfxent[i];
+
         if ( ent.v["type"] != "exploder" )
-		{
-			i++;
             continue;
-		}
+
-		else
-		{
         ent.v["exploder_id"] = getexploderid( ent );
-			if ( !isDefined( level.createfxexploders[ ent.v[ "exploder" ] ] ) )
+
-			{
+        if ( !isdefined( level.createfxexploders[ent.v["exploder"]] ) )
             level.createfxexploders[ent.v["exploder"]] = [];
-			}
+
         level.createfxexploders[ent.v["exploder"]][level.createfxexploders[ent.v["exploder"]].size] = ent;
     }
-		i++;
-	}
 }
 
 setup_traversals()
 {
     potential_traverse_nodes = getallnodes();
-	i = 0;
+
-	while ( i < potential_traverse_nodes.size )
+    for ( i = 0; i < potential_traverse_nodes.size; i++ )
     {
         node = potential_traverse_nodes[i];
+
         if ( node.type == "Begin" )
-		{
+            node maps\mp\animscripts\traverse\shared::init_traverse();
-			node maps/mp/animscripts/traverse/shared::init_traverse();
-		}
-		i++;
     }
 }
 
 calculate_map_center()
 {
-	if ( !isDefined( level.mapcenter ) )
+    if ( !isdefined( level.mapcenter ) )
     {
         level.nodesmins = ( 0, 0, 0 );
         level.nodesmaxs = ( 0, 0, 0 );
-		level.mapcenter = maps/mp/gametypes/_spawnlogic::findboxcenter( level.nodesmins, level.nodesmaxs );
+        level.mapcenter = maps\mp\gametypes\_spawnlogic::findboxcenter( level.nodesmins, level.nodesmaxs );
 /#
         println( "map center: ", level.mapcenter );
 #/
@@ -511,10 +492,9 @@ calculate_map_center()
 start_intro_screen_zm()
 {
     if ( level.createfx_enabled )
-	{
         return;
-	}
+
-	if ( !isDefined( level.introscreen ) )
+    if ( !isdefined( level.introscreen ) )
     {
         level.introscreen = newhudelem();
         level.introscreen.x = 0;
@@ -523,15 +503,14 @@ start_intro_screen_zm()
         level.introscreen.vertalign = "fullscreen";
         level.introscreen.foreground = 0;
         level.introscreen setshader( "black", 640, 480 );
-		wait 0,05;
+        wait 0.05;
     }
+
     level.introscreen.alpha = 1;
     players = get_players();
-	i = 0;
+
-	while ( i < players.size )
+    for ( i = 0; i < players.size; i++ )
-	{
         players[i] freezecontrols( 1 );
-		i++;
+
-	}
     wait 1;
 }

Multiplayer Core/patch_mp/maps/mp/_medals.gsc

@@ -1,9 +1,10 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_scoreevents;
+#include maps\mp\_utility;
-#include maps/mp/_utility;
+#include maps\mp\_scoreevents;
+#include common_scripts\utility;
 
-init() //checked matches cerberus output
+init()
 {
     level.medalinfo = [];
     level.medalcallbacks = [];
@@ -11,31 +12,32 @@ init() //checked matches cerberus output
     level thread onplayerconnect();
 }
 
-onplayerconnect() //checked matches cerberus output
+onplayerconnect()
 {
     for (;;)
     {
         level waittill( "connected", player );
+
         player.lastkilledby = undefined;
     }
 }
 
-setlastkilledby( attacker ) //checked matches cerberus output
+setlastkilledby( attacker )
 {
     self.lastkilledby = attacker;
 }
 
-offenseglobalcount() //checked matches cerberus output
+offenseglobalcount()
 {
     level.globalteammedals++;
 }
 
-defenseglobalcount() //checked matches cerberus output
+defenseglobalcount()
 {
     level.globalteammedals++;
 }
 
-codecallback_medal( medalindex ) //checked matches cerberus output
+codecallback_medal( medalindex )
 {
     self luinotifyevent( &"medal_received", 1, medalindex );
     self luinotifyeventtospectators( &"medal_received", 1, medalindex );

Multiplayer Core/patch_mp/maps/mp/_menus.gsc

@@ -1,4 +1,7 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
-init() //checked matches cerberus output
+init()
 {
+
 }

Multiplayer Core/patch_mp/maps/mp/_mgturret.gsc

@@ -1,79 +1,77 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include maps\mp\_utility;
+#include common_scripts\utility;
 
-main() //checked changed to match cerberus output dvar taken from beta dump
+main()
-{
-	if ( getDvar( "mg42" ) == "" )
 {
+    if ( getdvar( _hash_7C9A91DF ) == "" )
         setdvar( "mgTurret", "off" );
-	}
+
     level.magic_distance = 24;
     turretinfos = getentarray( "turretInfo", "targetname" );
+
     for ( index = 0; index < turretinfos.size; index++ )
-	{
         turretinfos[index] delete();
 }
-}
 
-set_difficulty( difficulty ) //checked changed to match cerberus output
+set_difficulty( difficulty )
 {
     init_turret_difficulty_settings();
     turrets = getentarray( "misc_turret", "classname" );
+
     for ( index = 0; index < turrets.size; index++ )
     {
-		if ( isDefined( turrets[ index ].script_skilloverride ) )
+        if ( isdefined( turrets[index].script_skilloverride ) )
         {
             switch ( turrets[index].script_skilloverride )
             {
                 case "easy":
                     difficulty = "easy";
                     break;
-				break;
                 case "medium":
                     difficulty = "medium";
                     break;
-				break;
                 case "hard":
                     difficulty = "hard";
                     break;
-				break;
                 case "fu":
                     difficulty = "fu";
                     break;
-				break;
                 default:
-			}
+                    continue;
-			turret_set_difficulty( turrets[ index ], difficulty );
-		}
             }
         }
 
-init_turret_difficulty_settings() //checked matches cerberus output
+        turret_set_difficulty( turrets[index], difficulty );
+    }
+}
+
+init_turret_difficulty_settings()
 {
     level.mgturretsettings["easy"]["convergenceTime"] = 2.5;
-	level.mgturretsettings[ "easy" ][ "suppressionTime" ] = 3;
+    level.mgturretsettings["easy"]["suppressionTime"] = 3.0;
     level.mgturretsettings["easy"]["accuracy"] = 0.38;
     level.mgturretsettings["easy"]["aiSpread"] = 2;
     level.mgturretsettings["easy"]["playerSpread"] = 0.5;
     level.mgturretsettings["medium"]["convergenceTime"] = 1.5;
-	level.mgturretsettings[ "medium" ][ "suppressionTime" ] = 3;
+    level.mgturretsettings["medium"]["suppressionTime"] = 3.0;
     level.mgturretsettings["medium"]["accuracy"] = 0.38;
     level.mgturretsettings["medium"]["aiSpread"] = 2;
     level.mgturretsettings["medium"]["playerSpread"] = 0.5;
     level.mgturretsettings["hard"]["convergenceTime"] = 0.8;
-	level.mgturretsettings[ "hard" ][ "suppressionTime" ] = 3;
+    level.mgturretsettings["hard"]["suppressionTime"] = 3.0;
     level.mgturretsettings["hard"]["accuracy"] = 0.38;
     level.mgturretsettings["hard"]["aiSpread"] = 2;
     level.mgturretsettings["hard"]["playerSpread"] = 0.5;
     level.mgturretsettings["fu"]["convergenceTime"] = 0.4;
-	level.mgturretsettings[ "fu" ][ "suppressionTime" ] = 3;
+    level.mgturretsettings["fu"]["suppressionTime"] = 3.0;
     level.mgturretsettings["fu"]["accuracy"] = 0.38;
     level.mgturretsettings["fu"]["aiSpread"] = 2;
     level.mgturretsettings["fu"]["playerSpread"] = 0.5;
 }
 
-turret_set_difficulty( turret, difficulty ) //checked matches cerberus output
+turret_set_difficulty( turret, difficulty )
 {
     turret.convergencetime = level.mgturretsettings[difficulty]["convergenceTime"];
     turret.suppressiontime = level.mgturretsettings[difficulty]["suppressionTime"];
@@ -82,14 +80,14 @@ turret_set_difficulty( turret, difficulty ) //checked matches cerberus output
     turret.playerspread = level.mgturretsettings[difficulty]["playerSpread"];
 }
 
-turret_suppression_fire( targets ) //checked matches beta dump
+turret_suppression_fire( targets )
 {
     self endon( "death" );
     self endon( "stop_suppression_fire" );
-	if ( !isDefined( self.suppresionfire ) )
+
-	{
+    if ( !isdefined( self.suppresionfire ) )
         self.suppresionfire = 1;
-	}
+
     for (;;)
     {
         while ( self.suppresionfire )
@@ -97,78 +95,59 @@ turret_suppression_fire( targets ) //checked matches beta dump
             self settargetentity( targets[randomint( targets.size )] );
             wait( 2 + randomfloat( 2 ) );
         }
+
         self cleartargetentity();
+
         while ( !self.suppresionfire )
-		{
             wait 1;
     }
 }
-}
 
-burst_fire_settings( setting ) //checked changed to match cerberus output
+burst_fire_settings( setting )
 {
     if ( setting == "delay" )
-	{
         return 0.2;
-	}
     else if ( setting == "delay_range" )
-	{
         return 0.5;
-	}
     else if ( setting == "burst" )
-	{
         return 0.5;
-	}
     else if ( setting == "burst_range" )
-	{
         return 4;
 }
-}
 
-burst_fire( turret, manual_target ) //checked matches cerberus output
+burst_fire( turret, manual_target )
 {
     turret endon( "death" );
     turret endon( "stopfiring" );
     self endon( "stop_using_built_in_burst_fire" );
-	if ( isDefined( turret.script_delay_min ) )
+
-	{
+    if ( isdefined( turret.script_delay_min ) )
         turret_delay = turret.script_delay_min;
-	}
     else
-	{
         turret_delay = burst_fire_settings( "delay" );
-	}
+
-	if ( isDefined( turret.script_delay_max ) )
+    if ( isdefined( turret.script_delay_max ) )
-	{
         turret_delay_range = turret.script_delay_max - turret_delay;
-	}
     else
-	{
         turret_delay_range = burst_fire_settings( "delay_range" );
-	}
+
-	if ( isDefined( turret.script_burst_min ) )
+    if ( isdefined( turret.script_burst_min ) )
-	{
         turret_burst = turret.script_burst_min;
-	}
     else
-	{
         turret_burst = burst_fire_settings( "burst" );
-	}
+
-	if ( isDefined( turret.script_burst_max ) )
+    if ( isdefined( turret.script_burst_max ) )
-	{
         turret_burst_range = turret.script_burst_max - turret_burst;
-	}
     else
-	{
         turret_burst_range = burst_fire_settings( "burst_range" );
-	}
+
-	while ( 1 )
+    while ( true )
     {
         turret startfiring();
-		if ( isDefined( manual_target ) )
+
-		{
+        if ( isdefined( manual_target ) )
             turret thread random_spread( manual_target );
-		}
+
         turret do_shoot();
         wait( turret_burst + randomfloat( turret_burst_range ) );
         turret stopshootturret();
@@ -177,60 +156,51 @@ burst_fire( turret, manual_target ) //checked matches cerberus output
     }
 }
 
-burst_fire_unmanned() //checked changed at own discretion
+burst_fire_unmanned()
 {
     self notify( "stop_burst_fire_unmanned" );
     self endon( "stop_burst_fire_unmanned" );
     self endon( "death" );
     self endon( "remote_start" );
     level endon( "game_ended" );
-	if ( is_true( self.controlled ) )
+
-	{
+    if ( isdefined( self.controlled ) && self.controlled )
         return;
-	}
+
-	if ( isDefined( self.script_delay_min ) )
+    if ( isdefined( self.script_delay_min ) )
-	{
         turret_delay = self.script_delay_min;
-	}
     else
-	{
         turret_delay = burst_fire_settings( "delay" );
-	}
+
-	if ( isDefined( self.script_delay_max ) )
+    if ( isdefined( self.script_delay_max ) )
-	{
         turret_delay_range = self.script_delay_max - turret_delay;
-	}
     else
-	{
         turret_delay_range = burst_fire_settings( "delay_range" );
-	}
+
-	if ( isDefined( self.script_burst_min ) )
+    if ( isdefined( self.script_burst_min ) )
-	{
         turret_burst = self.script_burst_min;
-	}
     else
-	{
         turret_burst = burst_fire_settings( "burst" );
-	}
+
-	if ( isDefined( self.script_burst_max ) )
+    if ( isdefined( self.script_burst_max ) )
-	{
         turret_burst_range = self.script_burst_max - turret_burst;
-	}
     else
-	{
         turret_burst_range = burst_fire_settings( "burst_range" );
-	}
+
-	pauseuntiltime = getTime();
+    pauseuntiltime = gettime();
     turretstate = "start";
     self.script_shooting = 0;
+
     for (;;)
     {
-		if ( isDefined( self.manual_targets ) )
+        if ( isdefined( self.manual_targets ) )
         {
             self cleartargetentity();
             self settargetentity( self.manual_targets[randomint( self.manual_targets.size )] );
         }
-		duration = ( pauseuntiltime - getTime() ) * 0.001;
+
+        duration = ( pauseuntiltime - gettime() ) * 0.001;
+
         if ( self isfiringturret() && duration <= 0 )
         {
             if ( turretstate != "fire" )
@@ -240,26 +210,32 @@ burst_fire_unmanned() //checked changed at own discretion
                 self thread do_shoot();
                 self.script_shooting = 1;
             }
+
             duration = turret_burst + randomfloat( turret_burst_range );
             self thread turret_timer( duration );
+
             self waittill( "turretstatechange" );
+
             self.script_shooting = 0;
             duration = turret_delay + randomfloat( turret_delay_range );
-			pauseuntiltime = getTime() + int( duration * 1000 );
+            pauseuntiltime = gettime() + int( duration * 1000 );
+            continue;
         }
-		else if ( turretstate != "aim" )
+
-		{
+        if ( turretstate != "aim" )
             turretstate = "aim";
-		}
+
         self thread turret_timer( duration );
+
         self waittill( "turretstatechange" );
     }
 }
 
-do_shoot() //checked matches cerberus output
+do_shoot()
 {
     self endon( "death" );
     self endon( "turretstatechange" );
+
     for (;;)
     {
         self shootturret();
@@ -267,21 +243,19 @@ do_shoot() //checked matches cerberus output
     }
 }
 
-turret_timer( duration ) //checked matches cerberus output
+turret_timer( duration )
 {
     if ( duration <= 0 )
-	{
         return;
-	}
+
     self endon( "turretstatechange" );
-	wait duration;
+    wait( duration );
-	if ( isDefined( self ) )
+
-	{
+    if ( isdefined( self ) )
         self notify( "turretstatechange" );
 }
-}
 
-random_spread( ent ) //checked matches cerberus output
+random_spread( ent )
 {
     self endon( "death" );
     self notify( "stop random_spread" );
@@ -289,18 +263,15 @@ random_spread( ent ) //checked matches cerberus output
     self endon( "stopfiring" );
     self settargetentity( ent );
     self.manual_target = ent;
-	while ( 1 )
+
+    while ( true )
     {
         if ( isplayer( ent ) )
-		{
             ent.origin = self.manual_target getorigin();
-		}
         else
-		{
             ent.origin = self.manual_target.origin;
-		}
+
         ent.origin += ( 20 - randomfloat( 40 ), 20 - randomfloat( 40 ), 20 - randomfloat( 60 ) );
         wait 0.2;
     }
 }
-

Multiplayer Core/patch_mp/maps/mp/_multi_extracam.gsc

@@ -1,4 +1,7 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
-init() //checked matches cerberus output
+init()
 {
+
 }

Multiplayer Core/patch_mp/maps/mp/_music.gsc

@@ -1,30 +1,28 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\_utility;
 
-music_init() //checked matches cerberus output
+music_init()
 {
-	/*
 /#
     assert( level.clientscripts );
 #/
-	*/
     level.musicstate = "";
     registerclientsys( "musicCmd" );
 }
 
-setmusicstate( state, player ) //checked changed to match cerberus output
+setmusicstate( state, player )
 {
-	if ( isDefined( level.musicstate ) )
+    if ( isdefined( level.musicstate ) )
     {
-		if ( isDefined( player ) )
+        if ( isdefined( player ) )
         {
             setclientsysstate( "musicCmd", state, player );
             return;
         }
         else if ( level.musicstate != state )
-		{
             setclientsysstate( "musicCmd", state );
     }
-	}
+
     level.musicstate = state;
 }

Multiplayer Core/patch_mp/maps/mp/_pc.gsc

@@ -1,5 +1,7 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
-pcserver() //checked matches cerberus output
+pcserver()
 {
     pcserverupdateplaylist();
 }

Multiplayer Core/patch_mp/maps/mp/_popups.gsc

@@ -1,21 +1,23 @@
-#include maps/mp/gametypes/_hud_message;
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_rank;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/gametypes/_persistence;
+#include maps\mp\_utility;
-#include maps/mp/_medals;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\_medals;
-#include maps/mp/_utility;
+#include maps\mp\gametypes\_persistence;
+#include maps\mp\gametypes\_rank;
+#include maps\mp\gametypes\_hud_message;
 
 init()
 {
     level.contractsettings = spawnstruct();
-	level.contractsettings.waittime = 4,2;
+    level.contractsettings.waittime = 4.2;
     level.killstreaksettings = spawnstruct();
     level.killstreaksettings.waittime = 3;
     level.ranksettings = spawnstruct();
     level.ranksettings.waittime = 3;
     level.startmessage = spawnstruct();
-	level.startmessagedefaultduration = 2;
+    level.startmessagedefaultduration = 2.0;
-	level.endmessagedefaultduration = 2;
+    level.endmessagedefaultduration = 2.0;
     level.challengesettings = spawnstruct();
     level.challengesettings.waittime = 3;
     level.teammessage = spawnstruct();
@@ -59,14 +61,14 @@ init()
 popupsfromconsole()
 {
 /#
-	while ( 1 )
+    while ( true )
     {
-		timeout = getdvarintdefault( "scr_popuptime", 1 );
+        timeout = getdvarintdefault( "scr_popuptime", 1.0 );
+
         if ( timeout == 0 )
-		{
             timeout = 1;
-		}
+
-		wait timeout;
+        wait( timeout );
         medal = getdvarintdefault( "scr_popupmedal", 0 );
         challenge = getdvarintdefault( "scr_popupchallenge", 0 );
         rank = getdvarintdefault( "scr_popuprank", 0 );
@@ -76,104 +78,78 @@ popupsfromconsole()
         gamemodemsg = getdvarintdefault( "scr_gamemodeslideout", 0 );
         teammsg = getdvarintdefault( "scr_teamslideout", 0 );
         challengeindex = getdvarintdefault( "scr_challengeIndex", 1 );
-		i = 0;
+
-		while ( i < medal )
+        for ( i = 0; i < medal; i++ )
+            level.players[0] maps\mp\_medals::codecallback_medal( 4 );
+
+        for ( i = 0; i < challenge; i++ )
         {
-			level.players[ 0 ] maps/mp/_medals::codecallback_medal( 4 );
+            level.players[0] maps\mp\gametypes\_persistence::codecallback_challengecomplete( 2500, 1, 84, 3, 0, 0, 851 );
-			i++;
+            level.players[0] maps\mp\gametypes\_persistence::codecallback_challengecomplete( 500, 1, 22, 2, 0, 0, 533 );
         }
-		i = 0;
+
-		while ( i < challenge )
+        for ( i = 0; i < rank; i++ )
-		{
+            level.players[0] maps\mp\gametypes\_rank::codecallback_rankup( 4, 0, 0 );
-			level.players[ 0 ] maps/mp/gametypes/_persistence::codecallback_challengecomplete( 2500, 1, 84, 3, 0, 0, 851 );
+
-			level.players[ 0 ] maps/mp/gametypes/_persistence::codecallback_challengecomplete( 500, 1, 22, 2, 0, 0, 533 );
+        for ( i = 0; i < gun; i++ )
-			i++;
+            level.players[0] maps\mp\gametypes\_persistence::codecallback_gunchallengecomplete( 0, 20, 25, 0 );
-		}
+
-		i = 0;
+        for ( i = 0; i < contractpass; i++ )
-		while ( i < rank )
+            level.players[0] maps\mp\gametypes\_persistence::addcontracttoqueue( 12, 1 );
-		{
+
-			level.players[ 0 ] maps/mp/gametypes/_rank::codecallback_rankup( 4, 0, 0 );
+        for ( i = 0; i < contractfail; i++ )
-			i++;
+            level.players[0] maps\mp\gametypes\_persistence::addcontracttoqueue( 12, 0 );
-		}
+
-		i = 0;
+        for ( i = 0; i < teammsg; i++ )
-		while ( i < gun )
-		{
-			level.players[ 0 ] maps/mp/gametypes/_persistence::codecallback_gunchallengecomplete( 0, 20, 25, 0 );
-			i++;
-		}
-		i = 0;
-		while ( i < contractpass )
-		{
-			level.players[ 0 ] maps/mp/gametypes/_persistence::addcontracttoqueue( 12, 1 );
-			i++;
-		}
-		i = 0;
-		while ( i < contractfail )
-		{
-			level.players[ 0 ] maps/mp/gametypes/_persistence::addcontracttoqueue( 12, 0 );
-			i++;
-		}
-		i = 0;
-		while ( i < teammsg )
         {
             player = level.players[0];
-			if ( isDefined( level.players[ 1 ] ) )
+
-			{
+            if ( isdefined( level.players[1] ) )
                 player = level.players[1];
-			}
+
             level.players[0] displayteammessagetoall( &"KILLSTREAK_DESTROYED_HELICOPTER", player );
-			i++;
         }
+
         reset = getdvarintdefault( "scr_popupreset", 1 );
+
         if ( reset )
         {
             if ( medal )
-			{
                 setdvar( "scr_popupmedal", 0 );
-			}
+
             if ( challenge )
-			{
                 setdvar( "scr_popupchallenge", 0 );
-			}
+
             if ( gun )
-			{
                 setdvar( "scr_popupgun", 0 );
-			}
+
             if ( rank )
-			{
                 setdvar( "scr_popuprank", 0 );
-			}
+
             if ( contractpass )
-			{
                 setdvar( "scr_popupcontractpass", 0 );
-			}
+
             if ( contractfail )
-			{
                 setdvar( "scr_popupcontractfail", 0 );
-			}
+
             if ( gamemodemsg )
-			{
                 setdvar( "scr_gamemodeslideout", 0 );
-			}
+
             if ( teammsg )
-			{
                 setdvar( "scr_teamslideout", 0 );
         }
     }
 #/
 }
-}
 
 displaykillstreakteammessagetoall( killstreak, player )
 {
-	if ( !isDefined( level.killstreaks[ killstreak ] ) )
+    if ( !isdefined( level.killstreaks[killstreak] ) )
-	{
         return;
-	}
+
-	if ( !isDefined( level.killstreaks[ killstreak ].inboundtext ) )
+    if ( !isdefined( level.killstreaks[killstreak].inboundtext ) )
-	{
         return;
-	}
+
     message = level.killstreaks[killstreak].inboundtext;
     self displayteammessagetoall( message, player );
 }
@@ -181,117 +157,91 @@ displaykillstreakteammessagetoall( killstreak, player )
 shoulddisplayteammessages()
 {
     if ( level.hardcoremode == 1 || level.splitscreen == 1 )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 displayteammessagetoall( message, player )
 {
     if ( !shoulddisplayteammessages() )
-	{
         return;
-	}
+
-	i = 0;
+    for ( i = 0; i < level.players.size; i++ )
-	while ( i < level.players.size )
     {
         cur_player = level.players[i];
+
         if ( cur_player isempjammed() )
-		{
-			i++;
             continue;
-		}
+
-		else size = cur_player.teammessagequeue.size;
+        size = cur_player.teammessagequeue.size;
+
         if ( size >= level.teammessagequeuemax )
-		{
-			i++;
             continue;
-		}
+
-		else
-		{
         cur_player.teammessagequeue[size] = spawnstruct();
         cur_player.teammessagequeue[size].message = message;
         cur_player.teammessagequeue[size].player = player;
         cur_player notify( "received teammessage" );
     }
-		i++;
-	}
 }
 
 displayteammessagetoteam( message, player, team )
 {
     if ( !shoulddisplayteammessages() )
-	{
         return;
-	}
+
-	i = 0;
+    for ( i = 0; i < level.players.size; i++ )
-	while ( i < level.players.size )
     {
         cur_player = level.players[i];
+
         if ( cur_player.team != team )
-		{
-			i++;
             continue;
-		}
+
-		else if ( cur_player isempjammed() )
+        if ( cur_player isempjammed() )
-		{
-			i++;
             continue;
-		}
+
-		else size = cur_player.teammessagequeue.size;
+        size = cur_player.teammessagequeue.size;
+
         if ( size >= level.teammessagequeuemax )
-		{
-			i++;
             continue;
-		}
+
-		else
-		{
         cur_player.teammessagequeue[size] = spawnstruct();
         cur_player.teammessagequeue[size].message = message;
         cur_player.teammessagequeue[size].player = player;
         cur_player notify( "received teammessage" );
     }
-		i++;
-	}
 }
 
 displayteammessagewaiter()
 {
     if ( !shoulddisplayteammessages() )
-	{
         return;
-	}
+
     self endon( "disconnect" );
     level endon( "game_ended" );
     self.teammessagequeue = [];
+
     for (;;)
     {
         if ( self.teammessagequeue.size == 0 )
-		{
             self waittill( "received teammessage" );
-		}
+
         if ( self.teammessagequeue.size > 0 )
         {
             nextnotifydata = self.teammessagequeue[0];
             arrayremoveindex( self.teammessagequeue, 0, 0 );
-			if ( !isDefined( nextnotifydata.player ) || !isplayer( nextnotifydata.player ) )
+
-			{
+            if ( !isdefined( nextnotifydata.player ) || !isplayer( nextnotifydata.player ) )
                 continue;
-			}
+
-			else
-			{
             if ( self isempjammed() )
-				{
+                continue;
-					break;
+
-				}
-				else
-				{
             self luinotifyevent( &"player_callout", 2, nextnotifydata.message, nextnotifydata.player.entnum );
         }
-				wait level.teammessage.waittime;
+
-			}
+        wait( level.teammessage.waittime );
-		}
     }
 }
 
@@ -299,90 +249,78 @@ displaypopupswaiter()
 {
     self endon( "disconnect" );
     self.ranknotifyqueue = [];
-	if ( !isDefined( self.pers[ "challengeNotifyQueue" ] ) )
+
-	{
+    if ( !isdefined( self.pers["challengeNotifyQueue"] ) )
         self.pers["challengeNotifyQueue"] = [];
-	}
+
-	if ( !isDefined( self.pers[ "contractNotifyQueue" ] ) )
+    if ( !isdefined( self.pers["contractNotifyQueue"] ) )
-	{
         self.pers["contractNotifyQueue"] = [];
-	}
+
     self.messagenotifyqueue = [];
     self.startmessagenotifyqueue = [];
     self.wagernotifyqueue = [];
+
     while ( !level.gameended )
     {
         if ( self.startmessagenotifyqueue.size == 0 && self.messagenotifyqueue.size == 0 )
-		{
             self waittill( "received award" );
-		}
+
         waittillframeend;
+
         if ( level.gameended )
-		{
+            break;
-			return;
+
-		}
-		else
-		{
         if ( self.startmessagenotifyqueue.size > 0 )
         {
             nextnotifydata = self.startmessagenotifyqueue[0];
             arrayremoveindex( self.startmessagenotifyqueue, 0, 0 );
-				if ( isDefined( nextnotifydata.duration ) )
+
-				{
+            if ( isdefined( nextnotifydata.duration ) )
                 duration = nextnotifydata.duration;
-				}
             else
-				{
                 duration = level.startmessagedefaultduration;
-				}
+
-				self maps/mp/gametypes/_hud_message::shownotifymessage( nextnotifydata, duration );
+            self maps\mp\gametypes\_hud_message::shownotifymessage( nextnotifydata, duration );
-				wait duration;
+            wait( duration );
-				continue;
         }
         else if ( self.messagenotifyqueue.size > 0 )
         {
             nextnotifydata = self.messagenotifyqueue[0];
             arrayremoveindex( self.messagenotifyqueue, 0, 0 );
-				if ( isDefined( nextnotifydata.duration ) )
+
-				{
+            if ( isdefined( nextnotifydata.duration ) )
                 duration = nextnotifydata.duration;
-				}
             else
-				{
                 duration = level.regulargamemessages.waittime;
-				}
+
-				self maps/mp/gametypes/_hud_message::shownotifymessage( nextnotifydata, duration );
+            self maps\mp\gametypes\_hud_message::shownotifymessage( nextnotifydata, duration );
-				continue;
         }
         else
-			{
             wait 1;
     }
 }
-	}
-}
 
 onplayerconnect()
 {
     for (;;)
     {
         level waittill( "connecting", player );
+
         player.resetgameoverhudrequired = 0;
         player thread displaypopupswaiter();
+
         if ( !level.hardcoremode )
-		{
             player thread displayteammessagewaiter();
     }
 }
-}
 
 milestonenotify( index, itemindex, type, tier )
 {
     level.globalchallenges++;
-	if ( !isDefined( type ) )
+
-	{
+    if ( !isdefined( type ) )
         type = "global";
-	}
+
     size = self.pers["challengeNotifyQueue"].size;
     self.pers["challengeNotifyQueue"][size] = [];
     self.pers["challengeNotifyQueue"][size]["tier"] = tier;

Multiplayer Core/patch_mp/maps/mp/_proximity_grenade.gsc

@@ -1,8 +1,10 @@
-#include maps/mp/_scoreevents;
+// T6 GSC SOURCE
-#include maps/mp/_challenges;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/gametypes/_weaponobjects;
+#include maps\mp\_utility;
-#include common_scripts/utility;
+#include common_scripts\utility;
-#include maps/mp/_utility;
+#include maps\mp\gametypes\_weaponobjects;
+#include maps\mp\_challenges;
+#include maps\mp\_scoreevents;
 
 init()
 {
@@ -15,15 +17,15 @@ init()
     level._effect["prox_grenade_enemy_warning"] = loadfx( "weapon/grenade/fx_prox_grenade_wrn_red" );
     level._effect["prox_grenade_player_shock"] = loadfx( "weapon/grenade/fx_prox_grenade_impact_player_spwner" );
     level.proximitygrenadedetectionradius = weapons_get_dvar_int( "scr_proximityGrenadeDetectionRadius", "150" );
-	level.proximitygrenadegraceperiod = weapons_get_dvar( "scr_proximityGrenadeGracePeriod", 0,1 );
+    level.proximitygrenadegraceperiod = weapons_get_dvar( "scr_proximityGrenadeGracePeriod", 0.1 );
     level.proximitygrenadedamageradius = weapons_get_dvar_int( "scr_proximityGrenadeDamageRadius", "200" );
     level.proximitygrenadedotdamageamount = weapons_get_dvar_int( "scr_proximityGrenadeDOTDamageAmount", "1" );
     level.proximitygrenadedotdamageamounthardcore = weapons_get_dvar_int( "scr_proximityGrenadeDOTDamageAmountHardcore", "1" );
-	level.proximitygrenadedotdamagetime = weapons_get_dvar( "scr_proximityGrenadeDOTDamageTime", 0,15 );
+    level.proximitygrenadedotdamagetime = weapons_get_dvar( "scr_proximityGrenadeDOTDamageTime", 0.15 );
     level.proximitygrenadedotdamageinstances = weapons_get_dvar_int( "scr_proximityGrenadeDOTDamageInstances", "4" );
     level.proximitygrenademaxinstances = weapons_get_dvar_int( "scr_proximityGrenadeMaxInstances", "3" );
     level.proximitygrenadeeffectdebug = weapons_get_dvar_int( "scr_proximityGrenadeEffectDebug", "0" );
-	level.proximitygrenadeactivationtime = weapons_get_dvar( "scr_proximityGrenadeActivationTime", 0,1 );
+    level.proximitygrenadeactivationtime = weapons_get_dvar( "scr_proximityGrenadeActivationTime", 0.1 );
     level.poisonfxduration = 6;
 /#
     level thread updatedvars();
@@ -37,7 +39,7 @@ register()
 
 updatedvars()
 {
-	while ( 1 )
+    while ( true )
     {
         level.proximitygrenadedetectionradius = weapons_get_dvar_int( "scr_proximityGrenadeDetectionRadius", level.proximitygrenadedetectionradius );
         level.proximitygrenadegraceperiod = weapons_get_dvar( "scr_proximityGrenadeGracePeriod", level.proximitygrenadegraceperiod );
@@ -49,13 +51,13 @@ updatedvars()
         level.proximitygrenademaxinstances = weapons_get_dvar_int( "scr_proximityGrenadeMaxInstances", level.proximitygrenademaxinstances );
         level.proximitygrenadeeffectdebug = weapons_get_dvar_int( "scr_proximityGrenadeEffectDebug", level.proximitygrenadeeffectdebug );
         level.proximitygrenadeactivationtime = weapons_get_dvar( "scr_proximityGrenadeActivationTime", level.proximitygrenadeactivationtime );
-		wait 1;
+        wait 1.0;
     }
 }
 
 createproximitygrenadewatcher()
 {
-	watcher = self maps/mp/gametypes/_weaponobjects::createproximityweaponobjectwatcher( "proximity_grenade", "proximity_grenade_mp", self.team );
+    watcher = self maps\mp\gametypes\_weaponobjects::createproximityweaponobjectwatcher( "proximity_grenade", "proximity_grenade_mp", self.team );
     watcher.watchforfire = 1;
     watcher.hackable = 1;
     watcher.hackertoolradius = level.equipmenthackertoolradius;
@@ -68,7 +70,7 @@ createproximitygrenadewatcher()
     watcher.immediatedetonation = 1;
     watcher.detectiongraceperiod = level.proximitygrenadegraceperiod;
     watcher.detonateradius = level.proximitygrenadedetectionradius;
-	watcher.stun = maps/mp/gametypes/_weaponobjects::weaponstun;
+    watcher.stun = maps\mp\gametypes\_weaponobjects::weaponstun;
     watcher.stuntime = 1;
     watcher.detonate = ::proximitydetonate;
     watcher.activationdelay = level.proximitygrenadeactivationtime;
@@ -86,30 +88,32 @@ setupkillcament()
 {
     self endon( "death" );
     self waittillnotmoving();
-	self.killcament = spawn( "script_model", self.origin + vectorScale( ( 0, 0, 1 ), 8 ) );
+    self.killcament = spawn( "script_model", self.origin + vectorscale( ( 0, 0, 1 ), 8.0 ) );
     self thread cleanupkillcamentondeath();
 }
 
 cleanupkillcamentondeath()
 {
     self waittill( "death" );
-	self.killcament deleteaftertime( 3 + ( level.proximitygrenadedotdamagetime * level.proximitygrenadedotdamageinstances ) );
+
+    self.killcament deleteaftertime( 3 + level.proximitygrenadedotdamagetime * level.proximitygrenadedotdamageinstances );
 }
 
 proximitydetonate( attacker, weaponname )
 {
-	if ( isDefined( weaponname ) )
+    if ( isdefined( weaponname ) )
     {
-		if ( isDefined( attacker ) )
+        if ( isdefined( attacker ) )
         {
             if ( self.owner isenemyplayer( attacker ) )
             {
-				attacker maps/mp/_challenges::destroyedexplosive( weaponname );
+                attacker maps\mp\_challenges::destroyedexplosive( weaponname );
-				maps/mp/_scoreevents::processscoreevent( "destroyed_proxy", attacker, self.owner, weaponname );
+                maps\mp\_scoreevents::processscoreevent( "destroyed_proxy", attacker, self.owner, weaponname );
             }
         }
     }
-	maps/mp/gametypes/_weaponobjects::weapondetonate( attacker, weaponname );
+
+    maps\mp\gametypes\_weaponobjects::weapondetonate( attacker, weaponname );
 }
 
 proximitygrenadedamageplayer( eattacker, einflictor )
@@ -117,26 +121,25 @@ proximitygrenadedamageplayer( eattacker, einflictor )
     if ( !self hasperk( "specialty_proximityprotection" ) )
     {
         if ( !level.proximitygrenadeeffectdebug )
-		{
             self thread damageplayerinradius( einflictor.origin, eattacker, einflictor );
     }
 }
-}
 
 watchproximitygrenadehitplayer( owner )
 {
     self endon( "death" );
     self setowner( owner );
     self setteam( owner.team );
-	while ( 1 )
+
+    while ( true )
     {
         self waittill( "grenade_bounce", pos, normal, ent, surface );
-		if ( isDefined( ent ) && isplayer( ent ) && surface != "riotshield" )
+
+        if ( isdefined( ent ) && isplayer( ent ) && surface != "riotshield" )
         {
             if ( level.teambased && ent.team == self.owner.team )
-			{
                 continue;
-			}
+
             self proximitydetonate( self.owner, undefined );
             return;
         }
@@ -145,8 +148,8 @@ watchproximitygrenadehitplayer( owner )
 
 performhudeffects( position, distancetogrenade )
 {
-	forwardvec = vectornormalize( anglesToForward( self.angles ) );
+    forwardvec = vectornormalize( anglestoforward( self.angles ) );
-	rightvec = vectornormalize( anglesToRight( self.angles ) );
+    rightvec = vectornormalize( anglestoright( self.angles ) );
     explosionvec = vectornormalize( position - self.origin );
     fdot = vectordot( explosionvec, forwardvec );
     rdot = vectordot( explosionvec, rightvec );
@@ -162,10 +165,11 @@ damageplayerinradius( position, owner, einflictor )
     self endon( "death" );
     owner endon( "disconnect" );
     self thread watch_death();
-	if ( !isDefined( einflictor.killcament ) )
+
+    if ( !isdefined( einflictor.killcament ) )
     {
-		killcament = spawn( "script_model", self.origin + vectorScale( ( 0, 0, 1 ), 8 ) );
+        killcament = spawn( "script_model", self.origin + vectorscale( ( 0, 0, 1 ), 8.0 ) );
-		killcament deleteaftertime( 3 + ( level.proximitygrenadedotdamagetime * level.proximitygrenadedotdamageinstances ) );
+        killcament deleteaftertime( 3 + level.proximitygrenadedotdamagetime * level.proximitygrenadedotdamageinstances );
         killcament.soundmod = "taser_spike";
     }
     else
@@ -173,36 +177,38 @@ damageplayerinradius( position, owner, einflictor )
         killcament = einflictor.killcament;
         killcament.soundmod = "taser_spike";
     }
+
     damage = level.proximitygrenadedotdamageamount;
     playfxontag( level._effect["prox_grenade_player_shock"], self, "J_SpineUpper" );
+
     if ( level.hardcoremode )
-	{
         damage = level.proximitygrenadedotdamageamounthardcore;
-	}
+
     if ( self mayapplyscreeneffect() )
     {
-		shellshock_duration = 1,5;
+        shellshock_duration = 1.5;
         self shellshock( "proximity_grenade", shellshock_duration, 0 );
         self setclientfieldtoplayer( "tazered", 1 );
     }
+
     self playrumbleonentity( "proximity_grenade" );
     self playsound( "wpn_taser_mine_zap" );
     self setclientuivisibilityflag( "hud_visible", 0 );
-	i = 0;
+
-	while ( i < level.proximitygrenadedotdamageinstances )
+    for ( i = 0; i < level.proximitygrenadedotdamageinstances; i++ )
     {
-		wait level.proximitygrenadedotdamagetime;
+        wait( level.proximitygrenadedotdamagetime );
 /#
-		assert( isDefined( owner ) );
+        assert( isdefined( owner ) );
 #/
 /#
-		assert( isDefined( killcament ) );
+        assert( isdefined( killcament ) );
 #/
         self dodamage( damage, position, owner, killcament, "none", "MOD_GAS", 0, "proximity_grenade_aoe_mp" );
-		i++;
     }
-	wait 0,85;
+
-	self shellshock( "proximity_grenade_exit", 0,6, 0 );
+    wait 0.85;
+    self shellshock( "proximity_grenade_exit", 0.6, 0 );
     self setclientuivisibilityflag( "hud_visible", 1 );
     self setclientfieldtoplayer( "tazered", 0 );
 }
@@ -212,27 +218,32 @@ deleteentonownerdeath( owner )
     self thread deleteentontimeout();
     self thread deleteentaftertime();
     self endon( "delete" );
+
     owner waittill( "death" );
+
     self notify( "deleteSound" );
 }
 
 deleteentaftertime()
 {
     self endon( "delete" );
-	wait 10;
+    wait 10.0;
     self notify( "deleteSound" );
 }
 
 deleteentontimeout()
 {
     self endon( "delete" );
+
     self waittill( "deleteSound" );
+
     self delete();
 }
 
 watch_death()
 {
     self waittill( "death" );
+
     self stoprumble( "proximity_grenade" );
     self setblur( 0, 0 );
     self setclientuivisibilityflag( "hud_visible", 1 );

Multiplayer Core/patch_mp/maps/mp/_riotshield.gsc

@@ -1,31 +1,35 @@
-#include maps/mp/_scoreevents;
+// T6 GSC SOURCE
-#include maps/mp/killstreaks/_killstreak_weapons;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/killstreaks/_killstreaks;
+#include maps\mp\_utility;
-#include common_scripts/utility;
+#include common_scripts\utility;
-#include maps/mp/_utility;
+#include maps\mp\killstreaks\_killstreaks;
+#include maps\mp\killstreaks\_killstreak_weapons;
+#include maps\mp\_scoreevents;
 
 #using_animtree("mp_riotshield");
 
 init()
 {
-	if ( !isDefined( level.riotshield_name ) )
+    if ( !isdefined( level.riotshield_name ) )
     {
         level.riotshield_name = "riotshield_mp";
-		if ( isDefined( level.is_zombie_level ) && level.is_zombie_level )
+
-		{
+        if ( isdefined( level.is_zombie_level ) && level.is_zombie_level )
             level.riotshield_name = "riotshield_zm";
     }
-	}
+
     level.deployedshieldmodel = "t6_wpn_shield_carry_world";
     level.stowedshieldmodel = "t6_wpn_shield_stow_world";
     level.carriedshieldmodel = "t6_wpn_shield_carry_world";
     level.detectshieldmodel = "t6_wpn_shield_carry_world_detect";
-	if ( isDefined( level.is_zombie_level ) && level.is_zombie_level )
+
+    if ( isdefined( level.is_zombie_level ) && level.is_zombie_level )
     {
         level.deployedshieldmodel = "t6_wpn_zmb_shield_world";
         level.stowedshieldmodel = "t6_wpn_zmb_shield_stow";
         level.carriedshieldmodel = "t6_wpn_zmb_shield_world";
     }
+
     precachemodel( level.stowedshieldmodel );
     precachemodel( level.carriedshieldmodel );
     precachemodel( level.detectshieldmodel );
@@ -50,7 +54,9 @@ watchpregameclasschange()
     self endon( "death" );
     self endon( "disconnect" );
     self endon( "track_riot_shield" );
+
     self waittill( "changed_class" );
+
     if ( level.ingraceperiod && !self.hasdonecombat )
     {
         self clearstowedweapon();
@@ -66,12 +72,14 @@ watchriotshieldpickup()
     self endon( "track_riot_shield" );
     self notify( "watch_riotshield_pickup" );
     self endon( "watch_riotshield_pickup" );
+
     self waittill( "pickup_riotshield" );
+
     self endon( "weapon_change" );
 /#
     println( "Picked up riotshield, expecting weapon_change notify..." );
 #/
-	wait 0,5;
+    wait 0.5;
 /#
     println( "picked up shield but didn't change weapons, attach it!" );
 #/
@@ -87,69 +95,67 @@ trackriotshield()
     self notify( "track_riot_shield" );
     self endon( "track_riot_shield" );
     self thread watchpregameclasschange();
+
     self waittill( "weapon_change", newweapon );
+
     self refreshshieldattachment();
     self.hasriotshield = self hasweapon( level.riotshield_name );
     self.hasriotshieldequipped = self getcurrentweapon() == level.riotshield_name;
     self.lastnonshieldweapon = "none";
-	while ( 1 )
+
+    while ( true )
     {
         self thread watchriotshieldpickup();
         currentweapon = self getcurrentweapon();
         self.hasriotshield = self hasweapon( level.riotshield_name );
         self.hasriotshieldequipped = self getcurrentweapon() == level.riotshield_name;
         refresh_attach = 0;
+
         self waittill( "weapon_change", newweapon );
+
         if ( newweapon == level.riotshield_name )
         {
             refresh_attach = 1;
-			if ( isDefined( self.riotshieldentity ) )
+
-			{
+            if ( isdefined( self.riotshieldentity ) )
                 self notify( "destroy_riotshield" );
-			}
+
             if ( self.hasriotshield )
             {
-				if ( isDefined( self.riotshieldtakeweapon ) )
+                if ( isdefined( self.riotshieldtakeweapon ) )
                 {
                     self takeweapon( self.riotshieldtakeweapon );
                     self.riotshieldtakeweapon = undefined;
                 }
             }
+
             if ( isvalidnonshieldweapon( currentweapon ) )
-			{
                 self.lastnonshieldweapon = currentweapon;
         }
-		}
+
         if ( self.hasriotshield || refresh_attach == 1 )
-		{
             self refreshshieldattachment();
     }
 }
-}
 
 isvalidnonshieldweapon( weapon )
 {
-	if ( maps/mp/killstreaks/_killstreaks::iskillstreakweapon( weapon ) )
+    if ( maps\mp\killstreaks\_killstreaks::iskillstreakweapon( weapon ) )
-	{
+        return false;
-		return 0;
+
-	}
+    if ( maps\mp\killstreaks\_killstreak_weapons::isheldkillstreakweapon( weapon ) )
-	if ( maps/mp/killstreaks/_killstreak_weapons::isheldkillstreakweapon( weapon ) )
+        return false;
-	{
+
-		return 0;
+    if ( maps\mp\killstreaks\_killstreak_weapons::isgameplayweapon( weapon ) )
-	}
+        return false;
-	if ( maps/mp/killstreaks/_killstreak_weapons::isgameplayweapon( weapon ) )
+
-	{
-		return 0;
-	}
     if ( weapon == "none" )
-	{
+        return false;
-		return 0;
+
-	}
     if ( isweaponequipment( weapon ) )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 startriotshielddeploy()
@@ -160,73 +166,58 @@ startriotshielddeploy()
 
 resetreconmodelvisibility( owner )
 {
-	if ( !isDefined( self ) )
+    if ( !isdefined( self ) )
-	{
         return;
-	}
+
     self setinvisibletoall();
     self setforcenocull();
-	if ( !isDefined( owner ) )
+
-	{
+    if ( !isdefined( owner ) )
         return;
-	}
+
-	i = 0;
+    for ( i = 0; i < level.players.size; i++ )
-	while ( i < level.players.size )
     {
         if ( level.players[i] hasperk( "specialty_showenemyequipment" ) )
         {
             if ( level.players[i].team == "spectator" )
-			{
-				i++;
                 continue;
-			}
+
-			else
-			{
             isenemy = 1;
+
             if ( level.teambased )
             {
                 if ( level.players[i].team == owner.team )
-					{
                     isenemy = 0;
             }
-				}
+            else if ( level.players[i] == owner )
-				else
-				{
-					if ( level.players[ i ] == owner )
-					{
                 isenemy = 0;
-					}
+
-				}
             if ( isenemy )
-				{
                 self setvisibletoplayer( level.players[i] );
         }
     }
 }
-		i++;
-	}
-}
 
 resetreconmodelonevent( eventname, owner )
 {
     self endon( "death" );
+
     for (;;)
     {
         level waittill( eventname, newowner );
-		if ( isDefined( newowner ) )
+
-		{
+        if ( isdefined( newowner ) )
             owner = newowner;
-		}
+
         self resetreconmodelvisibility( owner );
     }
 }
 
 attachreconmodel( modelname, owner )
 {
-	if ( !isDefined( self ) )
+    if ( !isdefined( self ) )
-	{
         return;
-	}
+
     reconmodel = spawn( "script_model", self.origin );
     reconmodel.angles = self.angles;
     reconmodel setmodel( modelname );
@@ -261,13 +252,17 @@ watchriotshielddeploy()
     self endon( "death" );
     self endon( "disconnect" );
     self endon( "start_riotshield_deploy" );
+
     self waittill( "deploy_riotshield", deploy_attempt );
+
     self setheldweaponmodel( 0 );
     self setplacementhint( 1 );
     placement_hint = 0;
+
     if ( deploy_attempt )
     {
         placement = self canplaceriotshield( "deploy_riotshield" );
+
         if ( placement["result"] )
         {
             self.hasdonecombat = 1;
@@ -276,39 +271,41 @@ watchriotshielddeploy()
             item_ent = deployriotshield( self, shield_ent );
             primaries = self getweaponslistprimaries();
 /#
-			assert( isDefined( item_ent ) );
+            assert( isdefined( item_ent ) );
-			assert( !isDefined( self.riotshieldretrievetrigger ) );
+            assert( !isdefined( self.riotshieldretrievetrigger ) );
-			assert( !isDefined( self.riotshieldentity ) );
+            assert( !isdefined( self.riotshieldentity ) );
+
             if ( level.gametype != "shrp" )
             {
+/#
                 assert( primaries.size > 0 );
 #/
             }
+#/
             shield_ent setclientfield( "riotshield_state", 1 );
             shield_ent.reconmodel setclientfield( "riotshield_state", 1 );
+
             if ( level.gametype != "shrp" )
             {
                 if ( self.lastnonshieldweapon != "none" && self hasweapon( self.lastnonshieldweapon ) )
-				{
                     self switchtoweapon( self.lastnonshieldweapon );
-				}
                 else
-				{
                     self switchtoweapon( primaries[0] );
             }
-			}
+
             if ( !self hasweapon( "knife_held_mp" ) )
             {
                 self giveweapon( "knife_held_mp" );
                 self.riotshieldtakeweapon = "knife_held_mp";
             }
+
             self.riotshieldretrievetrigger = item_ent;
             self.riotshieldentity = shield_ent;
             self thread watchdeployedriotshieldents();
             self thread deleteshieldontriggerdeath( self.riotshieldretrievetrigger );
             self thread deleteshieldonplayerdeathordisconnect( shield_ent );
             self.riotshieldentity thread watchdeployedriotshielddamage();
-			level notify( "riotshield_planted" );
+            level notify( "riotshield_planted", self );
         }
         else
         {
@@ -318,58 +315,55 @@ watchriotshielddeploy()
         }
     }
     else
-	{
         placement_hint = 1;
-	}
+
     if ( placement_hint )
-	{
         self setriotshieldfailhint();
 }
-}
 
 riotshielddistancetest( origin )
 {
 /#
-	assert( isDefined( origin ) );
+    assert( isdefined( origin ) );
 #/
-	min_dist_squared = getDvarFloat( "riotshield_deploy_limit_radius" );
+    min_dist_squared = getdvarfloat( "riotshield_deploy_limit_radius" );
     min_dist_squared *= min_dist_squared;
-	i = 0;
+
-	while ( i < level.players.size )
+    for ( i = 0; i < level.players.size; i++ )
     {
-		if ( isDefined( level.players[ i ].riotshieldentity ) )
+        if ( isdefined( level.players[i].riotshieldentity ) )
         {
             dist_squared = distancesquared( level.players[i].riotshieldentity.origin, origin );
+
             if ( min_dist_squared > dist_squared )
             {
 /#
                 println( "Shield placement denied!  Failed distance check to other riotshields." );
 #/
-				return 0;
+                return false;
             }
         }
-		i++;
     }
-	return 1;
+
+    return true;
 }
 
 watchdeployedriotshieldents()
 {
 /#
-	assert( isDefined( self.riotshieldretrievetrigger ) );
+    assert( isdefined( self.riotshieldretrievetrigger ) );
-	assert( isDefined( self.riotshieldentity ) );
+    assert( isdefined( self.riotshieldentity ) );
 #/
     self waittill( "destroy_riotshield" );
-	if ( isDefined( self.riotshieldretrievetrigger ) )
+
-	{
+    if ( isdefined( self.riotshieldretrievetrigger ) )
         self.riotshieldretrievetrigger delete();
-	}
+
-	if ( isDefined( self.riotshieldentity ) )
+    if ( isdefined( self.riotshieldentity ) )
-	{
-		if ( isDefined( self.riotshieldentity.reconmodel ) )
     {
+        if ( isdefined( self.riotshieldentity.reconmodel ) )
             self.riotshieldentity.reconmodel delete();
-		}
+
         self.riotshieldentity connectpaths();
         self.riotshieldentity delete();
     }
@@ -378,69 +372,44 @@ watchdeployedriotshieldents()
 watchdeployedriotshielddamage()
 {
     self endon( "death" );
-	damagemax = getDvarInt( "riotshield_deployed_health" );
+    damagemax = getdvarint( "riotshield_deployed_health" );
     self.damagetaken = 0;
-	while ( 1 )
+
+    while ( true )
     {
         self.maxhealth = 100000;
         self.health = self.maxhealth;
+
         self waittill( "damage", damage, attacker, direction, point, type, tagname, modelname, partname, weaponname, idflags );
-		while ( !isDefined( attacker ) )
+
-		{
+        if ( !isdefined( attacker ) )
             continue;
-		}
 /#
-		if ( isDefined( self.owner ) )
+        assert( isdefined( self.owner ) && isdefined( self.owner.team ) );
-		{
-			assert( isDefined( self.owner.team ) );
-		}
 #/
-		while ( isplayer( attacker ) )
+        if ( isplayer( attacker ) )
-		{
-			while ( level.teambased && attacker.team == self.owner.team && attacker != self.owner )
         {
+            if ( level.teambased && attacker.team == self.owner.team && attacker != self.owner )
                 continue;
         }
-		}
+
         if ( type == "MOD_MELEE" )
-		{
+            damage *= getdvarfloat( "riotshield_melee_damage_scale" );
-			damage *= getDvarFloat( "riotshield_melee_damage_scale" );
-		}
         else if ( type == "MOD_PISTOL_BULLET" || type == "MOD_RIFLE_BULLET" )
-		{
+            damage *= getdvarfloat( "riotshield_bullet_damage_scale" );
-			damage *= getDvarFloat( "riotshield_bullet_damage_scale" );
+        else if ( type == "MOD_GRENADE" || type == "MOD_GRENADE_SPLASH" || type == "MOD_EXPLOSIVE" || type == "MOD_EXPLOSIVE_SPLASH" || type == "MOD_PROJECTILE" || type == "MOD_PROJECTILE_SPLASH" )
-		}
+            damage *= getdvarfloat( "riotshield_explosive_damage_scale" );
-		else
+        else if ( type == "MOD_IMPACT" )
-		{
+            damage *= getdvarfloat( "riotshield_projectile_damage_scale" );
-			if ( type != "MOD_GRENADE" && type != "MOD_GRENADE_SPLASH" && type != "MOD_EXPLOSIVE" && type != "MOD_EXPLOSIVE_SPLASH" || type == "MOD_PROJECTILE" && type == "MOD_PROJECTILE_SPLASH" )
+        else if ( type == "MOD_CRUSH" )
-			{
-				damage *= getDvarFloat( "riotshield_explosive_damage_scale" );
-				break;
-			}
-			else
-			{
-				if ( type == "MOD_IMPACT" )
-				{
-					damage *= getDvarFloat( "riotshield_projectile_damage_scale" );
-					break;
-				}
-				else
-				{
-					if ( type == "MOD_CRUSH" )
-					{
             damage = damagemax;
-					}
+
-				}
-			}
-		}
         self.damagetaken += damage;
+
         if ( self.damagetaken >= damagemax )
         {
             self thread damagethendestroyriotshield( attacker, weaponname );
-			return;
+            break;
-		}
-		else
-		{
         }
     }
 }
@@ -449,23 +418,22 @@ damagethendestroyriotshield( attacker, weaponname )
 {
     self notify( "damageThenDestroyRiotshield" );
     self endon( "death" );
-	if ( isDefined( self.owner.riotshieldretrievetrigger ) )
+
-	{
+    if ( isdefined( self.owner.riotshieldretrievetrigger ) )
         self.owner.riotshieldretrievetrigger delete();
-	}
+
-	if ( isDefined( self.reconmodel ) )
+    if ( isdefined( self.reconmodel ) )
-	{
         self.reconmodel delete();
-	}
+
     self connectpaths();
     self.owner.riotshieldentity = undefined;
     self notsolid();
     self setclientfield( "riotshield_state", 2 );
-	if ( isDefined( attacker ) && isDefined( weaponname ) && attacker != self.owner && isplayer( attacker ) )
+
-	{
+    if ( isdefined( attacker ) && isdefined( weaponname ) && attacker != self.owner && isplayer( attacker ) )
-		maps/mp/_scoreevents::processscoreevent( "destroyed_shield", attacker, self.owner, weaponname );
+        maps\mp\_scoreevents::processscoreevent( "destroyed_shield", attacker, self.owner, weaponname );
-	}
+
-	wait getDvarFloat( "riotshield_destroyed_cleanup_time" );
+    wait( getdvarfloat( "riotshield_destroyed_cleanup_time" ) );
     self delete();
 }
 

Multiplayer Core/patch_mp/maps/mp/_satchel_charge.gsc

@@ -1,19 +1,20 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/_scoreevents;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_challenges;
+#include maps\mp\_utility;
-#include maps/mp/killstreaks/_emp;
+#include maps\mp\gametypes\_weaponobjects;
-#include maps/mp/gametypes/_weaponobjects;
+#include maps\mp\killstreaks\_emp;
-#include maps/mp/_utility;
+#include maps\mp\_challenges;
+#include maps\mp\_scoreevents;
 
-init() //checked matches cerberus output
+init()
 {
     level._effect["satchel_charge_enemy_light"] = loadfx( "weapon/c4/fx_c4_light_red" );
     level._effect["satchel_charge_friendly_light"] = loadfx( "weapon/c4/fx_c4_light_green" );
 }
 
-createsatchelwatcher() //checked matches cerberus output
+createsatchelwatcher()
 {
-	watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "satchel_charge", "satchel_charge_mp", self.team );
+    watcher = self maps\mp\gametypes\_weaponobjects::createuseweaponobjectwatcher( "satchel_charge", "satchel_charge_mp", self.team );
     watcher.altdetonate = 1;
     watcher.watchforfire = 1;
     watcher.hackable = 1;
@@ -21,26 +22,28 @@ createsatchelwatcher() //checked matches cerberus output
     watcher.hackertooltimems = level.equipmenthackertooltimems;
     watcher.headicon = 1;
     watcher.detonate = ::satcheldetonate;
-	watcher.stun = maps/mp/gametypes/_weaponobjects::weaponstun;
+    watcher.stun = maps\mp\gametypes\_weaponobjects::weaponstun;
     watcher.stuntime = 1;
     watcher.altweapon = "satchel_charge_detonator_mp";
     watcher.reconmodel = "t6_wpn_c4_world_detect";
     watcher.ownergetsassist = 1;
 }
 
-satcheldetonate( attacker, weaponname ) //checked matches cerberus output
+satcheldetonate( attacker, weaponname )
 {
-	from_emp = maps/mp/killstreaks/_emp::isempkillstreakweapon( weaponname );
+    from_emp = maps\mp\killstreaks\_emp::isempkillstreakweapon( weaponname );
-	if ( !isDefined( from_emp ) || !from_emp )
+
+    if ( !isdefined( from_emp ) || !from_emp )
     {
-		if ( isDefined( attacker ) )
+        if ( isdefined( attacker ) )
         {
             if ( self.owner isenemyplayer( attacker ) )
             {
-				attacker maps/mp/_challenges::destroyedexplosive( weaponname );
+                attacker maps\mp\_challenges::destroyedexplosive( weaponname );
-				maps/mp/_scoreevents::processscoreevent( "destroyed_c4", attacker, self.owner, weaponname );
+                maps\mp\_scoreevents::processscoreevent( "destroyed_c4", attacker, self.owner, weaponname );
             }
         }
     }
-	maps/mp/gametypes/_weaponobjects::weapondetonate( attacker, weaponname );
+
+    maps\mp\gametypes\_weaponobjects::weapondetonate( attacker, weaponname );
 }

Multiplayer Core/patch_mp/maps/mp/_scoreevents.gsc

@@ -1,15 +1,18 @@
-#include maps/mp/gametypes/_globallogic_score;
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_rank;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/killstreaks/_killstreaks;
+#include maps\mp\_utility;
-#include maps/mp/_scoreevents;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\_scoreevents;
-#include maps/mp/_utility;
+#include maps\mp\_challenges;
+#include maps\mp\killstreaks\_killstreaks;
+#include maps\mp\gametypes\_rank;
+#include maps\mp\gametypes\_globallogic_score;
 
 init()
 {
     level.scoreeventcallbacks = [];
     level.scoreeventgameendcallback = ::ongameend;
-	registerscoreeventcallback( "playerKilled", ::scoreeventplayerkill );
+    registerscoreeventcallback( "playerKilled", maps\mp\_scoreevents::scoreeventplayerkill );
 }
 
 scoreeventtablelookupint( index, scoreeventcolumn )
@@ -29,9 +32,8 @@ getscoreeventcolumn( gametype )
     assert( columnoffset >= 0 );
 #/
     if ( columnoffset >= 0 )
-	{
         columnoffset += 0;
-	}
+
     return columnoffset;
 }
 
@@ -42,45 +44,43 @@ getxpeventcolumn( gametype )
     assert( columnoffset >= 0 );
 #/
     if ( columnoffset >= 0 )
-	{
         columnoffset += 1;
-	}
+
     return columnoffset;
 }
 
 getcolumnoffsetforgametype( gametype )
 {
     foundgamemode = 0;
-	if ( !isDefined( level.scoreeventtableid ) )
+
-	{
+    if ( !isdefined( level.scoreeventtableid ) )
         level.scoreeventtableid = getscoreeventtableid();
-	}
 /#
-	assert( isDefined( level.scoreeventtableid ) );
+    assert( isdefined( level.scoreeventtableid ) );
 #/
-	if ( !isDefined( level.scoreeventtableid ) )
+    if ( !isdefined( level.scoreeventtableid ) )
-	{
         return -1;
-	}
+
     gamemodecolumn = 11;
+
     for (;;)
     {
         column_header = tablelookupcolumnforrow( level.scoreeventtableid, 0, gamemodecolumn );
+
         if ( column_header == "" )
         {
             gamemodecolumn = 11;
             break;
         }
-		else if ( column_header == ( level.gametype + " score" ) )
+
+        if ( column_header == level.gametype + " score" )
         {
             foundgamemode = 1;
             break;
         }
-		else
+
-		{
         gamemodecolumn += 2;
     }
-	}
 /#
     assert( foundgamemode, "Could not find gamemode in scoreInfo.csv:" + gametype );
 #/
@@ -91,10 +91,9 @@ getscoreeventtableid()
 {
     scoreinfotableloaded = 0;
     scoreinfotableid = tablelookupfindcoreasset( "mp/scoreInfo.csv" );
-	if ( isDefined( scoreinfotableid ) )
+
-	{
+    if ( isdefined( scoreinfotableid ) )
         scoreinfotableloaded = 1;
-	}
 /#
     assert( scoreinfotableloaded, "Score Event Table is not loaded: " + "mp/scoreInfo.csv" );
 #/
@@ -103,33 +102,28 @@ getscoreeventtableid()
 
 isregisteredevent( type )
 {
-	if ( isDefined( level.scoreinfo[ type ] ) )
+    if ( isdefined( level.scoreinfo[type] ) )
-	{
+        return true;
-		return 1;
-	}
     else
-	{
+        return false;
-		return 0;
-	}
 }
 
 shouldaddrankxp( player )
 {
-	if ( !isDefined( level.rankcap ) || level.rankcap == 0 )
+    if ( !isdefined( level.rankcap ) || level.rankcap == 0 )
-	{
+        return true;
-		return 1;
+
-	}
     if ( player.pers["plevel"] > 0 || player.pers["rank"] > level.rankcap )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
 processscoreevent( event, player, victim, weapon )
 {
     pixbeginevent( "processScoreEvent" );
     scoregiven = 0;
+
     if ( !isplayer( player ) )
     {
 /#
@@ -137,38 +131,37 @@ processscoreevent( event, player, victim, weapon )
 #/
         return scoregiven;
     }
-	player thread maps/mp/_challenges::eventreceived( event );
+
+    player thread maps\mp\_challenges::eventreceived( event );
+
     if ( isregisteredevent( event ) )
     {
         allowplayerscore = 0;
-		if ( !isDefined( weapon ) || maps/mp/killstreaks/_killstreaks::iskillstreakweapon( weapon ) == 0 )
+
-		{
+        if ( !isdefined( weapon ) || maps\mp\killstreaks\_killstreaks::iskillstreakweapon( weapon ) == 0 )
             allowplayerscore = 1;
-		}
         else
-		{
+            allowplayerscore = maps\mp\gametypes\_rank::killstreakweaponsallowedscore( event );
-			allowplayerscore = maps/mp/gametypes/_rank::killstreakweaponsallowedscore( event );
+
-		}
         if ( allowplayerscore )
         {
-			scoregiven = maps/mp/gametypes/_globallogic_score::giveplayerscore( event, player, victim, weapon, undefined );
+            scoregiven = maps\mp\gametypes\_globallogic_score::giveplayerscore( event, player, victim, weapon, undefined );
             isscoreevent = scoregiven > 0;
         }
     }
+
     if ( shouldaddrankxp( player ) )
-	{
         player addrankxp( event, weapon, isscoreevent );
-	}
+
     pixendevent();
     return scoregiven;
 }
 
 registerscoreeventcallback( callback, func )
 {
-	if ( !isDefined( level.scoreeventcallbacks[ callback ] ) )
+    if ( !isdefined( level.scoreeventcallbacks[callback] ) )
-	{
         level.scoreeventcallbacks[callback] = [];
-	}
+
     level.scoreeventcallbacks[callback][level.scoreeventcallbacks[callback].size] = func;
 }
 
@@ -184,116 +177,108 @@ scoreeventplayerkill( data, time )
     wasplanting = data.wasplanting;
     wasonground = data.victimonground;
     meansofdeath = data.smeansofdeath;
-	if ( isDefined( data.sweapon ) )
+
+    if ( isdefined( data.sweapon ) )
     {
         weapon = data.sweapon;
         weaponclass = getweaponclass( data.sweapon );
         killstreak = getkillstreakfromweapon( data.sweapon );
     }
+
     victim.anglesondeath = victim getplayerangles();
-	if ( meansofdeath != "MOD_GRENADE" && meansofdeath != "MOD_GRENADE_SPLASH" && meansofdeath != "MOD_EXPLOSIVE" && meansofdeath != "MOD_EXPLOSIVE_SPLASH" || meansofdeath == "MOD_PROJECTILE" && meansofdeath == "MOD_PROJECTILE_SPLASH" )
+
-	{
+    if ( meansofdeath == "MOD_GRENADE" || meansofdeath == "MOD_GRENADE_SPLASH" || meansofdeath == "MOD_EXPLOSIVE" || meansofdeath == "MOD_EXPLOSIVE_SPLASH" || meansofdeath == "MOD_PROJECTILE" || meansofdeath == "MOD_PROJECTILE_SPLASH" )
-		if ( weapon == "none" && isDefined( data.victim.explosiveinfo[ "weapon" ] ) )
     {
+        if ( weapon == "none" && isdefined( data.victim.explosiveinfo["weapon"] ) )
             weapon = data.victim.explosiveinfo["weapon"];
     }
-	}
+
-	while ( level.teambased )
+    if ( level.teambased )
     {
         attacker.lastkilltime = time;
-		if ( isDefined( victim.lastkilltime ) && victim.lastkilltime > ( time - 3000 ) )
+
+        if ( isdefined( victim.lastkilltime ) && victim.lastkilltime > time - 3000 )
         {
-			if ( isDefined( victim.lastkilledplayer ) && victim.lastkilledplayer isenemyplayer( attacker ) == 0 && attacker != victim.lastkilledplayer )
+            if ( isdefined( victim.lastkilledplayer ) && victim.lastkilledplayer isenemyplayer( attacker ) == 0 && attacker != victim.lastkilledplayer )
             {
                 processscoreevent( "kill_enemy_who_killed_teammate", attacker, victim, weapon );
                 victim recordkillmodifier( "avenger" );
             }
         }
-		while ( isDefined( victim.damagedplayers ) )
+
+        if ( isdefined( victim.damagedplayers ) )
         {
             keys = getarraykeys( victim.damagedplayers );
-			i = 0;
+
-			while ( i < keys.size )
+            for ( i = 0; i < keys.size; i++ )
             {
                 key = keys[i];
+
                 if ( key == attacker.clientid )
-				{
-					i++;
                     continue;
-				}
+
-				else if ( !isDefined( victim.damagedplayers[ key ].entity ) )
+                if ( !isdefined( victim.damagedplayers[key].entity ) )
-				{
-					i++;
                     continue;
-				}
+
-				else if ( attacker isenemyplayer( victim.damagedplayers[ key ].entity ) )
+                if ( attacker isenemyplayer( victim.damagedplayers[key].entity ) )
-				{
-					i++;
                     continue;
-				}
+
-				else
+                if ( time - victim.damagedplayers[key].time < 1000 )
-				{
-					if ( ( time - victim.damagedplayers[ key ].time ) < 1000 )
                 {
                     processscoreevent( "kill_enemy_injuring_teammate", attacker, victim, weapon );
-						if ( isDefined( victim.damagedplayers[ key ].entity ) )
+
+                    if ( isdefined( victim.damagedplayers[key].entity ) )
                     {
                         victim.damagedplayers[key].entity.lastrescuedby = attacker;
                         victim.damagedplayers[key].entity.lastrescuedtime = time;
                     }
+
                     victim recordkillmodifier( "defender" );
                 }
             }
-				i++;
-			}
         }
     }
+
     switch ( weapon )
     {
         case "hatchet_mp":
             attacker.pers["tomahawks"]++;
             attacker.tomahawks = attacker.pers["tomahawks"];
             processscoreevent( "hatchet_kill", attacker, victim, weapon );
-			if ( isDefined( data.victim.explosiveinfo[ "projectile_bounced" ] ) && data.victim.explosiveinfo[ "projectile_bounced" ] == 1 )
+
+            if ( isdefined( data.victim.explosiveinfo["projectile_bounced"] ) && data.victim.explosiveinfo["projectile_bounced"] == 1 )
             {
                 level.globalbankshots++;
                 processscoreevent( "bounce_hatchet_kill", attacker, victim, weapon );
             }
+
             break;
         case "knife_ballistic_mp":
             if ( meansofdeath == "MOD_PISTOL_BULLET" || meansofdeath == "MOD_HEAD_SHOT" )
-			{
                 processscoreevent( "ballistic_knife_kill", attacker, victim, data.sweapon );
-			}
+
             attacker addweaponstat( weapon, "ballistic_knife_kill", 1 );
             break;
-		case "inventory_supplydrop_mp":
         case "supplydrop_mp":
+        case "inventory_supplydrop_mp":
             if ( meansofdeath == "MOD_HIT_BY_OBJECT" || meansofdeath == "MOD_CRUSH" )
-			{
                 processscoreevent( "kill_enemy_with_care_package_crush", attacker, victim, weapon );
-			}
             else
-			{
                 processscoreevent( "kill_enemy_with_hacked_care_package", attacker, victim, weapon );
-			}
+
             break;
     }
-	if ( isDefined( data.victimweapon ) )
+
+    if ( isdefined( data.victimweapon ) )
     {
         if ( data.victimweapon == "minigun_mp" )
-		{
             processscoreevent( "killed_death_machine_enemy", attacker, victim, weapon );
-		}
+        else if ( data.victimweapon == "m32_mp" )
-		else
-		{
-			if ( data.victimweapon == "m32_mp" )
-			{
             processscoreevent( "killed_multiple_grenade_launcher_enemy", attacker, victim, weapon );
     }
-		}
+
-	}
     attacker thread updatemultikills( weapon, weaponclass, killstreak );
+
     if ( level.numkills == 1 )
     {
         victim recordkillmodifier( "firstblood" );
@@ -301,7 +286,7 @@ scoreeventplayerkill( data, time )
     }
     else
     {
-		if ( isDefined( attacker.lastkilledby ) )
+        if ( isdefined( attacker.lastkilledby ) )
         {
             if ( attacker.lastkilledby == victim )
             {
@@ -312,40 +297,40 @@ scoreeventplayerkill( data, time )
                 attacker.lastkilledby = undefined;
             }
         }
-		if ( victim maps/mp/killstreaks/_killstreaks::isonakillstreak() )
+
+        if ( victim maps\mp\killstreaks\_killstreaks::isonakillstreak() )
         {
             level.globalbuzzkills++;
             processscoreevent( "stop_enemy_killstreak", attacker, victim, weapon );
             victim recordkillmodifier( "buzzkill" );
         }
-		if ( isDefined( victim.lastmansd ) && victim.lastmansd == 1 )
+
+        if ( isdefined( victim.lastmansd ) && victim.lastmansd == 1 )
         {
             processscoreevent( "final_kill_elimination", attacker, victim, weapon );
-			if ( isDefined( attacker.lastmansd ) && attacker.lastmansd == 1 )
+
-			{
+            if ( isdefined( attacker.lastmansd ) && attacker.lastmansd == 1 )
                 processscoreevent( "elimination_and_last_player_alive", attacker, victim, weapon );
         }
     }
-	}
+
     if ( is_weapon_valid( meansofdeath, weapon, weaponclass ) )
     {
-		if ( isDefined( victim.vattackerorigin ) )
+        if ( isdefined( victim.vattackerorigin ) )
-		{
             attackerorigin = victim.vattackerorigin;
-		}
         else
-		{
             attackerorigin = attacker.origin;
-		}
+
         disttovictim = distancesquared( victim.origin, attackerorigin );
         weap_min_dmg_range = get_distance_for_weapon( weapon, weaponclass );
+
         if ( disttovictim > weap_min_dmg_range )
         {
-			attacker maps/mp/_challenges::longdistancekill();
+            attacker maps\mp\_challenges::longdistancekill();
+
             if ( weapon == "hatchet_mp" )
-			{
+                attacker maps\mp\_challenges::longdistancehatchetkill();
-				attacker maps/mp/_challenges::longdistancehatchetkill();
+
-			}
             processscoreevent( "longshot_kill", attacker, victim, weapon );
             attacker addweaponstat( weapon, "longshot_kill", 1 );
             attacker.pers["longshots"]++;
@@ -353,56 +338,54 @@ scoreeventplayerkill( data, time )
             victim recordkillmodifier( "longshot" );
         }
     }
+
     if ( isalive( attacker ) )
     {
-		if ( attacker.health < ( attacker.maxhealth * 0,35 ) )
+        if ( attacker.health < attacker.maxhealth * 0.35 )
         {
             attacker.lastkillwheninjured = time;
             processscoreevent( "kill_enemy_when_injured", attacker, victim, weapon );
             attacker addweaponstat( weapon, "kill_enemy_when_injured", 1 );
+
             if ( attacker hasperk( "specialty_bulletflinch" ) )
-			{
                 attacker addplayerstat( "perk_bulletflinch_kills", 1 );
         }
     }
-	}
+    else if ( isdefined( attacker.deathtime ) && attacker.deathtime + 800 < time && !attacker isinvehicle() )
-	else
-	{
-		if ( isDefined( attacker.deathtime ) && ( attacker.deathtime + 800 ) < time && !attacker isinvehicle() )
     {
         level.globalafterlifes++;
         processscoreevent( "kill_enemy_after_death", attacker, victim, weapon );
         victim recordkillmodifier( "posthumous" );
     }
-	}
+
     if ( attacker.cur_death_streak >= 3 )
     {
         level.globalcomebacks++;
         processscoreevent( "comeback_from_deathstreak", attacker, victim, weapon );
         victim recordkillmodifier( "comeback" );
     }
-	if ( isDefined( victim.beingmicrowavedby ) && weapon != "microwave_turret_mp" )
+
+    if ( isdefined( victim.beingmicrowavedby ) && weapon != "microwave_turret_mp" )
     {
         if ( victim.beingmicrowavedby != attacker && attacker isenemyplayer( victim.beingmicrowavedby ) == 0 )
         {
             scoregiven = processscoreevent( "microwave_turret_assist", victim.beingmicrowavedby, victim, weapon );
-			if ( isDefined( scoregiven ) && isDefined( victim.beingmicrowavedby ) )
+
-			{
+            if ( isdefined( scoregiven ) && isdefined( victim.beingmicrowavedby ) )
-				victim.beingmicrowavedby maps/mp/_challenges::earnedmicrowaveassistscore( scoregiven );
+                victim.beingmicrowavedby maps\mp\_challenges::earnedmicrowaveassistscore( scoregiven );
-			}
         }
         else
-		{
+            attacker maps\mp\_challenges::killwhiledamagingwithhpm();
-			attacker maps/mp/_challenges::killwhiledamagingwithhpm();
-		}
     }
+
     if ( meansofdeath == "MOD_MELEE" && weapon != "riotshield_mp" )
     {
         attacker.pers["stabs"]++;
         attacker.stabs = attacker.pers["stabs"];
         vangles = victim.anglesondeath[1];
         pangles = attacker.anglesonkill[1];
-		anglediff = angleClamp180( vangles - pangles );
+        anglediff = angleclamp180( vangles - pangles );
+
         if ( anglediff > -30 && anglediff < 70 )
         {
             level.globalbackstabs++;
@@ -414,7 +397,7 @@ scoreeventplayerkill( data, time )
     }
     else
     {
-		if ( isDefined( victim.firsttimedamaged ) && victim.firsttimedamaged == time )
+        if ( isdefined( victim.firsttimedamaged ) && victim.firsttimedamaged == time )
         {
             if ( weaponclass == "weapon_sniper" )
             {
@@ -422,47 +405,43 @@ scoreeventplayerkill( data, time )
                 attacker addweaponstat( weapon, "kill_enemy_one_bullet", 1 );
             }
         }
-		if ( isDefined( attacker.tookweaponfrom[ weapon ] ) && isDefined( attacker.tookweaponfrom[ weapon ].previousowner ) )
+
+        if ( isdefined( attacker.tookweaponfrom[weapon] ) && isdefined( attacker.tookweaponfrom[weapon].previousowner ) )
         {
             pickedupweapon = attacker.tookweaponfrom[weapon];
+
             if ( pickedupweapon.previousowner == victim )
             {
                 processscoreevent( "kill_enemy_with_their_weapon", attacker, victim, weapon );
                 attacker addweaponstat( weapon, "kill_enemy_with_their_weapon", 1 );
-				if ( isDefined( pickedupweapon.sweapon ) && isDefined( pickedupweapon.smeansofdeath ) )
+
+                if ( isdefined( pickedupweapon.sweapon ) && isdefined( pickedupweapon.smeansofdeath ) )
                 {
                     if ( pickedupweapon.sweapon == "knife_held_mp" && pickedupweapon.smeansofdeath == "MOD_MELEE" )
-					{
                         attacker addweaponstat( "knife_held_mp", "kill_enemy_with_their_weapon", 1 );
                 }
             }
         }
     }
-	}
+
     if ( wasdefusing )
-	{
         processscoreevent( "killed_bomb_defuser", attacker, victim, weapon );
-	}
+    else if ( wasplanting )
-	else
-	{
-		if ( wasplanting )
-		{
         processscoreevent( "killed_bomb_planter", attacker, victim, weapon );
-		}
+
-	}
     specificweaponkill( attacker, victim, weapon, killstreak );
-	if ( !isDefined( killstreak ) && isDefined( attacker.dtptime ) && ( attacker.dtptime + 5000 ) > time )
+
+    if ( !isdefined( killstreak ) && isdefined( attacker.dtptime ) && attacker.dtptime + 5000 > time )
     {
         attacker.dtptime = 0;
+
         if ( attacker getstance() == "prone" )
-		{
             processscoreevent( "kill_enemy_recent_dive_prone", attacker, self, weapon );
     }
-	}
+
-	if ( isDefined( killstreak ) )
+    if ( isdefined( killstreak ) )
-	{
         victim recordkillmodifier( "killstreak" );
-	}
+
     attacker.cur_death_streak = 0;
     attacker disabledeathstreak();
 }
@@ -470,22 +449,19 @@ scoreeventplayerkill( data, time )
 specificweaponkill( attacker, victim, weapon, killstreak )
 {
     switchweapon = weapon;
-	if ( isDefined( killstreak ) )
+
-	{
+    if ( isdefined( killstreak ) )
         switchweapon = killstreak;
-	}
+
     switch ( switchweapon )
     {
-		case "crossbow_mp":
         case "explosive_bolt_mp":
-			if ( isDefined( victim.explosiveinfo[ "stuckToPlayer" ] ) && victim.explosiveinfo[ "stuckToPlayer" ] == victim )
+        case "crossbow_mp":
-			{
+            if ( isdefined( victim.explosiveinfo["stuckToPlayer"] ) && victim.explosiveinfo["stuckToPlayer"] == victim )
                 event = "crossbow_kill";
-			}
             else
-			{
                 return;
-			}
+
             break;
         case "rcbomb_mp":
             event = "rcxd_kill";
@@ -502,12 +478,12 @@ specificweaponkill( attacker, victim, weapon, killstreak )
         case "planemortar_mp":
             event = "plane_mortar_kill";
             break;
-		case "inventory_minigun_mp":
         case "minigun_mp":
+        case "inventory_minigun_mp":
             event = "death_machine_kill";
             break;
-		case "inventory_m32_mp":
         case "m32_mp":
+        case "inventory_m32_mp":
             event = "multiple_grenade_launcher_kill";
             break;
         case "qrdrone_mp":
@@ -543,6 +519,7 @@ specificweaponkill( attacker, victim, weapon, killstreak )
         default:
             return;
     }
+
     processscoreevent( event, attacker, victim, weapon );
 }
 
@@ -551,52 +528,38 @@ multikill( killcount, weapon )
 /#
     assert( killcount > 1 );
 #/
-	self maps/mp/_challenges::multikill( killcount, weapon );
+    self maps\mp\_challenges::multikill( killcount, weapon );
+
     if ( killcount > 8 )
-	{
         processscoreevent( "multikill_more_than_8", self, undefined, weapon );
-	}
     else
-	{
         processscoreevent( "multikill_" + killcount, self, undefined, weapon );
-	}
+
     self recordmultikill( killcount );
 }
 
 uninterruptedobitfeedkills( attacker, sweapon )
 {
     self endon( "disconnect" );
-	wait 0,1;
+    wait 0.1;
     waittillslowprocessallowed();
-	wait 0,1;
+    wait 0.1;
-	maps/mp/_scoreevents::processscoreevent( "uninterrupted_obit_feed_kills", attacker, self, sweapon );
+    maps\mp\_scoreevents::processscoreevent( "uninterrupted_obit_feed_kills", attacker, self, sweapon );
 }
 
 is_weapon_valid( meansofdeath, weapon, weaponclass )
 {
     valid_weapon = 0;
+
     if ( get_distance_for_weapon( weapon, weaponclass ) == 0 )
-	{
         valid_weapon = 0;
-	}
     else if ( meansofdeath == "MOD_PISTOL_BULLET" || meansofdeath == "MOD_RIFLE_BULLET" )
-	{
         valid_weapon = 1;
-	}
+    else if ( meansofdeath == "MOD_HEAD_SHOT" )
-	else
-	{
-		if ( meansofdeath == "MOD_HEAD_SHOT" )
-		{
         valid_weapon = 1;
-		}
+    else if ( weapon == "hatchet_mp" && meansofdeath == "MOD_IMPACT" )
-		else
-		{
-			if ( weapon == "hatchet_mp" && meansofdeath == "MOD_IMPACT" )
-			{
         valid_weapon = 1;
-			}
+
-		}
-	}
     return valid_weapon;
 }
 
@@ -607,55 +570,50 @@ updatemultikills( weapon, weaponclass, killstreak )
     self notify( "updateRecentKills" );
     self endon( "updateRecentKills" );
     baseweaponname = getreffromitemindex( getbaseweaponitemindex( weapon ) ) + "_mp";
-	if ( !isDefined( self.recentkillcount ) )
+
-	{
+    if ( !isdefined( self.recentkillcount ) )
         self.recentkillcount = 0;
-	}
+
-	if ( !isDefined( self.recentkillcountweapon ) || self.recentkillcountweapon != baseweaponname )
+    if ( !isdefined( self.recentkillcountweapon ) || self.recentkillcountweapon != baseweaponname )
     {
         self.recentkillcountsameweapon = 0;
         self.recentkillcountweapon = baseweaponname;
     }
-	if ( !isDefined( killstreak ) )
+
+    if ( !isdefined( killstreak ) )
     {
         self.recentkillcountsameweapon++;
         self.recentkillcount++;
     }
-	if ( !isDefined( self.recent_lmg_smg_killcount ) )
+
-	{
+    if ( !isdefined( self.recent_lmg_smg_killcount ) )
         self.recent_lmg_smg_killcount = 0;
-	}
+
-	if ( !isDefined( self.recentremotemissilekillcount ) )
+    if ( !isdefined( self.recentremotemissilekillcount ) )
-	{
         self.recentremotemissilekillcount = 0;
-	}
+
-	if ( !isDefined( self.recentremotemissileattackerkillcount ) )
+    if ( !isdefined( self.recentremotemissileattackerkillcount ) )
-	{
         self.recentremotemissileattackerkillcount = 0;
-	}
+
-	if ( !isDefined( self.recentrcbombkillcount ) )
+    if ( !isdefined( self.recentrcbombkillcount ) )
-	{
         self.recentrcbombkillcount = 0;
-	}
+
-	if ( !isDefined( self.recentrcbombattackerkillcount ) )
+    if ( !isdefined( self.recentrcbombattackerkillcount ) )
-	{
         self.recentrcbombattackerkillcount = 0;
-	}
+
-	if ( !isDefined( self.recentmglkillcount ) )
+    if ( !isdefined( self.recentmglkillcount ) )
-	{
         self.recentmglkillcount = 0;
-	}
+
-	if ( isDefined( weaponclass ) )
+    if ( isdefined( weaponclass ) )
     {
         if ( weaponclass == "weapon_lmg" || weaponclass == "weapon_smg" )
         {
-			if ( self playerads() < 1 )
+            if ( self playerads() < 1.0 )
-			{
                 self.recent_lmg_smg_killcount++;
         }
     }
-	}
+
-	if ( isDefined( killstreak ) )
+    if ( isdefined( killstreak ) )
     {
         switch ( killstreak )
         {
@@ -665,41 +623,35 @@ updatemultikills( weapon, weaponclass, killstreak )
             case "rcbomb_mp":
                 self.recentrcbombkillcount++;
                 break;
-			case "inventory_m32_mp":
             case "m32_mp":
+            case "inventory_m32_mp":
                 self.recentmglkillcount++;
                 break;
         }
     }
+
     if ( self.recentkillcountsameweapon == 2 )
-	{
         self addweaponstat( weapon, "multikill_2", 1 );
-	}
     else if ( self.recentkillcountsameweapon == 3 )
-	{
         self addweaponstat( weapon, "multikill_3", 1 );
-	}
+
-	self waittilltimeoutordeath( 4 );
+    self waittilltimeoutordeath( 4.0 );
+
     if ( self.recent_lmg_smg_killcount >= 3 )
-	{
+        self maps\mp\_challenges::multi_lmg_smg_kill();
-		self maps/mp/_challenges::multi_lmg_smg_kill();
+
-	}
     if ( self.recentrcbombkillcount >= 2 )
-	{
+        self maps\mp\_challenges::multi_rcbomb_kill();
-		self maps/mp/_challenges::multi_rcbomb_kill();
+
-	}
     if ( self.recentmglkillcount >= 3 )
-	{
+        self maps\mp\_challenges::multi_mgl_kill();
-		self maps/mp/_challenges::multi_mgl_kill();
+
-	}
     if ( self.recentremotemissilekillcount >= 3 )
-	{
+        self maps\mp\_challenges::multi_remotemissile_kill();
-		self maps/mp/_challenges::multi_remotemissile_kill();
+
-	}
     if ( self.recentkillcount > 1 )
-	{
         self multikill( self.recentkillcount, weapon );
-	}
+
     self.recentkillcount = 0;
     self.recentkillcountsameweapon = 0;
     self.recentkillcountweapon = undefined;
@@ -713,7 +665,7 @@ updatemultikills( weapon, weaponclass, killstreak )
 waittilltimeoutordeath( timeout )
 {
     self endon( "death" );
-	wait timeout;
+    wait( timeout );
 }
 
 updateoneshotmultikills( victim, weapon, firsttimedamaged )
@@ -722,26 +674,25 @@ updateoneshotmultikills( victim, weapon, firsttimedamaged )
     self endon( "disconnect" );
     self notify( "updateoneshotmultikills" + firsttimedamaged );
     self endon( "updateoneshotmultikills" + firsttimedamaged );
-	if ( !isDefined( self.oneshotmultikills ) )
+
-	{
+    if ( !isdefined( self.oneshotmultikills ) )
         self.oneshotmultikills = 0;
-	}
+
     self.oneshotmultikills++;
-	wait 1;
+    wait 1.0;
+
     if ( self.oneshotmultikills > 1 )
-	{
         processscoreevent( "kill_enemies_one_bullet", self, victim, weapon );
-	}
     else
-	{
         processscoreevent( "kill_enemy_one_bullet", self, victim, weapon );
-	}
+
     self.oneshotmultikills = 0;
 }
 
 get_distance_for_weapon( weapon, weaponclass )
 {
     distance = 0;
+
     switch ( weaponclass )
     {
         case "weapon_smg":
@@ -764,31 +715,23 @@ get_distance_for_weapon( weapon, weaponclass )
             break;
         case "weapon_special":
             if ( weapon == "knife_ballistic_mp" )
-			{
                 distance = 2250000;
-			}
             else if ( weapon == "crossbow_mp" )
-			{
                 distance = 2250000;
-			}
+            else if ( weapon == "metalstorm_mp" )
-			else
-			{
-				if ( weapon == "metalstorm_mp" )
-				{
                 distance = 3062500;
-				}
+
-			}
             break;
         case "weapon_grenade":
             if ( weapon == "hatchet_mp" )
-			{
                 distance = 6250000;
-			}
+
             break;
         default:
             distance = 0;
             break;
     }
+
     return distance;
 }
 
@@ -797,7 +740,6 @@ decrementlastobituaryplayercountafterfade()
     level endon( "reset_obituary_count" );
     wait 5;
     level.lastobituaryplayercount--;
-
 /#
     assert( level.lastobituaryplayercount >= 0 );
 #/
@@ -807,7 +749,8 @@ ongameend( data )
 {
     player = data.player;
     winner = data.winner;
-	while ( isDefined( winner ) )
+
+    if ( isdefined( winner ) )
     {
         if ( level.teambased )
         {
@@ -816,23 +759,22 @@ ongameend( data )
                 processscoreevent( "won_match", player );
                 return;
             }
-			break;
         }
         else
         {
             placement = level.placement["all"];
             topthreeplayers = min( 3, placement.size );
-			index = 0;
+
-			while ( index < topthreeplayers )
+            for ( index = 0; index < topthreeplayers; index++ )
             {
                 if ( level.placement["all"][index] == player )
                 {
                     processscoreevent( "won_match", player );
                     return;
                 }
-				index++;
             }
         }
     }
+
     processscoreevent( "completed_match", player );
 }

Multiplayer Core/patch_mp/maps/mp/_scrambler.gsc

@@ -1,219 +1,193 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_damagefeedback;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/gametypes/_globallogic_player;
+#include maps\mp\_utility;
-#include maps/mp/_challenges;
+#include common_scripts\utility;
-#include maps/mp/killstreaks/_emp;
+#include maps\mp\gametypes\_weaponobjects;
-#include maps/mp/gametypes/_weaponobjects;
+#include maps\mp\killstreaks\_emp;
-#include common_scripts/utility;
+#include maps\mp\_challenges;
-#include maps/mp/_utility;
+#include maps\mp\gametypes\_globallogic_player;
+#include maps\mp\gametypes\_damagefeedback;
 
-init() //checked matches cerberus output
+init()
 {
     level._effect["scrambler_enemy_light"] = loadfx( "misc/fx_equip_light_red" );
     level._effect["scrambler_friendly_light"] = loadfx( "misc/fx_equip_light_green" );
     level.scramblerweapon = "scrambler_mp";
-	level.scramblerlength = 30;
+    level.scramblerlength = 30.0;
     level.scramblerouterradiussq = 1000000;
     level.scramblerinnerradiussq = 360000;
 }
 
-createscramblerwatcher() //checked matches cerberus output
+createscramblerwatcher()
 {
-	watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "scrambler", "scrambler_mp", self.team );
+    watcher = self maps\mp\gametypes\_weaponobjects::createuseweaponobjectwatcher( "scrambler", "scrambler_mp", self.team );
     watcher.onspawn = ::onspawnscrambler;
     watcher.detonate = ::scramblerdetonate;
-	watcher.stun = maps/mp/gametypes/_weaponobjects::weaponstun;
+    watcher.stun = maps\mp\gametypes\_weaponobjects::weaponstun;
     watcher.stuntime = 5;
     watcher.reconmodel = "t5_weapon_scrambler_world_detect";
     watcher.hackable = 1;
     watcher.ondamage = ::watchscramblerdamage;
 }
 
-onspawnscrambler( watcher, player ) //checked matches cerberus output
+onspawnscrambler( watcher, player )
 {
     player endon( "disconnect" );
     self endon( "death" );
-	self thread maps/mp/gametypes/_weaponobjects::onspawnuseweaponobject( watcher, player );
+    self thread maps\mp\gametypes\_weaponobjects::onspawnuseweaponobject( watcher, player );
     player.scrambler = self;
     self setowner( player );
     self setteam( player.team );
     self.owner = player;
     self setclientflag( 3 );
-	if ( !self maps/mp/_utility::ishacked() )
+
-	{
+    if ( !self maps\mp\_utility::ishacked() )
         player addweaponstat( "scrambler_mp", "used", 1 );
-	}
+
     self thread watchshutdown( player );
     level notify( "scrambler_spawn" );
 }
 
-scramblerdetonate( attacker, weaponname ) //checked matches cerberus output
+scramblerdetonate( attacker, weaponname )
 {
-	from_emp = maps/mp/killstreaks/_emp::isempweapon( weaponname );
+    from_emp = maps\mp\killstreaks\_emp::isempweapon( weaponname );
+
     if ( !from_emp )
-	{
         playfx( level._equipment_explode_fx, self.origin );
-	}
+
     if ( self.owner isenemyplayer( attacker ) )
-	{
+        attacker maps\mp\_challenges::destroyedequipment( weaponname );
-		attacker maps/mp/_challenges::destroyedequipment( weaponname );
+
-	}
     playsoundatposition( "dst_equipment_destroy", self.origin );
     self delete();
 }
 
-watchshutdown( player ) //checked matches cerberus output
+watchshutdown( player )
 {
     self waittill_any( "death", "hacked" );
     level notify( "scrambler_death" );
-	if ( isDefined( player ) )
+
-	{
+    if ( isdefined( player ) )
         player.scrambler = undefined;
 }
-}
 
-destroyent() //checked matches cerberus output
+destroyent()
 {
     self delete();
 }
 
-watchscramblerdamage( watcher ) //checked changed to match beta dump
+watchscramblerdamage( watcher )
 {
     self endon( "death" );
     self endon( "hacked" );
     self setcandamage( 1 );
     damagemax = 100;
-	if ( !self maps/mp/_utility::ishacked() )
+
-	{
+    if ( !self maps\mp\_utility::ishacked() )
         self.damagetaken = 0;
-	}
+
-	while ( 1 )
+    while ( true )
     {
         self.maxhealth = 100000;
         self.health = self.maxhealth;
+
         self waittill( "damage", damage, attacker, direction, point, type, tagname, modelname, partname, weaponname, idflags );
-		if ( !isDefined( attacker ) || !isplayer( attacker ) )
+
-		{
+        if ( !isdefined( attacker ) || !isplayer( attacker ) )
             continue;
-		}
+
         if ( level.teambased && attacker.team == self.owner.team && attacker != self.owner )
-		{
             continue;
-		}
+
-		if ( isDefined( weaponname ) )
+        if ( isdefined( weaponname ) )
         {
             switch ( weaponname )
             {
-				case "concussion_grenade_mp":
                 case "flash_grenade_mp":
+                case "concussion_grenade_mp":
                     if ( watcher.stuntime > 0 )
-					{
+                        self thread maps\mp\gametypes\_weaponobjects::stunstart( watcher, watcher.stuntime );
-						self thread maps/mp/gametypes/_weaponobjects::stunstart( watcher, watcher.stuntime );
+
-					}
                     if ( level.teambased && self.owner.team != attacker.team )
                     {
-						if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-						{
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-							attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
-						}
                     }
                     else if ( !level.teambased && self.owner != attacker )
                     {
-						if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-						{
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-							attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
-						}
                     }
+
                     continue;
                 case "emp_grenade_mp":
                     damage = damagemax;
                 default:
-					if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                    if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-					{
+                        attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-						attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
+
-					}
                     break;
             }
         }
         else
-		{
             weaponname = "";
-		}
+
-		if ( isplayer( attacker ) && level.teambased && isDefined( attacker.team ) && self.owner.team == attacker.team && attacker != self.owner )
+        if ( isplayer( attacker ) && level.teambased && isdefined( attacker.team ) && self.owner.team == attacker.team && attacker != self.owner )
-		{
             continue;
-		}
+
         if ( type == "MOD_MELEE" )
-		{
             self.damagetaken = damagemax;
-		}
         else
-		{
             self.damagetaken += damage;
-		}
+
         if ( self.damagetaken >= damagemax )
-		{
+            watcher thread maps\mp\gametypes\_weaponobjects::waitanddetonate( self, 0.0, attacker, weaponname );
-			watcher thread maps/mp/gametypes/_weaponobjects::waitanddetonate( self, 0, attacker, weaponname );
-		}
     }
 }
 
-ownersameteam( owner1, owner2 ) //checked matches cerberus output
+ownersameteam( owner1, owner2 )
 {
     if ( !level.teambased )
-	{
         return 0;
-	}
+
-	if ( !isDefined( owner1 ) || !isDefined( owner2 ) )
+    if ( !isdefined( owner1 ) || !isdefined( owner2 ) )
-	{
         return 0;
-	}
+
-	if ( !isDefined( owner1.team ) || !isDefined( owner2.team ) )
+    if ( !isdefined( owner1.team ) || !isdefined( owner2.team ) )
-	{
         return 0;
-	}
+
     return owner1.team == owner2.team;
 }
 
-checkscramblerstun() //checked partially changed to match cerberus output see info.md
+checkscramblerstun()
 {
     scramblers = getentarray( "grenade", "classname" );
-	if ( isDefined( self.name ) && self.name == "scrambler_mp" )
+
-	{
+    if ( isdefined( self.name ) && self.name == "scrambler_mp" )
-		return 0;
+        return false;
-	}
+
-	i = 0;
+    for ( i = 0; i < scramblers.size; i++ )
-	while ( i < scramblers.size )
     {
         scrambler = scramblers[i];
+
         if ( !isalive( scrambler ) )
-		{
-			i++;
             continue;
-		}
+
-		if ( !isDefined( scrambler.name ) )
+        if ( !isdefined( scrambler.name ) )
-		{
-			i++;
             continue;
-		}
+
         if ( scrambler.name != "scrambler_mp" )
-		{
-			i++;
             continue;
-		}
+
         if ( ownersameteam( self.owner, scrambler.owner ) )
-		{
-			i++;
             continue;
-		}
+
         flattenedselforigin = ( self.origin[0], self.origin[1], 0 );
         flattenedscramblerorigin = ( scrambler.origin[0], scrambler.origin[1], 0 );
+
         if ( distancesquared( flattenedselforigin, flattenedscramblerorigin ) < level.scramblerouterradiussq )
-		{
+            return true;
-			return 1;
-		}
-		i++;
-	}
-	return 0;
     }
 
+    return false;
+}

Multiplayer Core/patch_mp/maps/mp/_script_gen.gsc

@@ -1,18 +1,20 @@
-#include maps/mp/_script_gen;
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\_script_gen;
 
 script_gen_dump_checksaved()
 {
     signatures = getarraykeys( level.script_gen_dump );
-	i = 0;
+
-	while ( i < signatures.size )
+    for ( i = 0; i < signatures.size; i++ )
     {
-		if ( !isDefined( level.script_gen_dump2[ signatures[ i ] ] ) )
+        if ( !isdefined( level.script_gen_dump2[signatures[i]] ) )
         {
+            level.script_gen_dump[signatures[i]] = undefined;
             level.script_gen_dump_reasons[level.script_gen_dump_reasons.size] = "Signature unmatched( removed feature ): " + signatures[i];
         }
-		i++;
     }
 }
 
@@ -20,12 +22,15 @@ script_gen_dump()
 {
 /#
     script_gen_dump_checksaved();
+
     if ( !level.script_gen_dump_reasons.size )
     {
         flag_set( "scriptgen_done" );
         return;
     }
+
     firstrun = 0;
+
     if ( level.bscriptgened )
     {
         println( " " );
@@ -34,58 +39,54 @@ script_gen_dump()
         println( "^2 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- " );
         println( "^3Dumping scriptgen dump for these reasons" );
         println( "^2 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- " );
-		i = 0;
+
-		while ( i < level.script_gen_dump_reasons.size )
+        for ( i = 0; i < level.script_gen_dump_reasons.size; i++ )
         {
             if ( issubstr( level.script_gen_dump_reasons[i], "nowrite" ) )
             {
                 substr = getsubstr( level.script_gen_dump_reasons[i], 15 );
-				println( ( i + ". ) " ) + substr );
+                println( i + ". ) " + substr );
             }
             else
-			{
+                println( i + ". ) " + level.script_gen_dump_reasons[i] );
-				println( ( i + ". ) " ) + level.script_gen_dump_reasons[ i ] );
+
-			}
             if ( level.script_gen_dump_reasons[i] == "First run" )
-			{
                 firstrun = 1;
         }
-			i++;
+
-		}
         println( "^2 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- " );
         println( " " );
+
         if ( firstrun )
         {
-			println( "for First Run make sure you delete all of the vehicle precache script calls, createart calls, createfx calls( most commonly placed in maps\\" + level.script + "_fx.gsc ) " );
+            println( "for First Run make sure you delete all of the vehicle precache script calls, createart calls, createfx calls( most commonly placed in maps\" + level.script + "_fx.gsc ) " );
             println( " " );
             println( "replace:" );
-			println( "maps\\_load::main( 1 );" );
+            println( "maps\_load::main( 1 );" );
             println( " " );
             println( "with( don't forget to add this file to P4 ):" );
-			println( "maps\\scriptgen\\" + level.script + "_scriptgen::main();" );
+            println( "maps\scriptgen\" + level.script + "_scriptgen::main();" );
             println( " " );
         }
+
         println( "^2 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- " );
         println( " " );
-		println( "^2 / \\ / \\ / \\" );
+        println( "^2 / \ / \ / \" );
         println( "^2scroll up" );
-		println( "^2 / \\ / \\ / \\" );
+        println( "^2 / \ / \ / \" );
         println( " " );
     }
     else
-	{
         return;
-	}
+
     filename = "scriptgen/" + level.script + "_scriptgen.gsc";
     csvfilename = "zone_source/" + level.script + ".csv";
+
     if ( level.bscriptgened )
-	{
         file = openfile( filename, "write" );
-	}
     else
-	{
         file = 0;
-	}
+
     assert( file != -1, "File not writeable( check it and and restart the map ): " + filename );
     script_gen_dumpprintln( file, "// script generated script do not write your own script here it will go away if you do." );
     script_gen_dumpprintln( file, "main()" );
@@ -94,109 +95,86 @@ script_gen_dump()
     script_gen_dumpprintln( file, "\tlevel.script_gen_dump = [];" );
     script_gen_dumpprintln( file, "" );
     signatures = getarraykeys( level.script_gen_dump );
-	i = 0;
+
-	while ( i < signatures.size )
+    for ( i = 0; i < signatures.size; i++ )
     {
         if ( !issubstr( level.script_gen_dump[signatures[i]], "nowrite" ) )
-		{
             script_gen_dumpprintln( file, "\t" + level.script_gen_dump[signatures[i]] );
     }
-		i++;
+
-	}
+    for ( i = 0; i < signatures.size; i++ )
-	i = 0;
-	while ( i < signatures.size )
     {
         if ( !issubstr( level.script_gen_dump[signatures[i]], "nowrite" ) )
         {
-			script_gen_dumpprintln( file, "\tlevel.script_gen_dump[ " + """ + signatures[ i ] + """ + " ] = " + """ + signatures[ i ] + """ + ";" );
+            script_gen_dumpprintln( file, "\tlevel.script_gen_dump[ " + "\"" + signatures[i] + "\"" + " ] = " + "\"" + signatures[i] + "\"" + ";" );
-			i++;
             continue;
         }
-		else
+
-		{
+        script_gen_dumpprintln( file, "\tlevel.script_gen_dump[ " + "\"" + signatures[i] + "\"" + " ] = " + "\"nowrite\"" + ";" );
-			script_gen_dumpprintln( file, "\tlevel.script_gen_dump[ " + """ + signatures[ i ] + """ + " ] = " + ""nowrite"" + ";" );
-		}
-		i++;
     }
+
     script_gen_dumpprintln( file, "" );
     keys1 = undefined;
     keys2 = undefined;
-	if ( isDefined( level.sg_precacheanims ) )
+
-	{
+    if ( isdefined( level.sg_precacheanims ) )
         keys1 = getarraykeys( level.sg_precacheanims );
-	}
+
-	while ( isDefined( keys1 ) )
+    if ( isdefined( keys1 ) )
-	{
-		i = 0;
-		while ( i < keys1.size )
     {
+        for ( i = 0; i < keys1.size; i++ )
             script_gen_dumpprintln( file, "\tanim_precach_" + keys1[i] + "();" );
-			i++;
     }
-	}
+
-	script_gen_dumpprintln( file, "\tmaps\\_load::main( 1, " + level.bcsvgened + ", 1 );" );
+    script_gen_dumpprintln( file, "\tmaps\_load::main( 1, " + level.bcsvgened + ", 1 );" );
     script_gen_dumpprintln( file, "}" );
     script_gen_dumpprintln( file, "" );
-	if ( isDefined( level.sg_precacheanims ) )
+
-	{
+    if ( isdefined( level.sg_precacheanims ) )
         keys1 = getarraykeys( level.sg_precacheanims );
-	}
+
-	while ( isDefined( keys1 ) )
+    if ( isdefined( keys1 ) )
     {
-		i = 0;
+        for ( i = 0; i < keys1.size; i++ )
-		while ( i < keys1.size )
         {
-			script_gen_dumpprintln( file, "#using_animtree( "" + keys1[ i ] + "" );" );
+            script_gen_dumpprintln( file, "#using_animtree( \"" + keys1[i] + "\" );" );
             script_gen_dumpprintln( file, "anim_precach_" + keys1[i] + "()" );
             script_gen_dumpprintln( file, "{" );
-			script_gen_dumpprintln( file, "\tlevel.sg_animtree[ "" + keys1[ i ] + "" ] = #animtree;" );
+            script_gen_dumpprintln( file, "\tlevel.sg_animtree[ \"" + keys1[i] + "\" ] = #animtree;" );
             keys2 = getarraykeys( level.sg_precacheanims[keys1[i]] );
-			while ( isDefined( keys2 ) )
+
+            if ( isdefined( keys2 ) )
             {
-				j = 0;
+                for ( j = 0; j < keys2.size; j++ )
-				while ( j < keys2.size )
+                    script_gen_dumpprintln( file, "\tlevel.sg_anim[ \"" + keys2[j] + "\" ] = %" + keys2[j] + ";" );
-				{
-					script_gen_dumpprintln( file, "\tlevel.sg_anim[ "" + keys2[ j ] + "" ] = %" + keys2[ j ] + ";" );
-					j++;
-				}
             }
+
             script_gen_dumpprintln( file, "}" );
             script_gen_dumpprintln( file, "" );
-			i++;
         }
     }
+
     if ( level.bscriptgened )
-	{
         saved = closefile( file );
-	}
     else
-	{
         saved = 1;
-	}
+
     if ( level.bcsvgened )
-	{
         csvfile = openfile( csvfilename, "write" );
-	}
     else
-	{
         csvfile = 0;
-	}
+
     assert( csvfile != -1, "File not writeable( check it and and restart the map ): " + csvfilename );
     signatures = getarraykeys( level.script_gen_dump );
-	i = 0;
+
-	while ( i < signatures.size )
+    for ( i = 0; i < signatures.size; i++ )
-	{
         script_gen_csvdumpprintln( csvfile, signatures[i] );
-		i++;
+
-	}
     if ( level.bcsvgened )
-	{
         csvfilesaved = closefile( csvfile );
-	}
     else
-	{
         csvfilesaved = 1;
-	}
+
     assert( csvfilesaved == 1, "csv not saved( see above message? ): " + csvfilename );
     assert( saved == 1, "map not saved( see above message? ): " + filename );
 #/
@@ -209,6 +187,7 @@ script_gen_dump()
         assertmsg( "SCRIPTGEN updated: Rebuild fast file and run map again" );
 #/
     }
+
     flag_set( "scriptgen_done" );
 }
 
@@ -218,34 +197,21 @@ script_gen_csvdumpprintln( file, signature )
     writtenprefix = undefined;
     path = "";
     extension = "";
+
     if ( issubstr( signature, "ignore" ) )
-	{
         prefix = "ignore";
-	}
     else if ( issubstr( signature, "col_map_sp" ) )
-	{
         prefix = "col_map_sp";
-	}
     else if ( issubstr( signature, "gfx_map" ) )
-	{
         prefix = "gfx_map";
-	}
     else if ( issubstr( signature, "rawfile" ) )
-	{
         prefix = "rawfile";
-	}
     else if ( issubstr( signature, "sound" ) )
-	{
         prefix = "sound";
-	}
     else if ( issubstr( signature, "xmodel" ) )
-	{
         prefix = "xmodel";
-	}
     else if ( issubstr( signature, "xanim" ) )
-	{
         prefix = "xanim";
-	}
     else if ( issubstr( signature, "item" ) )
     {
         prefix = "item";
@@ -253,9 +219,7 @@ script_gen_csvdumpprintln( file, signature )
         path = "sp/";
     }
     else if ( issubstr( signature, "fx" ) )
-	{
         prefix = "fx";
-	}
     else if ( issubstr( signature, "menu" ) )
     {
         prefix = "menu";
@@ -294,49 +258,34 @@ script_gen_csvdumpprintln( file, signature )
         writtenprefix = "weapon";
         path = "sp/";
     }
-	else
+    else if ( issubstr( signature, "vehicle" ) )
-	{
-		if ( issubstr( signature, "vehicle" ) )
     {
         prefix = "vehicle";
         writtenprefix = "rawfile";
         path = "vehicles/";
     }
-	}
+
-	if ( !isDefined( prefix ) )
+    if ( !isdefined( prefix ) )
-	{
         return;
-	}
+
-	if ( !isDefined( writtenprefix ) )
+    if ( !isdefined( writtenprefix ) )
-	{
+        string = prefix + ", " + getsubstr( signature, prefix.size + 1, signature.size );
-		string = ( prefix + ", " ) + getsubstr( signature, prefix.size + 1, signature.size );
-	}
     else
-	{
+        string = writtenprefix + ", " + path + getsubstr( signature, prefix.size + 1, signature.size ) + extension;
-		string = ( writtenprefix + ", " ) + path + getsubstr( signature, prefix.size + 1, signature.size ) + extension;
-	}
 /#
     if ( file == -1 || !level.bcsvgened )
-	{
         println( string );
-	}
     else
-	{
         fprintln( file, string );
 #/
 }
-}
 
 script_gen_dumpprintln( file, string )
 {
 /#
     if ( file == -1 || !level.bscriptgened )
-	{
         println( string );
-	}
     else
-	{
         fprintln( file, string );
 #/
 }
-}

Multiplayer Core/patch_mp/maps/mp/_sensor_grenade.gsc

@@ -1,74 +1,79 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_damagefeedback;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/gametypes/_globallogic_player;
+#include common_scripts\utility;
-#include maps/mp/_utility;
+#include maps\mp\gametypes\_weaponobjects;
-#include maps/mp/_scoreevents;
+#include maps\mp\_hacker_tool;
-#include maps/mp/_challenges;
+#include maps\mp\killstreaks\_emp;
-#include maps/mp/killstreaks/_emp;
+#include maps\mp\_challenges;
-#include maps/mp/_hacker_tool;
+#include maps\mp\_scoreevents;
-#include maps/mp/gametypes/_weaponobjects;
+#include maps\mp\_utility;
-#include common_scripts/utility;
+#include maps\mp\gametypes\_globallogic_player;
+#include maps\mp\gametypes\_damagefeedback;
 
-init() //checked matches cerberus output
+init()
 {
     level.isplayertrackedfunc = ::isplayertracked;
 }
 
-createsensorgrenadewatcher() //checked matches cerberus output
+createsensorgrenadewatcher()
 {
-	watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "sensor_grenade", "sensor_grenade_mp", self.team );
+    watcher = self maps\mp\gametypes\_weaponobjects::createuseweaponobjectwatcher( "sensor_grenade", "sensor_grenade_mp", self.team );
     watcher.headicon = 0;
     watcher.onspawn = ::onspawnsensorgrenade;
     watcher.detonate = ::sensorgrenadedestroyed;
-	watcher.stun = maps/mp/gametypes/_weaponobjects::weaponstun;
+    watcher.stun = maps\mp\gametypes\_weaponobjects::weaponstun;
     watcher.stuntime = 0;
     watcher.reconmodel = "t6_wpn_motion_sensor_world_detect";
     watcher.ondamage = ::watchsensorgrenadedamage;
     watcher.enemydestroy = 1;
 }
 
-onspawnsensorgrenade( watcher, player ) //checked matches cerberus output
+onspawnsensorgrenade( watcher, player )
 {
     self endon( "death" );
-	self thread maps/mp/gametypes/_weaponobjects::onspawnuseweaponobject( watcher, player );
+    self thread maps\mp\gametypes\_weaponobjects::onspawnuseweaponobject( watcher, player );
     self setowner( player );
     self setteam( player.team );
     self.owner = player;
     self playloopsound( "fly_sensor_nade_lp" );
-	self maps/mp/_hacker_tool::registerwithhackertool( level.equipmenthackertoolradius, level.equipmenthackertooltimems );
+    self maps\mp\_hacker_tool::registerwithhackertool( level.equipmenthackertoolradius, level.equipmenthackertooltimems );
     player addweaponstat( "sensor_grenade_mp", "used", 1 );
     self thread watchforstationary( player );
     self thread watchforexplode( player );
 }
 
-watchforstationary( owner ) //checked matches cerberus output
+watchforstationary( owner )
 {
     self endon( "death" );
     self endon( "hacked" );
     self endon( "explode" );
     owner endon( "death" );
     owner endon( "disconnect" );
+
     self waittill( "stationary" );
+
     checkfortracking( self.origin );
 }
 
-watchforexplode( owner ) //checked matches cerberus output
+watchforexplode( owner )
 {
     self endon( "hacked" );
     self endon( "delete" );
     owner endon( "death" );
     owner endon( "disconnect" );
+
     self waittill( "explode", origin );
+
     checkfortracking( origin + ( 0, 0, 1 ) );
 }
 
-checkfortracking( origin ) //checked changed to match cerberus output
+checkfortracking( origin )
-{
-	if ( isDefined( self.owner ) == 0 )
 {
+    if ( isdefined( self.owner ) == 0 )
         return;
-	}
+
     players = level.players;
+
     foreach ( player in level.players )
     {
         if ( player isenemyplayer( self.owner ) )
@@ -77,142 +82,126 @@ checkfortracking( origin ) //checked changed to match cerberus output
             {
                 if ( distancesquared( player.origin, origin ) < 562500 )
                 {
-					trace = bullettrace( origin, player.origin + vectorScale( ( 0, 0, 1 ), 12 ), 0, player );
+                    trace = bullettrace( origin, player.origin + vectorscale( ( 0, 0, 1 ), 12.0 ), 0, player );
+
                     if ( trace["fraction"] == 1 )
-					{
                         self.owner tracksensorgrenadevictim( player );
                 }
             }
         }
     }
 }
-}
 
-tracksensorgrenadevictim( victim ) //checked matches cerberus output
+tracksensorgrenadevictim( victim )
-{
-	if ( !isDefined( self.sensorgrenadedata ) )
 {
+    if ( !isdefined( self.sensorgrenadedata ) )
         self.sensorgrenadedata = [];
-	}
+
-	if ( !isDefined( self.sensorgrenadedata[ victim.clientid ] ) )
+    if ( !isdefined( self.sensorgrenadedata[victim.clientid] ) )
-	{
+        self.sensorgrenadedata[victim.clientid] = gettime();
-		self.sensorgrenadedata[ victim.clientid ] = getTime();
-	}
 }
 
-isplayertracked( player, time ) //checked matches cerberus output
+isplayertracked( player, time )
 {
     playertracked = 0;
-	if ( isDefined( self.sensorgrenadedata ) && isDefined( self.sensorgrenadedata[ player.clientid ] ) )
+
-	{
+    if ( isdefined( self.sensorgrenadedata ) && isdefined( self.sensorgrenadedata[player.clientid] ) )
-		if ( ( self.sensorgrenadedata[ player.clientid ] + 10000 ) > time )
     {
+        if ( self.sensorgrenadedata[player.clientid] + 10000 > time )
             playertracked = 1;
     }
-	}
+
     return playertracked;
 }
 
-sensorgrenadedestroyed( attacker, weaponname ) //checked matches cerberus output
+sensorgrenadedestroyed( attacker, weaponname )
 {
-	from_emp = maps/mp/killstreaks/_emp::isempweapon( weaponname );
+    from_emp = maps\mp\killstreaks\_emp::isempweapon( weaponname );
+
     if ( !from_emp )
-	{
         playfx( level._equipment_explode_fx, self.origin );
-	}
+
-	if ( isDefined( attacker ) )
+    if ( isdefined( attacker ) )
     {
         if ( self.owner isenemyplayer( attacker ) )
         {
-			attacker maps/mp/_challenges::destroyedequipment( weaponname );
+            attacker maps\mp\_challenges::destroyedequipment( weaponname );
-			maps/mp/_scoreevents::processscoreevent( "destroyed_motion_sensor", attacker, self.owner, weaponname );
+            maps\mp\_scoreevents::processscoreevent( "destroyed_motion_sensor", attacker, self.owner, weaponname );
         }
     }
+
     playsoundatposition( "dst_equipment_destroy", self.origin );
     self delete();
 }
 
-watchsensorgrenadedamage( watcher ) //checked changed to match beta dump
+watchsensorgrenadedamage( watcher )
 {
     self endon( "death" );
     self endon( "hacked" );
     self setcandamage( 1 );
     damagemax = 1;
-	if ( !self maps/mp/_utility::ishacked() )
+
-	{
+    if ( !self maps\mp\_utility::ishacked() )
         self.damagetaken = 0;
-	}
+
-	while ( 1 )
+    while ( true )
     {
         self.maxhealth = 100000;
         self.health = self.maxhealth;
+
         self waittill( "damage", damage, attacker, direction, point, type, tagname, modelname, partname, weaponname, idflags );
-		if ( !isDefined( attacker ) || !isplayer( attacker ) )
+
-		{
+        if ( !isdefined( attacker ) || !isplayer( attacker ) )
             continue;
-		}
+
         if ( level.teambased && isplayer( attacker ) )
         {
             if ( !level.hardcoremode && self.owner.team == attacker.pers["team"] && self.owner != attacker )
-			{
                 continue;
         }
-		}
+
-		if ( isDefined( weaponname ) )
+        if ( isdefined( weaponname ) )
         {
             switch ( weaponname )
             {
-				case "concussion_grenade_mp":
                 case "flash_grenade_mp":
+                case "concussion_grenade_mp":
                     if ( watcher.stuntime > 0 )
-					{
+                        self thread maps\mp\gametypes\_weaponobjects::stunstart( watcher, watcher.stuntime );
-						self thread maps/mp/gametypes/_weaponobjects::stunstart( watcher, watcher.stuntime );
+
-					}
                     if ( level.teambased && self.owner.team != attacker.team )
                     {
-						if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
+                    }
+                    else if ( !level.teambased && self.owner != attacker )
                     {
-							attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-						}
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-					}
-					else
-					{
-						if ( !level.teambased && self.owner != attacker )
-						{
-							if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-							{
-								attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
-							}
-						}
                     }
+
                     continue;
                 case "emp_grenade_mp":
                     damage = damagemax;
                 default:
-					if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                    if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-					{
+                        attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-						attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
+
-					}
                     break;
             }
         }
         else
-		{
             weaponname = "";
-		}
+
         if ( type == "MOD_MELEE" )
-		{
             self.damagetaken = damagemax;
-		}
         else
-		{
             self.damagetaken += damage;
-		}
+
         if ( self.damagetaken >= damagemax )
         {
-			watcher thread maps/mp/gametypes/_weaponobjects::waitanddetonate( self, 0, attacker, weaponname );
+            watcher thread maps\mp\gametypes\_weaponobjects::waitanddetonate( self, 0.0, attacker, weaponname );
             return;
         }
     }
 }
-

Multiplayer Core/patch_mp/maps/mp/_smokegrenade.gsc

@@ -1,10 +1,11 @@
-//includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/killstreaks/_dogs;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/killstreaks/_airsupport;
+#include maps\mp\_utility;
-#include common_scripts/utility;
+#include common_scripts\utility;
-#include maps/mp/_utility;
+#include maps\mp\killstreaks\_airsupport;
+#include maps\mp\killstreaks\_dogs;
 
-init() //checked matches cerberus output
+init()
 {
     level.willypetedamageradius = 300;
     level.willypetedamageheight = 128;
@@ -16,42 +17,46 @@ init() //checked matches cerberus output
     precacheitem( level.fx_smokegrenade_single );
 }
 
-watchsmokegrenadedetonation( owner ) //checked matches cerberus output
+watchsmokegrenadedetonation( owner )
 {
     owner addweaponstat( "willy_pete_mp", "used", 1 );
+
     self waittill( "explode", position, surface );
-	if ( !isDefined( level.water_duds ) || level.water_duds == 1 )
+
-	{
+    if ( !isdefined( level.water_duds ) || level.water_duds == 1 )
-		if ( isDefined( surface ) && surface == "water" )
     {
+        if ( isdefined( surface ) && surface == "water" )
             return;
     }
-	}
+
-	onefoot = vectorScale( ( 0, 0, 1 ), 12 );
+    onefoot = vectorscale( ( 0, 0, 1 ), 12.0 );
     startpos = position + onefoot;
     ent = spawntimedfx( level.fx_smokegrenade_single, position, ( 0, 0, 1 ), 12 );
     ent thread blocksight();
-	if ( isDefined( owner ) )
+
+    if ( isdefined( owner ) )
     {
-		owner.smokegrenadetime = getTime();
+        owner.smokegrenadetime = gettime();
         owner.smokegrenadeposition = position;
     }
+
     thread playsmokesound( position, level.smokesoundduration, level.sound_smoke_start, level.sound_smoke_stop, level.sound_smoke_loop );
     damageeffectarea( owner, startpos, level.willypetedamageradius, level.willypetedamageheight, undefined );
 }
 
-damageeffectarea( owner, position, radius, height, killcament ) //checked matches cerberus output
+damageeffectarea( owner, position, radius, height, killcament )
 {
     effectarea = spawn( "trigger_radius", position, 0, radius, height );
-	owner thread maps/mp/killstreaks/_dogs::flash_dogs( effectarea );
+    owner thread maps\mp\killstreaks\_dogs::flash_dogs( effectarea );
     effectarea delete();
 }
 
-blocksight() //checked matches cerberus output
+blocksight()
 {
     self endon( "death" );
     radius = 64;
     fxblocksight( self, radius );
+
     for (;;)
     {
         wait 0.75;

Multiplayer Core/patch_mp/maps/mp/_sticky_grenade.gsc

@@ -1,13 +1,15 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include maps\mp\_utility;
+#include common_scripts\utility;
 
-init() //checked matches cerberus output
+init()
 {
     loadfx( "weapon/crossbow/fx_trail_crossbow_blink_grn_os" );
     loadfx( "weapon/crossbow/fx_trail_crossbow_blink_red_os" );
 }
 
-watch_bolt_detonation( owner ) //checked matches cerberus output
+watch_bolt_detonation( owner )
 {
+
 }

Multiplayer Core/patch_mp/maps/mp/_tabun.gsc

@@ -1,8 +1,10 @@
-#include maps/mp/gametypes/_battlechatter_mp;
+// T6 GSC SOURCE
-#include maps/mp/killstreaks/_dogs;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/killstreaks/_airsupport;
+#include maps\mp\_utility;
-#include common_scripts/utility;
+#include common_scripts\utility;
-#include maps/mp/_utility;
+#include maps\mp\killstreaks\_airsupport;
+#include maps\mp\killstreaks\_dogs;
+#include maps\mp\gametypes\_battlechatter_mp;
 
 init()
 {
@@ -43,7 +45,7 @@ init()
 
 checkdvarupdates()
 {
-	while ( 1 )
+    while ( true )
     {
         level.tabungaspoisonradius = weapons_get_dvar_int( "scr_tabun_effect_radius", level.tabungaspoisonradius );
         level.tabungaspoisonheight = weapons_get_dvar_int( "scr_tabun_shock_height", level.tabungaspoisonheight );
@@ -59,106 +61,89 @@ checkdvarupdates()
         level.fx_tabun_radius1 = weapons_get_dvar_int( "scr_fx_tabun_radius1", level.fx_tabun_radius1 );
         level.fx_tabun_radius2 = weapons_get_dvar_int( "scr_fx_tabun_radius2", level.fx_tabun_radius2 );
         level.fx_tabun_radius3 = weapons_get_dvar_int( "scr_fx_tabun_radius3", level.fx_tabun_radius3 );
-		wait 1;
+        wait 1.0;
     }
 }
 
 watchtabungrenadedetonation( owner )
 {
     self waittill( "explode", position, surface );
-	if ( !isDefined( level.water_duds ) || level.water_duds == 1 )
+
-	{
+    if ( !isdefined( level.water_duds ) || level.water_duds == 1 )
-		if ( isDefined( surface ) && surface == "water" )
     {
+        if ( isdefined( surface ) && surface == "water" )
             return;
     }
-	}
+
     if ( weapons_get_dvar_int( "scr_enable_new_tabun", 1 ) )
-	{
         generatelocations( position, owner );
-	}
     else
-	{
         singlelocation( position, owner );
 }
-}
 
 damageeffectarea( owner, position, radius, height, killcament )
 {
     shockeffectarea = spawn( "trigger_radius", position, 0, radius, height );
     gaseffectarea = spawn( "trigger_radius", position, 0, radius, height );
 /#
-	if ( getDvarInt( "scr_draw_triggers" ) )
+    if ( getdvarint( "scr_draw_triggers" ) )
-	{
         level thread drawcylinder( position, radius, height, undefined, "tabun_draw_cylinder_stop" );
 #/
-	}
+    owner thread maps\mp\killstreaks\_dogs::flash_dogs( shockeffectarea );
-	owner thread maps/mp/killstreaks/_dogs::flash_dogs( shockeffectarea );
+    owner thread maps\mp\killstreaks\_dogs::flash_dogs( gaseffectarea );
-	owner thread maps/mp/killstreaks/_dogs::flash_dogs( gaseffectarea );
+    loopwaittime = 0.5;
-	loopwaittime = 0,5;
+
-	durationoftabun = level.tabungasduration;
+    for ( durationoftabun = level.tabungasduration; durationoftabun > 0; durationoftabun -= loopwaittime )
-	while ( durationoftabun > 0 )
     {
         players = get_players();
-		i = 0;
+
-		while ( i < players.size )
+        for ( i = 0; i < players.size; i++ )
         {
             if ( level.friendlyfire == 0 )
             {
                 if ( players[i] != owner )
                 {
-					if ( !isDefined( owner ) || !isDefined( owner.team ) )
+                    if ( !isdefined( owner ) || !isdefined( owner.team ) )
-					{
-						i++;
                         continue;
-					}
+
-					else
-					{
                     if ( level.teambased && players[i].team == owner.team )
-						{
-							i++;
                         continue;
                 }
             }
-				}
+
-				else
+            if ( !isdefined( players[i].inpoisonarea ) || players[i].inpoisonarea == 0 )
-				{
-					if ( !isDefined( players[ i ].inpoisonarea ) || players[ i ].inpoisonarea == 0 )
             {
                 if ( players[i] istouching( gaseffectarea ) && players[i].sessionstate == "playing" )
                 {
                     if ( !players[i] hasperk( "specialty_proximityprotection" ) )
                     {
-								trace = bullettrace( position, players[ i ].origin + vectorScale( ( 0, 0, 0 ), 12 ), 0, players[ i ] );
+                        trace = bullettrace( position, players[i].origin + vectorscale( ( 0, 0, 1 ), 12.0 ), 0, players[i] );
+
                         if ( trace["fraction"] == 1 )
                         {
                             players[i].lastpoisonedby = owner;
                             players[i] thread damageinpoisonarea( shockeffectarea, killcament, trace, position );
                         }
                     }
-							players[ i ] thread maps/mp/gametypes/_battlechatter_mp::incomingspecialgrenadetracking( "gas" );
+
+                    players[i] thread maps\mp\gametypes\_battlechatter_mp::incomingspecialgrenadetracking( "gas" );
                 }
             }
         }
+
+        wait( loopwaittime );
     }
-			i++;
+
-		}
-		wait loopwaittime;
-		durationoftabun -= loopwaittime;
-	}
     if ( level.tabungasduration < level.poisonduration )
-	{
         wait( level.poisonduration - level.tabungasduration );
-	}
+
     shockeffectarea delete();
     gaseffectarea delete();
 /#
-	if ( getDvarInt( "scr_draw_triggers" ) )
+    if ( getdvarint( "scr_draw_triggers" ) )
-	{
         level notify( "tabun_draw_cylinder_stop" );
 #/
 }
-}
 
 damageinpoisonarea( gaseffectarea, killcament, trace, position )
 {
@@ -167,68 +152,72 @@ damageinpoisonarea( gaseffectarea, killcament, trace, position )
     self thread watch_death();
     self.inpoisonarea = 1;
     self startpoisoning();
-	tabunshocksound = spawn( "script_origin", ( 0, 0, 0 ) );
+    tabunshocksound = spawn( "script_origin", ( 0, 0, 1 ) );
     tabunshocksound thread deleteentonownerdeath( self );
     tabunshocksound.origin = position;
     tabunshocksound playsound( level.sound_shock_tabun_start );
     tabunshocksound playloopsound( level.sound_shock_tabun_loop );
     timer = 0;
-	while ( trace[ "fraction" ] == 1 && isDefined( gaseffectarea ) && self istouching( gaseffectarea ) && self.sessionstate == "playing" && isDefined( self.lastpoisonedby ) )
+
+    while ( trace["fraction"] == 1 && isdefined( gaseffectarea ) && self istouching( gaseffectarea ) && self.sessionstate == "playing" && isdefined( self.lastpoisonedby ) )
     {
         damage = level.poisondamage;
+
         if ( level.hardcoremode )
-		{
             damage = level.poisondamagehardcore;
-		}
+
         self dodamage( damage, gaseffectarea.origin, self.lastpoisonedby, killcament, "none", "MOD_GAS", 0, "tabun_gas_mp" );
+
         if ( self mayapplyscreeneffect() )
         {
             switch ( timer )
             {
-				case 0:
+                case "0":
-					self shellshock( "tabun_gas_mp", 1 );
+                    self shellshock( "tabun_gas_mp", 1.0 );
                     break;
-				timer++;
+                case "1":
-				continue;
+                    self shellshock( "tabun_gas_nokick_mp", 1.0 );
-				case 1:
-					self shellshock( "tabun_gas_nokick_mp", 1 );
                     break;
-				timer++;
-				continue;
                 default:
+                    break;
             }
+
             timer++;
+
             if ( timer >= 2 )
-				{
                 timer = 0;
-				}
+
             self hide_hud();
         }
-			wait 1;
+
-			trace = bullettrace( position, self.origin + vectorScale( ( 0, 0, 0 ), 12 ), 0, self );
+        wait 1.0;
+        trace = bullettrace( position, self.origin + vectorscale( ( 0, 0, 1 ), 12.0 ), 0, self );
     }
-		tabunshocksound stoploopsound( 0,5 );
+
-		wait 0,5;
+    tabunshocksound stoploopsound( 0.5 );
+    wait 0.5;
     thread playsoundinspace( level.sound_shock_tabun_stop, position );
-		wait 0,5;
+    wait 0.5;
     tabunshocksound notify( "delete" );
     tabunshocksound delete();
     self show_hud();
     self stoppoisoning();
     self.inpoisonarea = 0;
 }
-}
 
 deleteentonownerdeath( owner )
 {
     self endon( "delete" );
+
     owner waittill( "death" );
+
     self delete();
 }
 
 watch_death()
 {
     self waittill( "death" );
+
     self show_hud();
 }
 
@@ -249,10 +238,8 @@ weapons_get_dvar_int( dvar, def )
 
 weapons_get_dvar( dvar, def )
 {
-	if ( getDvar( dvar ) != "" )
+    if ( getdvar( dvar ) != "" )
-	{
+        return getdvarfloat( dvar );
-		return getDvarFloat( dvar );
-	}
     else
     {
         setdvar( dvar, def );
@@ -262,25 +249,26 @@ weapons_get_dvar( dvar, def )
 
 generatelocations( position, owner )
 {
-	onefoot = vectorScale( ( 0, 0, 0 ), 12 );
+    onefoot = vectorscale( ( 0, 0, 1 ), 12.0 );
     startpos = position + onefoot;
 /#
     level.tabun_debug = getdvarintdefault( "scr_tabun_debug", 0 );
+
     if ( level.tabun_debug )
     {
-		black = vectorScale( ( 0, 0, 0 ), 0,2 );
+        black = vectorscale( ( 1, 1, 1 ), 0.2 );
         debugstar( startpos, 2000, black );
-#/
     }
+#/
     spawnalllocs( owner, startpos );
 }
 
 singlelocation( position, owner )
 {
     spawntimedfx( level.fx_tabun_single, position );
-	killcament = spawn( "script_model", position + vectorScale( ( 0, 0, 0 ), 60 ) );
+    killcament = spawn( "script_model", position + vectorscale( ( 0, 0, 1 ), 60.0 ) );
-	killcament deleteaftertime( 15 );
+    killcament deleteaftertime( 15.0 );
-	killcament.starttime = getTime();
+    killcament.starttime = gettime();
     damageeffectarea( owner, position, level.tabungaspoisonradius, level.tabungaspoisonheight, killcament );
 }
 
@@ -289,10 +277,10 @@ hitpos( start, end, color )
     trace = bullettrace( start, end, 0, undefined );
 /#
     level.tabun_debug = getdvarintdefault( "scr_tabun_debug", 0 );
+
     if ( level.tabun_debug )
-	{
         debugstar( trace["position"], 2000, color );
-	}
+
     thread debug_line( start, trace["position"], color, 80 );
 #/
     return trace["position"];
@@ -301,12 +289,12 @@ hitpos( start, end, color )
 spawnalllocs( owner, startpos )
 {
     defaultdistance = weapons_get_dvar_int( "scr_defaultDistanceTabun", 220 );
-	cos45 = 0,707;
+    cos45 = 0.707;
-	negcos45 = -0,707;
+    negcos45 = -0.707;
-	red = ( 0,9, 0,2, 0,2 );
+    red = ( 0.9, 0.2, 0.2 );
-	blue = ( 0,2, 0,2, 0,9 );
+    blue = ( 0.2, 0.2, 0.9 );
-	green = ( 0,2, 0,9, 0,2 );
+    green = ( 0.2, 0.9, 0.2 );
-	white = vectorScale( ( 0, 0, 0 ), 0,9 );
+    white = vectorscale( ( 1, 1, 1 ), 0.9 );
     north = startpos + ( defaultdistance, 0, 0 );
     south = startpos - ( defaultdistance, 0, 0 );
     east = startpos + ( 0, defaultdistance, 0 );
@@ -338,109 +326,98 @@ spawnalllocs( owner, startpos )
     locations["point"][5] = sw;
     locations["point"][6] = west;
     locations["point"][7] = nw;
-	count = 0;
+
-	while ( count < 8 )
+    for ( count = 0; count < 8; count++ )
     {
         trace = hitpos( startpos, locations["point"][count], locations["color"][count] );
         locations["tracePos"][count] = trace;
-		locations[ "loc" ][ count ] = ( startpos / 2 ) + ( trace / 2 );
+        locations["loc"][count] = startpos / 2 + trace / 2;
-		locations[ "loc" ][ count ] -= vectorScale( ( 0, 0, 0 ), 12 );
+        locations["loc"][count] -= vectorscale( ( 0, 0, 1 ), 12.0 );
         locations["distSqrd"][count] = distancesquared( startpos, trace );
-		count++;
     }
+
     centroid = getcentroid( locations );
-	killcament = spawn( "script_model", centroid + vectorScale( ( 0, 0, 0 ), 60 ) );
+    killcament = spawn( "script_model", centroid + vectorscale( ( 0, 0, 1 ), 60.0 ) );
-	killcament deleteaftertime( 15 );
+    killcament deleteaftertime( 15.0 );
-	killcament.starttime = getTime();
+    killcament.starttime = gettime();
     center = getcenter( locations );
-	i = 0;
+
-	while ( i < 8 )
+    for ( i = 0; i < 8; i++ )
     {
         fxtoplay = setuptabunfx( owner, locations, i );
+
         switch ( fxtoplay )
         {
-			case 0:
+            case "0":
                 locations["fxtoplay"][i] = level.fx_tabun_0;
                 locations["radius"][i] = level.fx_tabun_radius0;
-				break;
-			i++;
                 continue;
-			case 1:
+            case "1":
                 locations["fxtoplay"][i] = level.fx_tabun_1;
                 locations["radius"][i] = level.fx_tabun_radius1;
-				break;
-			i++;
                 continue;
-			case 2:
+            case "2":
                 locations["fxtoplay"][i] = level.fx_tabun_2;
                 locations["radius"][i] = level.fx_tabun_radius2;
-				break;
-			i++;
                 continue;
-			case 3:
+            case "3":
                 locations["fxtoplay"][i] = level.fx_tabun_3;
                 locations["radius"][i] = level.fx_tabun_radius3;
-				break;
-			i++;
                 continue;
             default:
+                locations["fxtoplay"][i] = undefined;
                 locations["radius"][i] = 0;
         }
-		i++;
     }
+
     singleeffect = 1;
     freepassused = 0;
-	i = 0;
+
-	while ( i < 8 )
+    for ( i = 0; i < 8; i++ )
     {
         if ( locations["radius"][i] != level.fx_tabun_radius0 )
         {
             if ( freepassused == 0 && locations["radius"][i] == level.fx_tabun_radius1 )
             {
                 freepassused = 1;
-				i++;
                 continue;
             }
-			else
+
-			{
             singleeffect = 0;
         }
     }
-		i++;
+
-	}
+    onefoot = vectorscale( ( 0, 0, 1 ), 12.0 );
-	onefoot = vectorScale( ( 0, 0, 0 ), 12 );
     startpos -= onefoot;
     thread playtabunsound( startpos );
+
     if ( singleeffect == 1 )
-	{
         singlelocation( startpos, owner );
-	}
     else
     {
         spawntimedfx( level.fx_tabun_3, startpos );
-		count = 0;
+
-		while ( count < 8 )
+        for ( count = 0; count < 8; count++ )
         {
-			if ( isDefined( locations[ "fxtoplay" ][ count ] ) )
+            if ( isdefined( locations["fxtoplay"][count] ) )
             {
                 spawntimedfx( locations["fxtoplay"][count], locations["loc"][count] );
                 thread damageeffectarea( owner, locations["loc"][count], locations["radius"][count], locations["radius"][count], killcament );
             }
-			count++;
         }
     }
 }
 
 playtabunsound( position )
 {
-	tabunsound = spawn( "script_origin", ( 0, 0, 0 ) );
+    tabunsound = spawn( "script_origin", ( 0, 0, 1 ) );
     tabunsound.origin = position;
     tabunsound playsound( level.sound_tabun_start );
     tabunsound playloopsound( level.sound_tabun_loop );
-	wait level.tabungasduration;
+    wait( level.tabungasduration );
     thread playsoundinspace( level.sound_tabun_stop, position );
-	tabunsound stoploopsound( 0,5 );
+    tabunsound stoploopsound( 0.5 );
-	wait 0,5;
+    wait 0.5;
     tabunsound delete();
 }
 
@@ -448,66 +425,49 @@ setuptabunfx( owner, locations, count )
 {
     fxtoplay = undefined;
     previous = count - 1;
+
     if ( previous < 0 )
-	{
         previous += locations["loc"].size;
-	}
+
     next = count + 1;
+
     if ( next >= locations["loc"].size )
-	{
         next -= locations["loc"].size;
-	}
+
     effect0dist = level.fx_tabun_radius0 * level.fx_tabun_radius0;
     effect1dist = level.fx_tabun_radius1 * level.fx_tabun_radius1;
     effect2dist = level.fx_tabun_radius2 * level.fx_tabun_radius2;
     effect3dist = level.fx_tabun_radius3 * level.fx_tabun_radius3;
     effect4dist = level.fx_tabun_radius3;
     fxtoplay = -1;
+
     if ( locations["distSqrd"][count] > effect0dist && locations["distSqrd"][previous] > effect1dist && locations["distSqrd"][next] > effect1dist )
-	{
         fxtoplay = 0;
-	}
+    else if ( locations["distSqrd"][count] > effect1dist && locations["distSqrd"][previous] > effect2dist && locations["distSqrd"][next] > effect2dist )
-	else
-	{
-		if ( locations[ "distSqrd" ][ count ] > effect1dist && locations[ "distSqrd" ][ previous ] > effect2dist && locations[ "distSqrd" ][ next ] > effect2dist )
-		{
         fxtoplay = 1;
-		}
+    else if ( locations["distSqrd"][count] > effect2dist && locations["distSqrd"][previous] > effect3dist && locations["distSqrd"][next] > effect3dist )
-		else
-		{
-			if ( locations[ "distSqrd" ][ count ] > effect2dist && locations[ "distSqrd" ][ previous ] > effect3dist && locations[ "distSqrd" ][ next ] > effect3dist )
-			{
         fxtoplay = 2;
-			}
+    else if ( locations["distSqrd"][count] > effect3dist && locations["distSqrd"][previous] > effect4dist && locations["distSqrd"][next] > effect4dist )
-			else
-			{
-				if ( locations[ "distSqrd" ][ count ] > effect3dist && locations[ "distSqrd" ][ previous ] > effect4dist && locations[ "distSqrd" ][ next ] > effect4dist )
-				{
         fxtoplay = 3;
-				}
+
-			}
-		}
-	}
     return fxtoplay;
 }
 
 getcentroid( locations )
 {
     centroid = ( 0, 0, 0 );
-	i = 0;
+
-	while ( i < locations[ "loc" ].size )
+    for ( i = 0; i < locations["loc"].size; i++ )
-	{
         centroid += locations["loc"][i] / locations["loc"].size;
-		i++;
-	}
 /#
     level.tabun_debug = getdvarintdefault( "scr_tabun_debug", 0 );
+
     if ( level.tabun_debug )
     {
-		purple = ( 0,9, 0,2, 0,9 );
+        purple = ( 0.9, 0.2, 0.9 );
         debugstar( centroid, 2000, purple );
-#/
     }
+#/
     return centroid;
 }
 
@@ -520,47 +480,38 @@ getcenter( locations )
     maxx = curx;
     miny = cury;
     maxy = cury;
-	i = 1;
+
-	while ( i < locations[ "tracePos" ].size )
+    for ( i = 1; i < locations["tracePos"].size; i++ )
     {
         curx = locations["tracePos"][i][0];
         cury = locations["tracePos"][i][1];
+
         if ( curx > maxx )
-		{
             maxx = curx;
-		}
+        else if ( curx < minx )
-		else
-		{
-			if ( curx < minx )
-			{
             minx = curx;
-			}
+
-		}
         if ( cury > maxy )
         {
             maxy = cury;
-			i++;
             continue;
         }
-		else
+
-		{
         if ( cury < miny )
-			{
             miny = cury;
     }
-		}
+
-		i++;
-	}
     avgx = ( maxx + minx ) / 2;
     avgy = ( maxy + miny ) / 2;
     center = ( avgx, avgy, locations["tracePos"][0][2] );
 /#
     level.tabun_debug = getdvarintdefault( "scr_tabun_debug", 0 );
+
     if ( level.tabun_debug )
     {
-		cyan = ( 0,2, 0,9, 0,9 );
+        cyan = ( 0.2, 0.9, 0.9 );
         debugstar( center, 2000, cyan );
-#/
     }
+#/
     return center;
 }

Multiplayer Core/patch_mp/maps/mp/_tacticalinsertion.gsc

@@ -1,13 +1,15 @@
-#include maps/mp/gametypes/_damagefeedback;
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_globallogic_player;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_hacker_tool;
+#include common_scripts\utility;
-#include maps/mp/gametypes/_weaponobjects;
+#include maps\mp\_utility;
-#include maps/mp/_scoreevents;
+#include maps\mp\gametypes\_hud_util;
-#include maps/mp/_challenges;
+#include maps\mp\gametypes\_globallogic_audio;
-#include maps/mp/gametypes/_globallogic_audio;
+#include maps\mp\_challenges;
-#include maps/mp/gametypes/_hud_util;
+#include maps\mp\_scoreevents;
-#include maps/mp/_utility;
+#include maps\mp\gametypes\_weaponobjects;
-#include common_scripts/utility;
+#include maps\mp\_hacker_tool;
+#include maps\mp\gametypes\_globallogic_player;
+#include maps\mp\gametypes\_damagefeedback;
 
 init()
 {
@@ -16,7 +18,7 @@ init()
     loadfx( "misc/fx_equip_tac_insert_light_grn" );
     loadfx( "misc/fx_equip_tac_insert_light_red" );
     level._effect["tacticalInsertionFizzle"] = loadfx( "misc/fx_equip_tac_insert_exp" );
-	maps/mp/gametypes/_globallogic_audio::registerdialoggroup( "item_destroyed", 1 );
+    maps\mp\gametypes\_globallogic_audio::registerdialoggroup( "item_destroyed", 1 );
 }
 
 istacspawntouchingcrates( origin, angles )
@@ -24,102 +26,92 @@ istacspawntouchingcrates( origin, angles )
     crate_ents = getentarray( "care_package", "script_noteworthy" );
     mins = ( -17, -17, -40 );
     maxs = ( 17, 17, 40 );
-	i = 0;
+
-	while ( i < crate_ents.size )
+    for ( i = 0; i < crate_ents.size; i++ )
     {
-		if ( crate_ents[ i ] istouchingvolume( origin + vectorScale( ( 0, 0, 1 ), 40 ), mins, maxs ) )
+        if ( crate_ents[i] istouchingvolume( origin + vectorscale( ( 0, 0, 1 ), 40.0 ), mins, maxs ) )
-		{
+            return true;
-			return 1;
     }
-		i++;
+
-	}
+    return false;
-	return 0;
 }
 
 overridespawn( ispredictedspawn )
 {
-	if ( !isDefined( self.tacticalinsertion ) )
+    if ( !isdefined( self.tacticalinsertion ) )
-	{
+        return false;
-		return 0;
+
-	}
     origin = self.tacticalinsertion.origin;
     angles = self.tacticalinsertion.angles;
     team = self.tacticalinsertion.team;
+
     if ( !ispredictedspawn )
-	{
         self.tacticalinsertion destroy_tactical_insertion();
-	}
+
     if ( team != self.team )
-	{
+        return false;
-		return 0;
+
-	}
     if ( istacspawntouchingcrates( origin ) )
-	{
+        return false;
-		return 0;
+
-	}
     if ( !ispredictedspawn )
     {
-		self.tacticalinsertiontime = getTime();
+        self.tacticalinsertiontime = gettime();
         self spawn( origin, angles, "tactical insertion" );
         self setspawnclientflag( "SCDFL_DISABLE_LOGGING" );
         self addweaponstat( "tactical_insertion_mp", "used", 1 );
     }
-	return 1;
+
+    return true;
 }
 
 waitanddelete( time )
 {
     self endon( "death" );
-	wait 0,05;
+    wait 0.05;
     self delete();
 }
 
 watch( player )
 {
-	if ( isDefined( player.tacticalinsertion ) )
+    if ( isdefined( player.tacticalinsertion ) )
-	{
         player.tacticalinsertion destroy_tactical_insertion();
-	}
+
     player thread spawntacticalinsertion();
-	self waitanddelete( 0,05 );
+    self waitanddelete( 0.05 );
 }
 
 watchusetrigger( trigger, callback, playersoundonuse, npcsoundonuse )
 {
     self endon( "delete" );
-	while ( 1 )
+
+    while ( true )
     {
         trigger waittill( "trigger", player );
-		while ( !isalive( player ) )
+
-		{
+        if ( !isalive( player ) )
             continue;
-		}
+
-		while ( !player isonground() )
+        if ( !player isonground() )
-		{
             continue;
-		}
+
-		if ( isDefined( trigger.triggerteam ) && player.team != trigger.triggerteam )
+        if ( isdefined( trigger.triggerteam ) && player.team != trigger.triggerteam )
-		{
             continue;
-		}
+
-		if ( isDefined( trigger.triggerteamignore ) && player.team == trigger.triggerteamignore )
+        if ( isdefined( trigger.triggerteamignore ) && player.team == trigger.triggerteamignore )
-		{
             continue;
-		}
+
-		if ( isDefined( trigger.claimedby ) && player != trigger.claimedby )
+        if ( isdefined( trigger.claimedby ) && player != trigger.claimedby )
-		{
             continue;
-		}
+
         if ( player usebuttonpressed() && !player.throwinggrenade && !player meleebuttonpressed() )
         {
-			if ( isDefined( playersoundonuse ) )
+            if ( isdefined( playersoundonuse ) )
-			{
                 player playlocalsound( playersoundonuse );
-			}
+
-			if ( isDefined( npcsoundonuse ) )
+            if ( isdefined( npcsoundonuse ) )
-			{
                 player playsound( npcsoundonuse );
-			}
+
             self thread [[ callback ]]( player );
         }
     }
@@ -128,7 +120,9 @@ watchusetrigger( trigger, callback, playersoundonuse, npcsoundonuse )
 watchdisconnect()
 {
     self.tacticalinsertion endon( "delete" );
+
     self waittill( "disconnect" );
+
     self.tacticalinsertion thread destroy_tactical_insertion();
 }
 
@@ -139,45 +133,43 @@ destroy_tactical_insertion( attacker )
     self.owner notify( "tactical_insertion_destroyed" );
     self.friendlytrigger delete();
     self.enemytrigger delete();
-	if ( isDefined( attacker ) && isDefined( attacker.pers[ "team" ] ) && isDefined( self.owner ) && isDefined( self.owner.pers[ "team" ] ) )
+
+    if ( isdefined( attacker ) && isdefined( attacker.pers["team"] ) && isdefined( self.owner ) && isdefined( self.owner.pers["team"] ) )
     {
         if ( level.teambased )
         {
             if ( attacker.pers["team"] != self.owner.pers["team"] )
             {
                 attacker notify( "destroyed_explosive" );
-				attacker maps/mp/_challenges::destroyedequipment();
+                attacker maps\mp\_challenges::destroyedequipment();
-				attacker maps/mp/_challenges::destroyedtacticalinsert();
+                attacker maps\mp\_challenges::destroyedtacticalinsert();
-				maps/mp/_scoreevents::processscoreevent( "destroyed_tac_insert", attacker );
+                maps\mp\_scoreevents::processscoreevent( "destroyed_tac_insert", attacker );
             }
         }
-		else
+        else if ( attacker != self.owner )
-		{
-			if ( attacker != self.owner )
         {
             attacker notify( "destroyed_explosive" );
-				attacker maps/mp/_challenges::destroyedequipment();
+            attacker maps\mp\_challenges::destroyedequipment();
-				attacker maps/mp/_challenges::destroyedtacticalinsert();
+            attacker maps\mp\_challenges::destroyedtacticalinsert();
-				maps/mp/_scoreevents::processscoreevent( "destroyed_tac_insert", attacker );
+            maps\mp\_scoreevents::processscoreevent( "destroyed_tac_insert", attacker );
-			}
         }
     }
+
     self delete();
 }
 
 fizzle( attacker )
 {
-	if ( isDefined( self.fizzle ) && self.fizzle )
+    if ( isdefined( self.fizzle ) && self.fizzle )
-	{
         return;
-	}
+
     self.fizzle = 1;
     playfx( level._effect["tacticalInsertionFizzle"], self.origin );
     self playsound( "dst_tac_insert_break" );
-	if ( isDefined( attacker ) && attacker != self.owner )
+
-	{
+    if ( isdefined( attacker ) && attacker != self.owner )
-		self.owner maps/mp/gametypes/_globallogic_audio::leaderdialogonplayer( "tact_destroyed", "item_destroyed" );
+        self.owner maps\mp\gametypes\_globallogic_audio::leaderdialogonplayer( "tact_destroyed", "item_destroyed" );
-	}
+
     self destroy_tactical_insertion( attacker );
 }
 
@@ -201,147 +193,133 @@ spawntacticalinsertion()
     self.tacticalinsertion.owner = self;
     self.tacticalinsertion setowner( self );
     self.tacticalinsertion setweapon( level.tacticalinsertionweapon );
-	self.tacticalinsertion thread maps/mp/gametypes/_weaponobjects::attachreconmodel( "t6_wpn_tac_insert_detect", self );
+    self.tacticalinsertion thread maps\mp\gametypes\_weaponobjects::attachreconmodel( "t6_wpn_tac_insert_detect", self );
     self.tacticalinsertion endon( "delete" );
-	self.tacticalinsertion maps/mp/_hacker_tool::registerwithhackertool( level.equipmenthackertoolradius, level.equipmenthackertooltimems );
+    self.tacticalinsertion maps\mp\_hacker_tool::registerwithhackertool( level.equipmenthackertoolradius, level.equipmenthackertooltimems );
     triggerheight = 64;
     triggerradius = 128;
-	self.tacticalinsertion.friendlytrigger = spawn( "trigger_radius_use", self.tacticalinsertion.origin + vectorScale( ( 0, 0, 1 ), 3 ) );
+    self.tacticalinsertion.friendlytrigger = spawn( "trigger_radius_use", self.tacticalinsertion.origin + vectorscale( ( 0, 0, 1 ), 3.0 ) );
     self.tacticalinsertion.friendlytrigger setcursorhint( "HINT_NOICON", self.tacticalinsertion );
     self.tacticalinsertion.friendlytrigger sethintstring( &"MP_TACTICAL_INSERTION_PICKUP" );
+
     if ( level.teambased )
     {
         self.tacticalinsertion.friendlytrigger setteamfortrigger( self.team );
         self.tacticalinsertion.friendlytrigger.triggerteam = self.team;
     }
+
     self clientclaimtrigger( self.tacticalinsertion.friendlytrigger );
     self.tacticalinsertion.friendlytrigger.claimedby = self;
-	self.tacticalinsertion.enemytrigger = spawn( "trigger_radius_use", self.tacticalinsertion.origin + vectorScale( ( 0, 0, 1 ), 3 ) );
+    self.tacticalinsertion.enemytrigger = spawn( "trigger_radius_use", self.tacticalinsertion.origin + vectorscale( ( 0, 0, 1 ), 3.0 ) );
     self.tacticalinsertion.enemytrigger setcursorhint( "HINT_NOICON", self.tacticalinsertion );
     self.tacticalinsertion.enemytrigger sethintstring( &"MP_TACTICAL_INSERTION_DESTROY" );
     self.tacticalinsertion.enemytrigger setinvisibletoplayer( self );
+
     if ( level.teambased )
     {
         self.tacticalinsertion.enemytrigger setexcludeteamfortrigger( self.team );
         self.tacticalinsertion.enemytrigger.triggerteamignore = self.team;
     }
+
     self.tacticalinsertion setclientflag( 2 );
     self thread watchdisconnect();
-	watcher = maps/mp/gametypes/_weaponobjects::getweaponobjectwatcherbyweapon( level.tacticalinsertionweapon );
+    watcher = maps\mp\gametypes\_weaponobjects::getweaponobjectwatcherbyweapon( level.tacticalinsertionweapon );
     self.tacticalinsertion thread watchusetrigger( self.tacticalinsertion.friendlytrigger, ::pickup, watcher.pickupsoundplayer, watcher.pickupsound );
     self.tacticalinsertion thread watchusetrigger( self.tacticalinsertion.enemytrigger, ::fizzle );
-	if ( isDefined( self.tacticalinsertioncount ) )
+
-	{
+    if ( isdefined( self.tacticalinsertioncount ) )
         self.tacticalinsertioncount++;
-	}
     else
-	{
         self.tacticalinsertioncount = 1;
-	}
+
     self.tacticalinsertion setcandamage( 1 );
     self.tacticalinsertion.health = 1;
-	while ( 1 )
+
+    while ( true )
     {
         self.tacticalinsertion waittill( "damage", damage, attacker, direction, point, type, tagname, modelname, partname, weaponname, idflags );
-		while ( level.teambased && isDefined( attacker ) && isplayer( attacker ) && attacker.team == self.team && attacker != self )
+
-		{
+        if ( level.teambased && ( !isdefined( attacker ) || !isplayer( attacker ) || attacker.team == self.team ) && attacker != self )
             continue;
-		}
+
         if ( attacker != self )
         {
-			attacker maps/mp/_challenges::destroyedequipment( weaponname );
+            attacker maps\mp\_challenges::destroyedequipment( weaponname );
-			attacker maps/mp/_challenges::destroyedtacticalinsert();
+            attacker maps\mp\_challenges::destroyedtacticalinsert();
-			maps/mp/_scoreevents::processscoreevent( "destroyed_tac_insert", attacker );
+            maps\mp\_scoreevents::processscoreevent( "destroyed_tac_insert", attacker );
         }
-		if ( isDefined( weaponname ) )
+
+        if ( isdefined( weaponname ) )
         {
             switch ( weaponname )
             {
-				case "concussion_grenade_mp":
                 case "flash_grenade_mp":
+                case "concussion_grenade_mp":
                     if ( level.teambased && self.tacticalinsertion.owner.team != attacker.team )
                     {
-						if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
+                    }
+                    else if ( !level.teambased && self.tacticalinsertion.owner != attacker )
                     {
-							attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
                     }
-					}
+
-					else
-					{
-						if ( !level.teambased && self.tacticalinsertion.owner != attacker )
-						{
-							if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-							{
-								attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
-							}
-						}
-					}
-					break;
                     break;
                 default:
-					if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                    if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-					{
+                        attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-						attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
+
-					}
-					break;
                     break;
             }
         }
-		if ( isDefined( attacker ) && attacker != self )
+
-		{
+        if ( isdefined( attacker ) && attacker != self )
-			self maps/mp/gametypes/_globallogic_audio::leaderdialogonplayer( "tact_destroyed", "item_destroyed" );
+            self maps\mp\gametypes\_globallogic_audio::leaderdialogonplayer( "tact_destroyed", "item_destroyed" );
-		}
+
         self.tacticalinsertion thread fizzle();
     }
 }
 
 cancel_button_think()
 {
-	if ( !isDefined( self.tacticalinsertion ) )
+    if ( !isdefined( self.tacticalinsertion ) )
-	{
         return;
-	}
+
     text = cancel_text_create();
     self thread cancel_button_press();
     event = self waittill_any_return( "tactical_insertion_destroyed", "disconnect", "end_killcam", "abort_killcam", "tactical_insertion_canceled", "spawned" );
+
     if ( event == "tactical_insertion_canceled" )
-	{
         self.tacticalinsertion destroy_tactical_insertion();
-	}
+
-	if ( isDefined( text ) )
+    if ( isdefined( text ) )
-	{
         text destroy();
 }
-}
 
 canceltackinsertionbutton()
 {
     if ( level.console )
-	{
         return self changeseatbuttonpressed();
-	}
     else
-	{
         return self jumpbuttonpressed();
 }
-}
 
 cancel_button_press()
 {
     self endon( "disconnect" );
     self endon( "end_killcam" );
     self endon( "abort_killcam" );
-	while ( 1 )
+
+    while ( true )
     {
-		wait 0,05;
+        wait 0.05;
+
         if ( self canceltackinsertionbutton() )
-		{
             break;
     }
-		else
+
-		{
-		}
-	}
     self notify( "tactical_insertion_canceled" );
 }
 
@@ -358,15 +336,15 @@ cancel_text_create()
     text.font = "small";
     text.foreground = 1;
     text.hidewheninmenu = 1;
+
     if ( self issplitscreen() )
     {
         text.y = -80;
-		text.fontscale = 1,2;
+        text.fontscale = 1.2;
     }
     else
-	{
+        text.fontscale = 1.6;
-		text.fontscale = 1,6;
+
-	}
     text settext( &"PLATFORM_PRESS_TO_CANCEL_TACTICAL_INSERTION" );
     text.alpha = 1;
     return text;
@@ -375,34 +353,33 @@ cancel_text_create()
 gettacticalinsertions()
 {
     tac_inserts = [];
-	_a393 = level.players;
+
-	_k393 = getFirstArrayKey( _a393 );
+    foreach ( player in level.players )
-	while ( isDefined( _k393 ) )
-	{
-		player = _a393[ _k393 ];
-		if ( isDefined( player.tacticalinsertion ) )
     {
+        if ( isdefined( player.tacticalinsertion ) )
             tac_inserts[tac_inserts.size] = player.tacticalinsertion;
     }
-		_k393 = getNextArrayKey( _a393, _k393 );
+
-	}
     return tac_inserts;
 }
 
 tacticalinsertiondestroyedbytrophysystem( attacker, trophysystem )
 {
     owner = self.owner;
-	if ( isDefined( attacker ) )
+
+    if ( isdefined( attacker ) )
     {
-		attacker maps/mp/_challenges::destroyedequipment( trophysystem.name );
+        attacker maps\mp\_challenges::destroyedequipment( trophysystem.name );
-		attacker maps/mp/_challenges::destroyedtacticalinsert();
+        attacker maps\mp\_challenges::destroyedtacticalinsert();
     }
+
     self thread fizzle();
-	if ( isDefined( owner ) )
+
+    if ( isdefined( owner ) )
     {
         owner endon( "death" );
         owner endon( "disconnect" );
-		wait 0,05;
+        wait 0.05;
-		owner maps/mp/gametypes/_globallogic_audio::leaderdialogonplayer( "tact_destroyed", "item_destroyed" );
+        owner maps\mp\gametypes\_globallogic_audio::leaderdialogonplayer( "tact_destroyed", "item_destroyed" );
     }
 }

Multiplayer Core/patch_mp/maps/mp/_teargrenades.gsc

@@ -1,7 +1,8 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_perplayer;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include maps\mp\gametypes\_perplayer;
 
-main() //checked matches cerberus output
+main()
 {
     level.tearradius = 170;
     level.tearheight = 128;
@@ -10,166 +11,178 @@ main() //checked matches cerberus output
     level.tearsufferingduration = 3;
     level.teargrenadetimer = 4;
     precacheshellshock( "teargas" );
-	fgmonitor = maps/mp/gametypes/_perplayer::init( "tear_grenade_monitor", ::startmonitoringtearusage, ::stopmonitoringtearusage );
+    fgmonitor = maps\mp\gametypes\_perplayer::init( "tear_grenade_monitor", ::startmonitoringtearusage, ::stopmonitoringtearusage );
-	maps/mp/gametypes/_perplayer::enable( fgmonitor );
+    maps\mp\gametypes\_perplayer::enable( fgmonitor );
 }
 
-startmonitoringtearusage() //checked matches cerberus output
+startmonitoringtearusage()
 {
     self thread monitortearusage();
 }
 
-stopmonitoringtearusage( disconnected ) //checked matches cerberus output
+stopmonitoringtearusage( disconnected )
 {
     self notify( "stop_monitoring_tear_usage" );
 }
 
-monitortearusage() //checked changed to match cerberus output
+monitortearusage()
 {
     self endon( "stop_monitoring_tear_usage" );
     wait 0.05;
+
     if ( !self hasweapon( "tear_grenade_mp" ) )
-	{
         return;
-	}
+
     prevammo = self getammocount( "tear_grenade_mp" );
-	while ( 1 )
+
+    while ( true )
     {
         ammo = self getammocount( "tear_grenade_mp" );
+
         if ( ammo < prevammo )
         {
             num = prevammo - ammo;
+/#
+
+#/
             for ( i = 0; i < num; i++ )
             {
                 grenades = getentarray( "grenade", "classname" );
                 bestdist = undefined;
                 bestg = undefined;
+
                 for ( g = 0; g < grenades.size; g++ )
                 {
-					if ( !isDefined( grenades[ g ].teargrenade ) )
+                    if ( !isdefined( grenades[g].teargrenade ) )
                     {
-						dist = distance( grenades[ g ].origin, self.origin + vectorScale( ( 0, 0, 1 ), 48 ) );
+                        dist = distance( grenades[g].origin, self.origin + vectorscale( ( 0, 0, 1 ), 48.0 ) );
-						if ( !isDefined( bestdist ) || dist < bestdist )
+
+                        if ( !isdefined( bestdist ) || dist < bestdist )
                         {
                             bestdist = dist;
                             bestg = g;
                         }
                     }
                 }
-				if ( isDefined( bestdist ) )
+
+                if ( isdefined( bestdist ) )
                 {
                     grenades[bestg].teargrenade = 1;
                     grenades[bestg] thread teargrenade_think( self.team );
                 }
             }
         }
+
         prevammo = ammo;
         wait 0.05;
     }
 }
 
-teargrenade_think( team ) //checked matches cerberus output
+teargrenade_think( team )
 {
-	wait level.teargrenadetimer;
+    wait( level.teargrenadetimer );
     ent = spawnstruct();
     ent thread tear( self.origin );
 }
 
-tear( pos ) //checked changed to match beta dump
+tear( pos )
 {
     trig = spawn( "trigger_radius", pos, 0, level.tearradius, level.tearheight );
-	starttime = getTime();
+    starttime = gettime();
     self thread teartimer();
     self endon( "tear_timeout" );
-	while ( 1 )
+
+    while ( true )
     {
         trig waittill( "trigger", player );
+
         if ( player.sessionstate != "playing" )
-		{
             continue;
-		}
+
-		time = ( getTime() - starttime ) / 1000;
+        time = ( gettime() - starttime ) / 1000;
         currad = level.tearradius;
         curheight = level.tearheight;
+
         if ( time < level.teargasfillduration )
         {
-			currad = currad * ( time / level.teargasfillduration );
+            currad *= time / level.teargasfillduration;
-			curheight = curheight * ( time / level.teargasfillduration );
+            curheight *= time / level.teargasfillduration;
         }
-		offset = ( player.origin + vectorScale( ( 0, 0, 1 ), 32 ) ) - pos;
+
+        offset = player.origin + vectorscale( ( 0, 0, 1 ), 32.0 ) - pos;
         offset2d = ( offset[0], offset[1], 0 );
-		if ( lengthsquared( offset2d ) > ( currad * currad ) )
+
-		{
+        if ( lengthsquared( offset2d ) > currad * currad )
             continue;
-		}
+
-		if ( ( player.origin[ 2 ] - pos[ 2 ] ) > curheight )
+        if ( player.origin[2] - pos[2] > curheight )
-		{
             continue;
-		}
+
-		player.teargasstarttime = getTime();
+        player.teargasstarttime = gettime();
-		if ( !isDefined( player.teargassuffering ) )
+
-		{
+        if ( !isdefined( player.teargassuffering ) )
             player thread teargassuffering();
     }
 }
-}
 
-teartimer() //checked matches cerberus output
+teartimer()
 {
-	wait level.teargasduration;
+    wait( level.teargasduration );
     self notify( "tear_timeout" );
 }
 
-teargassuffering() //checked changed to match cerberus output
+teargassuffering()
 {
     self endon( "death" );
     self endon( "disconnect" );
     self.teargassuffering = 1;
+
     if ( self mayapplyscreeneffect() )
-	{
         self shellshock( "teargas", 60 );
-	}
+
-	while ( 1 )
+    while ( true )
-	{
-		if ( ( getTime() - self.teargasstarttime ) > ( level.tearsufferingduration * 1000 ) )
     {
+        if ( gettime() - self.teargasstarttime > level.tearsufferingduration * 1000 )
             break;
-		}
+
         wait 1;
     }
+
     self shellshock( "teargas", 1 );
+
     if ( self mayapplyscreeneffect() )
-	{
         self.teargassuffering = undefined;
 }
-}
 
-drawcylinder( pos, rad, height ) //checked changed to match beta dump
+drawcylinder( pos, rad, height )
 {
     time = 0;
-	while ( 1 )
+
+    while ( true )
     {
         currad = rad;
         curheight = height;
+
         if ( time < level.teargasfillduration )
         {
-			currad = currad * ( time / level.teargasfillduration );
+            currad *= time / level.teargasfillduration;
-			curheight = curheight * ( time / level.teargasfillduration );
+            curheight *= time / level.teargasfillduration;
         }
+
         for ( r = 0; r < 20; r++ )
         {
-			theta = ( r / 20 ) * 360;
+            theta = r / 20 * 360;
-			theta2 = ( ( r + 1 ) / 20 ) * 360;
+            theta2 = ( r + 1 ) / 20 * 360;
             line( pos + ( cos( theta ) * currad, sin( theta ) * currad, 0 ), pos + ( cos( theta2 ) * currad, sin( theta2 ) * currad, 0 ) );
             line( pos + ( cos( theta ) * currad, sin( theta ) * currad, curheight ), pos + ( cos( theta2 ) * currad, sin( theta2 ) * currad, curheight ) );
             line( pos + ( cos( theta ) * currad, sin( theta ) * currad, 0 ), pos + ( cos( theta ) * currad, sin( theta ) * currad, curheight ) );
         }
+
         time += 0.05;
+
         if ( time > level.teargasduration )
-		{
+            break;
-			return;
+
-		}
         wait 0.05;
     }
 }
-

Multiplayer Core/patch_mp/maps/mp/_treadfx.gsc

@@ -1,127 +1,101 @@
+// T6 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
 
-loadtreadfx( vehicle ) //checked matches cerberus output
+loadtreadfx( vehicle )
 {
     treadfx = vehicle.treadfxnamearray;
-	if ( isDefined( treadfx ) )
+
+    if ( isdefined( treadfx ) )
     {
         vehicle.treadfx = [];
-		if ( isDefined( treadfx[ "asphalt" ] ) && treadfx[ "asphalt" ] != "" )
+
-		{
+        if ( isdefined( treadfx["asphalt"] ) && treadfx["asphalt"] != "" )
             vehicle.treadfx["asphalt"] = loadfx( treadfx["asphalt"] );
-		}
+
-		if ( isDefined( treadfx[ "bark" ] ) && treadfx[ "bark" ] != "" )
+        if ( isdefined( treadfx["bark"] ) && treadfx["bark"] != "" )
-		{
             vehicle.treadfx["bark"] = loadfx( treadfx["bark"] );
-		}
+
-		if ( isDefined( treadfx[ "brick" ] ) && treadfx[ "brick" ] != "" )
+        if ( isdefined( treadfx["brick"] ) && treadfx["brick"] != "" )
-		{
             vehicle.treadfx["brick"] = loadfx( treadfx["brick"] );
-		}
+
-		if ( isDefined( treadfx[ "carpet" ] ) && treadfx[ "carpet" ] != "" )
+        if ( isdefined( treadfx["carpet"] ) && treadfx["carpet"] != "" )
-		{
             vehicle.treadfx["carpet"] = loadfx( treadfx["carpet"] );
-		}
+
-		if ( isDefined( treadfx[ "ceramic" ] ) && treadfx[ "ceramic" ] != "" )
+        if ( isdefined( treadfx["ceramic"] ) && treadfx["ceramic"] != "" )
-		{
             vehicle.treadfx["ceramic"] = loadfx( treadfx["ceramic"] );
-		}
+
-		if ( isDefined( treadfx[ "cloth" ] ) && treadfx[ "cloth" ] != "" )
+        if ( isdefined( treadfx["cloth"] ) && treadfx["cloth"] != "" )
-		{
             vehicle.treadfx["cloth"] = loadfx( treadfx["cloth"] );
-		}
+
-		if ( isDefined( treadfx[ "concrete" ] ) && treadfx[ "concrete" ] != "" )
+        if ( isdefined( treadfx["concrete"] ) && treadfx["concrete"] != "" )
-		{
             vehicle.treadfx["concrete"] = loadfx( treadfx["concrete"] );
-		}
+
-		if ( isDefined( treadfx[ "cushion" ] ) && treadfx[ "cushion" ] != "" )
+        if ( isdefined( treadfx["cushion"] ) && treadfx["cushion"] != "" )
-		{
             vehicle.treadfx["cushion"] = loadfx( treadfx["cushion"] );
-		}
+
-		if ( isDefined( treadfx[ "none" ] ) && treadfx[ "none" ] != "" )
+        if ( isdefined( treadfx["none"] ) && treadfx["none"] != "" )
-		{
             vehicle.treadfx["none"] = loadfx( treadfx["none"] );
-		}
+
-		if ( isDefined( treadfx[ "dirt" ] ) && treadfx[ "dirt" ] != "" )
+        if ( isdefined( treadfx["dirt"] ) && treadfx["dirt"] != "" )
-		{
             vehicle.treadfx["dirt"] = loadfx( treadfx["dirt"] );
-		}
+
-		if ( isDefined( treadfx[ "flesh" ] ) && treadfx[ "flesh" ] != "" )
+        if ( isdefined( treadfx["flesh"] ) && treadfx["flesh"] != "" )
-		{
             vehicle.treadfx["flesh"] = loadfx( treadfx["flesh"] );
-		}
+
-		if ( isDefined( treadfx[ "foliage" ] ) && treadfx[ "foliage" ] != "" )
+        if ( isdefined( treadfx["foliage"] ) && treadfx["foliage"] != "" )
-		{
             vehicle.treadfx["foliage"] = loadfx( treadfx["foliage"] );
-		}
+
-		if ( isDefined( treadfx[ "fruit" ] ) && treadfx[ "fruit" ] != "" )
+        if ( isdefined( treadfx["fruit"] ) && treadfx["fruit"] != "" )
-		{
             vehicle.treadfx["fruit"] = loadfx( treadfx["fruit"] );
-		}
+
-		if ( isDefined( treadfx[ "glass" ] ) && treadfx[ "glass" ] != "" )
+        if ( isdefined( treadfx["glass"] ) && treadfx["glass"] != "" )
-		{
             vehicle.treadfx["glass"] = loadfx( treadfx["glass"] );
-		}
+
-		if ( isDefined( treadfx[ "grass" ] ) && treadfx[ "grass" ] != "" )
+        if ( isdefined( treadfx["grass"] ) && treadfx["grass"] != "" )
-		{
             vehicle.treadfx["grass"] = loadfx( treadfx["grass"] );
-		}
+
-		if ( isDefined( treadfx[ "gravel" ] ) && treadfx[ "gravel" ] != "" )
+        if ( isdefined( treadfx["gravel"] ) && treadfx["gravel"] != "" )
-		{
             vehicle.treadfx["gravel"] = loadfx( treadfx["gravel"] );
-		}
+
-		if ( isDefined( treadfx[ "metal" ] ) && treadfx[ "metal" ] != "" )
+        if ( isdefined( treadfx["metal"] ) && treadfx["metal"] != "" )
-		{
             vehicle.treadfx["metal"] = loadfx( treadfx["metal"] );
-		}
+
-		if ( isDefined( treadfx[ "mud" ] ) && treadfx[ "mud" ] != "" )
+        if ( isdefined( treadfx["mud"] ) && treadfx["mud"] != "" )
-		{
             vehicle.treadfx["mud"] = loadfx( treadfx["mud"] );
-		}
+
-		if ( isDefined( treadfx[ "paintedmetal" ] ) && treadfx[ "paintedmetal" ] != "" )
+        if ( isdefined( treadfx["paintedmetal"] ) && treadfx["paintedmetal"] != "" )
-		{
             vehicle.treadfx["paintedmetal"] = loadfx( treadfx["paintedmetal"] );
-		}
+
-		if ( isDefined( treadfx[ "paper" ] ) && treadfx[ "paper" ] != "" )
+        if ( isdefined( treadfx["paper"] ) && treadfx["paper"] != "" )
-		{
             vehicle.treadfx["paper"] = loadfx( treadfx["paper"] );
-		}
+
-		if ( isDefined( treadfx[ "plaster" ] ) && treadfx[ "plaster" ] != "" )
+        if ( isdefined( treadfx["plaster"] ) && treadfx["plaster"] != "" )
-		{
             vehicle.treadfx["plaster"] = loadfx( treadfx["plaster"] );
-		}
+
-		if ( isDefined( treadfx[ "plastic" ] ) && treadfx[ "plastic" ] != "" )
+        if ( isdefined( treadfx["plastic"] ) && treadfx["plastic"] != "" )
-		{
             vehicle.treadfx["plastic"] = loadfx( treadfx["plastic"] );
-		}
+
-		if ( isDefined( treadfx[ "rock" ] ) && treadfx[ "rock" ] != "" )
+        if ( isdefined( treadfx["rock"] ) && treadfx["rock"] != "" )
-		{
             vehicle.treadfx["rock"] = loadfx( treadfx["rock"] );
-		}
+
-		if ( isDefined( treadfx[ "rubber" ] ) && treadfx[ "rubber" ] != "" )
+        if ( isdefined( treadfx["rubber"] ) && treadfx["rubber"] != "" )
-		{
             vehicle.treadfx["rubber"] = loadfx( treadfx["rubber"] );
-		}
+
-		if ( isDefined( treadfx[ "sand" ] ) && treadfx[ "sand" ] != "" )
+        if ( isdefined( treadfx["sand"] ) && treadfx["sand"] != "" )
-		{
             vehicle.treadfx["sand"] = loadfx( treadfx["sand"] );
-		}
+
-		if ( isDefined( treadfx[ "water" ] ) && treadfx[ "water" ] != "" )
+        if ( isdefined( treadfx["water"] ) && treadfx["water"] != "" )
-		{
             vehicle.treadfx["water"] = loadfx( treadfx["water"] );
-		}
+
-		if ( isDefined( treadfx[ "wood" ] ) && treadfx[ "wood" ] != "" )
+        if ( isdefined( treadfx["wood"] ) && treadfx["wood"] != "" )
-		{
             vehicle.treadfx["wood"] = loadfx( treadfx["wood"] );
     }
 }
-}
 
-preloadtreadfx( vehicle ) //checked changed to match cerberus output
+preloadtreadfx( vehicle )
 {
     treadfx = getvehicletreadfxarray( vehicle );
+
     for ( i = 0; i < treadfx.size; i++ )
-	{
         loadfx( treadfx[i] );
 }
-}
-

Multiplayer Core/patch_mp/maps/mp/_trophy_system.gsc

@@ -1,13 +1,15 @@
-#include maps/mp/gametypes/_damagefeedback;
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_globallogic_player;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/killstreaks/_emp;
+#include maps\mp\_utility;
-#include maps/mp/_tacticalinsertion;
+#include common_scripts\utility;
-#include maps/mp/_scoreevents;
+#include maps\mp\gametypes\_weaponobjects;
-#include maps/mp/_challenges;
+#include maps\mp\gametypes\_globallogic_audio;
-#include maps/mp/gametypes/_globallogic_audio;
+#include maps\mp\_challenges;
-#include maps/mp/gametypes/_weaponobjects;
+#include maps\mp\_scoreevents;
-#include common_scripts/utility;
+#include maps\mp\_tacticalinsertion;
-#include maps/mp/_utility;
+#include maps\mp\killstreaks\_emp;
+#include maps\mp\gametypes\_globallogic_player;
+#include maps\mp\gametypes\_damagefeedback;
 
 #using_animtree("mp_trophy_system");
 
@@ -31,7 +33,7 @@ register()
 
 createtrophysystemwatcher()
 {
-	watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "trophy_system", "trophy_system_mp", self.team );
+    watcher = self maps\mp\gametypes\_weaponobjects::createuseweaponobjectwatcher( "trophy_system", "trophy_system_mp", self.team );
     watcher.detonate = ::trophysystemdetonate;
     watcher.activatesound = "wpn_claymore_alert";
     watcher.hackable = 1;
@@ -40,7 +42,7 @@ createtrophysystemwatcher()
     watcher.reconmodel = "t6_wpn_trophy_system_world_detect";
     watcher.ownergetsassist = 1;
     watcher.ignoredirection = 1;
-	watcher.activationdelay = 0,1;
+    watcher.activationdelay = 0.1;
     watcher.headicon = 1;
     watcher.enemydestroy = 1;
     watcher.onspawn = ::ontrophysystemspawn;
@@ -55,38 +57,41 @@ ontrophysystemspawn( watcher, player )
     player endon( "death" );
     player endon( "disconnect" );
     level endon( "game_ended" );
-	self maps/mp/gametypes/_weaponobjects::onspawnuseweaponobject( watcher, player );
+    self maps\mp\gametypes\_weaponobjects::onspawnuseweaponobject( watcher, player );
     player addweaponstat( "trophy_system_mp", "used", 1 );
     self.ammo = 2;
     self thread trophyactive( player );
     self thread trophywatchhack();
     self setclientfield( "trophy_system_state", 1 );
-	self playloopsound( "wpn_trophy_spin", 0,25 );
+    self playloopsound( "wpn_trophy_spin", 0.25 );
-	if ( isDefined( watcher.reconmodel ) )
+
-	{
+    if ( isdefined( watcher.reconmodel ) )
         self thread setreconmodeldeployed();
 }
-}
 
 setreconmodeldeployed()
 {
     self endon( "death" );
+
     for (;;)
     {
-		if ( isDefined( self.reconmodelentity ) )
+        if ( isdefined( self.reconmodelentity ) )
         {
             self.reconmodelentity setclientfield( "trophy_system_state", 1 );
             return;
         }
-		wait 0,05;
+
+        wait 0.05;
     }
 }
 
 trophywatchhack()
 {
     self endon( "death" );
+
     self waittill( "hacked", player );
-	wait 0,05;
+
+    wait 0.05;
     self thread trophyactive( player );
 }
 
@@ -94,12 +99,14 @@ ontrophysystemsmashed( attacker )
 {
     playfx( level._effect["tacticalInsertionFizzle"], self.origin );
     self playsound( "dst_tac_insert_break" );
-	self.owner maps/mp/gametypes/_globallogic_audio::leaderdialogonplayer( "equipment_destroyed", "item_destroyed" );
+    self.owner maps\mp\gametypes\_globallogic_audio::leaderdialogonplayer( "equipment_destroyed", "item_destroyed" );
-	if ( isDefined( attacker ) && self.owner isenemyplayer( attacker ) )
+
+    if ( isdefined( attacker ) && self.owner isenemyplayer( attacker ) )
     {
-		attacker maps/mp/_challenges::destroyedequipment();
+        attacker maps\mp\_challenges::destroyedequipment();
-		maps/mp/_scoreevents::processscoreevent( "destroyed_trophy_system", attacker, self.owner );
+        maps\mp\_scoreevents::processscoreevent( "destroyed_trophy_system", attacker, self.owner );
     }
+
     self delete();
 }
 
@@ -108,143 +115,115 @@ trophyactive( owner )
     owner endon( "disconnect" );
     self endon( "death" );
     self endon( "hacked" );
-	while ( 1 )
+
+    while ( true )
     {
-		tac_inserts = maps/mp/_tacticalinsertion::gettacticalinsertions();
+        tac_inserts = maps\mp\_tacticalinsertion::gettacticalinsertions();
-		while ( level.missileentities.size < 1 || tac_inserts.size < 1 && isDefined( self.disabled ) )
+
+        if ( level.missileentities.size < 1 && tac_inserts.size < 1 || isdefined( self.disabled ) )
         {
-			wait 0,05;
+            wait 0.05;
+            continue;
         }
-		index = 0;
+
-		while ( index < level.missileentities.size )
+        for ( index = 0; index < level.missileentities.size; index++ )
         {
-			wait 0,05;
+            wait 0.05;
             grenade = level.missileentities[index];
-			if ( !isDefined( grenade ) )
+
-			{
+            if ( !isdefined( grenade ) )
-				index++;
                 continue;
-			}
+
-			else if ( grenade == self )
+            if ( grenade == self )
-			{
-				index++;
                 continue;
-			}
+
-			else if ( isDefined( grenade.weaponname ) )
+            if ( isdefined( grenade.weaponname ) )
             {
                 switch ( grenade.weaponname )
                 {
                     case "claymore_mp":
-						index++;
                         continue;
                 }
             }
-				if ( isDefined( grenade.name ) && grenade.name == "tactical_insertion_mp" )
+
-				{
+            if ( isdefined( grenade.name ) && grenade.name == "tactical_insertion_mp" )
-					index++;
                 continue;
-				}
+
-				else switch( grenade.model )
+            switch ( grenade.model )
             {
                 case "t6_wpn_grenade_supply_projectile":
-						index++;
                     continue;
             }
-					if ( !isDefined( grenade.owner ) )
+
-					{
+            if ( !isdefined( grenade.owner ) )
                 grenade.owner = getmissileowner( grenade );
-					}
+
-					if ( isDefined( grenade.owner ) )
+            if ( isdefined( grenade.owner ) )
             {
                 if ( level.teambased )
                 {
                     if ( grenade.owner.team == owner.team )
-							{
-								index++;
                         continue;
                 }
-							else }
                 else if ( grenade.owner == owner )
-						{
-							index++;
                     continue;
-						}
+
-						else
-						{
                 grenadedistancesquared = distancesquared( grenade.origin, self.origin );
+
                 if ( grenadedistancesquared < 262144 )
                 {
-								if ( bullettracepassed( grenade.origin, self.origin + vectorScale( ( 0, 0, 1 ), 29 ), 0, self ) )
+                    if ( bullettracepassed( grenade.origin, self.origin + vectorscale( ( 0, 0, 1 ), 29.0 ), 0, self ) )
                     {
-									playfx( level.trophylongflashfx, self.origin + vectorScale( ( 0, 0, 1 ), 15 ), grenade.origin - self.origin, anglesToUp( self.angles ) );
+                        playfx( level.trophylongflashfx, self.origin + vectorscale( ( 0, 0, 1 ), 15.0 ), grenade.origin - self.origin, anglestoup( self.angles ) );
                         owner thread projectileexplode( grenade, self );
                         index--;
-
                         self playsound( "wpn_trophy_alert" );
                         self.ammo--;
 
                         if ( self.ammo <= 0 )
-									{
                             self thread trophysystemdetonate();
                     }
                 }
             }
         }
-					}
+
-					index++;
+        for ( index = 0; index < tac_inserts.size; index++ )
-				}
-				index = 0;
-				while ( index < tac_inserts.size )
         {
-					wait 0,05;
+            wait 0.05;
             tac_insert = tac_inserts[index];
-					if ( !isDefined( tac_insert ) )
+
-					{
+            if ( !isdefined( tac_insert ) )
-						index++;
                 continue;
-					}
+
-					else if ( isDefined( tac_insert.owner ) )
+            if ( isdefined( tac_insert.owner ) )
             {
                 if ( level.teambased )
                 {
                     if ( tac_insert.owner.team == owner.team )
-							{
-								index++;
                         continue;
                 }
-							else }
                 else if ( tac_insert.owner == owner )
-						{
-							index++;
                     continue;
-						}
+
-						else
-						{
                 grenadedistancesquared = distancesquared( tac_insert.origin, self.origin );
+
                 if ( grenadedistancesquared < 262144 )
                 {
-								if ( bullettracepassed( tac_insert.origin, self.origin + vectorScale( ( 0, 0, 1 ), 29 ), 0, tac_insert ) )
+                    if ( bullettracepassed( tac_insert.origin, self.origin + vectorscale( ( 0, 0, 1 ), 29.0 ), 0, tac_insert ) )
                     {
-									playfx( level.trophylongflashfx, self.origin + vectorScale( ( 0, 0, 1 ), 15 ), tac_insert.origin - self.origin, anglesToUp( self.angles ) );
+                        playfx( level.trophylongflashfx, self.origin + vectorscale( ( 0, 0, 1 ), 15.0 ), tac_insert.origin - self.origin, anglestoup( self.angles ) );
                         owner thread trophydestroytacinsert( tac_insert, self );
                         index--;
-
                         self playsound( "wpn_trophy_alert" );
                         self.ammo--;
 
                         if ( self.ammo <= 0 )
-									{
                             self thread trophysystemdetonate();
                     }
                 }
             }
         }
     }
-					index++;
-				}
-			}
-		}
-	}
 }
 
 projectileexplode( projectile, trophy )
@@ -254,7 +233,7 @@ projectileexplode( projectile, trophy )
     playfx( level.trophydetonationfx, projposition );
     projectile delete();
     trophy radiusdamage( projposition, 128, 105, 10, self );
-	maps/mp/_scoreevents::processscoreevent( "trophy_defense", self );
+    maps\mp\_scoreevents::processscoreevent( "trophy_defense", self );
     self addplayerstat( "destroy_explosive_with_trophy", 1 );
     self addweaponstat( "trophy_system_mp", "CombatRecordStat", 1 );
 }
@@ -264,25 +243,26 @@ trophydestroytacinsert( tacinsert, trophy )
     self endon( "death" );
     tacpos = tacinsert.origin;
     playfx( level.trophydetonationfx, tacinsert.origin );
-	tacinsert thread maps/mp/_tacticalinsertion::tacticalinsertiondestroyedbytrophysystem( self, trophy );
+    tacinsert thread maps\mp\_tacticalinsertion::tacticalinsertiondestroyedbytrophysystem( self, trophy );
     trophy radiusdamage( tacpos, 128, 105, 10, self );
-	maps/mp/_scoreevents::processscoreevent( "trophy_defense", self );
+    maps\mp\_scoreevents::processscoreevent( "trophy_defense", self );
     self addplayerstat( "destroy_explosive_with_trophy", 1 );
     self addweaponstat( "trophy_system_mp", "CombatRecordStat", 1 );
 }
 
 trophysystemdetonate( attacker, weaponname )
 {
-	from_emp = maps/mp/killstreaks/_emp::isempweapon( weaponname );
+    from_emp = maps\mp\killstreaks\_emp::isempweapon( weaponname );
+
     if ( !from_emp )
-	{
         playfx( level._equipment_explode_fx_lg, self.origin );
-	}
+
-	if ( isDefined( attacker ) && self.owner isenemyplayer( attacker ) )
+    if ( isdefined( attacker ) && self.owner isenemyplayer( attacker ) )
     {
-		attacker maps/mp/_challenges::destroyedequipment( weaponname );
+        attacker maps\mp\_challenges::destroyedequipment( weaponname );
-		maps/mp/_scoreevents::processscoreevent( "destroyed_trophy_system", attacker, self.owner, weaponname );
+        maps\mp\_scoreevents::processscoreevent( "destroyed_trophy_system", attacker, self.owner, weaponname );
     }
+
     playsoundatposition( "dst_equipment_destroy", self.origin );
     self delete();
 }
@@ -293,87 +273,70 @@ watchtrophysystemdamage( watcher )
     self endon( "hacked" );
     self setcandamage( 1 );
     damagemax = 20;
-	if ( !self maps/mp/_utility::ishacked() )
+
-	{
+    if ( !self maps\mp\_utility::ishacked() )
         self.damagetaken = 0;
-	}
+
     self.maxhealth = 10000;
     self.health = self.maxhealth;
     self setmaxhealth( self.maxhealth );
     attacker = undefined;
-	for ( ;; )
+
-	{
+    while ( true )
-		while ( 1 )
     {
         self waittill( "damage", damage, attacker, direction_vec, point, type, modelname, tagname, partname, weaponname, idflags );
-			while ( !isplayer( attacker ) )
+
+        if ( !isplayer( attacker ) )
+            continue;
+
+        if ( level.teambased )
         {
+            if ( !level.hardcoremode && self.owner.team == attacker.pers["team"] && self.owner != attacker )
                 continue;
         }
-			while ( level.teambased )
+
-			{
+        if ( isdefined( weaponname ) )
-				while ( !level.hardcoremode && self.owner.team == attacker.pers[ "team" ] && self.owner != attacker )
-				{
-					continue;
-				}
-			}
-			if ( isDefined( weaponname ) )
         {
             switch ( weaponname )
             {
-					case "concussion_grenade_mp":
                 case "flash_grenade_mp":
+                case "concussion_grenade_mp":
                     if ( watcher.stuntime > 0 )
-						{
+                        self thread maps\mp\gametypes\_weaponobjects::stunstart( watcher, watcher.stuntime );
-							self thread maps/mp/gametypes/_weaponobjects::stunstart( watcher, watcher.stuntime );
+
-						}
                     if ( level.teambased && self.owner.team != attacker.team )
                     {
-							if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-							{
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-								attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
                     }
+                    else if ( !level.teambased && self.owner != attacker )
+                    {
+                        if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                            attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
+                    }
+
                     continue;
-						}
-						else
-						{
-							if ( !level.teambased && self.owner != attacker )
-							{
-								if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-								{
-									attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
-								}
-							}
-						}
-					}
                 case "emp_grenade_mp":
                     damage = damagemax;
                 default:
-							if ( maps/mp/gametypes/_globallogic_player::dodamagefeedback( weaponname, attacker ) )
+                    if ( maps\mp\gametypes\_globallogic_player::dodamagefeedback( weaponname, attacker ) )
-							{
+                        attacker maps\mp\gametypes\_damagefeedback::updatedamagefeedback();
-								attacker maps/mp/gametypes/_damagefeedback::updatedamagefeedback();
+
-							}
                     break;
             }
         }
         else
-				{
             weaponname = "";
-				}
+
         if ( type == "MOD_MELEE" )
-				{
             self.damagetaken = damagemax;
-				}
         else
-				{
             self.damagetaken += damage;
-				}
+
         if ( self.damagetaken >= damagemax )
         {
-					watcher thread maps/mp/gametypes/_weaponobjects::waitanddetonate( self, 0,05, attacker, weaponname );
+            watcher thread maps\mp\gametypes\_weaponobjects::waitanddetonate( self, 0.05, attacker, weaponname );
             return;
         }
     }
 }
-	}
-}

Multiplayer Core/patch_mp/maps/mp/animscripts/dog_combat.gsc

@@ -1,6 +1,8 @@
-#include maps/mp/animscripts/utility;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/shared;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include common_scripts\utility;
+#include maps\mp\animscripts\shared;
+#include maps\mp\animscripts\utility;
 
 main()
 {
@@ -12,26 +14,25 @@ main()
     {
         combatidle();
         return;
-#/
     }
-	if ( isDefined( level.hostmigrationtimer ) )
+#/
+    if ( isdefined( level.hostmigrationtimer ) )
     {
         combatidle();
         return;
     }
 /#
-	assert( isDefined( self.enemy ) );
+    assert( isdefined( self.enemy ) );
 #/
     if ( !isalive( self.enemy ) )
     {
         combatidle();
         return;
     }
+
     if ( isplayer( self.enemy ) )
-	{
         self meleebiteattackplayer( self.enemy );
 }
-}
 
 combatidle()
 {
@@ -44,7 +45,7 @@ combatidle()
     idleanim = random( idleanims );
     debug_anim_print( "dog_combat::combatIdle() - Setting " + idleanim );
     self setanimstate( idleanim );
-	self maps/mp/animscripts/shared::donotetracks( "done" );
+    self maps\mp\animscripts\shared::donotetracks( "done" );
     debug_anim_print( "dog_combat::combatIdle() - " + idleanim + " notify done." );
 }
 
@@ -53,30 +54,30 @@ meleebiteattackplayer( player )
     self set_orient_mode( "face enemy" );
     self animmode( "gravity", 0 );
     self.safetochangescript = 0;
+
     if ( use_low_attack() )
     {
         self animmode( "angle deltas", 0 );
         self setanimstate( "combat_attack_player_close_range" );
-		wait 0,35;
+        wait 0.35;
+
         if ( isplayer( self.enemy ) && self.enemy getstance() == "prone" )
-		{
+            self meleewithoffset( vectorscale( ( 0, 0, -1 ), 9.0 ) );
-			self meleewithoffset( vectorScale( ( 0, 0, -1 ), 9 ) );
-		}
         else
-		{
             self melee();
-		}
+
-		self maps/mp/animscripts/shared::donotetracksfortime( 1,2, "done" );
+        self maps\mp\animscripts\shared::donotetracksfortime( 1.2, "done" );
         self animmode( "gravity", 0 );
     }
     else
     {
-		attack_time = 1,2 + randomfloat( 0,4 );
+        attack_time = 1.2 + randomfloat( 0.4 );
         debug_anim_print( "dog_combat::meleeBiteAttackPlayer() - Setting  combat_run_attack" );
         self setanimstate( "combat_attack_run" );
-		self maps/mp/animscripts/shared::donotetracksfortime( attack_time, "done", ::handlemeleebiteattacknotetracks, player );
+        self maps\mp\animscripts\shared::donotetracksfortime( attack_time, "done", ::handlemeleebiteattacknotetracks, player );
         debug_anim_print( "dog_combat::meleeBiteAttackPlayer() - combat_attack_run notify done." );
     }
+
     self.safetochangescript = 1;
     self animmode( "none", 0 );
 }
@@ -84,9 +85,7 @@ meleebiteattackplayer( player )
 handlemeleebiteattacknotetracks( note, player )
 {
     if ( note == "dog_melee" )
-	{
+        self melee( anglestoforward( self.angles ) );
-		self melee( anglesToForward( self.angles ) );
-	}
 }
 
 use_low_attack()
@@ -96,11 +95,11 @@ use_low_attack()
         if ( self.enemy getstance() == "prone" )
         {
             attack_height = self.origin[2] + 16;
+
             if ( self.enemy.origin[2] < attack_height )
-			{
+                return true;
-				return 1;
         }
     }
-	}
+
-	return 0;
+    return false;
 }

Multiplayer Core/patch_mp/maps/mp/animscripts/dog_init.gsc

@@ -1,7 +1,9 @@
-#include maps/mp/animscripts/dog_combat;
+// T6 GSC SOURCE
-#include maps/mp/animscripts/dog_move;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/animscripts/utility;
+#include maps\mp\animscripts\shared;
-#include maps/mp/animscripts/shared;
+#include maps\mp\animscripts\utility;
+#include maps\mp\animscripts\dog_move;
+#include maps\mp\animscripts\dog_combat;
 
 main()
 {
@@ -10,7 +12,7 @@ main()
     level.dog_debug_anims_ent = 0;
     level.dog_debug_turns = 0;
     debug_anim_print( "dog_init::main() " );
-	maps/mp/animscripts/dog_move::setup_sound_variables();
+    maps\mp\animscripts\dog_move::setup_sound_variables();
     anim_get_dvar_int( "debug_dog_sound", "0" );
     anim_get_dvar_int( "debug_dog_notetracks", "0" );
     anim_get_dvar_int( "dog_force_walk", 0 );
@@ -29,34 +31,34 @@ main()
     set_anim_playback_rate();
     self.suppressionthreshold = 1;
     self.disablearrivals = 0;
-	level.dogstoppingdistsq = 3416,82;
+    level.dogstoppingdistsq = 3416.82;
     self.stopanimdistsq = level.dogstoppingdistsq;
     self.pathenemyfightdist = 512;
     self settalktospecies( "dog" );
     level.lastdogmeleeplayertime = 0;
     level.dogmeleeplayercounter = 0;
-	if ( !isDefined( level.dog_hits_before_kill ) )
+
-	{
+    if ( !isdefined( level.dog_hits_before_kill ) )
         level.dog_hits_before_kill = 1;
 }
-}
 
 set_anim_playback_rate()
 {
-	self.animplaybackrate = 0,9 + randomfloat( 0,2 );
+    self.animplaybackrate = 0.9 + randomfloat( 0.2 );
     self.moveplaybackrate = 1;
 }
 
 setmeleeattackdist()
 {
     self endon( "death" );
-	while ( 1 )
+
+    while ( true )
     {
         self.meleeattackdist = 0;
-		if ( self maps/mp/animscripts/dog_combat::use_low_attack() )
+
-		{
+        if ( self maps\mp\animscripts\dog_combat::use_low_attack() )
             self.meleeattackdist = 64;
-		}
+
         wait 1;
     }
 }

Multiplayer Core/patch_mp/maps/mp/bots/_bot_conf.gsc

@@ -1,100 +1,88 @@
-#include maps/mp/_utility;
+// T6 GSC SOURCE
-#include common_scripts/utility;
+// Decompiled by https://github.com/xensik/gsc-tool
+#include common_scripts\utility;
+#include maps\mp\_utility;
 
-bot_conf_think() //checked matches cerberus output
+bot_conf_think()
 {
-	time = getTime();
+    time = gettime();
+
     if ( time < self.bot.update_objective )
-	{
         return;
-	}
+
     self.bot.update_objective = time + randomintrange( 500, 1500 );
     goal = self getgoal( "conf_dogtag" );
-	if ( isDefined( goal ) )
+
+    if ( isdefined( goal ) )
     {
         if ( !conf_tag_in_radius( goal, 64 ) )
-		{
             self cancelgoal( "conf_dogtag" );
     }
-	}
+
     conf_get_tag_in_sight();
 }
 
-conf_get_tag_in_sight() //checked partially changed to match cerberus output did not use foreach see github for more info
+conf_get_tag_in_sight()
 {
     angles = self getplayerangles();
-	forward = anglesToForward( angles );
+    forward = anglestoforward( angles );
     forward = vectornormalize( forward );
     closest = 999999;
-	tags = level.dogtags;
+
-	i = 0;
+    foreach ( tag in level.dogtags )
-	while ( i < tags.size )
     {
-		if ( is_true( tags[ i ].unreachable ) )
+        if ( is_true( tag.unreachable ) )
-		{
-			i++;
             continue;
-		}
+
-		distsq = distancesquared( tags[ i ].curorigin, self.origin );
+        distsq = distancesquared( tag.curorigin, self.origin );
+
         if ( distsq > closest )
-		{
-			i++;
             continue;
-		}
+
-		delta = tags[ i ].curorigin - self.origin;
+        delta = tag.curorigin - self.origin;
         delta = vectornormalize( delta );
         dot = vectordot( forward, delta );
+
         if ( dot < self.bot.fov && distsq > 40000 )
-		{ 
-			i++;
             continue;
-		}
+
         if ( dot > self.bot.fov && distsq > 1440000 )
-		{
-			i++;
             continue;
-		}
+
-		nearest = getnearestnode( tags[ i ].curorigin );
+        nearest = getnearestnode( tag.curorigin );
-		if ( !isDefined( nearest ) )
+
+        if ( !isdefined( nearest ) )
         {
-			tags[ i ].unreachable = 1;
+            tag.unreachable = 1;
-			i++;
             continue;
         }
-		if ( ( tags[ i ].curorigin[ 2 ] - nearest.origin[ 2 ] ) > 18 )
-		{
-			tags[ i ].unreachable = 1;
-			i++;
-			continue;
-		}
-		if ( !isDefined( tags[ i ].unreachable ) && !findpath( self.origin, tags[ i ].curorigin, tags[ i ], 0, 1 ) )
-		{
-			tags[ i ].unreachable = 1;
-		}
-		else
-		{
-			tags[ i ].unreachable = 0;
-		}
-		closest = distsq;
-		closetag = tags[ i ];
-		i++;
-	}
-	if ( isDefined( closetag ) )
-	{
-		self addgoal( closetag.curorigin, 16, 3, "conf_dogtag" );
-	}
-}
 
-conf_tag_in_radius( origin, radius ) //checked changed to match cerberus output
+        if ( tag.curorigin[2] - nearest.origin[2] > 18 )
+        {
+            tag.unreachable = 1;
+            continue;
+        }
+
+        if ( !isdefined( tag.unreachable ) && !findpath( self.origin, tag.curorigin, tag, 0, 1 ) )
+            tag.unreachable = 1;
+        else
+            tag.unreachable = 0;
+
+        closest = distsq;
+        closetag = tag;
+    }
+
+    if ( isdefined( closetag ) )
+        self addgoal( closetag.curorigin, 16, 3, "conf_dogtag" );
+}
+
+conf_tag_in_radius( origin, radius )
 {
     foreach ( tag in level.dogtags )
     {
         if ( distancesquared( origin, tag.curorigin ) < radius * radius )
-		{
+            return true;
-			return 1;
-		}
-	}
-	return 0;
     }
 
-
+    return false;
+}

Multiplayer Core/patch_mp/maps/mp/bots/_bot_ctf.gsc

@@ -1,213 +1,182 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_gameobjects;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/bots/_bot_combat;
+#include maps\mp\gametypes\ctf;
-#include maps/mp/bots/_bot;
+#include common_scripts\utility;
-#include maps/mp/_utility;
+#include maps\mp\_utility;
-#include common_scripts/utility;
+#include maps\mp\bots\_bot;
-#include maps/mp/gametypes/ctf;
+#include maps\mp\bots\_bot_combat;
+#include maps\mp\gametypes\_gameobjects;
 
-bot_ctf_think() //checked changed to match cerberus output changed at own discretion
+bot_ctf_think()
 {
-	time = getTime();
+    time = gettime();
+
     if ( time < self.bot.update_objective )
-	{
         return;
-	}
+
     self.bot.update_objective = time + randomintrange( 500, 1500 );
-	if ( maps/mp/bots/_bot::bot_get_difficulty() != "easy" )
+
+    if ( maps\mp\bots\_bot::bot_get_difficulty() != "easy" )
     {
         flag_mine = ctf_get_flag( self.team );
+
         if ( flag_mine ishome() && distancesquared( self.origin, flag_mine.curorigin ) < 262144 )
         {
             nodes = getnodesinradius( flag_mine.curorigin, 256, 0, 64, "any", 8 );
             node = random( nodes );
-			if ( cointoss() )
+            self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( cointoss() ? flag_mine.curorigin : node.origin );
-			{
+            self maps\mp\bots\_bot_combat::bot_combat_toss_frag( cointoss() ? flag_mine.curorigin : node.origin );
-				self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( node.origin );
+            self maps\mp\bots\_bot_combat::bot_combat_toss_flash( cointoss() ? flag_mine.curorigin : node.origin );
-			}
-			if ( cointoss() )
-			{
-				self maps/mp/bots/_bot_combat::bot_combat_toss_frag( node.origin );
-			}
-			if ( cointoss() )
-			{
-				self maps/mp/bots/_bot_combat::bot_combat_toss_flash( node.origin );
-			}
         }
     }
+
     if ( bot_should_patrol_flag() )
     {
         bot_patrol_flag();
         return;
     }
+
     self cancelgoal( "ctf_flag_patrol" );
+
     if ( !bot_ctf_defend() )
-	{
         bot_ctf_capture();
-	}
+
     flag_mine = ctf_get_flag( self.team );
     flag_enemy = ctf_get_flag( getotherteam( self.team ) );
     home_mine = flag_mine ctf_flag_get_home();
+
     if ( ctf_has_flag( flag_enemy ) && self issprinting() && distancesquared( self.origin, home_mine ) < 36864 )
     {
         if ( bot_dot_product( home_mine ) > 0.9 )
-		{
             self bot_dive_to_prone( "stand" );
     }
-	}
+    else if ( !flag_mine ishome() && !isdefined( flag_mine.carrier ) )
-	else if ( !flag_mine ishome() && !isDefined( flag_mine.carrier ) )
     {
         if ( self issprinting() && distancesquared( self.origin, flag_mine.curorigin ) < 36864 )
         {
             if ( bot_dot_product( flag_mine.curorigin ) > 0.9 )
-			{
                 self bot_dive_to_prone( "stand" );
         }
     }
 }
-}
 
-bot_should_patrol_flag() //checked matches cerberus output
+bot_should_patrol_flag()
 {
     flag_mine = ctf_get_flag( self.team );
     flag_enemy = ctf_get_flag( getotherteam( self.team ) );
     home_mine = flag_mine ctf_flag_get_home();
+
     if ( self hasgoal( "ctf_flag" ) && !self atgoal( "ctf_flag" ) )
-	{
+        return false;
-		return 0;
+
-	}
     if ( ctf_has_flag( flag_enemy ) )
     {
         if ( !flag_mine ishome() )
-		{
+            return true;
-			return 1;
-		}
         else
-		{
+            return false;
-			return 0;
-		}
-	}
-	if ( !flag_mine ishome() )
-	{
-		return 0;
-	}
-	if ( distancesquared( self.origin, flag_enemy.curorigin ) < 262144 )
-	{
-		return 0;
-	}
-	if ( bot_get_friends().size && self maps/mp/bots/_bot::bot_friend_goal_in_radius( "ctf_flag_patrol", home_mine, 1024 ) == 0 )
-	{
-		return 1;
-	}
-	return 0;
     }
 
-ctf_get_flag( team ) //checked changed to match cerberus output
+    if ( !flag_mine ishome() )
+        return false;
+
+    if ( distancesquared( self.origin, flag_enemy.curorigin ) < 262144 )
+        return false;
+
+    if ( bot_get_friends().size && self maps\mp\bots\_bot::bot_friend_goal_in_radius( "ctf_flag_patrol", home_mine, 1024 ) == 0 )
+        return true;
+
+    return false;
+}
+
+ctf_get_flag( team )
 {
     foreach ( f in level.flags )
     {
-		if ( f maps/mp/gametypes/_gameobjects::getownerteam() == team )
+        if ( f maps\mp\gametypes\_gameobjects::getownerteam() == team )
-		{
             return f;
     }
-	}
+
     return undefined;
 }
 
-ctf_flag_get_home() //checked matches cerberus output
+ctf_flag_get_home()
 {
     return self.trigger.baseorigin;
 }
 
-ctf_has_flag( flag ) //checked changed at own discretion
+ctf_has_flag( flag )
 {
-	if ( isDefined( flag.carrier ) && flag.carrier == self )
+    return isdefined( flag.carrier ) && flag.carrier == self;
-	{
-		return 1;
-	}
-	return 0;
 }
 
-bot_ctf_capture() //checked changed to match cerberus output
+bot_ctf_capture()
 {
     flag_enemy = ctf_get_flag( getotherteam( self.team ) );
     flag_mine = ctf_get_flag( self.team );
     home_enemy = flag_enemy ctf_flag_get_home();
     home_mine = flag_mine ctf_flag_get_home();
+
     if ( ctf_has_flag( flag_enemy ) )
-	{
         self addgoal( home_mine, 16, 4, "ctf_flag" );
-	}
+    else if ( isdefined( flag_enemy.carrier ) )
-	else if ( isDefined( flag_enemy.carrier ) )
     {
         if ( self atgoal( "ctf_flag" ) )
-		{
             self cancelgoal( "ctf_flag" );
-		}
+
         goal = self getgoal( "ctf_flag" );
-		if ( isDefined( goal ) && distancesquared( goal, flag_enemy.carrier.origin ) < 589824 )
+
-		{
+        if ( isdefined( goal ) && distancesquared( goal, flag_enemy.carrier.origin ) < 589824 )
             return;
-		}
+
         nodes = getnodesinradius( flag_enemy.carrier.origin, 512, 64, 256, "any", 8 );
+
         if ( nodes.size )
-		{
             self addgoal( random( nodes ), 16, 3, "ctf_flag" );
-		}
         else
-		{
             self addgoal( flag_enemy.carrier.origin, 16, 3, "ctf_flag" );
     }
-	}
+    else if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "ctf_flag", flag_enemy.curorigin, 16 ) <= 1 )
-	else if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "ctf_flag", flag_enemy.curorigin, 16 ) <= 1 )
-	{
         self addgoal( flag_enemy.curorigin, 16, 3, "ctf_flag" );
 }
-}
 
-bot_ctf_defend() //checked changed to match cerberus output
+bot_ctf_defend()
 {
     flag_enemy = ctf_get_flag( getotherteam( self.team ) );
     flag_mine = ctf_get_flag( self.team );
     home_enemy = flag_enemy ctf_flag_get_home();
     home_mine = flag_mine ctf_flag_get_home();
+
     if ( flag_mine ishome() )
-	{
         return 0;
-	}
+
     if ( ctf_has_flag( flag_enemy ) )
-	{
         return 0;
-	}
+
-	if ( !isDefined( flag_mine.carrier ) )
+    if ( !isdefined( flag_mine.carrier ) )
-	{
-		if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "ctf_flag", flag_mine.curorigin, 16 ) <= 1 )
     {
+        if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "ctf_flag", flag_mine.curorigin, 16 ) <= 1 )
             return self bot_ctf_add_goal( flag_mine.curorigin, 4, "ctf_flag" );
     }
-	}
     else if ( !flag_enemy ishome() || distance2dsquared( self.origin, home_enemy ) > 250000 )
-	{
         return self bot_ctf_add_goal( flag_mine.curorigin, 4, "ctf_flag" );
-	}
+    else if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "ctf_flag", home_enemy, 16 ) <= 1 )
-	else if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "ctf_flag", home_enemy, 16 ) <= 1 )
-	{
         self addgoal( home_enemy, 16, 4, "ctf_flag" );
-	}
+
     return 1;
 }
 
-bot_ctf_add_goal( origin, goal_priority, goal_name ) //checked matches cerberus output
+bot_ctf_add_goal( origin, goal_priority, goal_name )
 {
     goal = undefined;
+
     if ( findpath( self.origin, origin, undefined, 0, 1 ) )
-	{
         goal = origin;
-	}
     else
     {
         node = bot_ctf_random_visible_node( origin );
-		if ( isDefined( node ) )
+
+        if ( isdefined( node ) )
         {
             if ( findpath( self.origin, node.origin, undefined, 0, 1 ) )
             {
@@ -216,168 +185,178 @@ bot_ctf_add_goal( origin, goal_priority, goal_name ) //checked matches cerberus
             }
         }
     }
-	if ( isDefined( goal ) )
+
+    if ( isdefined( goal ) )
     {
         self addgoal( goal, 16, goal_priority, goal_name );
-		return 1;
+        return true;
-	}
-	return 0;
     }
 
-bot_get_look_at() //checked matches cerberus output
+    return false;
+}
+
+bot_get_look_at()
 {
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( self.origin, 1 );
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( self.origin, 1 );
-	if ( isDefined( enemy ) )
+
+    if ( isdefined( enemy ) )
     {
         node = getvisiblenode( self.origin, enemy.origin );
-		if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-		{
+        if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
             return node.origin;
     }
-	}
+
-	enemies = self maps/mp/bots/_bot::bot_get_enemies( 0 );
+    enemies = self maps\mp\bots\_bot::bot_get_enemies( 0 );
+
     if ( enemies.size )
-	{
         enemy = random( enemies );
-	}
+
-	if ( isDefined( enemy ) )
+    if ( isdefined( enemy ) )
     {
         node = getvisiblenode( self.origin, enemy.origin );
-		if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-		{
+        if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
             return node.origin;
     }
-	}
+
     flag_mine = ctf_get_flag( self.team );
     home_mine = flag_mine ctf_flag_get_home();
     return home_mine;
 }
 
-bot_patrol_flag() //checked changed to match cerberus output
+bot_patrol_flag()
 {
     self cancelgoal( "ctf_flag" );
     flag_mine = ctf_get_flag( self.team );
+
     if ( self atgoal( "ctf_flag_patrol" ) )
     {
         node = getnearestnode( self.origin );
-		if ( !isDefined( node ) )
+
+        if ( !isdefined( node ) )
         {
             self clearlookat();
             self cancelgoal( "ctf_flag_patrol" );
             return;
         }
+
         if ( node.type == "Path" )
-		{
             self setstance( "crouch" );
-		}
         else
-		{
             self setstance( "stand" );
-		}
+
-		if ( getTime() > self.bot.update_lookat )
+        if ( gettime() > self.bot.update_lookat )
         {
             origin = self bot_get_look_at();
             z = 20;
+
             if ( distancesquared( origin, self.origin ) > 262144 )
-			{
                 z = randomintrange( 16, 60 );
-			}
+
             self lookat( origin + ( 0, 0, z ) );
+
             if ( distancesquared( origin, self.origin ) > 65536 )
             {
                 dir = vectornormalize( self.origin - origin );
-				dir = vectorScale( dir, 256 );
+                dir = vectorscale( dir, 256 );
                 origin += dir;
             }
-			self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( origin );
+
-			self.bot.update_lookat = getTime() + randomintrange( 1500, 3000 );
+            self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( origin );
+            self.bot.update_lookat = gettime() + randomintrange( 1500, 3000 );
         }
+
         goal = self getgoal( "ctf_flag_patrol" );
         nearest = base_nearest_node( flag_mine );
         mine = getnearestnode( goal );
-		if ( isDefined( mine ) && !nodesvisible( mine, nearest ) )
+
+        if ( isdefined( mine ) && !nodesvisible( mine, nearest ) )
         {
             self clearlookat();
             self cancelgoal( "ctf_flag_patrol" );
         }
-		if ( getTime() > self.bot.update_objective_patrol )
+
+        if ( gettime() > self.bot.update_objective_patrol )
         {
             self clearlookat();
             self cancelgoal( "ctf_flag_patrol" );
         }
+
         return;
     }
+
     nearest = base_nearest_node( flag_mine );
+
     if ( self hasgoal( "ctf_flag_patrol" ) )
     {
         goal = self getgoal( "ctf_flag_patrol" );
+
         if ( distancesquared( self.origin, goal ) < 65536 )
         {
             origin = self bot_get_look_at();
             self lookat( origin );
         }
+
         if ( distancesquared( self.origin, goal ) < 16384 )
-		{
+            self.bot.update_objective_patrol = gettime() + randomintrange( 3000, 6000 );
-			self.bot.update_objective_patrol = getTime() + randomintrange( 3000, 6000 );
+
-		}
         mine = getnearestnode( goal );
-		if ( isDefined( mine ) && !nodesvisible( mine, nearest ) )
+
+        if ( isdefined( mine ) && !nodesvisible( mine, nearest ) )
         {
             self clearlookat();
             self cancelgoal( "ctf_flag_patrol" );
         }
+
         return;
     }
-	if ( getTime() < self.bot.update_objective_patrol )
+
-	{
+    if ( gettime() < self.bot.update_objective_patrol )
         return;
-	}
+
     nodes = getvisiblenodes( nearest );
-	/*
 /#
     assert( nodes.size );
 #/
-	*/
     for ( i = randomint( nodes.size ); i < nodes.size; i++ )
     {
-		if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "ctf_flag_patrol", nodes[ i ].origin, 256 ) == 0 )
+        if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "ctf_flag_patrol", nodes[i].origin, 256 ) == 0 )
         {
             self addgoal( nodes[i], 24, 3, "ctf_flag_patrol" );
-			self.bot.update_objective_patrol = getTime() + randomintrange( 3000, 6000 );
+            self.bot.update_objective_patrol = gettime() + randomintrange( 3000, 6000 );
             return;
         }
     }
 }
 
-base_nearest_node( flag ) //checked matches cerberus output
+base_nearest_node( flag )
 {
     home = flag ctf_flag_get_home();
     nodes = getnodesinradiussorted( home, 256, 0 );
-	/*
 /#
     assert( nodes.size );
 #/
-	*/
     return nodes[0];
 }
 
-bot_ctf_random_visible_node( origin ) //checked changed to match cerberus output
+bot_ctf_random_visible_node( origin )
 {
     nodes = getnodesinradius( origin, 384, 0, 256 );
-	nearest = maps/mp/bots/_bot_combat::bot_nearest_node( origin );
+    nearest = maps\mp\bots\_bot_combat::bot_nearest_node( origin );
-	if ( isDefined( nearest ) && nodes.size )
+
+    if ( isdefined( nearest ) && nodes.size )
     {
         current = randomintrange( 0, nodes.size );
+
         for ( i = 0; i < nodes.size; i++ )
         {
             current = ( current + 1 ) % nodes.size;
+
             if ( nodesvisible( nodes[current], nearest ) )
-			{
                 return nodes[current];
         }
     }
-	}
+
     return undefined;
 }
-
-

Multiplayer Core/patch_mp/maps/mp/bots/_bot_dem.gsc

@@ -1,13 +1,14 @@
-//checked changed includes to match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/bots/_bot;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/bots/_bot_combat;
+#include maps\mp\gametypes\dem;
-#include maps/mp/_utility;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\_utility;
-#include maps/mp/gametypes/dem;
+#include maps\mp\bots\_bot_combat;
+#include maps\mp\bots\_bot;
 
-bot_dem_think() //checked changed to match cerberus output
+bot_dem_think()
 {
-	if ( !isDefined( level.bombzones[ 0 ].dem_nodes ) )
+    if ( !isdefined( level.bombzones[0].dem_nodes ) )
     {
         foreach ( zone in level.bombzones )
         {
@@ -15,33 +16,33 @@ bot_dem_think() //checked changed to match cerberus output
             zone.dem_nodes = getnodesinradius( zone.trigger.origin, 1024, 64, 128, "Path" );
         }
     }
+
     if ( self.team == game["attackers"] )
-	{
         bot_dem_attack_think();
-	}
     else
-	{
         bot_dem_defend_think();
 }
-}
 
-bot_dem_attack_think() //checked partially changed to match cerberus output changed at own discretion
+bot_dem_attack_think()
 {
     zones = dem_get_alive_zones();
+
     if ( !zones.size )
-	{
         return;
-	}
+
-	if ( !isDefined( self.goal_flag ) )
+    if ( !isdefined( self.goal_flag ) )
     {
         zones = array_randomize( zones );
+
         foreach ( zone in zones )
         {
             if ( zones.size == 1 || is_true( zone.bombplanted ) && !is_true( zone.bombexploded ) )
             {
                 self.goal_flag = zone;
                 break;
+                continue;
             }
+
             if ( randomint( 100 ) < 50 )
             {
                 self.goal_flag = zone;
@@ -49,7 +50,8 @@ bot_dem_attack_think() //checked partially changed to match cerberus output chan
             }
         }
     }
-	else if ( isDefined( self.goal_flag ) )
+
+    if ( isdefined( self.goal_flag ) )
     {
         if ( is_true( self.goal_flag.bombexploded ) )
         {
@@ -58,37 +60,34 @@ bot_dem_attack_think() //checked partially changed to match cerberus output chan
             self cancelgoal( "bomb" );
         }
         else if ( is_true( self.goal_flag.bombplanted ) )
-		{
             self bot_dem_guard( self.goal_flag, self.goal_flag.dem_nodes, self.goal_flag.trigger.origin );
-		}
         else if ( self bot_dem_friend_interacting( self.goal_flag.trigger.origin ) )
-		{
             self bot_dem_guard( self.goal_flag, self.goal_flag.dem_nodes, self.goal_flag.trigger.origin );
-		}
         else
-		{
             self bot_dem_attack( self.goal_flag );
     }
 }
-}
 
-bot_dem_defend_think() //checked partially changed to match cerberus output changed at own discretion
+bot_dem_defend_think()
 {
     zones = dem_get_alive_zones();
+
     if ( !zones.size )
-	{
         return;
-	}
+
-	if ( !isDefined( self.goal_flag ) )
+    if ( !isdefined( self.goal_flag ) )
     {
         zones = array_randomize( zones );
+
         foreach ( zone in zones )
         {
             if ( zones.size == 1 || is_true( zone.bombplanted ) && !is_true( zone.bombexploded ) )
             {
                 self.goal_flag = zone;
                 break;
+                continue;
             }
+
             if ( randomint( 100 ) < 50 )
             {
                 self.goal_flag = zone;
@@ -96,7 +95,8 @@ bot_dem_defend_think() //checked partially changed to match cerberus output chan
             }
         }
     }
-	else if ( isDefined( self.goal_flag ) )
+
+    if ( isdefined( self.goal_flag ) )
     {
         if ( is_true( self.goal_flag.bombexploded ) )
         {
@@ -105,130 +105,132 @@ bot_dem_defend_think() //checked partially changed to match cerberus output chan
             self cancelgoal( "bomb" );
         }
         else if ( is_true( self.goal_flag.bombplanted ) && !self bot_dem_friend_interacting( self.goal_flag.trigger.origin ) )
-		{
             self bot_dem_defuse( self.goal_flag );
-		}
         else
-		{
             self bot_dem_guard( self.goal_flag, self.goal_flag.dem_nodes, self.goal_flag.trigger.origin );
     }
 }
-}
 
-bot_dem_attack( zone ) //checked changed to match cerberus output
+bot_dem_attack( zone )
 {
     self cancelgoal( "dem_guard" );
+
     if ( !self hasgoal( "bomb" ) )
     {
         self.bomb_goal = self dem_get_bomb_goal( zone.visuals[0] );
-		if ( isDefined( self.bomb_goal ) )
+
-		{
+        if ( isdefined( self.bomb_goal ) )
             self addgoal( self.bomb_goal, 48, 2, "bomb" );
-		}
+
         return;
     }
+
     if ( !self atgoal( "bomb" ) )
     {
-		if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_smoke( self.bomb_goal ) )
+        if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_smoke( self.bomb_goal ) )
         {
-			if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( self.bomb_goal ) )
+            if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( self.bomb_goal ) )
-			{
+                self maps\mp\bots\_bot_combat::bot_combat_throw_lethal( self.bomb_goal );
-				self maps/mp/bots/_bot_combat::bot_combat_throw_lethal( self.bomb_goal );
-			}
         }
+
         return;
     }
+
     self addgoal( self.bomb_goal, 48, 4, "bomb" );
     self setstance( "prone" );
     self pressusebutton( level.planttime + 1 );
     wait 0.5;
+
     if ( is_true( self.isplanting ) )
-	{
         wait( level.planttime + 1 );
-	}
+
     self pressusebutton( 0 );
     defenders = self bot_get_enemies();
+
     foreach ( defender in defenders )
     {
         if ( defender is_bot() )
-		{
             defender.goal_flag = undefined;
     }
-	}
+
     self setstance( "crouch" );
     wait 0.25;
     self cancelgoal( "bomb" );
     self setstance( "stand" );
 }
 
-bot_dem_guard( zone, nodes, origin ) //checked matches cerberus output
+bot_dem_guard( zone, nodes, origin )
 {
     self cancelgoal( "bomb" );
     enemy = self bot_dem_enemy_interacting( origin );
-	if ( isDefined( enemy ) )
+
+    if ( isdefined( enemy ) )
     {
-		self maps/mp/bots/_bot_combat::bot_combat_throw_lethal( enemy.origin );
+        self maps\mp\bots\_bot_combat::bot_combat_throw_lethal( enemy.origin );
         self addgoal( enemy.origin, 128, 3, "dem_guard" );
         return;
     }
+
     enemy = self bot_dem_enemy_nearby( origin );
-	if ( isDefined( enemy ) )
+
+    if ( isdefined( enemy ) )
     {
-		self maps/mp/bots/_bot_combat::bot_combat_throw_lethal( enemy.origin );
+        self maps\mp\bots\_bot_combat::bot_combat_throw_lethal( enemy.origin );
         self addgoal( enemy.origin, 128, 3, "dem_guard" );
         return;
     }
+
     if ( self hasgoal( "dem_guard" ) && !self atgoal( "dem_guard" ) )
     {
-		self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( origin );
+        self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( origin );
         return;
     }
+
     node = random( nodes );
     self addgoal( node, 24, 2, "dem_guard" );
 }
 
-bot_dem_defuse( zone ) //checked matches cerberus output
+bot_dem_defuse( zone )
 {
     self cancelgoal( "dem_guard" );
+
     if ( !self hasgoal( "bomb" ) )
     {
         self.bomb_goal = self dem_get_bomb_goal( zone.visuals[0] );
-		if ( isDefined( self.bomb_goal ) )
+
-		{
+        if ( isdefined( self.bomb_goal ) )
             self addgoal( self.bomb_goal, 48, 2, "bomb" );
-		}
+
         return;
     }
+
     if ( !self atgoal( "bomb" ) )
     {
-		if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_smoke( self.bomb_goal ) )
+        if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_smoke( self.bomb_goal ) )
         {
-			if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( self.bomb_goal ) )
+            if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( self.bomb_goal ) )
-			{
+                self maps\mp\bots\_bot_combat::bot_combat_throw_lethal( self.bomb_goal );
-				self maps/mp/bots/_bot_combat::bot_combat_throw_lethal( self.bomb_goal );
         }
-		}
+
-		if ( ( self.goal_flag.detonatetime - getTime() ) < 12000 )
+        if ( self.goal_flag.detonatetime - gettime() < 12000 )
-		{
             self addgoal( self.bomb_goal, 48, 4, "bomb" );
-		}
+
         return;
     }
+
     self addgoal( self.bomb_goal, 48, 4, "bomb" );
+
     if ( cointoss() )
-	{
         self setstance( "crouch" );
-	}
     else
-	{
         self setstance( "prone" );
-	}
+
     self pressusebutton( level.defusetime + 1 );
     wait 0.5;
+
     if ( is_true( self.isdefusing ) )
-	{
         wait( level.defusetime + 1 );
-	}
+
     self pressusebutton( 0 );
     self setstance( "crouch" );
     wait 0.25;
@@ -236,96 +238,96 @@ bot_dem_defuse( zone ) //checked matches cerberus output
     self setstance( "stand" );
 }
 
-bot_dem_enemy_interacting( origin ) //checked partially changed to match cerberus output did not use continue see github for more info
+bot_dem_enemy_interacting( origin )
 {
-	enemies = maps/mp/bots/_bot::bot_get_enemies();
+    enemies = maps\mp\bots\_bot::bot_get_enemies();
+
     foreach ( enemy in enemies )
     {
         if ( distancesquared( enemy.origin, origin ) > 65536 )
-		{
+            continue;
-		}
+
-		else if ( is_true( enemy.isdefusing ) || is_true( enemy.isplanting ) )
+        if ( is_true( enemy.isdefusing ) || is_true( enemy.isplanting ) )
-		{
             return enemy;
     }
-	}
+
     return undefined;
 }
 
-bot_dem_friend_interacting( origin ) //checked partially changed to match cerberus output did not use continue see github for more info
+bot_dem_friend_interacting( origin )
 {
-	friends = maps/mp/bots/_bot::bot_get_friends();
+    friends = maps\mp\bots\_bot::bot_get_friends();
+
     foreach ( friend in friends )
     {
         if ( distancesquared( friend.origin, origin ) > 65536 )
-		{
+            continue;
-		}
+
-		else if ( is_true( friend.isdefusing ) || is_true( friend.isplanting ) )
+        if ( is_true( friend.isdefusing ) || is_true( friend.isplanting ) )
-		{
+            return true;
-			return 1;
-		}
-	}
-	return 0;
     }
 
-bot_dem_enemy_nearby( origin ) //checked matches cerberus output
+    return false;
+}
+
+bot_dem_enemy_nearby( origin )
 {
-	enemy = maps/mp/bots/_bot::bot_get_closest_enemy( origin, 1 );
+    enemy = maps\mp\bots\_bot::bot_get_closest_enemy( origin, 1 );
-	if ( isDefined( enemy ) )
+
+    if ( isdefined( enemy ) )
     {
         if ( distancesquared( enemy.origin, origin ) < 1048576 )
-		{
             return enemy;
     }
-	}
+
     return undefined;
 }
 
-dem_get_alive_zones() //checked partially changed to match cerberus output did not use continue see github for more info
+dem_get_alive_zones()
 {
     zones = [];
+
     foreach ( zone in level.bombzones )
     {
         if ( is_true( zone.bombexploded ) )
-		{
+            continue;
-		}
+
-		else
-		{
         zones[zones.size] = zone;
     }
-	}
+
     return zones;
 }
 
-dem_get_bomb_goal( ent ) //checked changed to match cerberus output
+dem_get_bomb_goal( ent )
 {
-	if ( !isDefined( ent.bot_goals ) )
+    if ( !isdefined( ent.bot_goals ) )
     {
         goals = [];
         ent.bot_goals = [];
-		dir = anglesToForward( ent.angles );
+        dir = anglestoforward( ent.angles );
-		dir = vectorScale( dir, 32 );
+        dir = vectorscale( dir, 32 );
         goals[0] = ent.origin + dir;
         goals[1] = ent.origin - dir;
-		dir = anglesToRight( ent.angles );
+        dir = anglestoright( ent.angles );
-		dir = vectorScale( dir, 48 );
+        dir = vectorscale( dir, 48 );
         goals[2] = ent.origin + dir;
         goals[3] = ent.origin - dir;
+
         foreach ( goal in goals )
         {
-			start = goal + vectorScale( ( 0, 0, 1 ), 128 );
+            start = goal + vectorscale( ( 0, 0, 1 ), 128.0 );
             trace = bullettrace( start, goal, 0, undefined );
             ent.bot_goals[ent.bot_goals.size] = trace["position"];
         }
     }
+
     goals = array_randomize( ent.bot_goals );
+
     foreach ( goal in goals )
     {
         if ( findpath( self.origin, goal, 0 ) )
-		{
             return goal;
     }
-	}
+
     return undefined;
 }
-

Multiplayer Core/patch_mp/maps/mp/bots/_bot_dom.gsc

@@ -1,201 +1,196 @@
-//checked includes match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/bots/_bot;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/bots/_bot_combat;
+#include maps\mp\gametypes\dom;
-#include maps/mp/_utility;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\_utility;
-#include maps/mp/gametypes/dom;
+#include maps\mp\bots\_bot_combat;
+#include maps\mp\bots\_bot;
 
-bot_dom_think() //checked changed to match cerberus output
+bot_dom_think()
 {
-	time = getTime();
+    time = gettime();
+
     if ( time < self.bot.update_objective )
-	{
         return;
-	}
+
     self.bot.update_objective = time + randomintrange( 500, 1500 );
+
     if ( self bot_is_capturing_flag() )
     {
         flag = self dom_get_closest_flag();
         self bot_capture_flag( flag );
         return;
     }
+
     flag = self dom_get_closest_flag();
+
     if ( flag getflagteam() != self.team && distance2dsquared( self.origin, flag.origin ) < 147456 && !bot_has_flag_goal( flag ) )
     {
         self bot_move_to_flag( flag );
         return;
     }
+
     flag = dom_get_weighted_flag( "neutral" );
-	if ( !isDefined( flag ) )
+
-	{
+    if ( !isdefined( flag ) )
         flag = dom_get_best_flag( self.team );
-	}
+
     if ( dom_has_two_flags( self.team ) )
-	{
         flag = dom_get_best_flag( self.team );
-	}
+
-	if ( !isDefined( flag ) )
+    if ( !isdefined( flag ) )
-	{
         return;
-	}
+
     if ( !bot_has_flag_goal( flag ) && !self bot_goal_is_enemy_flag() )
-	{
         self bot_move_to_flag( flag );
-	}
+    else
-	else if ( !dom_is_game_start() )
     {
+        if ( !dom_is_game_start() )
             self bot_flag_grenade( flag );
-	}
+
-	if ( distancesquared( self.origin, flag.origin ) < ( flag.radius * flag.radius ) && self istouching( flag.useobj.trigger ) )
+        if ( distancesquared( self.origin, flag.origin ) < flag.radius * flag.radius && self istouching( flag.useobj.trigger ) )
-	{
             self bot_capture_flag( flag );
     }
 }
 
-bot_move_to_flag( flag ) //checked matches cerberus output
+bot_move_to_flag( flag )
 {
     if ( level.script == "mp_frostbite" )
-	{
         nodes = getnodesinradius( flag.origin, flag.radius, 0, 32 );
-	}
     else
-	{
         nodes = getnodesinradius( flag.origin, flag.radius, 0 );
-	}
-	/*
 /#
     assert( nodes.size );
 #/
-	*/
     node = random( nodes );
     self addgoal( node, 24, 3, "dom_flag" );
 }
 
-bot_is_capturing_flag() //checked matches cerberus output
+bot_is_capturing_flag()
 {
     return self atgoal( "dom_flag" );
 }
 
-bot_has_flag_goal( flag ) //checked matches cerberus output
+bot_has_flag_goal( flag )
 {
     origin = self getgoal( "dom_flag" );
-	if ( isDefined( origin ) )
+
+    if ( isdefined( origin ) )
     {
-		if ( distancesquared( flag.origin, origin ) < ( flag.radius * flag.radius ) )
+        if ( distancesquared( flag.origin, origin ) < flag.radius * flag.radius )
-		{
+            return true;
-			return 1;
-		}
-	}
-	return 0;
     }
 
-bot_has_no_goal() //checked matches cerberus output
+    return false;
-{
-	origin = self getgoal( "dom_flag" );
-	if ( isDefined( origin ) )
-	{
-		return 0;
-	}
-	return 1;
 }
 
-bot_goal_is_enemy_flag() //checked changed to match cerberus output
+bot_has_no_goal()
 {
     origin = self getgoal( "dom_flag" );
-	if ( isDefined( origin ) )
+
+    if ( isdefined( origin ) )
+        return false;
+
+    return true;
+}
+
+bot_goal_is_enemy_flag()
+{
+    origin = self getgoal( "dom_flag" );
+
+    if ( isdefined( origin ) )
     {
         foreach ( flag in level.flags )
         {
-			if ( distancesquared( flag.origin, origin ) < ( flag.radius * flag.radius ) )
+            if ( distancesquared( flag.origin, origin ) < flag.radius * flag.radius )
             {
                 if ( flag getflagteam() != self.team || dom_is_flag_contested( flag ) )
-				{
+                    return true;
-					return 1;
             }
         }
     }
-	}
-	return 0;
-}
 
-bot_flag_grenade( flag ) //checked matches cerberus output
+    return false;
+}
+
+bot_flag_grenade( flag )
 {
     if ( flag getflagteam() != self.team )
     {
         if ( bot_tactical_insertion( flag ) )
-		{
             return;
+
+        self maps\mp\bots\_bot_combat::bot_combat_throw_smoke( flag.origin );
     }
-		self maps/mp/bots/_bot_combat::bot_combat_throw_smoke( flag.origin );
+
-	}
     if ( !dom_is_flag_contested( flag ) )
-	{
         return;
-	}
+
-	if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_lethal( flag.origin ) )
+    if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_lethal( flag.origin ) )
     {
-		if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_tactical( flag.origin ) )
+        if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_tactical( flag.origin ) )
-		{
+            self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( flag.origin );
-			self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( flag.origin );
-		}
     }
 }
 
-bot_get_look_at( flag ) //checked matches cerberus output
+bot_get_look_at( flag )
 {
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( self.origin, 0 );
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( self.origin, 0 );
-	if ( isDefined( enemy ) )
+
+    if ( isdefined( enemy ) )
     {
         node = getvisiblenode( self.origin, enemy.origin );
-		if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-		{
+        if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
             return node.origin;
     }
-	}
+
     spawn = random( level.spawn_all );
     node = getvisiblenode( self.origin, spawn.origin );
-	if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-	{
+    if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
         return node.origin;
-	}
+
     return flag.origin;
 }
 
-bot_capture_flag( flag ) //checked changed to match cerberus output
+bot_capture_flag( flag )
 {
-	time = getTime();
+    time = gettime();
+
     if ( flag getflagteam() != self.team )
     {
         if ( self getstance() == "prone" )
-		{
             self addgoal( self.origin, 24, 4, "dom_flag" );
-		}
         else
-		{
             self addgoal( self.origin, 24, 3, "dom_flag" );
-		}
+
         if ( time > self.bot.update_lookat )
         {
             origin = self bot_get_look_at( flag );
             z = 20;
+
             if ( distancesquared( origin, self.origin ) > 262144 )
-			{
                 z = randomintrange( 16, 60 );
-			}
+
             self lookat( origin + ( 0, 0, z ) );
             self.bot.update_lookat = time + randomintrange( 1500, 3000 );
+
             if ( distancesquared( origin, self.origin ) > 65536 )
             {
                 dir = vectornormalize( self.origin - origin );
-				dir = vectorScale( dir, 256 );
+                dir = vectorscale( dir, 256 );
                 origin += dir;
             }
-			self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( origin );
+
-			self maps/mp/bots/_bot_combat::bot_combat_toss_frag( self.origin );
+            self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( origin );
-			self maps/mp/bots/_bot_combat::bot_combat_toss_flash( self.origin );
+            self maps\mp\bots\_bot_combat::bot_combat_toss_frag( self.origin );
+            self maps\mp\bots\_bot_combat::bot_combat_toss_flash( self.origin );
+
             if ( !dom_is_game_start() )
             {
                 weapon = self getcurrentweapon();
+
                 if ( weapon == "riotshield_mp" || weapon == "minigun_mp" )
                 {
                     if ( cointoss() )
@@ -207,7 +202,7 @@ bot_capture_flag( flag ) //checked changed to match cerberus output
                 else if ( cointoss() && !bot_friend_in_radius( self.origin, 384 ) )
                 {
                     self addgoal( self.origin, 24, 4, "dom_flag" );
-					wait randomfloatrange( 0.5, 1 );
+                    wait( randomfloatrange( 0.5, 1 ) );
                     self setstance( "prone" );
                     self.bot.update_lookat += 5000;
                 }
@@ -217,7 +212,7 @@ bot_capture_flag( flag ) //checked changed to match cerberus output
         {
             if ( self getstance() == "stand" )
             {
-				wait randomfloatrange( 0.5, 1 );
+                wait( randomfloatrange( 0.5, 1 ) );
                 self setstance( "crouch" );
             }
         }
@@ -226,6 +221,7 @@ bot_capture_flag( flag ) //checked changed to match cerberus output
     {
         self clearlookat();
         self cancelgoal( "dom_flag" );
+
         if ( self getstance() == "crouch" )
         {
             self setstance( "stand" );
@@ -241,223 +237,196 @@ bot_capture_flag( flag ) //checked changed to match cerberus output
     }
 }
 
-dom_is_game_start() //checked changed to match cerberus output
+dom_is_game_start()
 {
-	/*
 /#
-	assert( isDefined( level.flags ) );
+    assert( isdefined( level.flags ) );
 #/
-	*/
     foreach ( flag in level.flags )
     {
         if ( flag getflagteam() != "neutral" )
-		{
+            return false;
-			return 0;
-		}
-	}
-	return 1;
     }
 
-dom_get_closest_flag() //checked matches cerberus output
+    return true;
+}
+
+dom_get_closest_flag()
 {
     flags = arraysort( level.flags, self.origin );
     return flags[0];
 }
 
-dom_get_weighted_flag( owner ) //checked partially changed to match cerberus output did not use continue see github for more info
+dom_get_weighted_flag( owner )
 {
-	/*
 /#
-	assert( isDefined( level.flags ) );
+    assert( isdefined( level.flags ) );
 #/
-	*/
     best = undefined;
     distsq = 9999999;
+
     foreach ( flag in level.flags )
     {
-		if ( isDefined( owner ) && flag getflagteam() != owner )
+        if ( isdefined( owner ) && flag getflagteam() != owner )
-		{
+            continue;
-		}
+
-		else
-		{
         d = distancesquared( self.origin, flag.origin );
-			if ( distsq != 9999999 && d < distsq || randomint( 100 ) < 70 && randomint( 100 ) > 70 )
+
+        if ( distsq == 9999999 || d < distsq && randomint( 100 ) < 70 || randomint( 100 ) > 70 )
         {
             best = flag;
             distsq = d;
         }
     }
-	}
+
     return best;
 }
 
-dom_get_weighted_enemy_flag( team ) //checked partially changed to match cerberus output did not use continue see github for more info
+dom_get_weighted_enemy_flag( team )
 {
-	/*
 /#
-	assert( isDefined( level.flags ) );
+    assert( isdefined( level.flags ) );
 #/
-	*/
     best = undefined;
     distsq = 9999999;
+
     foreach ( flag in level.flags )
     {
         if ( flag getflagteam() == team )
-		{
+            continue;
-		}
+
-		else
-		{
         d = distancesquared( self.origin, flag.origin );
-			if ( distsq != 9999999 && d < distsq || randomint( 100 ) < 80 && randomint( 100 ) > 80 )
+
+        if ( distsq == 9999999 || d < distsq && randomint( 100 ) < 80 || randomint( 100 ) > 80 )
         {
             best = flag;
             distsq = d;
         }
     }
-	}
+
     return best;
 }
 
-dom_is_flag_contested( flag ) //checked changed at own discretion
+dom_is_flag_contested( flag )
 {
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( flag.origin, 0 );
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( flag.origin, 0 );
-	if ( isDefined( enemy ) && distancesquared( enemy.origin, flag.origin ) < 147456 )
+    return isdefined( enemy ) && distancesquared( enemy.origin, flag.origin ) < 147456;
-	{
-		return 1;
-	}
-	return 0;
 }
 
-dom_has_two_flags( team ) //checked partially changed to match cerberus output did not use continue see github for more info
+dom_has_two_flags( team )
 {
     count = 0;
+
     foreach ( flag in level.flags )
     {
         if ( dom_is_flag_contested( flag ) )
-		{
+            continue;
-		}
+
-		else
-		{
         if ( flag getflagteam() == team )
-			{
             count++;
     }
-		}
+
-	}
     return count >= 2;
 }
 
-dom_get_weighted_contested_flag( team ) //checked partially changed to match cerberus output did not use continue see github for more info
+dom_get_weighted_contested_flag( team )
 {
-	/*
 /#
-	assert( isDefined( level.flags ) );
+    assert( isdefined( level.flags ) );
 #/
-	*/
     best = undefined;
     distsq = 9999999;
+
     foreach ( flag in level.flags )
     {
         if ( !dom_is_flag_contested( flag ) )
-		{
+            continue;
-		}
+
-		else
-		{
         d = distancesquared( self.origin, flag.origin );
-			if ( distsq != 9999999 && d < distsq || randomint( 100 ) < 80 && randomint( 100 ) > 80 )
+
+        if ( distsq == 9999999 || d < distsq && randomint( 100 ) < 80 || randomint( 100 ) > 80 )
         {
             best = flag;
             distsq = d;
         }
     }
-	}
+
     return best;
 }
 
-dom_get_random_flag( owner ) //checked changed to match cerberus output
+dom_get_random_flag( owner )
 {
-	/*
 /#
-	assert( isDefined( level.flags ) );
+    assert( isdefined( level.flags ) );
 #/
-	*/
     flagindex = randomintrange( 0, level.flags.size );
-	if ( !isDefined( owner ) )
+
-	{
+    if ( !isdefined( owner ) )
         return level.flags[flagindex];
-	}
+
     for ( i = 0; i < level.flags.size; i++ )
     {
         if ( level.flags[flagindex] getflagteam() == owner )
-		{
             return level.flags[flagindex];
-		}
+
         flagindex = ( flagindex + 1 ) % level.flags.size;
     }
+
     return undefined;
 }
 
-dom_get_best_flag( team ) //checked matches cerberus output
+dom_get_best_flag( team )
 {
     flag1 = dom_get_weighted_enemy_flag( team );
     flag2 = dom_get_weighted_contested_flag( team );
-	if ( !isDefined( flag1 ) )
+
-	{
+    if ( !isdefined( flag1 ) )
         return flag2;
-	}
+
-	if ( !isDefined( flag2 ) )
+    if ( !isdefined( flag2 ) )
-	{
         return flag1;
-	}
+
     offchance = randomint( 100 ) > 80;
+
     if ( distancesquared( self.origin, flag1.origin ) < distancesquared( self.origin, flag2.origin ) )
     {
         if ( !offchance )
-		{
             return flag1;
-		}
         else
-		{
             return flag2;
     }
-	}
-	if ( !offchance )
-	{
-		return flag2;
-	}
-	else
-	{
-		return flag1;
-	}
-}
 
-bot_tactical_insertion( flag ) //checked matches cerberus output
+    if ( !offchance )
+        return flag2;
+    else
+        return flag1;
+}
+
+bot_tactical_insertion( flag )
 {
     if ( self getweaponammostock( "tactical_insertion_mp" ) <= 0 )
-	{
         return 0;
-	}
+
     dist = self getlookaheaddist();
     dir = self getlookaheaddir();
-	if ( !isDefined( dist ) || !isDefined( dir ) )
+
-	{
+    if ( !isdefined( dist ) || !isdefined( dir ) )
         return 0;
-	}
+
     node = bot_nearest_node( flag.origin );
     mine = bot_nearest_node( self.origin );
-	if ( isDefined( mine ) && !nodesvisible( mine, node ) )
+
+    if ( isdefined( mine ) && !nodesvisible( mine, node ) )
     {
-		origin = self.origin + vectorScale( dir, dist );
+        origin = self.origin + vectorscale( dir, dist );
         next = bot_nearest_node( origin );
+
         if ( next isdangerous( self.team ) )
-		{
             return 0;
-		}
+
-		if ( isDefined( next ) && nodesvisible( next, node ) )
+        if ( isdefined( next ) && nodesvisible( next, node ) )
-		{
             return bot_combat_tactical_insertion( self.origin );
     }
-	}
+
     return 0;
 }
-

Multiplayer Core/patch_mp/maps/mp/bots/_bot_hack.gsc

@@ -1,91 +1,89 @@
-#include maps/mp/bots/_bot;
+// T6 GSC SOURCE
-#include maps/mp/_utility;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include common_scripts/utility;
+#include maps\mp\gametypes\ctf;
-#include maps/mp/gametypes/ctf;
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\bots\_bot;
 
-bot_hack_tank_get_goal_origin( tank ) //checked changed to match cerberus output
+bot_hack_tank_get_goal_origin( tank )
 {
     nodes = getnodesinradiussorted( tank.origin, 256, 0, 64, "Path" );
+
     foreach ( node in nodes )
     {
         dir = vectornormalize( node.origin - tank.origin );
-		dir = vectorScale( dir, 32 );
+        dir = vectorscale( dir, 32 );
         goal = tank.origin + dir;
+
         if ( findpath( self.origin, goal, 0 ) )
-		{
             return goal;
     }
-	}
+
     return undefined;
 }
 
-bot_hack_has_goal( tank ) //checked matches cerberus output
+bot_hack_has_goal( tank )
 {
     goal = self getgoal( "hack" );
-	if ( isDefined( goal ) )
+
+    if ( isdefined( goal ) )
     {
         if ( distancesquared( goal, tank.origin ) < 16384 )
-		{
+            return true;
-			return 1;
-		}
-	}
-	return 0;
     }
 
-bot_hack_at_goal() //checked changed to match cerberus output
+    return false;
+}
+
+bot_hack_at_goal()
 {
     if ( self atgoal( "hack" ) )
-	{
+        return true;
-		return 1;
+
-	}
     goal = self getgoal( "hack" );
-	if ( isDefined( goal ) )
+
+    if ( isdefined( goal ) )
     {
         tanks = getentarray( "talon", "targetname" );
         tanks = arraysort( tanks, self.origin );
+
         foreach ( tank in tanks )
         {
             if ( distancesquared( goal, tank.origin ) < 16384 )
             {
-				if ( isDefined( tank.trigger ) && self istouching( tank.trigger ) )
+                if ( isdefined( tank.trigger ) && self istouching( tank.trigger ) )
-				{
+                    return true;
-					return 1;
             }
         }
     }
-	}
-	return 0;
-}
 
-bot_hack_goal_pregame( tanks ) //checked partially changed to match cerberus output did not use foreach see github for more info
+    return false;
-{
-	i = 0;
-	while ( i < tanks.size )
-	{
-		if ( isDefined( tanks[ i ].owner ) )
-		{
-			i++;
-			continue;
 }
-		if ( isDefined( tanks[ i ].team ) && tanks[ i ].team == self.team )
+
+bot_hack_goal_pregame( tanks )
 {
-			i++;
+    foreach ( tank in tanks )
+    {
+        if ( isdefined( tank.owner ) )
             continue;
-		}
+
-		goal = self bot_hack_tank_get_goal_origin( tanks[ i ] );
+        if ( isdefined( tank.team ) && tank.team == self.team )
-		if ( isDefined( goal ) )
+            continue;
+
+        goal = self bot_hack_tank_get_goal_origin( tank );
+
+        if ( isdefined( goal ) )
         {
             if ( self addgoal( goal, 24, 2, "hack" ) )
             {
-				self.goal_flag = tanks[ i ];
+                self.goal_flag = tank;
                 return;
             }
         }
-		i++;
     }
 }
 
-bot_hack_think() //checked partially changed to match cerberus output did not us foreach see github for more info
+bot_hack_think()
 {
     if ( bot_hack_at_goal() )
     {
@@ -97,48 +95,50 @@ bot_hack_think() //checked partially changed to match cerberus output did not us
         self setstance( "stand" );
         self cancelgoal( "hack" );
     }
+
     tanks = getentarray( "talon", "targetname" );
     tanks = arraysort( tanks, self.origin );
+
     if ( !is_true( level.drones_spawned ) )
-	{
         self bot_hack_goal_pregame( tanks );
-	}
+    else
-	i = 0;
-	while ( i < tanks.size )
     {
-		if ( isDefined( tanks[ i ].owner ) && tanks[ i ].owner == self )
+        foreach ( tank in tanks )
         {
-			i++;
+            if ( isdefined( tank.owner ) && tank.owner == self )
                 continue;
-		}
+
-		if ( !isDefined( tanks[ i ].owner ) )
+            if ( !isdefined( tank.owner ) )
-		{
-			if ( self bot_hack_has_goal( tanks[ i ] ) )
             {
+                if ( self bot_hack_has_goal( tank ) )
                     return;
-			}
+
-			goal = self bot_hack_tank_get_goal_origin( tanks[ i ] );
+                goal = self bot_hack_tank_get_goal_origin( tank );
-			if ( isDefined( goal ) )
+
+                if ( isdefined( goal ) )
                 {
                     self addgoal( goal, 24, 2, "hack" );
                     return;
                 }
             }
-		if ( tanks[ i ].isstunned && distancesquared( self.origin, tanks[ i ].origin ) < 262144 )
+
+            if ( tank.isstunned && distancesquared( self.origin, tank.origin ) < 262144 )
             {
-			goal = self bot_hack_tank_get_goal_origin( tanks[ i ] );
+                goal = self bot_hack_tank_get_goal_origin( tank );
-			if ( isDefined( goal ) )
+
+                if ( isdefined( goal ) )
                 {
                     self addgoal( goal, 24, 3, "hack" );
                     return;
                 }
             }
-		i++;
         }
-	if ( !maps/mp/bots/_bot::bot_vehicle_weapon_ammo( "emp_grenade_mp" ) )
+
+        if ( !maps\mp\bots\_bot::bot_vehicle_weapon_ammo( "emp_grenade_mp" ) )
         {
             ammo = getentarray( "weapon_scavenger_item_hack_mp", "classname" );
             ammo = arraysort( ammo, self.origin );
+
             foreach ( bag in ammo )
             {
                 if ( findpath( self.origin, bag.origin, 0 ) )
@@ -147,33 +147,31 @@ bot_hack_think() //checked partially changed to match cerberus output did not us
                     return;
                 }
             }
+
             return;
         }
-	i = 0;
+
-	while ( i < tanks.size )
+        foreach ( tank in tanks )
         {
-		if ( isDefined( tanks[ i ].owner ) && tanks[ i ].owner == self )
+            if ( isdefined( tank.owner ) && tank.owner == self )
-		{
-			i++;
                 continue;
-		}
+
-		if ( tanks[ i ].isstunned )
+            if ( tank.isstunned )
-		{
-			i++;
                 continue;
-		}
+
-		if ( self throwgrenade( "emp_grenade_mp", tanks[ i ].origin ) )
+            if ( self throwgrenade( "emp_grenade_mp", tank.origin ) )
             {
                 self waittill( "grenade_fire" );
-			goal = self bot_hack_tank_get_goal_origin( tanks[ i ] );
+
-			if ( isDefined( goal ) )
+                goal = self bot_hack_tank_get_goal_origin( tank );
+
+                if ( isdefined( goal ) )
                 {
                     self addgoal( goal, 24, 3, "hack" );
                     wait 0.5;
                     return;
                 }
             }
-		i++;
         }
     }
-
+}

Multiplayer Core/patch_mp/maps/mp/bots/_bot_hq.gsc

@@ -1,160 +1,164 @@
-//checked includes changed to match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/bots/_bot;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/bots/_bot_combat;
+#include maps\mp\gametypes\koth;
-#include maps/mp/_utility;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\_utility;
-#include maps/mp/gametypes/koth;
+#include maps\mp\bots\_bot_combat;
+#include maps\mp\bots\_bot;
 
-bot_hq_think() //checked changed to match cerberus output
+bot_hq_think()
 {
-	time = getTime();
+    time = gettime();
+
     if ( time < self.bot.update_objective )
-	{
         return;
-	}
+
     self.bot.update_objective = time + randomintrange( 500, 1500 );
+
     if ( bot_should_patrol_hq() )
-	{
         self bot_patrol_hq();
-	}
     else if ( !bot_has_hq_goal() )
-	{
         self bot_move_to_hq();
-	}
+
     if ( self bot_is_capturing_hq() )
-	{
         self bot_capture_hq();
-	}
+
     bot_hq_tactical_insertion();
     bot_hq_grenade();
+
     if ( !bot_is_capturing_hq() && !self atgoal( "hq_patrol" ) )
     {
         mine = getnearestnode( self.origin );
         node = hq_nearest_node();
-		if ( isDefined( mine ) && nodesvisible( mine, node ) )
+
-		{
+        if ( isdefined( mine ) && nodesvisible( mine, node ) )
-			self lookat( level.radio.baseorigin + vectorScale( ( 0, 0, 1 ), 30 ) );
+            self lookat( level.radio.baseorigin + vectorscale( ( 0, 0, 1 ), 30.0 ) );
-		}
     }
 }
 
-bot_has_hq_goal() //checked changed to match cerberus output
+bot_has_hq_goal()
 {
     origin = self getgoal( "hq_radio" );
-	if ( isDefined( origin ) )
+
+    if ( isdefined( origin ) )
     {
         foreach ( node in level.radio.nodes )
         {
             if ( distancesquared( origin, node.origin ) < 4096 )
-			{
+                return true;
-				return 1;
         }
     }
-	}
-	return 0;
-}
 
-bot_is_capturing_hq() //checked matches cerberus output
+    return false;
+}
+
+bot_is_capturing_hq()
 {
     return self atgoal( "hq_radio" );
 }
 
-bot_should_patrol_hq() //checked matches cerberus output
+bot_should_patrol_hq()
 {
     if ( level.radio.gameobject.ownerteam == "neutral" )
-	{
+        return false;
-		return 0;
+
-	}
     if ( level.radio.gameobject.ownerteam != self.team )
-	{
+        return false;
-		return 0;
+
-	}
     if ( hq_is_contested() )
-	{
+        return false;
-		return 0;
+
-	}
+    return true;
-	return 1;
 }
 
-bot_patrol_hq() //checked changed to match cerberus output
+bot_patrol_hq()
 {
     self cancelgoal( "hq_radio" );
+
     if ( self atgoal( "hq_patrol" ) )
     {
         node = getnearestnode( self.origin );
+
         if ( node.type == "Path" )
-		{
             self setstance( "crouch" );
-		}
         else
-		{
             self setstance( "stand" );
-		}
+
-		if ( getTime() > self.bot.update_lookat )
+        if ( gettime() > self.bot.update_lookat )
         {
             origin = self bot_get_look_at();
             z = 20;
+
             if ( distancesquared( origin, self.origin ) > 262144 )
-			{
                 z = randomintrange( 16, 60 );
-			}
+
             self lookat( origin + ( 0, 0, z ) );
+
             if ( distancesquared( origin, self.origin ) > 65536 )
             {
                 dir = vectornormalize( self.origin - origin );
-				dir = vectorScale( dir, 256 );
+                dir = vectorscale( dir, 256 );
                 origin += dir;
             }
-			self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( origin );
+
-			self.bot.update_lookat = getTime() + randomintrange( 1500, 3000 );
+            self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( origin );
+            self.bot.update_lookat = gettime() + randomintrange( 1500, 3000 );
         }
+
         goal = self getgoal( "hq_patrol" );
         nearest = hq_nearest_node();
         mine = getnearestnode( goal );
-		if ( isDefined( mine ) && !nodesvisible( mine, nearest ) )
+
+        if ( isdefined( mine ) && !nodesvisible( mine, nearest ) )
         {
             self clearlookat();
             self cancelgoal( "hq_patrol" );
         }
-		if ( getTime() > self.bot.update_objective_patrol )
+
+        if ( gettime() > self.bot.update_objective_patrol )
         {
             self clearlookat();
             self cancelgoal( "hq_patrol" );
         }
+
         return;
     }
+
     nearest = hq_nearest_node();
+
     if ( self hasgoal( "hq_patrol" ) )
     {
         goal = self getgoal( "hq_patrol" );
+
         if ( distancesquared( self.origin, goal ) < 65536 )
         {
             origin = self bot_get_look_at();
             self lookat( origin );
         }
+
         if ( distancesquared( self.origin, goal ) < 16384 )
-		{
+            self.bot.update_objective_patrol = gettime() + randomintrange( 3000, 6000 );
-			self.bot.update_objective_patrol = getTime() + randomintrange( 3000, 6000 );
+
-		}
         mine = getnearestnode( goal );
-		if ( isDefined( mine ) && !nodesvisible( mine, nearest ) )
+
+        if ( isdefined( mine ) && !nodesvisible( mine, nearest ) )
         {
             self clearlookat();
             self cancelgoal( "hq_patrol" );
         }
+
         return;
     }
+
     nodes = getvisiblenodes( nearest );
-	/*
 /#
     assert( nodes.size );
 #/
-	*/
     for ( i = randomint( nodes.size ); i < nodes.size; i++ )
     {
-		if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "hq_radio", nodes[ i ].origin, 128 ) == 0 )
+        if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "hq_radio", nodes[i].origin, 128 ) == 0 )
         {
-			if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "hq_patrol", nodes[ i ].origin, 256 ) == 0 )
+            if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "hq_patrol", nodes[i].origin, 256 ) == 0 )
             {
                 self addgoal( nodes[i], 24, 3, "hq_patrol" );
                 return;
@@ -163,200 +167,196 @@ bot_patrol_hq() //checked changed to match cerberus output
     }
 }
 
-bot_move_to_hq() //checked changed to match cerberus output
+bot_move_to_hq()
 {
     self clearlookat();
     self cancelgoal( "hq_radio" );
     self cancelgoal( "hq_patrol" );
+
     if ( self getstance() == "prone" )
     {
         self setstance( "crouch" );
         wait 0.25;
     }
+
     if ( self getstance() == "crouch" )
     {
         self setstance( "stand" );
         wait 0.25;
     }
+
     nodes = array_randomize( level.radio.nodes );
+
     foreach ( node in nodes )
     {
-		if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "hq_radio", node.origin, 64 ) == 0 )
+        if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "hq_radio", node.origin, 64 ) == 0 )
         {
             self addgoal( node, 24, 3, "hq_radio" );
             return;
         }
     }
+
     self addgoal( random( nodes ), 24, 3, "hq_radio" );
 }
 
-bot_get_look_at() //checked matches cerberus output
+bot_get_look_at()
 {
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( self.origin, 1 );
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( self.origin, 1 );
-	if ( isDefined( enemy ) )
+
+    if ( isdefined( enemy ) )
     {
         node = getvisiblenode( self.origin, enemy.origin );
-		if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-		{
+        if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
             return node.origin;
     }
-	}
+
-	enemies = self maps/mp/bots/_bot::bot_get_enemies( 0 );
+    enemies = self maps\mp\bots\_bot::bot_get_enemies( 0 );
+
     if ( enemies.size )
-	{
         enemy = random( enemies );
-	}
+
-	if ( isDefined( enemy ) )
+    if ( isdefined( enemy ) )
     {
         node = getvisiblenode( self.origin, enemy.origin );
-		if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-		{
+        if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
             return node.origin;
     }
-	}
+
     spawn = random( level.spawnpoints );
     node = getvisiblenode( self.origin, spawn.origin );
-	if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-	{
+    if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
         return node.origin;
-	}
+
     return level.radio.baseorigin;
 }
 
-bot_capture_hq() //checked matches cerberus output
+bot_capture_hq()
 {
     self addgoal( self.origin, 24, 3, "hq_radio" );
     self setstance( "crouch" );
-	if ( getTime() > self.bot.update_lookat )
+
+    if ( gettime() > self.bot.update_lookat )
     {
         origin = self bot_get_look_at();
         z = 20;
+
         if ( distancesquared( origin, self.origin ) > 262144 )
-		{
             z = randomintrange( 16, 60 );
-		}
+
         self lookat( origin + ( 0, 0, z ) );
+
         if ( distancesquared( origin, self.origin ) > 65536 )
         {
             dir = vectornormalize( self.origin - origin );
-			dir = vectorScale( dir, 256 );
+            dir = vectorscale( dir, 256 );
             origin += dir;
         }
-		self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( origin );
+
-		self.bot.update_lookat = getTime() + randomintrange( 1500, 3000 );
+        self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( origin );
+        self.bot.update_lookat = gettime() + randomintrange( 1500, 3000 );
     }
 }
 
-any_other_team_touching( skip_team ) //checked partially changed to match cerberus output did not use continue see github for more info
+any_other_team_touching( skip_team )
 {
     foreach ( team in level.teams )
     {
         if ( team == skip_team )
-		{
+            continue;
-		}
+
-		else
-		{
         if ( level.radio.gameobject.numtouching[team] )
-			{
+            return true;
-				return 1;
-			}
-		}
-	}
-	return 0;
     }
 
-is_hq_contested( skip_team ) //checked matches cerberus output
+    return false;
+}
+
+is_hq_contested( skip_team )
 {
     if ( any_other_team_touching( skip_team ) )
-	{
+        return true;
-		return 1;
+
-	}
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( level.radio.baseorigin, 1 );
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( level.radio.baseorigin, 1 );
+
-	if ( isDefined( enemy ) && distancesquared( enemy.origin, level.radio.baseorigin ) < 262144 )
+    if ( isdefined( enemy ) && distancesquared( enemy.origin, level.radio.baseorigin ) < 262144 )
-	{
+        return true;
-		return 1;
+
-	}
+    return false;
-	return 0;
 }
 
-bot_hq_grenade() //checked matches cerberus output
+bot_hq_grenade()
 {
     enemies = bot_get_enemies();
+
     if ( !enemies.size )
-	{
         return;
-	}
+
     if ( self atgoal( "hq_patrol" ) || self atgoal( "hq_radio" ) )
     {
         if ( self getweaponammostock( "proximity_grenade_mp" ) > 0 )
         {
             origin = bot_get_look_at();
-			if ( self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( origin ) )
+
-			{
+            if ( self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( origin ) )
                 return;
         }
     }
-	}
-	if ( !is_hq_contested( self.team ) )
-	{
-		self maps/mp/bots/_bot_combat::bot_combat_throw_smoke( level.radio.baseorigin );
-		return;
-	}
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( level.radio.baseorigin, 0 );
-	if ( isDefined( enemy ) )
-	{
-		origin = enemy.origin;
-	}
-	else
-	{
-		origin = level.radio.baseorigin;
-	}
-	dir = vectornormalize( self.origin - origin );
-	dir = ( 0, dir[ 1 ], 0 );
-	origin += vectorScale( dir, 128 );
-	if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_lethal( origin ) )
-	{
-		self maps/mp/bots/_bot_combat::bot_combat_throw_tactical( origin );
-	}
-}
 
-bot_hq_tactical_insertion() //checked matches cerberus output
+    if ( !is_hq_contested( self.team ) )
+    {
+        self maps\mp\bots\_bot_combat::bot_combat_throw_smoke( level.radio.baseorigin );
+        return;
+    }
+
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( level.radio.baseorigin, 0 );
+
+    if ( isdefined( enemy ) )
+        origin = enemy.origin;
+    else
+        origin = level.radio.baseorigin;
+
+    dir = vectornormalize( self.origin - origin );
+    dir = ( 0, dir[1], 0 );
+    origin += vectorscale( dir, 128 );
+
+    if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_lethal( origin ) )
+        self maps\mp\bots\_bot_combat::bot_combat_throw_tactical( origin );
+}
+
+bot_hq_tactical_insertion()
 {
     if ( !self hasweapon( "tactical_insertion_mp" ) )
-	{
         return;
-	}
+
     dist = self getlookaheaddist();
     dir = self getlookaheaddir();
-	if ( !isDefined( dist ) || !isDefined( dir ) )
+
-	{
+    if ( !isdefined( dist ) || !isdefined( dir ) )
         return;
-	}
+
     node = hq_nearest_node();
     mine = getnearestnode( self.origin );
-	if ( isDefined( mine ) && !nodesvisible( mine, node ) )
+
+    if ( isdefined( mine ) && !nodesvisible( mine, node ) )
     {
-		origin = self.origin + vectorScale( dir, dist );
+        origin = self.origin + vectorscale( dir, dist );
         next = getnearestnode( origin );
-		if ( isDefined( next ) && nodesvisible( next, node ) )
+
-		{
+        if ( isdefined( next ) && nodesvisible( next, node ) )
             bot_combat_tactical_insertion( self.origin );
     }
 }
-}
 
-hq_nearest_node() //checked matches cerberus output
+hq_nearest_node()
 {
     return random( level.radio.nodes );
 }
 
-hq_is_contested() //checked changed at own discretion
+hq_is_contested()
 {
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( level.radio.baseorigin, 0 );
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( level.radio.baseorigin, 0 );
-	if ( isDefined( enemy ) && distancesquared( enemy.origin, level.radio.baseorigin ) < ( level.radio.node_radius * level.radio.node_radius ) )
+    return isdefined( enemy ) && distancesquared( enemy.origin, level.radio.baseorigin ) < level.radio.node_radius * level.radio.node_radius;
-	{
-		return 1;
 }
-	return 0;
-}
-

Multiplayer Core/patch_mp/maps/mp/bots/_bot_koth.gsc

@@ -1,298 +1,290 @@
-#include maps/mp/bots/_bot_combat;
+// T6 GSC SOURCE
-#include maps/mp/bots/_bot;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include maps\mp\gametypes\koth;
-#include common_scripts/utility;
+#include common_scripts\utility;
-#include maps/mp/gametypes/koth;
+#include maps\mp\_utility;
+#include maps\mp\bots\_bot;
+#include maps\mp\bots\_bot_combat;
 
-bot_koth_think() //checked matches cerberus output
+bot_koth_think()
 {
-	if ( !isDefined( level.zone.trig.goal_radius ) )
+    if ( !isdefined( level.zone.trig.goal_radius ) )
     {
         maxs = level.zone.trig getmaxs();
         maxs = level.zone.trig.origin + maxs;
         level.zone.trig.goal_radius = distance( level.zone.trig.origin, maxs );
-		/*
 /#
         println( "distance: " + level.zone.trig.goal_radius );
 #/
-		*/
+        ground = bullettrace( level.zone.gameobject.curorigin, level.zone.gameobject.curorigin - vectorscale( ( 0, 0, 1 ), 1024.0 ), 0, undefined );
-		ground = bullettrace( level.zone.gameobject.curorigin, level.zone.gameobject.curorigin - vectorScale( ( 0, 0, 1 ), 1024 ), 0, undefined );
+        level.zone.trig.goal = ground["position"] + vectorscale( ( 0, 0, 1 ), 8.0 );
-		level.zone.trig.goal = ground[ "position" ] + vectorScale( ( 0, 0, 1 ), 8 );
     }
+
     if ( !bot_has_hill_goal() )
-	{
         self bot_move_to_hill();
-	}
+
     if ( self bot_is_at_hill() )
-	{
         self bot_capture_hill();
-	}
+
     bot_hill_tactical_insertion();
     bot_hill_grenade();
 }
 
-bot_has_hill_goal() //checked matches cerberus output
+bot_has_hill_goal()
 {
     origin = self getgoal( "koth_hill" );
-	if ( isDefined( origin ) )
+
+    if ( isdefined( origin ) )
     {
         if ( distance2dsquared( level.zone.gameobject.curorigin, origin ) < level.zone.trig.goal_radius * level.zone.trig.goal_radius )
-		{
+            return true;
-			return 1;
-		}
-	}
-	return 0;
     }
 
-bot_is_at_hill() //checked matches cerberus output
+    return false;
+}
+
+bot_is_at_hill()
 {
     return self atgoal( "koth_hill" );
 }
 
-bot_move_to_hill() //checked changed to match cerberus output
+bot_move_to_hill()
-{
-	if ( getTime() < ( self.bot.update_objective + 4000 ) )
 {
+    if ( gettime() < self.bot.update_objective + 4000 )
         return;
-	}
+
     self clearlookat();
     self cancelgoal( "koth_hill" );
+
     if ( self getstance() == "prone" )
     {
         self setstance( "crouch" );
         wait 0.25;
     }
+
     if ( self getstance() == "crouch" )
     {
         self setstance( "stand" );
         wait 0.25;
     }
+
     nodes = getnodesinradiussorted( level.zone.trig.goal, level.zone.trig.goal_radius, 0, 128 );
+
     foreach ( node in nodes )
     {
-		if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "koth_hill", node.origin, 64 ) == 0 )
+        if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "koth_hill", node.origin, 64 ) == 0 )
         {
             if ( findpath( self.origin, node.origin, self, 0, 1 ) )
             {
                 self addgoal( node, 24, 3, "koth_hill" );
-				self.bot.update_objective = getTime();
+                self.bot.update_objective = gettime();
                 return;
             }
         }
     }
 }
 
-bot_get_look_at() //checked matches cerberus output
+bot_get_look_at()
 {
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( self.origin, 1 );
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( self.origin, 1 );
-	if ( isDefined( enemy ) )
+
+    if ( isdefined( enemy ) )
     {
         node = getvisiblenode( self.origin, enemy.origin );
-		if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 1024 )
+
-		{
+        if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 1024 )
             return node.origin;
     }
-	}
+
-	enemies = self maps/mp/bots/_bot::bot_get_enemies( 0 );
+    enemies = self maps\mp\bots\_bot::bot_get_enemies( 0 );
+
     if ( enemies.size )
-	{
         enemy = random( enemies );
-	}
+
-	if ( isDefined( enemy ) )
+    if ( isdefined( enemy ) )
     {
         node = getvisiblenode( self.origin, enemy.origin );
-		if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 1024 )
+
-		{
+        if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 1024 )
             return node.origin;
     }
-	}
+
     spawn = random( level.spawnpoints );
     node = getvisiblenode( self.origin, spawn.origin );
-	if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 1024 )
+
-	{
+    if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 1024 )
         return node.origin;
-	}
+
     return level.zone.gameobject.curorigin;
 }
 
-bot_capture_hill() //checked changed to match cerberus output
+bot_capture_hill()
 {
     self addgoal( self.origin, 24, 3, "koth_hill" );
     self setstance( "crouch" );
-	if ( getTime() > self.bot.update_lookat )
+
+    if ( gettime() > self.bot.update_lookat )
     {
         origin = self bot_get_look_at();
         z = 20;
+
         if ( distancesquared( origin, self.origin ) > 262144 )
-		{
             z = randomintrange( 16, 60 );
-		}
+
         self lookat( origin + ( 0, 0, z ) );
+
         if ( distancesquared( origin, self.origin ) > 65536 )
         {
             dir = vectornormalize( self.origin - origin );
-			dir = vectorScale( dir, 256 );
+            dir = vectorscale( dir, 256 );
             origin += dir;
         }
-		self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( origin );
+
+        self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( origin );
+
         if ( cointoss() && lengthsquared( self getvelocity() ) < 2 )
         {
             nodes = getnodesinradius( level.zone.trig.goal, level.zone.trig.goal_radius + 128, 0, 128 );
+
             for ( i = randomintrange( 0, nodes.size ); i < nodes.size; i++ )
             {
                 node = nodes[i];
+
                 if ( distancesquared( node.origin, self.origin ) > 1024 )
                 {
-					if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "koth_hill", node.origin, 128 ) == 0 )
+                    if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "koth_hill", node.origin, 128 ) == 0 )
                     {
                         if ( findpath( self.origin, node.origin, self, 0, 1 ) )
                         {
                             self addgoal( node, 24, 3, "koth_hill" );
-							self.bot.update_objective = getTime();
+                            self.bot.update_objective = gettime();
                             break;
                         }
                     }
                 }
             }
         }
-		self.bot.update_lookat = getTime() + randomintrange( 1500, 3000 );
+
+        self.bot.update_lookat = gettime() + randomintrange( 1500, 3000 );
     }
 }
 
-any_other_team_touching( skip_team ) //checked partially changed to match cerberus output did not use foreach see github for more info
+any_other_team_touching( skip_team )
 {
-	teams = getArrayKeys( level.teams );
+    foreach ( team in level.teams )
-	while ( i < teams.size )
-	{
-		if ( teams[ i ] == skip_team )
     {
+        if ( team == skip_team )
             continue;
-		}
+
-		if ( level.zone.gameobject.numtouching[ teams[ i ] ] )
+        if ( level.zone.gameobject.numtouching[team] )
-		{
+            return true;
-			return 1;
-		}
-	}
-	return 0;
     }
 
-is_hill_contested( skip_team ) //checked matches cerberus output
+    return false;
+}
+
+is_hill_contested( skip_team )
 {
     if ( any_other_team_touching( skip_team ) )
-	{
+        return true;
-		return 1;
+
-	}
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( level.zone.gameobject.curorigin, 1 );
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( level.zone.gameobject.curorigin, 1 );
+
-	if ( isDefined( enemy ) && distancesquared( enemy.origin, level.zone.gameobject.curorigin ) < 262144 )
+    if ( isdefined( enemy ) && distancesquared( enemy.origin, level.zone.gameobject.curorigin ) < 262144 )
-	{
+        return true;
-		return 1;
+
-	}
+    return false;
-	return 0;
 }
 
-bot_hill_grenade() //checked changed to match cerberus output
+bot_hill_grenade()
 {
     enemies = bot_get_enemies();
+
     if ( !enemies.size )
-	{
         return;
-	}
+
     if ( self atgoal( "hill_patrol" ) || self atgoal( "koth_hill" ) )
     {
         if ( self getweaponammostock( "proximity_grenade_mp" ) > 0 )
         {
             origin = bot_get_look_at();
-			if ( self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( origin ) )
+
-			{
+            if ( self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( origin ) )
                 return;
         }
     }
-	}
-	if ( !is_hill_contested( self.team ) )
-	{
-		if ( !isDefined( level.next_smoke_time ) )
-		{
-			level.next_smoke_time = 0;
-		}
-		if ( getTime() > level.next_smoke_time )
-		{
-			if ( self maps/mp/bots/_bot_combat::bot_combat_throw_smoke( level.zone.gameobject.curorigin ) )
-			{
-				level.next_smoke_time = getTime() + randomintrange( 60000, 120000 );
-			}
-		}
-		return;
-	}
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( level.zone.gameobject.curorigin, 0 );
-	if ( isDefined( enemy ) )
-	{
-		origin = enemy.origin;
-	}
-	else
-	{
-		origin = level.zone.gameobject.curorigin;
-	}
-	dir = vectornormalize( self.origin - origin );
-	dir = ( 0, dir[ 1 ], 0 );
-	origin += vectorScale( dir, 128 );
-	if ( maps/mp/bots/_bot::bot_get_difficulty() == "easy" )
-	{
-		if ( !isDefined( level.next_grenade_time ) )
-		{
-			level.next_grenade_time = 0;
-		}
-		if ( getTime() > level.next_grenade_time )
-		{
-			if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_lethal( origin ) )
-			{
-				self maps/mp/bots/_bot_combat::bot_combat_throw_tactical( origin );
-			}
-			else
-			{
-				level.next_grenade_time = getTime() + randomintrange( 60000, 120000 );
-			}
-		}
-	}
-	else if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_lethal( origin ) )
-	{
-		self maps/mp/bots/_bot_combat::bot_combat_throw_tactical( origin );
-	}
-}
 
-bot_hill_tactical_insertion() //checked matches cerberus output
+    if ( !is_hill_contested( self.team ) )
+    {
+        if ( !isdefined( level.next_smoke_time ) )
+            level.next_smoke_time = 0;
+
+        if ( gettime() > level.next_smoke_time )
+        {
+            if ( self maps\mp\bots\_bot_combat::bot_combat_throw_smoke( level.zone.gameobject.curorigin ) )
+                level.next_smoke_time = gettime() + randomintrange( 60000, 120000 );
+        }
+
+        return;
+    }
+
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( level.zone.gameobject.curorigin, 0 );
+
+    if ( isdefined( enemy ) )
+        origin = enemy.origin;
+    else
+        origin = level.zone.gameobject.curorigin;
+
+    dir = vectornormalize( self.origin - origin );
+    dir = ( 0, dir[1], 0 );
+    origin += vectorscale( dir, 128 );
+
+    if ( maps\mp\bots\_bot::bot_get_difficulty() == "easy" )
+    {
+        if ( !isdefined( level.next_grenade_time ) )
+            level.next_grenade_time = 0;
+
+        if ( gettime() > level.next_grenade_time )
+        {
+            if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_lethal( origin ) )
+                self maps\mp\bots\_bot_combat::bot_combat_throw_tactical( origin );
+            else
+                level.next_grenade_time = gettime() + randomintrange( 60000, 120000 );
+        }
+    }
+    else if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_lethal( origin ) )
+        self maps\mp\bots\_bot_combat::bot_combat_throw_tactical( origin );
+}
+
+bot_hill_tactical_insertion()
 {
     if ( !self hasweapon( "tactical_insertion_mp" ) )
-	{
         return;
-	}
+
     dist = self getlookaheaddist();
     dir = self getlookaheaddir();
-	if ( !isDefined( dist ) || !isDefined( dir ) )
+
-	{
+    if ( !isdefined( dist ) || !isdefined( dir ) )
         return;
-	}
+
     node = hill_nearest_node();
     mine = getnearestnode( self.origin );
-	if ( isDefined( mine ) && !nodesvisible( mine, node ) )
+
+    if ( isdefined( mine ) && !nodesvisible( mine, node ) )
     {
-		origin = self.origin + vectorScale( dir, dist );
+        origin = self.origin + vectorscale( dir, dist );
         next = getnearestnode( origin );
-		if ( isDefined( next ) && nodesvisible( next, node ) )
+
-		{
+        if ( isdefined( next ) && nodesvisible( next, node ) )
             bot_combat_tactical_insertion( self.origin );
     }
 }
-}
 
-hill_nearest_node() //checked matches cerberus output
+hill_nearest_node()
 {
     nodes = getnodesinradiussorted( level.zone.gameobject.curorigin, 256, 0 );
-	/*
 /#
     assert( nodes.size );
 #/
-	*/
     return nodes[0];
 }
-
-

Multiplayer Core/patch_mp/maps/mp/bots/_bot_loadout.gsc

@@ -1,36 +1,40 @@
-#include maps/mp/gametypes/_rank;
+// T6 GSC SOURCE
-#include maps/mp/bots/_bot;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/_utility;
+#include common_scripts\utility;
-#include common_scripts/utility;
+#include maps\mp\_utility;
+#include maps\mp\bots\_bot;
+#include maps\mp\gametypes\_rank;
 
-init() //checked changed to match cerberus output
+init()
 {
     level endon( "game_ended" );
     level.bot_banned_killstreaks = array( "KILLSTREAK_RCBOMB", "KILLSTREAK_QRDRONE", "KILLSTREAK_REMOTE_MISSILE", "KILLSTREAK_REMOTE_MORTAR", "KILLSTREAK_HELICOPTER_GUNNER" );
+
     for (;;)
     {
         level waittill( "connected", player );
+
         if ( !player istestclient() )
-		{
             continue;
-		}
+
         player thread on_bot_connect();
     }
 }
 
-on_bot_connect() //checked changed to match cerberus output
+on_bot_connect()
 {
     self endon( "disconnect" );
-	if ( isDefined( self.pers[ "bot_loadout" ] ) )
+
-	{
+    if ( isdefined( self.pers["bot_loadout"] ) )
         return;
-	}
+
     wait 0.1;
-	if ( ( self getentitynumber() % 2 ) == 0 )
+
-	{
+    if ( self getentitynumber() % 2 == 0 )
         wait 0.05;
-	}
+
-	self maps/mp/bots/_bot::bot_set_rank();
+    self maps\mp\bots\_bot::bot_set_rank();
+
     if ( level.onlinegame && !sessionmodeisprivate() )
     {
         self botsetdefaultclass( 5, "class_assault" );
@@ -47,24 +51,24 @@ on_bot_connect() //checked changed to match cerberus output
         self botsetdefaultclass( 8, "class_cqb" );
         self botsetdefaultclass( 9, "class_sniper" );
     }
+
     max_allocation = 10;
+
     for ( i = 1; i <= 3; i++ )
     {
-		if ( self isitemlocked( maps/mp/gametypes/_rank::getitemindex( "feature_allocation_slot_" + i ) ) )
+        if ( self isitemlocked( maps\mp\gametypes\_rank::getitemindex( "feature_allocation_slot_" + i ) ) )
-		{
             max_allocation--;
     }
-	}
+
     self bot_construct_loadout( max_allocation );
     self.pers["bot_loadout"] = 1;
 }
 
-bot_construct_loadout( allocation_max ) //checked matches cerberus output
+bot_construct_loadout( allocation_max )
-{
-	if ( self isitemlocked( maps/mp/gametypes/_rank::getitemindex( "feature_cac" ) ) )
 {
+    if ( self isitemlocked( maps\mp\gametypes\_rank::getitemindex( "feature_cac" ) ) )
         return;
-	}
+
     pixbeginevent( "bot_construct_loadout" );
     item_list = bot_build_item_list();
     bot_construct_class( 0, item_list, allocation_max );
@@ -73,33 +77,35 @@ bot_construct_loadout( allocation_max ) //checked matches cerberus output
     bot_construct_class( 3, item_list, allocation_max );
     bot_construct_class( 4, item_list, allocation_max );
     killstreaks = item_list["killstreak1"];
-	if ( isDefined( item_list[ "killstreak2" ] ) )
+
-	{
+    if ( isdefined( item_list["killstreak2"] ) )
         killstreaks = arraycombine( killstreaks, item_list["killstreak2"], 1, 0 );
-	}
+
-	if ( isDefined( item_list[ "killstreak3" ] ) )
+    if ( isdefined( item_list["killstreak3"] ) )
-	{
         killstreaks = arraycombine( killstreaks, item_list["killstreak3"], 1, 0 );
-	}
+
-	if ( isDefined( killstreaks ) && killstreaks.size )
+    if ( isdefined( killstreaks ) && killstreaks.size )
     {
         bot_choose_weapon( 0, killstreaks );
         bot_choose_weapon( 0, killstreaks );
         bot_choose_weapon( 0, killstreaks );
     }
+
     self.claimed_items = undefined;
     pixendevent();
 }
 
-bot_construct_class( class, items, allocation_max ) //checked partially changed to match cerberus output did not change while loop to for loop see github for more info
+bot_construct_class( class, items, allocation_max )
 {
     allocation = 0;
     claimed_count = bot_build_claimed_list( items );
     self.claimed_items = [];
+
     while ( allocation < allocation_max )
     {
         secondary_chance = 40;
         remaining = allocation_max - allocation;
+
         if ( remaining >= 1 && bot_make_choice( 95, claimed_count["primary"], 1 ) )
         {
             weapon = bot_choose_weapon( class, items["primary"] );
@@ -110,10 +116,10 @@ bot_construct_class( class, items, allocation_max ) //checked partially changed
             allocation += bot_choose_primary_attachments( class, weapon, allocation, allocation_max );
         }
         else if ( !claimed_count["primary"] )
-		{
             secondary_chance = 100;
-		}
+
         remaining = allocation_max - allocation;
+
         if ( remaining >= 1 && bot_make_choice( secondary_chance, claimed_count["secondary"], 1 ) )
         {
             if ( remaining >= 2 && randomint( 100 ) < 10 )
@@ -121,40 +127,40 @@ bot_construct_class( class, items, allocation_max ) //checked partially changed
                 self botclassadditem( class, "BONUSCARD_OVERKILL" );
                 weapon = bot_choose_weapon( class, items["primary"] );
                 allocation++;
-				continue;
             }
             else
             {
                 weapon = bot_choose_weapon( class, items["secondary"] );
                 bot_choose_weapon_option( class, "camo", 1 );
             }
+
             allocation++;
             claimed_count["secondary"]++;
             allocation += bot_choose_secondary_attachments( class, weapon, allocation, allocation_max );
         }
+
         perks_chance = 50;
         lethal_chance = 30;
         tactical_chance = 20;
+
         if ( claimed_count["specialty1"] && claimed_count["specialty2"] && claimed_count["specialty3"] )
-		{
             perks_chance = 0;
-		}
+
         if ( claimed_count["primarygrenade"] )
-		{
             lethal_chance = 0;
-		}
+
         if ( claimed_count["specialgrenade"] )
-		{
             tactical_chance = 0;
-		}
+
-		if ( ( perks_chance + lethal_chance + tactical_chance ) <= 0 )
+        if ( perks_chance + lethal_chance + tactical_chance <= 0 )
-		{
             return;
-		}
+
         next_action = bot_chose_action( "perks", perks_chance, "lethal", lethal_chance, "tactical", tactical_chance, "none", 0 );
+
         if ( next_action == "perks" )
         {
             remaining = allocation_max - allocation;
+
             if ( remaining >= 3 && !claimed_count["specialty1"] && randomint( 100 ) < 25 )
             {
                 self botclassadditem( class, "BONUSCARD_PERK_1_GREED" );
@@ -163,7 +169,9 @@ bot_construct_class( class, items, allocation_max ) //checked partially changed
                 claimed_count["specialty1"] = 2;
                 allocation += 3;
             }
+
             remaining = allocation_max - allocation;
+
             if ( remaining >= 3 && !claimed_count["specialty2"] && randomint( 100 ) < 25 )
             {
                 self botclassadditem( class, "BONUSCARD_PERK_2_GREED" );
@@ -172,7 +180,9 @@ bot_construct_class( class, items, allocation_max ) //checked partially changed
                 claimed_count["specialty2"] = 2;
                 allocation += 3;
             }
+
             remaining = allocation_max - allocation;
+
             if ( remaining >= 3 && !claimed_count["specialty3"] && randomint( 100 ) < 25 )
             {
                 self botclassadditem( class, "BONUSCARD_PERK_3_GREED" );
@@ -181,42 +191,42 @@ bot_construct_class( class, items, allocation_max ) //checked partially changed
                 claimed_count["specialty3"] = 2;
                 allocation += 3;
             }
+
             remaining = allocation_max - allocation;
-			i = 0;
+
-			while ( i < 3 )
+            for ( i = 0; i < 3; i++ )
             {
                 perks = [];
                 remaining = allocation_max - allocation;
+
                 if ( remaining > 0 )
                 {
                     if ( !claimed_count["specialty1"] )
-					{
                         perks[perks.size] = "specialty1";
-					}
+
                     if ( !claimed_count["specialty2"] )
-					{
                         perks[perks.size] = "specialty2";
-					}
+
                     if ( !claimed_count["specialty3"] )
-					{
                         perks[perks.size] = "specialty3";
-					}
+
                     if ( perks.size )
                     {
                         perk = random( perks );
                         bot_choose_weapon( class, items[perk] );
                         claimed_count[perk]++;
                         allocation++;
-						i++;
                         continue;
                     }
+
+                    break;
                 }
-				i++;
             }
         }
         else if ( next_action == "lethal" )
         {
             remaining = allocation_max - allocation;
+
             if ( remaining >= 2 && randomint( 100 ) < 50 )
             {
                 if ( !claimed_count["primarygrenade"] )
@@ -225,6 +235,7 @@ bot_construct_class( class, items, allocation_max ) //checked partially changed
                     claimed_count["primarygrenade"]++;
                     allocation++;
                 }
+
                 self botclassadditem( class, "BONUSCARD_DANGER_CLOSE" );
                 allocation++;
             }
@@ -238,9 +249,11 @@ bot_construct_class( class, items, allocation_max ) //checked partially changed
         else if ( next_action == "tactical" )
         {
             remaining = allocation_max - allocation;
+
             if ( remaining >= 2 && !claimed_count["specialgrenade"] && randomint( 100 ) < 50 )
             {
                 weapon = bot_choose_weapon( class, items["specialgrenade"] );
+
                 if ( weapon == "WEAPON_TACTICAL_INSERTION" || weapon == "WEAPON_WILLY_PETE" )
                 {
                     claimed_count["specialgrenade"] = 1;
@@ -263,79 +276,73 @@ bot_construct_class( class, items, allocation_max ) //checked partially changed
     }
 }
 
-bot_make_choice( chance, claimed, max_claim ) //checked changed at own discretion
+bot_make_choice( chance, claimed, max_claim )
 {
-	if ( claimed < max_claim && randomint( 100 ) < chance )
+    return claimed < max_claim && randomint( 100 ) < chance;
-	{
-		return 1;
-	}
-	return 0;
 }
 
-bot_chose_action( action1, chance1, action2, chance2, action3, chance3, action4, chance4 ) //checked changed to match cerberus output
+bot_chose_action( action1, chance1, action2, chance2, action3, chance3, action4, chance4 )
 {
     chance1 = int( chance1 / 10 );
     chance2 = int( chance2 / 10 );
     chance3 = int( chance3 / 10 );
     chance4 = int( chance4 / 10 );
     actions = [];
+
     for ( i = 0; i < chance1; i++ )
-	{
         actions[actions.size] = action1;
-	}
+
     for ( i = 0; i < chance2; i++ )
-	{
         actions[actions.size] = action2;
-	}
+
     for ( i = 0; i < chance3; i++ )
-	{
         actions[actions.size] = action3;
-	}
+
     for ( i = 0; i < chance4; i++ )
-	{
         actions[actions.size] = action4;
-	}
+
     return random( actions );
 }
 
-bot_item_is_claimed( item ) //checked changed to match cerberus output
+bot_item_is_claimed( item )
 {
     foreach ( claim in self.claimed_items )
     {
         if ( claim == item )
-		{
+            return true;
-			return 1;
-		}
-	}
-	return 0;
     }
 
-bot_choose_weapon( class, items ) //checked changed to match cerberus output
+    return false;
-{
-	if ( !isDefined( items ) || !items.size )
-	{
-		return undefined;
 }
+
+bot_choose_weapon( class, items )
+{
+    if ( !isdefined( items ) || !items.size )
+        return undefined;
+
     start = randomint( items.size );
+
     for ( i = 0; i < items.size; i++ )
     {
         weapon = items[start];
+
         if ( !bot_item_is_claimed( weapon ) )
-		{
             break;
-		}
+
         start = ( start + 1 ) % items.size;
     }
+
     self.claimed_items[self.claimed_items.size] = weapon;
     self botclassadditem( class, weapon );
     return weapon;
 }
 
-bot_build_weapon_options_list( optiontype ) //checked changed to match cerberus output
+bot_build_weapon_options_list( optiontype )
 {
     level.botweaponoptionsid[optiontype] = [];
     level.botweaponoptionsprob[optiontype] = [];
     prob = 0;
+
     for ( row = 0; row < 255; row++ )
     {
         if ( tablelookupcolumnforrow( "mp/attachmentTable.csv", row, 1 ) == optiontype )
@@ -348,57 +355,61 @@ bot_build_weapon_options_list( optiontype ) //checked changed to match cerberus
     }
 }
 
-bot_choose_weapon_option( class, optiontype, primary ) //checked changed to match cerberus output may need to review order of operations
+bot_choose_weapon_option( class, optiontype, primary )
 {
-	if ( !isDefined( level.botweaponoptionsid ) )
+    if ( !isdefined( level.botweaponoptionsid ) )
     {
         level.botweaponoptionsid = [];
         level.botweaponoptionsprob = [];
         bot_build_weapon_options_list( "camo" );
         bot_build_weapon_options_list( "reticle" );
     }
+
     if ( !level.onlinegame && !level.systemlink )
-	{
         return;
-	}
+
     numoptions = level.botweaponoptionsprob[optiontype].size;
     maxprob = level.botweaponoptionsprob[optiontype][numoptions - 1];
+
     if ( !level.systemlink && self.pers["rank"] < 20 )
-	{
+        maxprob += 4 * maxprob * ( 20 - self.pers["rank"] ) / 20;
-		maxprob += ( 4 * maxprob ) * ( ( 20 - self.pers[ "rank" ] ) / 20 );
+
-	}
     rnd = randomint( int( maxprob ) );
+
     for ( i = 0; i < numoptions; i++ )
     {
         if ( level.botweaponoptionsprob[optiontype][i] > rnd )
         {
             self botclasssetweaponoption( class, primary, optiontype, level.botweaponoptionsid[optiontype][i] );
-			return;
+            break;
         }
     }
 }
 
-bot_choose_primary_attachments( class, weapon, allocation, allocation_max ) //checked changed to match cerberus output
+bot_choose_primary_attachments( class, weapon, allocation, allocation_max )
 {
     attachments = getweaponattachments( weapon );
     remaining = allocation_max - allocation;
+
     if ( !attachments.size || !remaining )
-	{
         return 0;
-	}
+
     attachment_action = bot_chose_action( "3_attachments", 25, "2_attachments", 35, "1_attachments", 35, "none", 5 );
+
     if ( remaining >= 4 && attachment_action == "3_attachments" )
     {
         a1 = random( attachments );
         self botclassaddattachment( class, weapon, a1, "primaryattachment1" );
         count = 1;
         attachments = getweaponattachments( weapon, a1 );
+
         if ( attachments.size )
         {
             a2 = random( attachments );
             self botclassaddattachment( class, weapon, a2, "primaryattachment2" );
             count++;
             attachments = getweaponattachments( weapon, a1, a2 );
+
             if ( attachments.size )
             {
                 a3 = random( attachments );
@@ -407,6 +418,7 @@ bot_choose_primary_attachments( class, weapon, allocation, allocation_max ) //ch
                 return 4;
             }
         }
+
         return count;
     }
     else if ( remaining >= 2 && attachment_action == "2_attachments" )
@@ -414,12 +426,14 @@ bot_choose_primary_attachments( class, weapon, allocation, allocation_max ) //ch
         a1 = random( attachments );
         self botclassaddattachment( class, weapon, a1, "primaryattachment1" );
         attachments = getweaponattachments( weapon, a1 );
+
         if ( attachments.size )
         {
             a2 = random( attachments );
             self botclassaddattachment( class, weapon, a2, "primaryattachment2" );
             return 2;
         }
+
         return 1;
     }
     else if ( remaining >= 1 && attachment_action == "1_attachments" )
@@ -428,23 +442,26 @@ bot_choose_primary_attachments( class, weapon, allocation, allocation_max ) //ch
         self botclassaddattachment( class, weapon, a, "primaryattachment1" );
         return 1;
     }
+
     return 0;
 }
 
-bot_choose_secondary_attachments( class, weapon, allocation, allocation_max ) //checked changed to match cerberus output
+bot_choose_secondary_attachments( class, weapon, allocation, allocation_max )
 {
     attachments = getweaponattachments( weapon );
     remaining = allocation_max - allocation;
+
     if ( !attachments.size || !remaining )
-	{
         return 0;
-	}
+
     attachment_action = bot_chose_action( "2_attachments", 10, "1_attachments", 40, "none", 50, "none", 0 );
+
     if ( remaining >= 3 && attachment_action == "2_attachments" )
     {
         a1 = random( attachments );
         self botclassaddattachment( class, weapon, a1, "secondaryattachment1" );
         attachments = getweaponattachments( weapon, a1 );
+
         if ( attachments.size )
         {
             a2 = random( attachments );
@@ -452,6 +469,7 @@ bot_choose_secondary_attachments( class, weapon, allocation, allocation_max ) //
             self botclassaddattachment( class, weapon, a2, "secondaryattachment2" );
             return 3;
         }
+
         return 1;
     }
     else if ( remaining >= 1 && attachment_action == "1_attachments" )
@@ -460,87 +478,79 @@ bot_choose_secondary_attachments( class, weapon, allocation, allocation_max ) //
         self botclassaddattachment( class, weapon, a, "secondaryattachment1" );
         return 1;
     }
+
     return 0;
 }
 
-bot_build_item_list() //checked partially changed to match cerberus output did not change while loop to for loop see github for more info
+bot_build_item_list()
 {
     pixbeginevent( "bot_build_item_list" );
     items = [];
-	i = 0;
+
-	while ( i < 256 )
+    for ( i = 0; i < 256; i++ )
     {
         row = tablelookuprownum( level.statstableid, 0, i );
+
         if ( row > -1 )
         {
             slot = tablelookupcolumnforrow( level.statstableid, row, 13 );
+
             if ( slot == "" )
-			{
-				i++;
                 continue;
-			}
+
             number = int( tablelookupcolumnforrow( level.statstableid, row, 0 ) );
+
             if ( self isitemlocked( number ) )
-			{
-				i++;
                 continue;
-			}
+
             allocation = int( tablelookupcolumnforrow( level.statstableid, row, 12 ) );
+
             if ( allocation < 0 )
-			{
-				i++;
                 continue;
-			}
+
             name = tablelookupcolumnforrow( level.statstableid, row, 3 );
+
             if ( bot_item_is_banned( slot, name ) )
-			{
-				i++;
                 continue;
-			}
+
-			if ( !isDefined( items[ slot ] ) )
+            if ( !isdefined( items[slot] ) )
-			{
                 items[slot] = [];
-			}
+
             items[slot][items[slot].size] = name;
         }
-		i++;
     }
+
     pixendevent();
     return items;
 }
 
-bot_item_is_banned( slot, item ) //checked changed to match cerberus output
+bot_item_is_banned( slot, item )
 {
     if ( item == "WEAPON_KNIFE_BALLISTIC" )
-	{
+        return true;
-		return 1;
+
-	}
+    if ( getdvarint( "tu6_enableDLCWeapons" ) == 0 && item == "WEAPON_PEACEKEEPER" )
-	if ( /* getDvarInt( #"97A055DA" ) == 0 && */ item == "WEAPON_PEACEKEEPER" )
+        return true;
-	{
+
-		return 1;
-	}
     if ( slot != "killstreak1" && slot != "killstreak2" && slot != "killstreak3" )
-	{
+        return false;
-		return 0;
+
-	}
     foreach ( banned in level.bot_banned_killstreaks )
     {
         if ( item == banned )
-		{
+            return true;
-			return 1;
-		}
-	}
-	return 0;
     }
 
-bot_build_claimed_list( items ) //checked changed to match cerberus output
+    return false;
+}
+
+bot_build_claimed_list( items )
 {
     claimed = [];
     keys = getarraykeys( items );
+
     foreach ( key in keys )
-	{
         claimed[key] = 0;
-	}
+
     return claimed;
 }
-

Multiplayer Core/patch_mp/maps/mp/bots/_bot_sd.gsc

@@ -1,37 +1,35 @@
-//changed includes to match cerberus output
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_globallogic_utils;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/bots/_bot_combat;
+#include common_scripts\utility;
-#include maps/mp/bots/_bot;
+#include maps\mp\_utility;
-#include maps/mp/gametypes/_gameobjects;
+#include maps\mp\gametypes\_gameobjects;
-#include maps/mp/_utility;
+#include maps\mp\bots\_bot;
-#include common_scripts/utility;
+#include maps\mp\bots\_bot_combat;
+#include maps\mp\gametypes\_globallogic_utils;
 
-bot_sd_think() //checked changed to match cerberus output
+bot_sd_think()
 {
     foreach ( zone in level.bombzones )
     {
-		if ( !isDefined( zone.nearest_node ) )
+        if ( !isdefined( zone.nearest_node ) )
         {
             nodes = getnodesinradiussorted( zone.trigger.origin, 256, 0 );
-			/*
 /#
             assert( nodes.size );
 #/
-			*/
             zone.nearest_node = nodes[0];
         }
     }
+
     zone = sd_get_planted_zone();
-	if ( isDefined( zone ) )
+
-	{
+    if ( isdefined( zone ) )
         self bot_sd_defender( zone, 1 );
-	}
     else if ( self.team == game["attackers"] )
     {
         if ( level.multibomb )
-		{
             self.isbombcarrier = 1;
-		}
+
         self bot_sd_attacker();
     }
     else
@@ -41,15 +39,17 @@ bot_sd_think() //checked changed to match cerberus output
     }
 }
 
-bot_sd_attacker() //checked changed to match cerberus output
+bot_sd_attacker()
 {
     level endon( "game_ended" );
-	if ( !level.multibomb && !isDefined( level.sdbomb.carrier ) && !level.bombplanted )
+
+    if ( !level.multibomb && !isdefined( level.sdbomb.carrier ) && !level.bombplanted )
     {
         self cancelgoal( "sd_protect_carrier" );
-		if ( !level.sdbomb maps/mp/gametypes/_gameobjects::isobjectawayfromhome() )
+
+        if ( !level.sdbomb maps\mp\gametypes\_gameobjects::isobjectawayfromhome() )
         {
-			if ( !self maps/mp/bots/_bot::bot_friend_goal_in_radius( "sd_pickup", level.sdbomb.curorigin, 64 ) )
+            if ( !self maps\mp\bots\_bot::bot_friend_goal_in_radius( "sd_pickup", level.sdbomb.curorigin, 64 ) )
             {
                 self addgoal( level.sdbomb.curorigin, 16, 4, "sd_pickup" );
                 return;
@@ -62,13 +62,13 @@ bot_sd_attacker() //checked changed to match cerberus output
         }
     }
     else
-	{
         self cancelgoal( "sd_pickup" );
-	}
+
     if ( is_true( self.isbombcarrier ) )
     {
         goal = self getgoal( "sd_plant" );
-		if ( isDefined( goal ) )
+
+        if ( isdefined( goal ) )
         {
             if ( distancesquared( self.origin, goal ) < 2304 )
             {
@@ -76,95 +76,94 @@ bot_sd_attacker() //checked changed to match cerberus output
                 wait 0.5;
                 self pressusebutton( level.planttime + 1 );
                 wait 0.5;
+
                 if ( is_true( self.isplanting ) )
-				{
                     wait( level.planttime + 1 );
-				}
+
                 self pressusebutton( 0 );
                 self setstance( "crouch" );
                 wait 0.25;
                 self cancelgoal( "sd_plant" );
                 self setstance( "stand" );
             }
+
             return;
         }
-		else if ( getTime() > self.bot[ "patrol_update" ] )
+        else if ( gettime() > self.bot["patrol_update"] )
         {
             frac = sd_get_time_frac();
-			if ( randomint( 100 ) < ( frac * 100 ) || frac > 0.85 )
+
+            if ( randomint( 100 ) < frac * 100 || frac > 0.85 )
             {
                 zone = sd_get_closest_bomb();
                 goal = sd_get_bomb_goal( zone.visuals[0] );
-				if ( isDefined( goal ) )
+
+                if ( isdefined( goal ) )
                 {
                     if ( frac > 0.85 )
-					{
                         self addgoal( goal, 24, 4, "sd_plant" );
-					}
                     else
-					{
                         self addgoal( goal, 24, 3, "sd_plant" );
                 }
             }
-			}
+
-			self.bot[ "patrol_update" ] = getTime() + randomintrange( 2500, 5000 );
+            self.bot["patrol_update"] = gettime() + randomintrange( 2500, 5000 );
         }
     }
-	else if ( isDefined( level.sdbomb.carrier ) && !isplayer( level.sdbomb.carrier ) )
+    else if ( isdefined( level.sdbomb.carrier ) && !isplayer( level.sdbomb.carrier ) )
     {
-		if ( !isDefined( self.protectcarrier ) )
+        if ( !isdefined( self.protectcarrier ) )
         {
             if ( randomint( 100 ) > 70 )
-			{
                 self.protectcarrier = 1;
-			}
             else
-			{
                 self.protectcarrier = 0;
         }
-		}
+
         if ( self.protectcarrier )
         {
             goal = level.sdbomb.carrier getgoal( "sd_plant" );
-			if ( isDefined( goal ) )
+
+            if ( isdefined( goal ) )
             {
                 nodes = getnodesinradiussorted( goal, 256, 0 );
-				if ( isDefined( nodes ) && nodes.size > 0 && !isDefined( self getgoal( "sd_protect_carrier" ) ) )
+
-				{
+                if ( isdefined( nodes ) && nodes.size > 0 && !isdefined( self getgoal( "sd_protect_carrier" ) ) )
                     self addgoal( nodes[randomint( nodes.size )], 24, 3, "sd_protect_carrier" );
             }
         }
     }
 }
-}
 
-bot_sd_defender( zone, isplanted ) //checked partially changed to match cerberus output did not use foreach see github for more info
+bot_sd_defender( zone, isplanted )
 {
     bot_sd_grenade();
-	if ( isDefined( isplanted ) && isplanted && self hasgoal( "sd_defend" ) )
+
+    if ( isdefined( isplanted ) && isplanted && self hasgoal( "sd_defend" ) )
     {
         goal = self getgoal( "sd_defend" );
         planted = sd_get_planted_zone();
+
         foreach ( zone in level.bombzones )
         {
             if ( planted != zone && distance2d( goal, zone.nearest_node.origin ) < distance2d( goal, planted.nearest_node.origin ) )
-			{
                 self cancelgoal( "sd_defend" );
         }
     }
-	}
+
-	else if ( self atgoal( "sd_defend" ) || self bot_need_to_defuse() )
+    if ( self atgoal( "sd_defend" ) || self bot_need_to_defuse() )
     {
         bot_sd_defender_think( zone );
+
         if ( self hasgoal( "sd_defend" ) )
-		{
             return;
     }
-	}
+
     if ( self hasgoal( "enemy_patrol" ) )
     {
         goal = self getgoal( "enemy_patrol" );
         closezone = sd_get_closest_bomb();
+
         if ( distancesquared( goal, closezone.nearest_node.origin ) < 262144 )
         {
             self clearlookat();
@@ -172,120 +171,113 @@ bot_sd_defender( zone, isplanted ) //checked partially changed to match cerberus
             return;
         }
     }
+
     if ( self hasgoal( "sd_defend" ) )
     {
-		self.bot[ "patrol_update" ] = getTime() + randomintrange( 2500, 5000 );
+        self.bot["patrol_update"] = gettime() + randomintrange( 2500, 5000 );
         return;
     }
+
     if ( self hasgoal( "enemy_patrol" ) )
-	{
         return;
-	}
+
     nodes = getvisiblenodes( zone.nearest_node );
     best = undefined;
     highest = -100;
-	i = 0;
+
-	while ( i < nodes.size )
+    foreach ( node in nodes )
     {
-		if ( node[ i ].type == "BAD NODE" )
+        if ( node.type == "BAD NODE" )
-		{
-			i++;
             continue;
-		}
+
-		if ( !canclaimnode( node[ i ], self.team ) )
+        if ( !canclaimnode( node, self.team ) )
-		{
-			i++;
             continue;
-		}
+
-		if ( distancesquared( node[ i ].origin, self.origin ) < 65536 )
+        if ( distancesquared( node.origin, self.origin ) < 65536 )
-		{
-			i++;
             continue;
-		}
+
-		if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "sd_defend", node[ i ].origin, 256 ) > 0 )
+        if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "sd_defend", node.origin, 256 ) > 0 )
-		{
-			i++;
             continue;
-		}
+
-		height = node[ i ].origin[ 2 ] - zone.nearest_node.origin[ 2 ];
+        height = node.origin[2] - zone.nearest_node.origin[2];
-		if ( is_true( isplanted ) )
+
+        if ( isdefined( isplanted ) && isplanted )
         {
-			dist = distance2d( node[ i ].origin, zone.nearest_node.origin );
+            dist = distance2d( node.origin, zone.nearest_node.origin );
-			score = ( 10000 - dist ) + height;
+            score = 10000 - dist + height;
         }
         else
-		{
             score = height;
-		}
+
         if ( score > highest )
         {
             highest = score;
             best = node;
         }
-		i++;
     }
-	if ( !isDefined( best ) )
+
-	{
+    if ( !isdefined( best ) )
         return;
-	}
+
     self addgoal( best, 24, 3, "sd_defend" );
 }
 
-bot_get_look_at() //checked matches cebrerus output
+bot_get_look_at()
 {
-	enemy = self maps/mp/bots/_bot::bot_get_closest_enemy( self.origin, 1 );
+    enemy = self maps\mp\bots\_bot::bot_get_closest_enemy( self.origin, 1 );
-	if ( isDefined( enemy ) )
+
+    if ( isdefined( enemy ) )
     {
         node = getvisiblenode( self.origin, enemy.origin );
-		if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-		{
+        if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
             return node.origin;
     }
-	}
+
-	enemies = self maps/mp/bots/_bot::bot_get_enemies( 0 );
+    enemies = self maps\mp\bots\_bot::bot_get_enemies( 0 );
+
     if ( enemies.size )
-	{
         enemy = random( enemies );
-	}
+
-	if ( isDefined( enemy ) )
+    if ( isdefined( enemy ) )
     {
         node = getvisiblenode( self.origin, enemy.origin );
-		if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-		{
+        if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
             return node.origin;
     }
-	}
+
     zone = sd_get_closest_bomb();
     node = getvisiblenode( self.origin, zone.nearest_node.origin );
-	if ( isDefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
+
-	{
+    if ( isdefined( node ) && distancesquared( self.origin, node.origin ) > 16384 )
         return node.origin;
-	}
+
-	forward = anglesToForward( self getplayerangles() );
+    forward = anglestoforward( self getplayerangles() );
-	origin = self geteye() + ( forward * 1024 );
+    origin = self geteye() + forward * 1024;
     return origin;
 }
 
-bot_sd_defender_think( zone ) //checked matches cerberus output
+bot_sd_defender_think( zone )
 {
     if ( self bot_need_to_defuse() )
     {
-		if ( self maps/mp/bots/_bot::bot_friend_goal_in_radius( "sd_defuse", level.sdbombmodel.origin, 16 ) > 0 )
+        if ( self maps\mp\bots\_bot::bot_friend_goal_in_radius( "sd_defuse", level.sdbombmodel.origin, 16 ) > 0 )
-		{
             return;
-		}
+
         self clearlookat();
         goal = self getgoal( "sd_defuse" );
-		if ( isDefined( goal ) && distancesquared( self.origin, goal ) < 2304 )
+
+        if ( isdefined( goal ) && distancesquared( self.origin, goal ) < 2304 )
         {
             self setstance( "prone" );
             wait 0.5;
             self pressusebutton( level.defusetime + 1 );
             wait 0.5;
+
             if ( is_true( self.isdefusing ) )
-			{
                 wait( level.defusetime + 1 );
-			}
+
             self pressusebutton( 0 );
             self setstance( "crouch" );
             wait 0.25;
@@ -293,13 +285,14 @@ bot_sd_defender_think( zone ) //checked matches cerberus output
             self setstance( "stand" );
             return;
         }
-		if ( !isDefined( goal ) && distance2dsquared( self.origin, level.sdbombmodel.origin ) < 1000000 )
+
-		{
+        if ( !isdefined( goal ) && distance2dsquared( self.origin, level.sdbombmodel.origin ) < 1000000 )
             self addgoal( level.sdbombmodel.origin, 24, 4, "sd_defuse" );
-		}
+
         return;
     }
-	if ( getTime() > self.bot[ "patrol_update" ] )
+
+    if ( gettime() > self.bot["patrol_update"] )
     {
         if ( cointoss() )
         {
@@ -307,12 +300,15 @@ bot_sd_defender_think( zone ) //checked matches cerberus output
             self cancelgoal( "sd_defend" );
             return;
         }
-		self.bot[ "patrol_update" ] = getTime() + randomintrange( 2500, 5000 );
+
+        self.bot["patrol_update"] = gettime() + randomintrange( 2500, 5000 );
     }
+
     if ( self hasgoal( "enemy_patrol" ) )
     {
         goal = self getgoal( "enemy_patrol" );
         zone = sd_get_closest_bomb();
+
         if ( distancesquared( goal, zone.nearest_node.origin ) < 262144 )
         {
             self clearlookat();
@@ -320,123 +316,127 @@ bot_sd_defender_think( zone ) //checked matches cerberus output
             return;
         }
     }
-	if ( getTime() > self.bot[ "lookat_update" ] )
+
+    if ( gettime() > self.bot["lookat_update"] )
     {
         origin = self bot_get_look_at();
         z = 20;
+
         if ( distancesquared( origin, self.origin ) > 262144 )
-		{
             z = randomintrange( 16, 60 );
-		}
+
         self lookat( origin + ( 0, 0, z ) );
-		self.bot[ "lookat_update" ] = getTime() + randomintrange( 1500, 3000 );
+        self.bot["lookat_update"] = gettime() + randomintrange( 1500, 3000 );
+
         if ( distancesquared( origin, self.origin ) > 65536 )
         {
             dir = vectornormalize( self.origin - origin );
-			dir = vectorScale( dir, 256 );
+            dir = vectorscale( dir, 256 );
             origin += dir;
         }
-		self maps/mp/bots/_bot_combat::bot_combat_throw_proximity( origin );
+
+        self maps\mp\bots\_bot_combat::bot_combat_throw_proximity( origin );
     }
 }
 
-bot_need_to_defuse() //checked changed at own discretion
+bot_need_to_defuse()
 {
-	if ( level.bombplanted && self.team == game[ "defenders" ] )
+    return level.bombplanted && self.team == game["defenders"];
-	{
-		return 1;
-	}
-	return 0;
 }
 
-sd_get_bomb_goal( ent ) //checked changed to match cerberus output
+sd_get_bomb_goal( ent )
 {
     goals = [];
-	dir = anglesToForward( ent.angles );
+    dir = anglestoforward( ent.angles );
-	dir = vectorScale( dir, 32 );
+    dir = vectorscale( dir, 32 );
     goals[0] = ent.origin + dir;
     goals[1] = ent.origin - dir;
-	dir = anglesToRight( ent.angles );
+    dir = anglestoright( ent.angles );
-	dir = vectorScale( dir, 48 );
+    dir = vectorscale( dir, 48 );
     goals[2] = ent.origin + dir;
     goals[3] = ent.origin - dir;
     goals = array_randomize( goals );
+
     foreach ( goal in goals )
     {
         if ( findpath( self.origin, goal, 0 ) )
-		{
             return goal;
     }
-	}
+
     return undefined;
 }
 
-sd_get_time_frac() //checked matches cerberus output
+sd_get_time_frac()
 {
-	remaining = maps/mp/gametypes/_globallogic_utils::gettimeremaining();
+    remaining = maps\mp\gametypes\_globallogic_utils::gettimeremaining();
-	end = ( level.timelimit * 60 ) * 1000;
+    end = level.timelimit * 60 * 1000;
+
     if ( end == 0 )
     {
         end = self.spawntime + 120000;
-		remaining = end - getTime();
+        remaining = end - gettime();
-	}
-	return 1 - ( remaining / end );
     }
 
-sd_get_closest_bomb() //checked partially changed to match cerberus output did not use continue see github for more info
+    return 1 - remaining / end;
+}
+
+sd_get_closest_bomb()
 {
     best = undefined;
     distsq = 9999999;
+
     foreach ( zone in level.bombzones )
     {
         d = distancesquared( self.origin, zone.curorigin );
-		if ( !isDefined( best ) )
+
+        if ( !isdefined( best ) )
         {
             best = zone;
             distsq = d;
+            continue;
         }
-		else if ( d < distsq )
+
+        if ( d < distsq )
         {
             best = zone;
             distsq = d;
         }
     }
+
     return best;
 }
 
-sd_get_planted_zone() //checked changed to match cerberus output
+sd_get_planted_zone()
 {
     if ( level.bombplanted )
     {
         foreach ( zone in level.bombzones )
         {
             if ( zone.interactteam == "none" )
-			{
                 return zone;
         }
     }
-	}
+
     return undefined;
 }
 
-bot_sd_grenade() //checked changed to match cerberus output
+bot_sd_grenade()
 {
     enemies = bot_get_enemies();
+
     if ( !enemies.size )
-	{
         return;
-	}
+
     zone = sd_get_closest_bomb();
+
     foreach ( enemy in enemies )
     {
         if ( distancesquared( enemy.origin, zone.nearest_node.origin ) < 147456 )
         {
-			if ( !self maps/mp/bots/_bot_combat::bot_combat_throw_lethal( enemy.origin ) )
+            if ( !self maps\mp\bots\_bot_combat::bot_combat_throw_lethal( enemy.origin ) )
-			{
+                self maps\mp\bots\_bot_combat::bot_combat_throw_tactical( enemy.origin );
-				self maps/mp/bots/_bot_combat::bot_combat_throw_tactical( enemy.origin );
+
-			}
             return;
         }
     }
 }
-

Multiplayer Core/patch_mp/maps/mp/gametypes/_callbacksetup.gsc

@@ -1,133 +1,120 @@
-#include maps/mp/gametypes/_hostmigration;
+// T6 GSC SOURCE
-#include maps/mp/gametypes/_globallogic_vehicle;
+// Decompiled by https://github.com/xensik/gsc-tool
-#include maps/mp/gametypes/_globallogic_actor;
-#include maps/mp/gametypes/_globallogic_player;
-#include maps/mp/gametypes/_globallogic;
-#include maps/mp/_audio;
-#include maps/mp/_utility;
-#include common_scripts/utility;
 
-codecallback_startgametype() //checked matches cerberus output
+codecallback_startgametype()
 {
-	if ( !isDefined( level.gametypestarted ) || !level.gametypestarted )
+    if ( !isdefined( level.gametypestarted ) || !level.gametypestarted )
     {
         [[ level.callbackstartgametype ]]();
         level.gametypestarted = 1;
     }
 }
 
-codecallback_finalizeinitialization() //checked matches cerberus output
+codecallback_finalizeinitialization()
 {
-	maps/mp/_utility::callback( "on_finalize_initialization" );
+    maps\mp\_utility::callback( "on_finalize_initialization" );
 }
 
-codecallback_playerconnect() //checked matches cerberus output
+codecallback_playerconnect()
 {
     self endon( "disconnect" );
-	self thread maps/mp/_audio::monitor_player_sprint();
+    self thread maps\mp\_audio::monitor_player_sprint();
     [[ level.callbackplayerconnect ]]();
 }
 
-codecallback_playerdisconnect() //checked matches cerberus output
+codecallback_playerdisconnect()
 {
     self notify( "disconnect" );
-	level notify( "disconnect" );
+    level notify( "disconnect", self );
     client_num = self getentitynumber();
     [[ level.callbackplayerdisconnect ]]();
 }
 
-codecallback_hostmigration() //checked matches cerberus output
+codecallback_hostmigration()
 {
-	/*
 /#
     println( "****CodeCallback_HostMigration****" );
 #/
-	*/
     [[ level.callbackhostmigration ]]();
 }
 
-codecallback_hostmigrationsave() //checked matches cerberus output
+codecallback_hostmigrationsave()
 {
-	/*
 /#
     println( "****CodeCallback_HostMigrationSave****" );
 #/
-	*/
     [[ level.callbackhostmigrationsave ]]();
 }
 
-codecallback_playermigrated() //checked matches cerberus output
+codecallback_playermigrated()
 {
-	/*
 /#
     println( "****CodeCallback_PlayerMigrated****" );
 #/
-	*/
     [[ level.callbackplayermigrated ]]();
 }
 
-codecallback_playerdamage( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, timeoffset, boneindex ) //checked matches cerberus output
+codecallback_playerdamage( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, timeoffset, boneindex )
 {
     self endon( "disconnect" );
     [[ level.callbackplayerdamage ]]( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, timeoffset, boneindex );
 }
 
-codecallback_playerkilled( einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, timeoffset, deathanimduration ) //checked matches cerberus output
+codecallback_playerkilled( einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, timeoffset, deathanimduration )
 {
     self endon( "disconnect" );
     [[ level.callbackplayerkilled ]]( einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, timeoffset, deathanimduration );
 }
 
-codecallback_playerlaststand( einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, timeoffset, deathanimduration ) //checked matches cerberus output
+codecallback_playerlaststand( einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, timeoffset, deathanimduration )
 {
     self endon( "disconnect" );
     [[ level.callbackplayerlaststand ]]( einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, timeoffset, deathanimduration );
 }
 
-codecallback_playermelee( eattacker, idamage, sweapon, vorigin, vdir, boneindex, shieldhit ) //checked matches cerberus output
+codecallback_playermelee( eattacker, idamage, sweapon, vorigin, vdir, boneindex, shieldhit )
 {
     self endon( "disconnect" );
     [[ level.callbackplayermelee ]]( eattacker, idamage, sweapon, vorigin, vdir, boneindex, shieldhit );
 }
 
-codecallback_actordamage( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, timeoffset, boneindex ) //checked matches cerberus output
+codecallback_actordamage( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, timeoffset, boneindex )
 {
     [[ level.callbackactordamage ]]( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, timeoffset, boneindex );
 }
 
-codecallback_actorkilled( einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, timeoffset ) //checked matches cerberus output
+codecallback_actorkilled( einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, timeoffset )
 {
     [[ level.callbackactorkilled ]]( einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, timeoffset );
 }
 
-codecallback_vehicledamage( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, timeoffset, damagefromunderneath, modelindex, partname ) //checked matches cerberus output
+codecallback_vehicledamage( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, timeoffset, damagefromunderneath, modelindex, partname )
 {
     [[ level.callbackvehicledamage ]]( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, timeoffset, damagefromunderneath, modelindex, partname );
 }
 
-codecallback_vehicleradiusdamage( einflictor, eattacker, idamage, finnerdamage, fouterdamage, idflags, smeansofdeath, sweapon, vpoint, fradius, fconeanglecos, vconedir, timeoffset ) //checked matches cerberus output
+codecallback_vehicleradiusdamage( einflictor, eattacker, idamage, finnerdamage, fouterdamage, idflags, smeansofdeath, sweapon, vpoint, fradius, fconeanglecos, vconedir, timeoffset )
 {
     [[ level.callbackvehicleradiusdamage ]]( einflictor, eattacker, idamage, finnerdamage, fouterdamage, idflags, smeansofdeath, sweapon, vpoint, fradius, fconeanglecos, vconedir, timeoffset );
 }
 
-codecallback_faceeventnotify( notify_msg, ent ) //checked matches cerberus output 
+codecallback_faceeventnotify( notify_msg, ent )
 {
-	if ( isDefined( ent ) && is_true( ent.do_face_anims ) )
+    if ( isdefined( ent ) && isdefined( ent.do_face_anims ) && ent.do_face_anims )
-	{
-		if ( isDefined( level.face_event_handler ) && isDefined( level.face_event_handler.events[ notify_msg ] ) )
     {
+        if ( isdefined( level.face_event_handler ) && isdefined( level.face_event_handler.events[notify_msg] ) )
             ent sendfaceevent( level.face_event_handler.events[notify_msg] );
     }
 }
-}
 
-codecallback_menuresponse( action, arg ) //checked matches cerberus output
+codecallback_menuresponse( action, arg )
 {
-	if ( !isDefined( level.menuresponsequeue ) )
+    if ( !isdefined( level.menuresponsequeue ) )
     {
         level.menuresponsequeue = [];
         level thread menuresponsequeuepump();
     }
+
     index = level.menuresponsequeue.size;
     level.menuresponsequeue[index] = spawnstruct();
     level.menuresponsequeue[index].action = action;
@@ -136,18 +123,24 @@ codecallback_menuresponse( action, arg ) //checked matches cerberus output
     level notify( "menuresponse_queue" );
 }
 
-menuresponsequeuepump() //checked changed to match cerberus output
+menuresponsequeuepump()
 {
-	while ( 1 )
+    while ( true )
     {
         level waittill( "menuresponse_queue" );
+
         level.menuresponsequeue[0].ent notify( "menuresponse", level.menuresponsequeue[0].action, level.menuresponsequeue[0].arg );
         arrayremoveindex( level.menuresponsequeue, 0, 0 );
         wait 0.05;
+
+        if ( !( level.menuresponsequeue.size > 0 ) )
+        {
+
+        }
     }
 }
 
-setupcallbacks() //checked matches cerberus output
+setupcallbacks()
 {
     setdefaultcallbacks();
     level.idflags_radius = 1;
@@ -163,31 +156,29 @@ setupcallbacks() //checked matches cerberus output
     level.idflags_passthru = 1024;
 }
 
-setdefaultcallbacks() //checked matches cerberus output 
+setdefaultcallbacks()
 {
-	level.callbackstartgametype = maps/mp/gametypes/_globallogic::callback_startgametype;
+    level.callbackstartgametype = maps\mp\gametypes\_globallogic::callback_startgametype;
-	level.callbackplayerconnect = maps/mp/gametypes/_globallogic_player::callback_playerconnect;
+    level.callbackplayerconnect = maps\mp\gametypes\_globallogic_player::callback_playerconnect;
-	level.callbackplayerdisconnect = maps/mp/gametypes/_globallogic_player::callback_playerdisconnect;
+    level.callbackplayerdisconnect = maps\mp\gametypes\_globallogic_player::callback_playerdisconnect;
-	level.callbackplayerdamage = maps/mp/gametypes/_globallogic_player::callback_playerdamage;
+    level.callbackplayerdamage = maps\mp\gametypes\_globallogic_player::callback_playerdamage;
-	level.callbackplayerkilled = maps/mp/gametypes/_globallogic_player::callback_playerkilled;
+    level.callbackplayerkilled = maps\mp\gametypes\_globallogic_player::callback_playerkilled;
-	level.callbackplayermelee = maps/mp/gametypes/_globallogic_player::callback_playermelee;
+    level.callbackplayermelee = maps\mp\gametypes\_globallogic_player::callback_playermelee;
-	level.callbackplayerlaststand = maps/mp/gametypes/_globallogic_player::callback_playerlaststand;
+    level.callbackplayerlaststand = maps\mp\gametypes\_globallogic_player::callback_playerlaststand;
-	level.callbackactordamage = maps/mp/gametypes/_globallogic_actor::callback_actordamage;
+    level.callbackactordamage = maps\mp\gametypes\_globallogic_actor::callback_actordamage;
-	level.callbackactorkilled = maps/mp/gametypes/_globallogic_actor::callback_actorkilled;
+    level.callbackactorkilled = maps\mp\gametypes\_globallogic_actor::callback_actorkilled;
-	level.callbackvehicledamage = maps/mp/gametypes/_globallogic_vehicle::callback_vehicledamage;
+    level.callbackvehicledamage = maps\mp\gametypes\_globallogic_vehicle::callback_vehicledamage;
-	level.callbackvehicleradiusdamage = maps/mp/gametypes/_globallogic_vehicle::callback_vehicleradiusdamage;
+    level.callbackvehicleradiusdamage = maps\mp\gametypes\_globallogic_vehicle::callback_vehicleradiusdamage;
-	level.callbackplayermigrated = maps/mp/gametypes/_globallogic_player::callback_playermigrated;
+    level.callbackplayermigrated = maps\mp\gametypes\_globallogic_player::callback_playermigrated;
-	level.callbackhostmigration = maps/mp/gametypes/_hostmigration::callback_hostmigration;
+    level.callbackhostmigration = maps\mp\gametypes\_hostmigration::callback_hostmigration;
-	level.callbackhostmigrationsave = maps/mp/gametypes/_hostmigration::callback_hostmigrationsave;
+    level.callbackhostmigrationsave = maps\mp\gametypes\_hostmigration::callback_hostmigrationsave;
 }
 
-abortlevel() //checked matches cerberus output
+abortlevel()
 {
-	/*
 /#
     println( "ERROR: Aborting level - gametype is not supported" );
 #/
-	*/
     level.callbackstartgametype = ::callbackvoid;
     level.callbackplayerconnect = ::callbackvoid;
     level.callbackplayerdisconnect = ::callbackvoid;
@@ -202,12 +193,12 @@ abortlevel() //checked matches cerberus output
     exitlevel( 0 );
 }
 
-codecallback_glasssmash( pos, dir ) //checked matches cerberus output
+codecallback_glasssmash( pos, dir )
 {
-	level notify( "glass_smash" );
+    level notify( "glass_smash", pos, dir );
 }
 
-callbackvoid() //checked matches cerberus output
+callbackvoid()
 {
-}
 
+}