improve nav + a couple other things (#421)

5 files changed, 271 insertions, 117 deletions

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd.nut
index e97ab396..15da6866 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd.nut
@@ -3,6 +3,10 @@ global function RateSpawnpoints_FD
 global function startHarvester
 global function GetTargetNameForID
 
+global function DisableTitanSelection
+global function DisableTitanSelectionForPlayer
+global function EnableTitanSelection
+global function EnableTitanSelectionForPlayer
 
 struct player_struct_fd{
 	bool diedThisRound
@@ -25,6 +29,7 @@ struct player_struct_fd{
 
 global HarvesterStruct& fd_harvester
 global vector shopPosition
+global vector shopAngles = <0,0,0>
 global table<string,array<vector> > routes
 global array<entity> routeNodes
 global array<entity> spawnedNPCs
@@ -157,6 +162,11 @@ void function GamemodeFD_InitPlayer(entity player)
 	if(GetGlobalNetInt("FD_currentWave")>1)
 		PlayerEarnMeter_AddEarnedAndOwned(player,1.0,1.0)
 
+	if ( GetGlobalNetInt("FD_currentWave") != 0 )
+		DisableTitanSelectionForPlayer( player ) // this might need moving to when they exit the titan selection UI when we do that
+	else
+		EnableTitanSelectionForPlayer( player )
+
 }
 void function SetTurretSettings_threaded(entity player)
 {	//has to be delayed because PlayerConnect callbacks get called in wrong order
@@ -277,8 +287,13 @@ void function mainGameLoop()
 			showShop = true
 			foreach(entity player in GetPlayerArray())
 			{
-			PlayerEarnMeter_AddEarnedAndOwned(player,1.0,1.0)
+				PlayerEarnMeter_AddEarnedAndOwned(player,1.0,1.0)
 			}
+			DisableTitanSelection()
+		}
+		else if (i + 1 == waveEvents.len() )
+		{
+			EnableTitanSelection()
 		}
 
 	}
@@ -985,8 +1000,7 @@ bool function isSecondWave()
 
 void function LoadEntities()
 {
-
-	CreateBoostStoreLocation(TEAM_MILITIA,shopPosition,<0,0,0>)
+	CreateBoostStoreLocation(TEAM_MILITIA,shopPosition,shopAngles)
 	foreach ( entity info_target in GetEntArrayByClass_Expensive("info_target") )
 	{
 
@@ -1203,4 +1217,44 @@ void function AddTurretSentry(entity turret)
 	turret.Minimap_AlwaysShow( TEAM_MILITIA, null )
 	turret.Minimap_SetHeightTracking( true )
 	turret.Minimap_SetCustomState( eMinimapObject_npc.FD_TURRET )
-}
\ No newline at end of file
+}
+
+void function DisableTitanSelection( )
+{
+	foreach ( entity player in GetPlayerArray() )
+	{
+		DisableTitanSelectionForPlayer( player )
+	}
+}
+
+void function EnableTitanSelection( )
+{
+	foreach ( entity player in GetPlayerArray() )
+	{
+		EnableTitanSelectionForPlayer( player )
+	}
+}
+
+void function EnableTitanSelectionForPlayer( entity player )
+{
+	int enumCount =	PersistenceGetEnumCount( "titanClasses" )
+	for ( int i = 0; i < enumCount; i++ )
+	{
+		string enumName = PersistenceGetEnumItemNameForIndex( "titanClasses", i )
+		if ( enumName != "" )
+			player.SetPersistentVar( "titanClassLockState[" + enumName + "]", TITAN_CLASS_LOCK_STATE_AVAILABLE )
+
+	}
+}
+
+void function DisableTitanSelectionForPlayer( entity player )
+{
+	int enumCount =	PersistenceGetEnumCount( "titanClasses" )
+	for ( int i = 0; i < enumCount; i++ )
+	{
+		string enumName = PersistenceGetEnumItemNameForIndex( "titanClasses", i )
+		string selectedEnumName = PersistenceGetEnumItemNameForIndex( "titanClasses", player.GetPersistentVarAsInt("activeTitanLoadoutIndex") )
+		if ( enumName != "" && enumName != selectedEnumName )
+			player.SetPersistentVar( "titanClassLockState[" + enumName + "]", TITAN_CLASS_LOCK_STATE_LOCKED )
+	}
+}
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd_nav.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd_nav.nut
index c1d0c7a9..57282766 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd_nav.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd_nav.nut
@@ -17,7 +17,7 @@ void function singleNav_thread(entity npc, string routeName,int nodesToSkip= 0,f
 		
 
 
-	array<entity> routeArray = getRoute(routeName)
+	/*array<entity> routeArray = getRoute(routeName)
 	WaitFrame()//so other code setting up what happens on signals is run before this
 	if(routeArray.len()==0)
 	{
@@ -41,7 +41,52 @@ void function singleNav_thread(entity npc, string routeName,int nodesToSkip= 0,f
 		table result = npc.WaitSignal("OnFinishedAssault","OnFailedToPath")
 		if(result.signal == "OnFailedToPath")
 			break
+	}*/
+
+	// NEW STUFF
+	WaitFrame() // so other code setting up what happens on signals is run before this
+
+	entity targetNode
+	if ( routeName == "" )
+	{
+		float dist = 1000000000
+		foreach ( entity node in routeNodes )
+		{
+			if( !node.HasKey("route_name") )
+				continue
+			if ( Distance( npc.GetOrigin(), node.GetOrigin() ) < dist )
+			{
+				dist = Distance( npc.GetOrigin(), node.GetOrigin() )
+				targetNode = node
+			}
+		}
+		printt("Entity had no route defined: using nearest node: " + targetNode.kv.route_name)
+	}
+	else
+	{
+		targetNode = GetRouteStart( routeName )
+	}
+
+	// skip nodes
+	for ( int i = 0; i < nodesToSkip; i++ )
+	{
+		targetNode = targetNode.GetLinkEnt()
 	}
+
+	
+	while ( targetNode != null )
+	{
+		if( !IsAlive( fd_harvester.harvester ) )
+			return
+		npc.AssaultPoint( targetNode.GetOrigin() )
+		npc.AssaultSetGoalRadius( npc.GetMinGoalRadius() )
+		npc.AssaultSetFightRadius( 0 )
+		
+		table result = npc.WaitSignal( "OnFinishedAssault", "OnFailedToPath" )
+		
+		targetNode = targetNode.GetLinkEnt()
+	}
+
 	npc.Signal("FD_ReachedHarvester")
 }
 
@@ -49,7 +94,7 @@ void function SquadNav_Thread( array<entity> npcs ,string routeName,int nodesToS
 {
 	//TODO this function wont stop when noone alive anymore also it only works half of the time
 
-	array<entity> routeArray = getRoute(routeName)
+	/*array<entity> routeArray = getRoute(routeName)
 	WaitFrame()//so other code setting up what happens on signals is run before this
 	if(routeArray.len()==0)
 		return
@@ -64,8 +109,60 @@ void function SquadNav_Thread( array<entity> npcs ,string routeName,int nodesToS
 		
 		SquadAssaultOrigin(npcs,node.GetOrigin(),nextDistance)
 
+	}*/
+	// NEW STUFF
+	WaitFrame() // so other code setting up what happens on signals is run before this
+
+	entity targetNode
+	if ( routeName == "" )
+	{
+		float dist = 1000000000
+		foreach ( entity node in routeNodes )
+		{
+			if( !node.HasKey("route_name") )
+				continue
+			if ( Distance( npcs[0].GetOrigin(), node.GetOrigin() ) < dist )
+			{
+				dist = Distance( npcs[0].GetOrigin(), node.GetOrigin() )
+				targetNode = node
+			}
+		}
+		printt("Entity had no route defined: using nearest node: " + targetNode.kv.route_name)
+	}
+	else
+	{
+		targetNode = GetRouteStart( routeName )
+	}
+
+	// skip nodes
+	for ( int i = 0; i < nodesToSkip; i++ )
+	{
+		targetNode = targetNode.GetLinkEnt()
 	}
 
+	
+	while ( targetNode != null )
+	{
+		if( !IsAlive( fd_harvester.harvester ) )
+			return
+		SquadAssaultOrigin(npcs,targetNode.GetOrigin(),nextDistance)
+		
+		targetNode = targetNode.GetLinkEnt()
+	}
+
+}
+
+entity function GetRouteStart( string routeName )
+{
+	foreach( entity node in routeNodes )
+	{
+		if( !node.HasKey("route_name") )
+			continue
+		if( expect string( node.kv.route_name ) == routeName )
+		{
+			return node
+		}
+	}
 }
 
 array<entity> function getRoute(string routeName)
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
index 8d29c612..df6829c8 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
@@ -121,6 +121,7 @@ void function CodeCallback_OnClientConnectionStarted( entity player )
 // playerconnected
 void function CodeCallback_OnClientConnectionCompleted( entity player )
 {
+	InitPersistentData( player )
 	if ( IsLobby() )
 	{
 		Lobby_OnClientConnectionCompleted( player )
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_forwardbase_kodai_fd.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_forwardbase_kodai_fd.nut
index 084ce8d5..b1c67fd6 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_forwardbase_kodai_fd.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_forwardbase_kodai_fd.nut
@@ -16,7 +16,7 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(1.0,8))
     wave1.append(CreateDroppodGruntEvent(< 1116.630005 , 329.750000 , 1372.280029 >,"hillRouteClose",9))
     wave1.append(CreateWaitForTimeEvent(5.0,10))
-    wave1.append(CreateWaitUntilAliveEvent(0,11))
+    wave1.append(CreateWaitUntilAliveEvent(4,11))
     wave1.append(CreateDroppodGruntEvent(< 864.625000 , 693.750000 , 1379.910034 >,"hillRouteClose",12))
     wave1.append(CreateWaitForTimeEvent(1.1669998,13))
     wave1.append(CreateDroppodGruntEvent(< 884.625000 , 1721.750000 , 1377.410034 >,"hillRouteClose",14))
@@ -27,7 +27,7 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(0.5999985,19))
     wave1.append(CreateDroppodStalkerEvent(< 1116.630005 , 329.750000 , 1372.280029 >,"hillRouteClose",20))
     wave1.append(CreateWaitForTimeEvent(5.0,21))
-    wave1.append(CreateWaitUntilAliveEvent(0,22))
+    wave1.append(CreateWaitUntilAliveEvent(4,22))
     wave1.append(CreateDroppodGruntEvent(< 864.625000 , 693.750000 , 1379.910034 >,"hillRouteClose",23))
     wave1.append(CreateWaitForTimeEvent(1.3829956,24))
     wave1.append(CreateDroppodGruntEvent(< 884.625000 , 1721.750000 , 1377.410034 >,"hillRouteClose",25))
@@ -38,7 +38,7 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(1.5,30))
     wave1.append(CreateDroppodGruntEvent(< 1116.630005 , 329.750000 , 1372.280029 >,"hillRouteClose",31))
     wave1.append(CreateWaitForTimeEvent(5.0,32))
-    wave1.append(CreateWaitUntilAliveEvent(0,33))
+    wave1.append(CreateWaitUntilAliveEvent(4,33))
     wave1.append(CreateDroppodGruntEvent(< 864.625000 , 693.750000 , 1379.910034 >,"hillRouteClose",34))
     wave1.append(CreateWaitForTimeEvent(1.5,35))
     wave1.append(CreateDroppodGruntEvent(< 884.625000 , 1721.750000 , 1377.410034 >,"hillRouteClose",36))
@@ -49,7 +49,7 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(1.2829895,41))
     wave1.append(CreateDroppodStalkerEvent(< 1116.630005 , 329.750000 , 1372.280029 >,"hillRouteClose",42))
     wave1.append(CreateWaitForTimeEvent(5.0,43))
