[FD] Drone improvements + move homestead to use Weighted wait functions (#423)

* improve nav + a couple other things

* Add drone nav function and give drones routes in homestead

* fix race condition and stuff

3 files changed, 60 insertions, 58 deletions

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd.nut
index aa148e0c..8952c915 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd.nut
@@ -158,7 +158,6 @@ void function GamemodeFD_InitPlayer(entity player)
 	data.diedThisRound = false
 	file.players[player] <- data
 	thread SetTurretSettings_threaded(player)
-	SetMoneyForPlayer(player,GetGlobalNetInt("FD_currentWave")*GetCurrentPlaylistVarInt("fd_money_per_round",600))
 	if(GetGlobalNetInt("FD_currentWave")>1)
 		PlayerEarnMeter_AddEarnedAndOwned(player,1.0,1.0)
 
@@ -633,6 +632,8 @@ bool function runWave(int waveIndex,bool shouldDoBuyTime)
 			PlayFactionDialogueToPlayer( "fd_wavePayoutAddtnl", player )
 		AddPlayerScore(player,"FDTeamWave")
 		AddMoneyToPlayer(player,GetCurrentPlaylistVarInt("fd_money_per_round",600))
+		// this function is called "Set" but in reality it is "Add"
+		SetJoinInProgressBonus( GetCurrentPlaylistVarInt("fd_money_per_round",600) )
 		EmitSoundOnEntityOnlyToPlayer(player,player,"HUD_MP_BountyHunt_BankBonusPts_Deposit_Start_1P")
 	}
 	wait 1
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd_events.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd_events.nut
index 11c6774a..45e3b296 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd_events.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_fd_events.nut
@@ -11,6 +11,7 @@ global function CreateGenericTitanSpawnWithAiSettingsEvent
 global function CreateDroppodStalkerEvent
 global function CreateDroppodSpectreMortarEvent
 global function CreateWaitUntilAliveEvent
+global function CreateWaitUntilAliveWeightedEvent
 global function CreateCloakDroneEvent
 global function CreateDroppodTickEvent
 global function CreateSpawnDroneEvent
