From 932ab46a9b649697bfc25fa8f69e96f10c8b9c97 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Sun, 24 Jul 2016 09:28:39 +0100
Subject: [PATCH] Various mission tweaks.

---
 .../granada/02 - suspect packages #2.json     | 11 ++++
 .../temper/04 - pirate uprising #4.json       |  8 ++-
 data/missions/warro/02 - evacuation #2.json   | 63 +++++++------------
 3 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/data/missions/granada/02 - suspect packages #2.json b/data/missions/granada/02 - suspect packages #2.json
index 6aafc88..33f91a5 100644
--- a/data/missions/granada/02 - suspect packages #2.json	
+++ b/data/missions/granada/02 - suspect packages #2.json	
@@ -42,6 +42,14 @@
 			"targetValue" : 7,
 			"targetType" : "TT_DESTROY",
 			"active" : 0
+		},
+		{
+			"description" : "Protect Shuttle and Tug",
+			"targetName" : "ShuttleTug",
+			"targetValue" : 1,
+			"targetType" : "TT_DESTROY",
+			"active" : 0,
+			"isCondition" : 1
 		}
 	],
 	"player" : {
@@ -62,6 +70,7 @@
 			"scatter" : 500
 		},
 		{
+			"groupName" : "ShuttleTug",
 			"types" : "Shuttle",
 			"side" : "SIDE_ALLIES",
 			"x" : 10.5,
@@ -78,6 +87,7 @@
 		},
 		{
 			"name" : "Tug",
+			"groupName" : "ShuttleTug",
 			"types" : "Tug",
 			"side" : "SIDE_ALLIES",
 			"x" : 10,
@@ -156,6 +166,7 @@
 				"WAIT 20",
 				"ACTIVATE_ENTITIES Dart",
 				"ACTIVATE_OBJECTIVES Destroy intercepting Darts",
+				"ACTIVATE_OBJECTIVES Protect Shuttle and Tug",
 				"MSG_BOX Wingmate;Dan, we've got hostile vessels inbound. More Darts.",
 				"MSG_BOX Carr;Prepare to engage. Protect the asset!"
 			]
diff --git a/data/missions/temper/04 - pirate uprising #4.json b/data/missions/temper/04 - pirate uprising #4.json
index e669a3d..773e0ab 100644
--- a/data/missions/temper/04 - pirate uprising #4.json	
+++ b/data/missions/temper/04 - pirate uprising #4.json	
@@ -82,7 +82,13 @@
 		{
 			"function" : "TIME 1",
 			"lines" : [
-				"MSG_BOX Strickland;This is a straight forward one, guys: take down all enemy targets. But make sure none of those Nymphs make it to the jumpgate ."
+				"MSG_BOX Strickland;This is a straight forward one, guys: take down all enemy targets. But make sure none of those Nymphs make it to the jumpgate."
+			]
+		},
+		{
+			"function" : "ALL_OBJECTIVES_COMPLETE",
+			"lines" : [
+				"MSG_BOX Strickland;Excellent works, people. This one's a wrap."
 			]
 		}
 	]
diff --git a/data/missions/warro/02 - evacuation #2.json b/data/missions/warro/02 - evacuation #2.json
index 64e2a6e..db587e7 100644
--- a/data/missions/warro/02 - evacuation #2.json	
+++ b/data/missions/warro/02 - evacuation #2.json	
@@ -5,6 +5,7 @@
 	"background" : "gfx/backgrounds/background03.jpg",
 	"planet" : "gfx/planets/oracleIX.png",
 	"music" : "music/battle/determination.mp3",
+	"manualComplete" : 1,
 	"objectives" : [
 		{
 			"description" : "Rescue all civilians",
@@ -61,39 +62,6 @@
 			"x" : 35,
 			"y" : 35,
 			"scatter" : 1500
-		},
-		{
-			"types" : "Jackal",
-			"number" : 2,
-			"name" : "Pandoran",
-			"groupName" : "Pandoran-1",
-			"side" : "SIDE_PANDORAN",
-			"x" : 27,
-			"y" : 27,
-			"scatter" : 500,
-			"active" : 0
-		},
-		{
-			"types" : "Jackal",
-			"number" : 2,
-			"name" : "Pandoran",
-			"groupName" : "Pandoran-2",
-			"side" : "SIDE_PANDORAN",
-			"x" : 25,
-			"y" : 33,
-			"scatter" : 500,
-			"active" : 0
-		},
-		{
-			"types" : "Jackal",
-			"number" : 2,
-			"name" : "Pandoran",
-			"groupName" : "Pandoran-3",
-			"side" : "SIDE_PANDORAN",
-			"x" : 25,
-			"y" : 23,
-			"scatter" : 500,
-			"active" : 0
 		}
 	],
 	"entities" : [
@@ -104,23 +72,34 @@
 			"y" : 25
 		}
 	],
+	"spawners" : [
+		{
+			"name" : "PandoranSpawner",
+			"types" : "Jackal",
+			"side" : "SIDE_PANDORAN",
+			"step" : 2,
+			"interval" : 60,
+			"total" : 6,
+			"offscreen" : 1,
+			"active" : 0
+		}
+	],
 	"script"  : [
 		{
 			"function" : "TIME 60",
 			"lines" : [
-				"ACTIVATE_ENTITY_GROUPS Pandoran-1"
+				"ACTIVATE_SPAWNER 1 PandoranSpawner",
+				"IMPORTANT_MSG_BOX Wingmate;Gaskin, INF fighters spotted! Pandorans, without a doubt!",
+				"MSG_BOX Gaskin;Break and attack! Protect the civilians!"
 			]
 		},
 		{
-			"function" : "TIME 120",
+			"function" : "ALL_OBJECTIVES_COMPLETE",
 			"lines" : [
-				"ACTIVATE_ENTITY_GROUPS Pandoran-2"
-			]
-		},
-		{
-			"function" : "TIME 180",
-			"lines" : [
-				"ACTIVATE_ENTITY_GROUPS Pandoran-3"
+				"WAIT 1",
+				"MSG_BOX Gaskin;That was a close one. Looks like they were scouting. We'll have to take extra precautions in future.",
+				"WAIT_MSG_BOX",
+				"COMPLETE_MISSION"
 			]
 		}
 	]