-    wave1.append(CreateWaitUntilAliveEvent(0,44))
+    wave1.append(CreateWaitUntilAliveEvent(4,44))
     wave1.append(CreateDroppodGruntEvent(< 864.625000 , 693.750000 , 1379.910034 >,"hillRouteClose",45))
     wave1.append(CreateWaitForTimeEvent(1.5,46))
     wave1.append(CreateDroppodGruntEvent(< 884.625000 , 1721.750000 , 1377.410034 >,"hillRouteClose",47))
@@ -60,7 +60,7 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(0.66700745,52))
     wave1.append(CreateDroppodGruntEvent(< 1116.630005 , 329.750000 , 1372.280029 >,"hillRouteClose",53))
     wave1.append(CreateWaitForTimeEvent(5.0,54))
-    wave1.append(CreateWaitUntilAliveEvent(0,55))
+    wave1.append(CreateWaitUntilAliveEvent(4,55))
     wave1.append(CreateDroppodGruntEvent(< 864.625000 , 693.750000 , 1379.910034 >,"hillRouteClose",56))
     wave1.append(CreateWaitForTimeEvent(1.2169952,57))
     wave1.append(CreateDroppodGruntEvent(< 884.625000 , 1721.750000 , 1377.410034 >,"hillRouteClose",58))
@@ -70,15 +70,15 @@ void function initFrontierDefenseData()
     wave1.append(CreateToneSniperTitanEvent(< 1373.469971 , 1219.410034 , 1314.339966 >,< 0.000000 , 169.541000 , 0.000000 >,0))
     waveEvents.append(wave1)
     array<WaveEvent> wave2
-    wave2.append(CreateDroppodTickEvent(< 864.625000 , 693.750000 , 1379.910034 >,4,"",1))
+    wave2.append(CreateDroppodTickEvent(< 864.625000 , 693.750000 , 1379.910034 >,4,"hillRouteClose",1))
     wave2.append(CreateWaitForTimeEvent(1.0169983,2))
-    wave2.append(CreateDroppodTickEvent(< 884.625000 , 1721.750000 , 1377.410034 >,4,"",3))
+    wave2.append(CreateDroppodTickEvent(< 884.625000 , 1721.750000 , 1377.410034 >,4,"hillRouteClose",3))
     wave2.append(CreateWaitForTimeEvent(1.6500244,4))
-    wave2.append(CreateDroppodTickEvent(< 1226.410034 , 1391.130005 , 1334.689941 >,4,"",5))
+    wave2.append(CreateDroppodTickEvent(< 1226.410034 , 1391.130005 , 1334.689941 >,4,"hillRouteClose",5))
     wave2.append(CreateWaitForTimeEvent(1.0329895,6))
-    wave2.append(CreateDroppodTickEvent(< 1258.060059 , 921.593994 , 1330.750000 >,4,"",7))
+    wave2.append(CreateDroppodTickEvent(< 1258.060059 , 921.593994 , 1330.750000 >,4,"hillRouteClose",7))
     wave2.append(CreateWaitForTimeEvent(5.0,8))
-    wave2.append(CreateWaitUntilAliveEvent(0,9))
+    wave2.append(CreateWaitUntilAliveEvent(4,9))
     wave2.append(CreateToneSniperTitanEvent(< 1373.469971 , 1219.410034 , 1314.339966 >,< 0.000000 , 169.541000 , 0.000000 >,10))
     wave2.append(CreateWaitForTimeEvent(1.0159912,11))
     wave2.append(CreateToneSniperTitanEvent(< 1209.469971 , 579.406006 , 1332.310059 >,< 0.000000 , 169.541000 , 0.000000 >,12))
@@ -89,7 +89,7 @@ void function initFrontierDefenseData()
     wave2.append(CreateWaitForTimeEvent(1.1499939,17))
     wave2.append(CreateDroppodSpectreMortarEvent(< 864.625000 , 693.750000 , 1379.910034 >,"",18))
     wave2.append(CreateWaitForTimeEvent(5.0,19))
-    wave2.append(CreateWaitUntilAliveEvent(0,20))
+    wave2.append(CreateWaitUntilAliveEvent(4,20))
     wave2.append(CreateDroppodSpectreMortarEvent(< 884.625000 , 1721.750000 , 1377.410034 >,"",21))
     wave2.append(CreateWaitForTimeEvent(0.6000061,22))
     wave2.append(CreateDroppodGruntEvent(< 1226.410034 , 1391.130005 , 1334.689941 >,"",23))
@@ -98,7 +98,7 @@ void function initFrontierDefenseData()
     wave2.append(CreateWaitForTimeEvent(2.9160156,26))
     wave2.append(CreateDroppodGruntEvent(< 1258.060059 , 921.593994 , 1330.750000 >,"",27))
     wave2.append(CreateWaitForTimeEvent(5.0,28))
-    wave2.append(CreateWaitUntilAliveEvent(0,29))
+    wave2.append(CreateWaitUntilAliveEvent(4,29))
     wave2.append(CreateDroppodGruntEvent(< 864.625000 , 693.750000 , 1379.910034 >,"",30))
     wave2.append(CreateWaitForTimeEvent(0.8659973,31))
     wave2.append(CreateDroppodGruntEvent(< 884.625000 , 1721.750000 , 1377.410034 >,"",32))
@@ -109,7 +109,7 @@ void function initFrontierDefenseData()
     wave2.append(CreateWaitForTimeEvent(0.6000061,37))
     wave2.append(CreateToneTitanEvent(< 2665.060059 , 4456.129883 , 960.687988 >,< 0.000000 , -141.108002 , 0.000000 >,"",38))
     wave2.append(CreateWaitForTimeEvent(5.0,39))
-    wave2.append(CreateWaitUntilAliveEvent(0,40))
+    wave2.append(CreateWaitUntilAliveEvent(4,40))
     wave2.append(CreateSuperSpectreEvent(< 1856.959961 , -3177.639893 , 812.718018 >,< -0.000000 , -162.389999 , 0.000000 >,"",41))
     wave2.append(CreateWaitForTimeEvent(1.03302,42))
     wave2.append(CreateSuperSpectreEvent(< 3123.000000 , 4201.589844 , 950.937988 >,< 0.000000 , -117.246002 , 0.000000 >,"",43))