@@ -582,7 +583,7 @@ void function spawnDrones(SmokeEvent smokeEvent,SpawnEvent spawnEvent,FlowContro
 {
 	//TODO
 	PingMinimap(spawnEvent.origin.x, spawnEvent.origin.y, 4, 600, 150, 0)
-	array<vector> offsets = [ < 0, 100, 0 >, < 100, 0, 0 >, < 0, -100, 0 >, < -100, 0, 0 > ]
+	array<vector> offsets = [ < 0, 32, 0 >, < 32, 0, 0 >, < 0, -32, 0 >, < -32, 0, 0 > ]
 
 
 	string squadName = MakeSquadName( TEAM_IMC, UniqueString( "ZiplineTable" ) )
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 0d107d5d..cd7d7895 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
@@ -18,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(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     // replaced this with the one below because it seemed off?
     //wave1.append(CreateSpawnDroneEvent(< -697.750000 , 940.593994 , 153.656006 >,< -0.000000 , 0.000000 , 0.000000 >,"",index++))
     wave1.append(CreateSpawnDroneEvent(< 6050.669922 , 132.485001 , 4918.959961 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
@@ -37,7 +37,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(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -48,7 +48,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(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,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 >,"centerRightDrones_Loop1",index++))
@@ -59,7 +59,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(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -70,19 +70,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(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -93,16 +93,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(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave1.append(CreateDroppodGruntEvent(< 4230.189941 , -366.312988 , 22.968800 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave1.append(CreateDroppodGruntEvent(< -1881.280029 , 1307.310059 , -159.781006 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave1.append(CreateDroppodGruntEvent(< 2812.340088 , -1307.750000 , -156.563004 >,"",index++))
     wave1.append(CreateWaitForTimeEvent(5.0,index++))
-    wave1.append(CreateWaitUntilAliveEvent(6,index++))
+    wave1.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave1.append(CreateDroppodGruntEvent(< 2696.000000 , -1068.719971 , -92.687500 >,"",0))
     waveEvents.append(wave1)
     index = 1
@@ -117,51 +117,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(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave2.append(CreateSpawnDroneEvent(< 6036.729980 , 172.546997 , 4870.890137 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
     wave2.append(CreateWaitForTimeEvent(2.7000122,index++))
     wave2.append(CreateSpawnDroneEvent(< 6012.029785 , 1321.359985 , 4831.279785 >,< 0.004999 , -73.121300 , 0.000004 >,"centerLeftDrones_Loop3",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave2.append(CreateSpawnDroneEvent(< 6076.790039 , 186.516006 , 4886.330078 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
     wave2.append(CreateWaitForTimeEvent(5.0,index++))
-    wave2.append(CreateWaitUntilAliveEvent(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave2.append(CreateSpawnDroneEvent(< 3367.949951 , 2291.610107 , 4918.220215 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",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(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -172,7 +172,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(6,index++))
+    wave2.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -197,17 +197,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 >,"centerRightDrones_Loop4",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave3.append(CreateSpawnDroneEvent(< 3341.850098 , 2237.580078 , 4889.950195 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,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 >,"centerRightDrones_Loop1",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave3.append(CreateSpawnDroneEvent(< 3381.919922 , 2251.550049 , 4946.819824 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
     wave3.append(CreateWaitForTimeEvent(0.717041,index++))
     wave3.append(CreateSpawnDroneEvent(< 2880.760010 , 3060.300049 , 4874.819824 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
@@ -222,7 +222,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(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -233,7 +233,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(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -246,7 +246,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(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -255,7 +255,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(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -264,7 +264,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 >,"centerRightDrones_Loop1",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -275,7 +275,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 >,"centerRightDrones_Loop2",index++))
     wave3.append(CreateWaitForTimeEvent(5.0,index++))
-    wave3.append(CreateWaitUntilAliveEvent(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave3.append(CreateSpawnDroneEvent(< 3367.949951 , 2291.610107 , 4898.049805 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
     wave3.append(CreateWaitForTimeEvent(1.1669922,index++))
     wave3.append(CreateSpawnDroneEvent(< 4542.890137 , 2610.110107 , 4888.470215 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
@@ -292,7 +292,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(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave3.append(CreateSpawnDroneEvent(< 6076.790039 , 186.516006 , 4864.759766 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
     wave3.append(CreateWaitForTimeEvent(0.8840332,index++))
     wave3.append(CreateSpawnDroneEvent(< 3367.949951 , 2291.610107 , 4941.009766 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
@@ -305,21 +305,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(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave3.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -332,7 +332,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -341,50 +341,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave4.append(CreateSpawnDroneEvent(< 6050.669922 , 132.485001 , 4890.120117 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
     wave4.append(CreateWaitForTimeEvent(0.8099365,index++))
     wave4.append(CreateSpawnDroneEvent(< 5994.600098 , 1378.760010 , 4814.129883 >,< 0.004999 , -73.121300 , 0.000004 >,"centerLeftDrones_Loop3",index++))
@@ -393,7 +393,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 >,"centerRightDrones_Loop1",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave4.append(CreateSpawnDroneEvent(< 3327.889893 , 2277.639893 , 4940.600098 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
     wave4.append(CreateWaitForTimeEvent(0.8300781,index++))
     wave4.append(CreateSpawnDroneEvent(< 2866.790039 , 3100.360107 , 4857.200195 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
@@ -408,17 +408,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,index++))
     wave4.append(CreateSpawnDroneEvent(< 6036.729980 , 172.546997 , 4861.959961 >,< 0.004999 , -115.792000 , 0.000004 >,"centerRightDrones_Loop1",index++))
     wave4.append(CreateWaitForTimeEvent(0.98999023,index++))
     wave4.append(CreateSpawnDroneEvent(< 6032.029785 , 1358.760010 , 4831.629883 >,< 0.004999 , -73.121300 , 0.000004 >,"centerLeftDrones_Loop3",index++))
     wave4.append(CreateWaitForTimeEvent(1.1099854,index++))
     wave4.append(CreateSpawnDroneEvent(< 5204.000000 , 1335.729980 , 4926.459961 >,< 0.004999 , -89.996300 , 0.000004 >,"centerRightDrones_Loop2",index++))
     wave4.append(CreateWaitForTimeEvent(5.0,index++))
-    wave4.append(CreateWaitUntilAliveEvent(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave4.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -435,7 +435,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(6,index++))
+    wave5.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -444,7 +444,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(6,index++))
+    wave5.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -459,7 +459,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(6,index++))
+    wave5.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -478,7 +478,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(6,index++))
+    wave5.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -511,7 +511,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(6,index++))
+    wave5.append(CreateWaitUntilAliveWeightedEvent(12,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++))
@@ -532,20 +532,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(6,index++))
+    wave5.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave5.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave5.append(CreateWaitUntilAliveWeightedEvent(12,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(6,index++))
+    wave5.append(CreateWaitUntilAliveWeightedEvent(12,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++))