Make the ships move in pirate

Author: tilderain

scripts/vscripts/tf2ware_ultimate/minigames/pirate.nut

@@ -23,6 +23,8 @@ ship_model <- "models/marioragdoll/super mario galaxy/bj ship/bjship.mdl"
 red_ship  <- null
 blue_ship <- null
 
+ships <- []
+
 function OnPrecache()
 {
 	PrecacheModel(ship_model)
@@ -32,32 +34,56 @@ function OnStart()
 {
 	Ware_SetGlobalLoadout(TF_CLASS_DEMOMAN, "Stickybomb Jumper")
 
+	local mission = RandomInt(0,1)
 	foreach (player in Ware_MinigamePlayers)
 	{
-		local team = player.GetTeam()
-		if (team == TF_TEAM_RED)
-			Ware_SetPlayerMission(player, 0)
-		else if (team == TF_TEAM_BLUE)
-			Ware_SetPlayerMission(player, 1)	
+		Ware_SetPlayerMission(player, mission)
 	}
-	
-	local swap = RandomBool()
+
+	local x_off = 100
+
 	red_ship = Ware_SpawnEntity("prop_dynamic_override",
 	{
-		origin      = Ware_MinigameLocation.center + Vector(2200, swap ? -500 : 300, -136),
+		origin      = Ware_MinigameLocation.center + Vector(2200 + (mission == 0 ? x_off : 0), RandomFloat(-300,300), -136),
 		model       = ship_model
 		rendercolor = "255 0 0",
 	})
 	blue_ship = Ware_SpawnEntity("prop_dynamic_override",
 	{
-		origin      = Ware_MinigameLocation.center + Vector(2200, swap ? 300 : -500, -136),
+		origin      = Ware_MinigameLocation.center + Vector(2200 + (mission == 1 ? x_off : 0), RandomFloat(-300,300), -136),
 		model       = ship_model
 		rendercolor = "0 255 255",
 	})
+
+	ships <- [red_ship, blue_ship]
+	foreach (ship in ships)
+	{
+		ship.ValidateScriptScope()
+		local scope = ship.GetScriptScope()
+
+		scope.speed <- RandomFloat(-20, 20)
+		if (abs(scope.speed) < 5) scope.speed = RandomBool() ? 10 : -10
+		scope.start_y <- ship.GetOrigin().y
+	}
+
 }
 
 function OnUpdate()
 {
+
+	foreach (ship in ships)
+	{
+		local scope = ship.GetScriptScope()
+		local origin = ship.GetOrigin()
+
+		if (origin.y > scope.start_y)
+			scope.speed -= 0.2
+		else
+			scope.speed += 0.2
+
+		ship.KeyValueFromVector("origin", origin + Vector(0, scope.speed, 0))
+	}
+
 	local offset = Vector(0, 0, 300)
 	local red_point = red_ship.GetOrigin() + offset
 	local blue_point = blue_ship.GetOrigin() + offset
@@ -75,8 +101,8 @@ function OnUpdate()
 
 		local target = player // squirrel needs this to be happy
 		local origin = player.GetOrigin()
-		local team = player.GetTeam()
-		if (team == TF_TEAM_RED)
+		local mission = Ware_GetPlayerMission(player)
+		if (mission == 0)
 		{
 			if (origin.z > red_point.z && VectorDistance2D(origin, red_point) < 150.0)
 			{
@@ -95,7 +121,7 @@ function OnUpdate()
 				Ware_ChatPrint(player, "You pirated the wrong ship!")
 			}
 		}
-		else if (team == TF_TEAM_BLUE)
+		else if (mission == 1)
 		{
 			if (origin.z > blue_point.z && VectorDistance2D(origin, blue_point) < 150.0)
 			{