@@ -120,31 +120,31 @@ void function initFrontierDefenseData()
     wave2.append(CreateWaitForTimeEvent(3.1829834,48))
     wave2.append(CreateSuperSpectreEvent(< 2184.969971 , -3550.040039 , 819.479980 >,< 0.000000 , 177.582993 , 0.000000 >,"",49))
     wave2.append(CreateWaitForTimeEvent(5.0,50))
-    wave2.append(CreateWaitUntilAliveEvent(0,51))
+    wave2.append(CreateWaitUntilAliveEvent(4,51))
     wave2.append(CreateSuperSpectreEvent(< 1764.410034 , 4424.220215 , 953.375000 >,< -0.000000 , -170.024002 , 0.000000 >,"",52))
     wave2.append(CreateWaitForTimeEvent(5.0,53))
-    wave2.append(CreateWaitUntilAliveEvent(0,54))
-    wave2.append(CreateDroppodTickEvent(< 3248.840088 , 161.156006 , 951.781006 >,4,"",55))
+    wave2.append(CreateWaitUntilAliveEvent(4,54))
+    wave2.append(CreateDroppodTickEvent(< 3248.840088 , 161.156006 , 951.781006 >,4,"hillRouteClose",55))
     wave2.append(CreateWaitForTimeEvent(1.1499939,56))
-    wave2.append(CreateDroppodTickEvent(< 3156.560059 , 2266.939941 , 951.781006 >,4,"",57))
+    wave2.append(CreateDroppodTickEvent(< 3156.560059 , 2266.939941 , 951.781006 >,4,"hillRouteClose",57))
     wave2.append(CreateWaitForTimeEvent(5.0,58))
-    wave2.append(CreateWaitUntilAliveEvent(0,59))
-    wave2.append(CreateDroppodTickEvent(< 3248.840088 , 161.156006 , 951.781006 >,4,"",60))
+    wave2.append(CreateWaitUntilAliveEvent(4,59))
+    wave2.append(CreateDroppodTickEvent(< 3248.840088 , 161.156006 , 951.781006 >,4,"hillRouteClose",60))
     wave2.append(CreateWaitForTimeEvent(1.1170044,61))
-    wave2.append(CreateDroppodTickEvent(< 3156.560059 , 2266.939941 , 951.781006 >,4,"",62))
+    wave2.append(CreateDroppodTickEvent(< 3156.560059 , 2266.939941 , 951.781006 >,4,"hillRouteClose",62))
     wave2.append(CreateWaitForTimeEvent(0.8829956,63))
     wave2.append(CreateToneTitanEvent(< 4466.220215 , 1469.410034 , 947.281006 >,< 0.000000 , 169.541000 , 0.000000 >,"",64))
     wave2.append(CreateWaitForTimeEvent(3.5169983,65))
     wave2.append(CreateDroppodGruntEvent(< 2336.000000 , 1968.000000 , 953.531006 >,"",66))
     wave2.append(CreateWaitForTimeEvent(5.0,67))
-    wave2.append(CreateWaitUntilAliveEvent(0,68))
+    wave2.append(CreateWaitUntilAliveEvent(4,68))
     wave2.append(CreateDroppodGruntEvent(< 3248.840088 , 161.156006 , 951.781006 >,"",69))
     wave2.append(CreateWaitForTimeEvent(2.6660156,70))
     wave2.append(CreateDroppodGruntEvent(< 3156.560059 , 2266.939941 , 951.781006 >,"",71))
     wave2.append(CreateWaitForTimeEvent(1.1999817,72))
     wave2.append(CreateDroppodGruntEvent(< 2336.000000 , 1968.000000 , 953.531006 >,"",73))
     wave2.append(CreateWaitForTimeEvent(5.0,74))
-    wave2.append(CreateWaitUntilAliveEvent(0,75))
+    wave2.append(CreateWaitUntilAliveEvent(4,75))
     wave2.append(CreateSuperSpectreEvent(< 4163.069824 , 1471.650024 , 944.281006 >,< -0.000000 , -179.416000 , 0.000000 >,"",76))
     wave2.append(CreateWaitForTimeEvent(1.5159912,77))
     wave2.append(CreateSuperSpectreEvent(< 4210.669922 , 895.575989 , 944.281006 >,< -0.000000 , -164.787003 , 0.000000 >,"",78))
@@ -153,12 +153,12 @@ void function initFrontierDefenseData()
     wave2.append(CreateWaitForTimeEvent(1.1340027,81))
     wave2.append(CreateSuperSpectreEvent(< 3982.860107 , 1778.540039 , 944.281006 >,< -0.000000 , 179.488007 , 0.000000 >,"",82))
     wave2.append(CreateWaitForTimeEvent(5.0,83))
-    wave2.append(CreateWaitUntilAliveEvent(0,84))
+    wave2.append(CreateWaitUntilAliveEvent(4,84))
     wave2.append(CreateDroppodGruntEvent(< 2457.310059 , -2563.659912 , 789.250000 >,"",85))
     wave2.append(CreateWaitForTimeEvent(1.3840027,86))
     wave2.append(CreateDroppodGruntEvent(< 1935.839966 , 3727.840088 , 931.656006 >,"",87))
     wave2.append(CreateWaitForTimeEvent(5.0,88))
-    wave2.append(CreateWaitUntilAliveEvent(0,89))
+    wave2.append(CreateWaitUntilAliveEvent(4,89))
     wave2.append(CreateSuperSpectreEvent(< 2182.939941 , -3549.810059 , 819.468994 >,< 0.000000 , 177.582993 , 0.000000 >,"",90))
     wave2.append(CreateWaitForTimeEvent(0.1159668,91))
     wave2.append(CreateDroppodGruntEvent(< 1045.339966 , -2843.340088 , 804.812988 >,"",92))
@@ -167,12 +167,12 @@ void function initFrontierDefenseData()
     wave2.append(CreateWaitForTimeEvent(0.7000122,95))
     wave2.append(CreateDroppodGruntEvent(< 2111.840088 , 3295.840088 , 939.031006 >,"",96))
     wave2.append(CreateWaitForTimeEvent(5.0,97))
-    wave2.append(CreateWaitUntilAliveEvent(0,98))
+    wave2.append(CreateWaitUntilAliveEvent(4,98))
     wave2.append(CreateSuperSpectreEvent(< 2343.590088 , -3185.840088 , 788.312988 >,< -0.000000 , 174.550995 , 0.000000 >,"",99))
     wave2.append(CreateWaitForTimeEvent(0.8500366,100))
     wave2.append(CreateSuperSpectreEvent(< 2338.270020 , 4684.279785 , 952.682007 >,< -0.000000 , -167.669006 , 0.000000 >,"",101))
     wave2.append(CreateWaitForTimeEvent(5.0,102))
-    wave2.append(CreateWaitUntilAliveEvent(0,103))
+    wave2.append(CreateWaitUntilAliveEvent(4,103))
     wave2.append(CreateSuperSpectreEvent(< 2177.209961 , -3539.600098 , 817.719971 >,< 0.000000 , 178.065994 , 0.000000 >,"",104))
     wave2.append(CreateWaitForTimeEvent(1.0,105))
     wave2.append(CreateSuperSpectreEvent(< 2401.719971 , 4475.089844 , 962.406006 >,< 0.000000 , 177.626999 , 0.000000 >,"",106))
@@ -185,15 +185,15 @@ void function initFrontierDefenseData()
     wave2.append(CreateWaitForTimeEvent(0.7839966,113))
     wave2.append(CreateSuperSpectreEvent(< 2828.399902 , 4138.450195 , 938.893982 >,< 0.000000 , -171.078995 , 0.000000 >,"",114))
     wave2.append(CreateWaitForTimeEvent(5.0,115))
-    wave2.append(CreateWaitUntilAliveEvent(0,116))
+    wave2.append(CreateWaitUntilAliveEvent(4,116))
     wave2.append(CreateLegionTitanEvent(< 4466.689941 , 1469.410034 , 947.281006 >,< 0.000000 , 169.541000 , 0.000000 >,"",117))
     wave2.append(CreateWaitForTimeEvent(5.0,118))
-    wave2.append(CreateWaitUntilAliveEvent(0,119))
+    wave2.append(CreateWaitUntilAliveEvent(4,119))
     wave2.append(CreateSuperSpectreEvent(< 4182.189941 , 917.906006 , 944.281006 >,< 0.000000 , -124.805000 , 0.000000 >,"",120))
     wave2.append(CreateWaitForTimeEvent(1.3170166,121))
     wave2.append(CreateSuperSpectreEvent(< 2747.790039 , 1574.170044 , 944.281006 >,< -0.000000 , -164.485001 , 0.000000 >,"",122))
     wave2.append(CreateWaitForTimeEvent(5.0,123))
-    wave2.append(CreateWaitUntilAliveEvent(0,124))
+    wave2.append(CreateWaitUntilAliveEvent(4,124))
     wave2.append(CreateScorchTitanEvent(< 2821.659912 , -2937.090088 , 827.937988 >,< 0.000000 , 117.202003 , 0.000000 >,"",125))
     wave2.append(CreateWaitForTimeEvent(1.0,126))
     wave2.append(CreateScorchTitanEvent(< 3123.560059 , 4202.060059 , 954.343994 >,< 0.000000 , -141.108002 , 0.000000 >,"",127))
