From 3969af0378bfe41bdbd0f73f6d39f47954502d02 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Sat, 6 Aug 2016 08:54:28 +0100
Subject: [PATCH] Campaign tweaks.

---
 data/missions/alba/05 - alba defence #2.json  | 63 ++++++++++++++-----
 .../donesta/03 - donesta defence #2.json      |  4 +-
 2 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/data/missions/alba/05 - alba defence #2.json b/data/missions/alba/05 - alba defence #2.json
index 0f18b15..3bdfdbb 100644
--- a/data/missions/alba/05 - alba defence #2.json	
+++ b/data/missions/alba/05 - alba defence #2.json	
@@ -35,7 +35,7 @@
 		"pilot" : "1st Lt. Curtis Rice",
 		"squadron" : "Eightballers",
 		"x" : 25,
-		"y" : 5
+		"y" : 15
 	},
 	"fighters" : [
 		{
@@ -43,7 +43,7 @@
 			"number" : 11,
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
-			"y" : 5,
+			"y" : 15,
 			"scatter" : 500
 		},
 		{
@@ -51,7 +51,7 @@
 			"number" : 5,
 			"side" : "SIDE_TZAC",
 			"x" : 25,
-			"y" : 12,
+			"y" : 22,
 			"scatter" : 500
 		},
 		{
@@ -79,11 +79,22 @@
 		{
 			"groupName" : "Rebels-2",
 			"types" : "Shale;Razor;SK-31;SK-34",
-			"number" : 48,
+			"number" : 24,
 			"side" : "SIDE_TZAC",
-			"x" : -1,
-			"y" : 35,
-			"scatter" : 8500,
+			"x" : 20,
+			"y" : -1,
+			"scatter" : 500,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE",
+			"active" : 0
+		},
+		{
+			"groupName" : "Rebels-2",
+			"types" : "Shale;Razor;SK-31;SK-34",
+			"number" : 24,
+			"side" : "SIDE_TZAC",
+			"x" : 20,
+			"y" : -1,
+			"scatter" : 500,
 			"flags" : "+EF_AI_TARGET",
 			"aiFlags" : "+AIF_MOVES_TO_LEADER",
 			"active" : 0
@@ -92,15 +103,27 @@
 			"groupName" : "Pandorans",
 			"name" : "Pandoran",
 			"types" : "Jackal;Sphinx;Mantis;Thunderhead",
-			"number" : 48,
+			"number" : 24,
 			"side" : "SIDE_PANDORAN",
-			"x" : 51,
-			"y" : 35,
-			"scatter" : 8500,
+			"x" : 30,
+			"y" : -1,
+			"scatter" : 500,
 			"flags" : "+EF_AI_TARGET",
 			"aiFlags" : "+AIF_MOVES_TO_LEADER",
 			"active" : 0
 		},
+		{
+			"groupName" : "Pandorans",
+			"name" : "Pandoran",
+			"types" : "Jackal;Sphinx;Mantis;Thunderhead",
+			"number" : 24,
+			"side" : "SIDE_PANDORAN",
+			"x" : 30,
+			"y" : -1,
+			"scatter" : 500,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE",
+			"active" : 0
+		},
 		{
 			"groupName" : "White Knights",
 			"name" : "de Winter",
@@ -128,8 +151,8 @@
 			"name" : "HMS 821-283",
 			"types" : "HMS Corvette 01",
 			"side" : "SIDE_TZAC",
-			"x" : -1,
-			"y" : 35,
+			"x" : 20,
+			"y" : -1,
 			"flags" : "+EF_AI_LEADER",
 			"active" : 0
 		},
@@ -138,12 +161,20 @@
 			"name" : "INF Burnside",
 			"types" : "INF Corvette 02",
 			"side" : "SIDE_PANDORAN",
-			"x" : 51,
-			"y" : 35,
+			"x" : 30,
+			"y" : -1,
 			"flags" : "+EF_AI_LEADER",
 			"active" : 0
 		}
 	],
+	"entities" : [
+		{
+			"type" : "ET_JUMPGATE",
+			"x" : 25,
+			"y" : 48,
+			"flags" : "+EF_DISABLED"
+		}
+	],
 	"script" : [
 		{
 			"function" : "TIME 1",
@@ -190,7 +221,7 @@
 			]
 		},
 		{
-			"function" : "OBJECTIVES_COMPLETE 3",
+			"function" : "ALL_OBJECTIVES_COMPLETE",
 			"lines" : [
 				"WAIT 1",
 				"MSG_BOX Rice;I owe you my life, Knights.",
diff --git a/data/missions/donesta/03 - donesta defence #2.json b/data/missions/donesta/03 - donesta defence #2.json
index e8d5b30..dfe8af7 100644
--- a/data/missions/donesta/03 - donesta defence #2.json	
+++ b/data/missions/donesta/03 - donesta defence #2.json	
@@ -42,7 +42,7 @@
 			"y" : 15,
 			"number" : 80,
 			"scatter" : 5000,
-			"flags" : "+EF_FRIENDLY_HEALTH_BAR"
+			"flags" : "+EF_FRIENDLY_HEALTH_BAR+EF_NO_PLAYER_TARGET"
 		}
 	],
 	"script" : [
@@ -50,7 +50,7 @@
 			"function" : "TIME 2",
 			"lines" : [
 				"MSG_BOX Wing Commander;Remember everyone: the Pandorans are using UNF fighters.",
-				"MSG_BOX Wing Commander;Using your radar and HUD is the way to go in this fight."
+				"MSG_BOX Wing Commander;Using your radar is the way to go in this fight."
 			]
 		},
 		{