@@ -215,7 +215,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(1.1170044,10))
     wave3.append(CreateDroppodGruntEvent(< 1418.310059 , -2254.659912 , 810.031006 >,"",11))
     wave3.append(CreateWaitForTimeEvent(5.0,12))
-    wave3.append(CreateWaitUntilAliveEvent(0,13))
+    wave3.append(CreateWaitUntilAliveEvent(4,13))
     wave3.append(CreateSuperSpectreEvent(< 2170.020020 , -3549.570068 , 819.468994 >,< -0.000000 , 177.626007 , 0.000000 >,"",14))
     wave3.append(CreateWaitForTimeEvent(1.0669556,15))
     wave3.append(CreateSuperSpectreEvent(< 2577.060059 , -3007.379883 , 796.093994 >,< -0.000000 , -165.850006 , 0.000000 >,"",16))
@@ -224,7 +224,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(1.4000244,19))
     wave3.append(CreateSuperSpectreEvent(< 1531.000000 , -1779.880005 , 800.031006 >,< 0.000000 , 133.110001 , 0.000000 >,"",20))
     wave3.append(CreateWaitForTimeEvent(5.0,21))
-    wave3.append(CreateWaitUntilAliveEvent(0,22))
+    wave3.append(CreateWaitUntilAliveEvent(4,22))
     wave3.append(CreateScorchTitanEvent(< 2475.909912 , -3544.659912 , 810.281006 >,< 0.000000 , 90.000000 , 0.000000 >,"",23))
     wave3.append(CreateWaitForTimeEvent(0.6829834,24))
     wave3.append(CreateIonTitanEvent(< 2821.340088 , -2936.719971 , 827.937988 >,< 0.000000 , 117.202003 , 0.000000 >,"",25))
@@ -233,7 +233,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(1.0,28))
     wave3.append(CreateScorchTitanEvent(< 1559.910034 , -2024.660034 , 803.031006 >,< 0.000000 , 90.000000 , 0.000000 >,"",29))
     wave3.append(CreateWaitForTimeEvent(5.0,30))
-    wave3.append(CreateWaitUntilAliveEvent(0,31))
+    wave3.append(CreateWaitUntilAliveEvent(4,31))
     wave3.append(CreateSpawnDroneEvent(< 2487.310059 , -2561.379883 , 5744.229980 >,< 0.004999 , 90.003700 , 0.000004 >,"",32))
     wave3.append(CreateWaitForTimeEvent(0.0,33))
     wave3.append(CreateSpawnDroneEvent(< 2457.310059 , -2591.379883 , 5744.189941 >,< 0.004999 , 90.003700 , 0.000004 >,"",34))
@@ -242,7 +242,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(0.0,37))
     wave3.append(CreateSpawnDroneEvent(< 2427.310059 , -2561.379883 , 5744.549805 >,< 0.004999 , 90.003700 , 0.000004 >,"",38))
     wave3.append(CreateWaitForTimeEvent(5.0,39))
-    wave3.append(CreateWaitUntilAliveEvent(0,40))
+    wave3.append(CreateWaitUntilAliveEvent(4,40))
     wave3.append(CreateDroppodGruntEvent(< 2457.310059 , -2563.659912 , 789.250000 >,"",41))
     wave3.append(CreateWaitForTimeEvent(1.282959,42))
     wave3.append(CreateDroppodGruntEvent(< 1045.339966 , -2843.340088 , 804.812988 >,"",43))
@@ -255,7 +255,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(0.6170044,50))
     wave3.append(CreateMonarchTitanEvent(< 4453.129883 , 964.750000 , 947.281006 >,< 0.000000 , -172.529007 , 0.000000 >,"",51))
     wave3.append(CreateWaitForTimeEvent(5.0,52))
-    wave3.append(CreateWaitUntilAliveEvent(0,53))
+    wave3.append(CreateWaitUntilAliveEvent(4,53))
     wave3.append(CreateRoninTitanEvent(< 1763.839966 , -1608.750000 , 810.281006 >,< 0.000000 , 90.000000 , 0.000000 >,"",54))
     wave3.append(CreateWaitForTimeEvent(0.61602783,55))
     wave3.append(CreateRoninTitanEvent(< 2359.840088 , -1596.750000 , 802.718994 >,< 0.000000 , 90.000000 , 0.000000 >,"",56))
@@ -264,7 +264,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(1.0999756,59))
     wave3.append(CreateToneTitanEvent(< 2821.340088 , -2936.719971 , 827.937988 >,< 0.000000 , 117.202003 , 0.000000 >,"",60))
     wave3.append(CreateWaitForTimeEvent(5.0,61))
-    wave3.append(CreateWaitUntilAliveEvent(0,62))
+    wave3.append(CreateWaitUntilAliveEvent(4,62))
     wave3.append(CreateSuperSpectreEvent(< 2180.080078 , -3539.689941 , 817.739014 >,< 0.000000 , 178.065994 , 0.000000 >,"",63))
     wave3.append(CreateWaitForTimeEvent(0.6329956,64))
     wave3.append(CreateLegionTitanEvent(< 2680.219971 , -1724.630005 , 809.718994 >,< 0.000000 , 169.320999 , 0.000000 >,"",65))
@@ -289,7 +289,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(1.3170166,84))
     wave3.append(CreateScorchTitanEvent(< 2475.909912 , -3544.659912 , 810.281006 >,< 0.000000 , 90.000000 , 0.000000 >,"",85))
     wave3.append(CreateWaitForTimeEvent(5.0,86))
-    wave3.append(CreateWaitUntilAliveEvent(0,87))
+    wave3.append(CreateWaitUntilAliveEvent(4,87))
     wave3.append(CreateToneTitanEvent(< 1763.810059 , -1608.189941 , 810.000000 >,< 0.000000 , 90.000000 , 0.000000 >,"",88))
     wave3.append(CreateWaitForTimeEvent(0.9000244,89))
     wave3.append(CreateToneTitanEvent(< 2359.810059 , -1596.189941 , 802.718994 >,< 0.000000 , 90.000000 , 0.000000 >,"",90))
@@ -298,7 +298,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(1.3330078,93))
     wave3.append(CreateSpawnDroneEvent(< 1982.020020 , -1598.000000 , 1236.040039 >,< 0.000000 , 0.000000 , 0.000000 >,"",94))
     wave3.append(CreateWaitForTimeEvent(5.0,95))
-    wave3.append(CreateWaitUntilAliveEvent(0,96))
+    wave3.append(CreateWaitUntilAliveEvent(4,96))
     wave3.append(CreateLegionTitanEvent(< 4466.689941 , 1469.410034 , 947.281006 >,< 0.000000 , 169.541000 , 0.000000 >,"",97))
     wave3.append(CreateWaitForTimeEvent(0.7999878,98))
     wave3.append(CreateLegionTitanEvent(< 4453.589844 , 964.906006 , 947.281006 >,< 0.000000 , -172.529007 , 0.000000 >,"",99))
@@ -326,7 +326,7 @@ void function initFrontierDefenseData()
     wave4.append(CreateWaitForTimeEvent(1.2999878,18))
     wave4.append(CreateDroppodStalkerEvent(< 3156.560059 , 2266.939941 , 951.781006 >,"",19))
     wave4.append(CreateWaitForTimeEvent(5.0,20))
-    wave4.append(CreateWaitUntilAliveEvent(0,21))
+    wave4.append(CreateWaitUntilAliveEvent(4,21))
     wave4.append(CreateDroppodStalkerEvent(< 1935.839966 , 3727.840088 , 931.656006 >,"",22))
     wave4.append(CreateWaitForTimeEvent(0.7000122,23))
     wave4.append(CreateDroppodStalkerEvent(< 2111.840088 , 3295.840088 , 939.031006 >,"",24))
@@ -355,7 +355,7 @@ void function initFrontierDefenseData()
     wave4.append(CreateWaitForTimeEvent(1.3000488,47))
     wave4.append(CreateDroppodStalkerEvent(< 3156.560059 , 2266.939941 , 951.781006 >,"",48))
     wave4.append(CreateWaitForTimeEvent(5.0,49))
-    wave4.append(CreateWaitUntilAliveEvent(0,50))
+    wave4.append(CreateWaitUntilAliveEvent(4,50))
     wave4.append(CreateSuperSpectreEvent(< 2355.209961 , 4472.799805 , 963.218994 >,< -0.000000 , 175.473007 , 0.000000 >,"",51))
     wave4.append(CreateWaitForTimeEvent(0.5999756,52))
     wave4.append(CreateSuperSpectreEvent(< 2835.689941 , 4139.939941 , 939.281006 >,< 0.000000 , -171.078995 , 0.000000 >,"",53))
@@ -378,7 +378,7 @@ void function initFrontierDefenseData()
     wave4.append(CreateWaitForTimeEvent(0.3670044,70))
     wave4.append(CreateSuperSpectreEvent(< 3604.739990 , 835.104004 , 944.281006 >,< -0.000000 , -159.296997 , 0.000000 >,"",71))
     wave4.append(CreateWaitForTimeEvent(5.0,72))
-    wave4.append(CreateWaitUntilAliveEvent(0,73))
+    wave4.append(CreateWaitUntilAliveEvent(4,73))
     wave4.append(CreateArcTitanEvent(< 2665.469971 , 4456.529785 , 960.656006 >,< 0.000000 , -141.108002 , 0.000000 >,"",74))
     wave4.append(CreateWaitForTimeEvent(1.4199829,75))
     wave4.append(CreateArcTitanEvent(< 3123.659912 , 4202.089844 , 954.343994 >,< 0.000000 , -141.108002 , 0.000000 >,"",76))
@@ -409,7 +409,7 @@ void function initFrontierDefenseData()
     wave4.append(CreateWaitForTimeEvent(0.5800781,101))
     wave4.append(CreateSuperSpectreEvent(< 545.906006 , 1309.910034 , 1438.750000 >,< 0.000000 , -166.860001 , 0.000000 >,"",102))
     wave4.append(CreateWaitForTimeEvent(5.0,103))
-    wave4.append(CreateWaitUntilAliveEvent(0,104))
+    wave4.append(CreateWaitUntilAliveEvent(4,104))
     wave4.append(CreateNukeTitanEvent(< 2665.340088 , 4456.500000 , 960.656006 >,< 0.000000 , -141.108002 , 0.000000 >,"",105))
     wave4.append(CreateWaitForTimeEvent(1.0198975,106))
     wave4.append(CreateNukeTitanEvent(< 3123.560059 , 4202.060059 , 954.343994 >,< 0.000000 , -141.108002 , 0.000000 >,"",107))
@@ -421,15 +421,15 @@ void function initFrontierDefenseData()
     wave4.append(CreateNukeTitanEvent(< 3739.129883 , 1985.719971 , 947.281006 >,< 0.000000 , 180.000000 , 0.000000 >,"",0))
     waveEvents.append(wave4)
     array<WaveEvent> wave5
-    wave5.append(CreateDroppodTickEvent(< 864.625000 , 693.750000 , 1379.910034 >,4,"",1))
+    wave5.append(CreateDroppodTickEvent(< 864.625000 , 693.750000 , 1379.910034 >,4,"hillRouteClose",1))
     wave5.append(CreateWaitForTimeEvent(1.2000732,2))
-    wave5.append(CreateDroppodTickEvent(< 884.625000 , 1721.750000 , 1377.410034 >,4,"",3))
+    wave5.append(CreateDroppodTickEvent(< 884.625000 , 1721.750000 , 1377.410034 >,4,"hillRouteClose",3))
     wave5.append(CreateWaitForTimeEvent(0.79992676,4))
     wave5.append(CreateDroppodStalkerEvent(< 1226.410034 , 1391.130005 , 1334.689941 >,"",5))
     wave5.append(CreateWaitForTimeEvent(0.9400635,6))
     wave5.append(CreateDroppodStalkerEvent(< 1258.060059 , 921.593994 , 1330.750000 >,"",7))
     wave5.append(CreateWaitForTimeEvent(5.0,8))
-    wave5.append(CreateWaitUntilAliveEvent(0,9))
+    wave5.append(CreateWaitUntilAliveEvent(4,9))
     wave5.append(CreateSuperSpectreEvent(< 1094.089966 , 1330.660034 , 1354.969971 >,< -0.000000 , 157.544006 , 0.000000 >,"",10))
     wave5.append(CreateWaitForTimeEvent(0.7800293,11))
     wave5.append(CreateSuperSpectreEvent(< 857.406006 , 739.843994 , 1373.030029 >,< -0.000000 , 151.962997 , 0.000000 >,"",12))
@@ -438,7 +438,7 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(1.2099609,15))
     wave5.append(CreateSuperSpectreEvent(< 2724.129883 , 2458.629883 , 946.155029 >,< -0.000000 , -127.245003 , 0.000000 >,"",16))
     wave5.append(CreateWaitForTimeEvent(5.0,17))
-    wave5.append(CreateWaitUntilAliveEvent(0,18))
+    wave5.append(CreateWaitUntilAliveEvent(4,18))
     wave5.append(CreateSuperSpectreEvent(< 1092.119995 , 1331.380005 , 1355.650024 >,< 0.000000 , 157.500000 , 0.000000 >,"",19))
     wave5.append(CreateWaitForTimeEvent(1.1699219,20))
     wave5.append(CreateSuperSpectreEvent(< 938.187988 , 707.406006 , 1362.939941 >,< -0.000000 , 153.720993 , 0.000000 >,"",21))
@@ -463,12 +463,12 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(1.3399658,40))
     wave5.append(CreateLegionTitanEvent(< 3144.659912 , 2935.629883 , 917.218994 >,< 0.000000 , 179.341003 , 0.000000 >,"",41))
     wave5.append(CreateWaitForTimeEvent(5.0,42))
-    wave5.append(CreateWaitUntilAliveEvent(0,43))
+    wave5.append(CreateWaitUntilAliveEvent(4,43))
     wave5.append(CreateDroppodStalkerEvent(< 2457.310059 , -2563.659912 , 789.250000 >,"",44))
     wave5.append(CreateWaitForTimeEvent(0.92004395,45))
     wave5.append(CreateDroppodStalkerEvent(< 1045.339966 , -2843.340088 , 804.812988 >,"",46))
     wave5.append(CreateWaitForTimeEvent(5.0,47))
-    wave5.append(CreateWaitUntilAliveEvent(0,48))
+    wave5.append(CreateWaitUntilAliveEvent(4,48))
     wave5.append(CreateIonTitanEvent(< 4466.220215 , 1469.410034 , 947.281006 >,< 0.000000 , 169.541000 , 0.000000 >,"",49))
     wave5.append(CreateWaitForTimeEvent(0.9499512,50))
     wave5.append(CreateIonTitanEvent(< 4453.129883 , 964.750000 , 947.281006 >,< 0.000000 , -172.529007 , 0.000000 >,"",51))
@@ -495,14 +495,14 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(0.710083,72))
     wave5.append(CreateSuperSpectreEvent(< 2129.800049 , -1492.459961 , 806.202026 >,< 0.000000 , 143.744995 , 0.000000 >,"",73))
     wave5.append(CreateWaitForTimeEvent(5.0,74))
-    wave5.append(CreateWaitUntilAliveEvent(0,75))
+    wave5.append(CreateWaitUntilAliveEvent(4,75))
     wave5.append(CreateToneTitanEvent(< 2665.060059 , 4456.129883 , 960.687988 >,< 0.000000 , -141.108002 , 0.000000 >,"",76))
     wave5.append(CreateWaitForTimeEvent(0.5600586,77))
     wave5.append(CreateToneTitanEvent(< 3123.250000 , 4201.689941 , 954.281006 >,< 0.000000 , -141.108002 , 0.000000 >,"",78))
     wave5.append(CreateWaitForTimeEvent(1.3199463,79))
     wave5.append(CreateMonarchTitanEvent(< 1324.160034 , 4820.189941 , 937.531006 >,< 0.000000 , -90.000000 , 0.000000 >,"",80))
     wave5.append(CreateWaitForTimeEvent(5.0,81))
-    wave5.append(CreateWaitUntilAliveEvent(0,82))
+    wave5.append(CreateWaitUntilAliveEvent(4,82))
     wave5.append(CreateSuperSpectreEvent(< 1511.160034 , -1437.079956 , 809.958008 >,< -0.000000 , 142.475998 , 0.000000 >,"",83))
     wave5.append(CreateWaitForTimeEvent(1.1899414,84))
     wave5.append(CreateSuperSpectreEvent(< 2091.909912 , -1464.430054 , 809.992981 >,< -0.000000 , 143.503998 , 0.000000 >,"",85))
@@ -519,14 +519,14 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(0.11999512,96))
     wave5.append(CreateDroppodStalkerEvent(< 2457.310059 , -2563.659912 , 789.250000 >,"",97))
     wave5.append(CreateWaitForTimeEvent(5.0,98))
-    wave5.append(CreateWaitUntilAliveEvent(0,99))
+    wave5.append(CreateWaitUntilAliveEvent(4,99))
     wave5.append(CreateToneTitanEvent(< 2665.060059 , 4456.129883 , 960.687988 >,< 0.000000 , -141.108002 , 0.000000 >,"",100))
     wave5.append(CreateWaitForTimeEvent(0.5999756,101))
     wave5.append(CreateToneTitanEvent(< 3123.250000 , 4201.689941 , 954.281006 >,< 0.000000 , -141.108002 , 0.000000 >,"",102))
     wave5.append(CreateWaitForTimeEvent(0.60009766,103))
     wave5.append(CreateSpawnDroneEvent(< 2674.979980 , 4322.020020 , 1283.979980 >,< 0.000000 , 0.000000 , 0.000000 >,"",104))
     wave5.append(CreateWaitForTimeEvent(5.0,105))
-    wave5.append(CreateWaitUntilAliveEvent(0,106))
+    wave5.append(CreateWaitUntilAliveEvent(4,106))
     wave5.append(CreateToneTitanEvent(< 2475.810059 , -3544.189941 , 810.218994 >,< 0.000000 , 90.000000 , 0.000000 >,"",107))
     wave5.append(CreateWaitForTimeEvent(1.2999268,108))
     wave5.append(CreateToneTitanEvent(< 2821.340088 , -2936.719971 , 827.937988 >,< 0.000000 , 117.202003 , 0.000000 >,"",109))
@@ -541,14 +541,14 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(0.6999512,118))
     wave5.append(CreateIonTitanEvent(< 2411.810059 , -1108.189941 , 803.375000 >,< 0.000000 , 90.000000 , 0.000000 >,"",119))
     wave5.append(CreateWaitForTimeEvent(5.0,120))
-    wave5.append(CreateWaitUntilAliveEvent(0,121))
+    wave5.append(CreateWaitUntilAliveEvent(4,121))
     wave5.append(CreateToneSniperTitanEvent(< 4466.220215 , 1469.410034 , 947.281006 >,< 0.000000 , 169.541000 , 0.000000 >,122))
     wave5.append(CreateWaitForTimeEvent(0.9000244,123))
     wave5.append(CreateToneSniperTitanEvent(< 4453.129883 , 964.750000 , 947.281006 >,< 0.000000 , -172.529007 , 0.000000 >,124))
     wave5.append(CreateWaitForTimeEvent(1.0999756,125))
     wave5.append(CreateArcTitanEvent(< 3867.219971 , 1445.689941 , 947.281006 >,< 0.000000 , 180.000000 , 0.000000 >,"",126))
     wave5.append(CreateWaitForTimeEvent(5.0,127))
-    wave5.append(CreateWaitUntilAliveEvent(0,128))
+    wave5.append(CreateWaitUntilAliveEvent(4,128))
     wave5.append(CreateNukeTitanEvent(< 2475.909912 , -3544.659912 , 810.281006 >,< 0.000000 , 90.000000 , 0.000000 >,"",129))
     wave5.append(CreateWaitForTimeEvent(1.2000732,130))
     wave5.append(CreateNukeTitanEvent(< 2665.340088 , 4456.500000 , 960.656006 >,< 0.000000 , -141.108002 , 0.000000 >,"",131))
@@ -561,7 +561,7 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(0.6999512,138))
     wave5.append(CreateNukeTitanEvent(< 1324.060059 , 4820.660156 , 937.562988 >,< 0.000000 , -90.000000 , 0.000000 >,"",139))
     wave5.append(CreateWaitForTimeEvent(5.0,140))
-    wave5.append(CreateWaitUntilAliveEvent(0,141))
+    wave5.append(CreateWaitUntilAliveEvent(4,141))
     wave5.append(CreateToneTitanEvent(< 4466.220215 , 1469.410034 , 947.281006 >,< 0.000000 , 169.541000 , 0.000000 >,"",142))
     wave5.append(CreateWaitForTimeEvent(1.3000488,143))
     wave5.append(CreateToneTitanEvent(< 4453.129883 , 964.750000 , 947.281006 >,< 0.000000 , -172.529007 , 0.000000 >,"",144))
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_homestead_fd.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_homestead_fd.nut
index b2f1c551..193cc159 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_homestead_fd.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_homestead_fd.nut
@@ -1,7 +1,9 @@
 global function initFrontierDefenseData
 void function initFrontierDefenseData()
 {
-    shopPosition = < -792.552, -4243.41, -20.65455>
+    shopPosition = < -800.156, -4250, -63 >
+    shopAngles = < 9, 60, 0 >
+
     int index = 1
     array<WaveEvent> wave1
     wave1.append(CreateSpawnDroneEvent(< 6050.669922 , 132.485001 , 4918.959961 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
@@ -16,7 +18,7 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(1.0,index++))
     wave1.append(CreateDroppodGruntEvent(< 2420.310059 , -1135.250000 , -159.218994 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateSpawnDroneEvent(< -697.750000 , 940.593994 , 153.656006 >,< -0.000000 , 0.000000 , 0.000000 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(0.5999985,index++))
     wave1.append(CreateSpawnDroneEvent(< 2696.909912 , -388.062988 , 349.250000 >,< -0.000000 , 0.000000 , 0.000000 >,"",index++))
@@ -31,7 +33,7 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(1.5830078,index++))
     wave1.append(CreateDroppodGruntEvent(< 4731.839844 , -2077.219971 , -35.625000 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(2.7829895,index++))
     wave1.append(CreateDroppodGruntEvent(< -1197.939941 , 1928.560059 , 80.031303 >,"",index++))
@@ -42,7 +44,7 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(0.6170044,index++))
     wave1.append(CreateDroppodGruntEvent(< -3570.879883 , -1498.500000 , -49.625000 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateDroppodGruntEvent(< -3570.879883 , -1498.500000 , -49.625000 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(1.2999878,index++))
     wave1.append(CreateSpawnDroneEvent(< 6050.669922 , 132.485001 , 4877.899902 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
@@ -53,7 +55,7 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(2.0,index++))
     wave1.append(CreateSuperSpectreEvent(< 2918.379883 , -3060.629883 , -25.187500 >,< -0.000000 , -170.770996 , 0.000000 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(1.300003,index++))
     wave1.append(CreateDroppodGruntEvent(< 3754.719971 , -2589.250000 , -63.906300 >,"",index++))
@@ -64,19 +66,19 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(2.9000092,index++))
     wave1.append(CreateDroppodGruntEvent(< 4009.219971 , 3091.500000 , -2.406250 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateDroppodGruntEvent(< 4009.219971 , 3091.500000 , -2.406250 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(1.4669952,index++))
     wave1.append(CreateDroppodGruntEvent(< 5542.589844 , 2078.189941 , -31.531300 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(1.0330048,index++))
     wave1.append(CreateDroppodGruntEvent(< 5204.000000 , 1308.000000 , 7.593750 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateSuperSpectreEvent(< -523.031006 , 807.125000 , -167.218994 >,< 0.000000 , -91.450203 , 0.000000 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(1.2169952,index++))
     wave1.append(CreateSuperSpectreEvent(< 3316.060059 , -2935.530029 , -67.218803 >,< -0.000000 , -156.182007 , 0.000000 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateDroppodSpectreMortarEvent(< 3754.719971 , -2589.250000 , -63.906300 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(1.1000061,index++))
     wave1.append(CreateDroppodSpectreMortarEvent(< -1881.280029 , 1307.310059 , -159.781006 >,"",index++))
@@ -87,16 +89,16 @@ void function initFrontierDefenseData()
     wave1.append(CreateWaitForTimeEvent(1.0,index++))
     wave1.append(CreateDroppodSpectreMortarEvent(< 2870.810059 , -2727.629883 , 77.968803 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateDroppodGruntEvent(< 4230.189941 , -366.312988 , 22.968800 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateDroppodGruntEvent(< -1881.280029 , 1307.310059 , -159.781006 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateDroppodGruntEvent(< 2812.340088 , -1307.750000 , -156.563004 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(0,index++))
+    wave1.append(CreateWaitUntilAliveEvent(6,index++))
     wave1.append(CreateDroppodGruntEvent(< 2696.000000 , -1068.719971 , -92.687500 >,"",0))
     waveEvents.append(wave1)
     index = 1
@@ -111,51 +113,51 @@ void function initFrontierDefenseData()
     wave2.append(CreateWaitForTimeEvent(0.7669983,index++))
     wave2.append(CreateDroppodGruntEvent(< -770.500000 , 1070.060059 , -159.781006 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateDroppodGruntEvent(< 4230.189941 , -366.312988 , 22.968800 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(1.0,index++))
     wave2.append(CreateDroppodGruntEvent(< 3754.719971 , -2589.250000 , -63.906300 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateSpawnDroneEvent(< 6036.729980 , 172.546997 , 4870.890137 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(2.7000122,index++))
     wave2.append(CreateSpawnDroneEvent(< 6012.029785 , 1321.359985 , 4831.279785 >,< 0.004999 , -73.121300 , 0.000004 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateSpawnDroneEvent(< 6076.790039 , 186.516006 , 4886.330078 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateSpawnDroneEvent(< 3367.949951 , 2291.610107 , 4918.220215 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(1.4830322,index++))
     wave2.append(CreateDroppodSpectreMortarEvent(< 3754.719971 , -2589.250000 , -63.906300 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(0.6170044,index++))
     wave2.append(CreateDroppodSpectreMortarEvent(< -1881.280029 , 1307.310059 , -159.781006 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateDroppodGruntEvent(< 2812.340088 , -1307.750000 , -156.563004 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(1.3500366,index++))
     wave2.append(CreateDroppodGruntEvent(< -3570.879883 , -1498.500000 , -49.625000 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateDroppodGruntEvent(< 4230.189941 , -366.312988 , 22.968800 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(3.0,index++))
     wave2.append(CreateToneSniperTitanEvent(< 1484.189941 , 968.218994 , 97.968803 >,< -0.922852 , -141.942993 , -1.582030 >,index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateDroppodGruntEvent(< 2812.340088 , -1307.750000 , -156.563004 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(1.1670532,index++))
     wave2.append(CreateDroppodGruntEvent(< 2696.000000 , -1068.719971 , -92.687500 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(1.4829712,index++))
     wave2.append(CreateMortarTitanEvent(< -515.187988 , 1099.160034 , -162.281006 >,< 0.000000 , -90.000000 , 0.000000 >,index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateDroppodGruntEvent(< 68.781303 , -516.468994 , -97.937500 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(1.5170288,index++))
     wave2.append(CreateDroppodGruntEvent(< 4230.189941 , -366.312988 , 22.968800 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(3.0999756,index++))
     wave2.append(CreateDroppodGruntEvent(< -770.500000 , 1070.060059 , -159.781006 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateDroppodGruntEvent(< 3754.719971 , -2589.250000 , -63.906300 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(0.8829956,index++))
     wave2.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
@@ -166,7 +168,7 @@ void function initFrontierDefenseData()
     wave2.append(CreateWaitForTimeEvent(2.8999634,index++))
     wave2.append(CreateDroppodGruntEvent(< 2812.340088 , -1307.750000 , -156.563004 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(0,index++))
+    wave2.append(CreateWaitUntilAliveEvent(6,index++))
     wave2.append(CreateDroppodGruntEvent(< -3570.879883 , -1498.500000 , -49.625000 >,"",index++))
     wave2.append(CreateWaitForTimeEvent(1.532959,index++))
     wave2.append(CreateDroppodGruntEvent(< 4230.189941 , -366.312988 , 22.968800 >,"",index++))
@@ -191,17 +193,17 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(0.9160156,index++))
     wave3.append(CreateSpawnDroneEvent(< 4024.330078 , 3117.510010 , 4947.189941 >,< 0.004999 , -25.792200 , 0.000004 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateSpawnDroneEvent(< 3341.850098 , 2237.580078 , 4889.950195 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateSuperSpectreEvent(< -515.437988 , -263.281006 , 420.281006 >,< -0.000000 , 176.923996 , 0.000000 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(1.2160034,index++))
     wave3.append(CreateSuperSpectreEvent(< 2567.189941 , -3095.969971 , 25.437500 >,< -0.000000 , -174.945999 , 0.000000 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(0.10003662,index++))
     wave3.append(CreateSpawnDroneEvent(< 3341.850098 , 2237.580078 , 4936.169922 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateSpawnDroneEvent(< 3381.919922 , 2251.550049 , 4946.819824 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(0.717041,index++))
     wave3.append(CreateSpawnDroneEvent(< 2880.760010 , 3060.300049 , 4874.819824 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
@@ -216,7 +218,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(1.0170288,index++))
     wave3.append(CreateIonTitanEvent(< 3574.409912 , -2788.219971 , -68.312500 >,< 0.000000 , 0.000000 , 0.000000 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateDroppodGruntEvent(< 25.437500 , -2.062500 , -159.781006 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(0.96698,index++))
     wave3.append(CreateDroppodGruntEvent(< 3754.719971 , -2589.250000 , -63.906300 >,"",index++))
@@ -227,7 +229,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(0.717041,index++))
     wave3.append(CreateMortarTitanEvent(< 3574.409912 , -2788.219971 , -68.312500 >,< 0.000000 , 0.000000 , 0.000000 >,index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateDroppodGruntEvent(< -1197.939941 , 1928.560059 , 80.031303 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(1.5,index++))
     wave3.append(CreateDroppodGruntEvent(< -610.500000 , 1743.060059 , 93.156303 >,"",index++))
@@ -240,7 +242,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(0.6000366,index++))
     wave3.append(CreateMortarTitanEvent(< 1984.030029 , 138.125000 , -75.031303 >,< -0.922852 , -97.602501 , -1.582030 >,index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateDroppodGruntEvent(< -1197.939941 , 1928.560059 , 80.031303 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(1.5,index++))
     wave3.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
@@ -249,7 +251,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(0.41705322,index++))
     wave3.append(CreateDroppodGruntEvent(< -610.500000 , 1743.060059 , 93.156303 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.017029,index++))
     wave3.append(CreateSuperSpectreEvent(< 3324.590088 , -2931.780029 , -67.531303 >,< 0.000000 , -156.138000 , 0.000000 >,"",index++))
@@ -258,7 +260,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(1.217041,index++))
     wave3.append(CreateSpawnDroneEvent(< 3367.949951 , 2291.610107 , 4934.399902 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateDroppodGruntEvent(< -1197.939941 , 1928.560059 , 80.031303 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(1.1329956,index++))
     wave3.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
@@ -269,7 +271,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(1.0999756,index++))
     wave3.append(CreateSpawnDroneEvent(< 5204.000000 , 1275.729980 , 4938.310059 >,< 0.004999 , -89.996300 , 0.000004 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateSpawnDroneEvent(< 3367.949951 , 2291.610107 , 4898.049805 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(1.1669922,index++))
     wave3.append(CreateSpawnDroneEvent(< 4542.890137 , 2610.110107 , 4888.470215 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
@@ -286,7 +288,7 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(4.31604,index++))
     wave3.append(CreateSuperSpectreEvent(< -522.593994 , -251.406006 , 416.437988 >,< -0.000000 , 169.408997 , 0.000000 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateSpawnDroneEvent(< 6076.790039 , 186.516006 , 4864.759766 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(0.8840332,index++))
     wave3.append(CreateSpawnDroneEvent(< 3367.949951 , 2291.610107 , 4941.009766 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
@@ -299,21 +301,21 @@ void function initFrontierDefenseData()
     wave3.append(CreateWaitForTimeEvent(0.9329834,index++))
     wave3.append(CreateNukeTitanEvent(< -1799.530029 , 1310.839966 , -164.218994 >,< -0.922852 , -151.830994 , -1.582030 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(1.3999634,index++))
     wave3.append(CreateDroppodGruntEvent(< -1197.939941 , 1928.560059 , 80.031303 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(1.2000122,index++))
     wave3.append(CreateDroppodGruntEvent(< -3570.879883 , -1498.500000 , -49.625000 >,"",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(0,index++))
+    wave3.append(CreateWaitUntilAliveEvent(6,index++))
     wave3.append(CreateDroppodGruntEvent(< 4230.189941 , -366.312988 , 22.968800 >,"",0))
     waveEvents.append(wave3)
     index = 1
     array<WaveEvent> wave4
     wave4.append(CreateIonTitanEvent(< -1799.910034 , 1310.530029 , -164.218994 >,< -0.922852 , -151.830994 , -1.582030 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateSuperSpectreEvent(< -2619.399902 , 511.446014 , -141.567993 >,< -0.000000 , -139.373001 , 0.000000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(1.5,index++))
     wave4.append(CreateSuperSpectreEvent(< -1172.420044 , 1221.010010 , -167.218994 >,< 0.000000 , -175.912994 , 0.000000 >,"",index++))
@@ -326,7 +328,7 @@ void function initFrontierDefenseData()
     wave4.append(CreateWaitForTimeEvent(1.1400146,index++))
     wave4.append(CreateDroppodSpectreMortarEvent(< 5542.589844 , 2078.189941 , -31.531300 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateDroppodGruntEvent(< -3570.879883 , -1498.500000 , -49.625000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(1.1199951,index++))
     wave4.append(CreateDroppodSpectreMortarEvent(< -3375.090088 , -1307.969971 , -90.593803 >,"",index++))
@@ -335,50 +337,50 @@ void function initFrontierDefenseData()
     wave4.append(CreateWaitForTimeEvent(1.1600342,index++))
     wave4.append(CreateDroppodSpectreMortarEvent(< 3754.719971 , -2589.250000 , -63.906300 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateScorchTitanEvent(< 5251.529785 , 2049.280029 , 13.125000 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.7800293,index++))
     wave4.append(CreateScorchTitanEvent(< 4249.879883 , 2937.159912 , -44.156300 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(1.920044,index++))
     wave4.append(CreateSuperSpectreEvent(< 275.593994 , -144.656006 , -156.968994 >,< 0.000000 , -168.091003 , 0.000000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateRoninTitanEvent(< -1799.439941 , 1310.839966 , -164.218994 >,< -0.922852 , -151.830994 , -1.582030 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateSuperSpectreEvent(< -2191.379883 , 875.562988 , -139.968994 >,< -0.000000 , -142.382996 , 0.000000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.11999512,index++))
     wave4.append(CreateRoninTitanEvent(< 3573.840088 , -2788.250000 , -68.250000 >,< 0.000000 , 0.000000 , 0.000000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.57995605,index++))
     wave4.append(CreateSuperSpectreEvent(< -1868.939941 , 1052.229980 , -153.057007 >,< -0.000000 , -156.475006 , 0.000000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateSuperSpectreEvent(< 3465.909912 , -2830.469971 , -68.375000 >,< -0.922858 , -149.106003 , -1.582030 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.9699707,index++))
     wave4.append(CreateIonTitanEvent(< 5136.720215 , -2059.379883 , -105.125000 >,< 0.000000 , 0.000000 , 0.000000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.5,index++))
     wave4.append(CreateSuperSpectreEvent(< 3640.330078 , -2726.229980 , -72.381897 >,< -0.922858 , -146.380997 , -1.582030 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateSuperSpectreEvent(< 3683.840088 , -2703.780029 , -69.718803 >,< -0.922858 , -149.766006 , -1.582030 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.6800537,index++))
     wave4.append(CreateSuperSpectreEvent(< 2472.750000 , -733.406006 , -117.594002 >,< -0.922852 , -132.231003 , -1.582030 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateDroppodGruntEvent(< 4230.189941 , -366.312988 , 22.968800 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.79003906,index++))
     wave4.append(CreateDroppodGruntEvent(< -1197.939941 , 1928.560059 , 80.031303 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(1.0100098,index++))
     wave4.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateSuperSpectreEvent(< 2614.300049 , -3101.199951 , 14.673600 >,< 0.000000 , -172.837006 , 0.000000 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.8199463,index++))
     wave4.append(CreateSuperSpectreEvent(< -2551.510010 , 644.447998 , -123.125000 >,< -0.922858 , -132.886993 , -1.582030 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(1.4100342,index++))
     wave4.append(CreateSuperSpectreEvent(< 3910.250000 , -2404.560059 , -89.156303 >,< -0.922852 , -121.376999 , -1.582030 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateSpawnDroneEvent(< 6050.669922 , 132.485001 , 4890.120117 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.8099365,index++))
     wave4.append(CreateSpawnDroneEvent(< 5994.600098 , 1378.760010 , 4814.129883 >,< 0.004999 , -73.121300 , 0.000004 >,"",index++))
@@ -387,7 +389,7 @@ void function initFrontierDefenseData()
     wave4.append(CreateWaitForTimeEvent(1.2000732,index++))
     wave4.append(CreateSpawnDroneEvent(< 3341.850098 , 2237.580078 , 4911.430176 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateSpawnDroneEvent(< 3327.889893 , 2277.639893 , 4940.600098 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.8300781,index++))
     wave4.append(CreateSpawnDroneEvent(< 2866.790039 , 3100.360107 , 4857.200195 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
@@ -402,17 +404,17 @@ void function initFrontierDefenseData()
     wave4.append(CreateWaitForTimeEvent(1.4100342,index++))
     wave4.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateSpawnDroneEvent(< 6036.729980 , 172.546997 , 4861.959961 >,< 0.004999 , -115.792000 , 0.000004 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(0.98999023,index++))
     wave4.append(CreateSpawnDroneEvent(< 6032.029785 , 1358.760010 , 4831.629883 >,< 0.004999 , -73.121300 , 0.000004 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(1.1099854,index++))
     wave4.append(CreateSpawnDroneEvent(< 5204.000000 , 1335.729980 , 4926.459961 >,< 0.004999 , -89.996300 , 0.000004 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateToneSniperTitanEvent(< 1484.189941 , 968.218994 , 97.968803 >,< -0.922852 , -141.942993 , -1.582030 >,index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(0,index++))
+    wave4.append(CreateWaitUntilAliveEvent(6,index++))
     wave4.append(CreateDroppodGruntEvent(< -1197.939941 , 1928.560059 , 80.031303 >,"",index++))
     wave4.append(CreateWaitForTimeEvent(1.1099854,index++))
     wave4.append(CreateDroppodGruntEvent(< 3917.000000 , -2654.719971 , -81.468803 >,"",index++))
@@ -429,7 +431,7 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(1.1899414,index++))
     wave5.append(CreateMortarTitanEvent(< 1484.189941 , 968.218994 , 97.968803 >,< -0.922852 , -141.942993 , -1.582030 >,index++))
     wave5.append(CreateWaitForTimeEvent(5.0,index++))
-    wave5.append(CreateWaitUntilAliveEvent(0,index++))
+    wave5.append(CreateWaitUntilAliveEvent(6,index++))
     wave5.append(CreateNukeTitanEvent(< 5251.529785 , 2049.280029 , 13.125000 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(1.0999756,index++))
     wave5.append(CreateNukeTitanEvent(< 4249.879883 , 2937.159912 , -44.156300 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
@@ -438,7 +440,7 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(0.92993164,index++))
     wave5.append(CreateSuperSpectreEvent(< 3183.560059 , 2090.909912 , -48.263699 >,< -0.000000 , -105.017998 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(5.0,index++))
-    wave5.append(CreateWaitUntilAliveEvent(0,index++))
+    wave5.append(CreateWaitUntilAliveEvent(6,index++))
     wave5.append(CreateNorthstarSniperTitanEvent(< 5251.560059 , 2049.379883 , 13.093800 >,< 0.000000 , -90.000000 , 0.000000 >,index++))
     wave5.append(CreateWaitForTimeEvent(0.8000488,index++))
     wave5.append(CreateToneSniperTitanEvent(< 4249.970215 , 2936.689941 , -44.187500 >,< 0.000000 , -90.000000 , 0.000000 >,index++))
@@ -453,7 +455,7 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(0.98999023,index++))
     wave5.append(CreateSuperSpectreEvent(< 5161.879883 , 804.687988 , -41.937500 >,< 0.000000 , -134.824005 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(5.0,index++))
-    wave5.append(CreateWaitUntilAliveEvent(0,index++))
+    wave5.append(CreateWaitUntilAliveEvent(6,index++))
     wave5.append(CreateNukeTitanEvent(< 5251.529785 , 2049.280029 , 13.125000 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(1.0,index++))
     wave5.append(CreateNukeTitanEvent(< 4249.879883 , 2937.159912 , -44.156300 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
@@ -472,7 +474,7 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(1.1999512,index++))
     wave5.append(CreateSuperSpectreEvent(< 5253.410156 , 1635.689941 , 16.718800 >,< 0.000000 , -146.908997 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(5.0,index++))
-    wave5.append(CreateWaitUntilAliveEvent(0,index++))
+    wave5.append(CreateWaitUntilAliveEvent(6,index++))
     wave5.append(CreateNukeTitanEvent(< 5605.439941 , 1266.410034 , -54.562500 >,< 0.000000 , -162.641998 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(1.2199707,index++))
     wave5.append(CreateNukeTitanEvent(< 4249.879883 , 2937.159912 , -44.156300 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
@@ -505,7 +507,7 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(1.3599854,index++))
     wave5.append(CreateSuperSpectreEvent(< 2692.169922 , 2159.280029 , -142.787003 >,< -0.000000 , -84.377403 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(5.0,index++))
-    wave5.append(CreateWaitUntilAliveEvent(0,index++))
+    wave5.append(CreateWaitUntilAliveEvent(6,index++))
     wave5.append(CreateArcTitanEvent(< 5251.560059 , 2049.379883 , 13.093800 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(1.4399414,index++))
     wave5.append(CreateNukeTitanEvent(< 5748.529785 , 1979.339966 , -71.062500 >,< 0.000000 , -142.690002 , 0.000000 >,"",index++))
@@ -526,20 +528,20 @@ void function initFrontierDefenseData()
     wave5.append(CreateWaitForTimeEvent(1.3601074,index++))
     wave5.append(CreateNukeTitanEvent(< 4699.589844 , 2906.159912 , -72.843803 >,< 0.000000 , -115.795998 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(5.0,index++))
-    wave5.append(CreateWaitUntilAliveEvent(0,index++))
+    wave5.append(CreateWaitUntilAliveEvent(6,index++))
     wave5.append(CreateSuperSpectreEvent(< -524.656006 , -249.875000 , 416.437988 >,< -0.000000 , 161.938004 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(5.0,index++))
-    wave5.append(CreateWaitUntilAliveEvent(0,index++))
+    wave5.append(CreateWaitUntilAliveEvent(6,index++))
     wave5.append(CreateScorchTitanEvent(< 5251.529785 , 2049.280029 , 13.125000 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(0.9199219,index++))
     wave5.append(CreateScorchTitanEvent(< 4249.879883 , 2937.159912 , -44.156300 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(5.0,index++))
-    wave5.append(CreateWaitUntilAliveEvent(0,index++))
+    wave5.append(CreateWaitUntilAliveEvent(6,index++))
     wave5.append(CreateNukeTitanEvent(< 5605.439941 , 1266.410034 , -54.562500 >,< 0.000000 , -162.641998 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(1.3800049,index++))
     wave5.append(CreateNukeTitanEvent(< 1484.500000 , 968.593994 , 98.031303 >,< -0.922852 , -141.942993 , -1.582030 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(5.0,index++))
-    wave5.append(CreateWaitUntilAliveEvent(0,index++))
+    wave5.append(CreateWaitUntilAliveEvent(6,index++))
     wave5.append(CreateScorchTitanEvent(< 5251.529785 , 2049.280029 , 13.125000 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))
     wave5.append(CreateWaitForTimeEvent(0.8300781,index++))
     wave5.append(CreateScorchTitanEvent(< 4249.879883 , 2937.159912 , -44.156300 >,< 0.000000 , -90.000000 , 0.000000 >,"",index++))