From 0a5430bbe4cd85b9e030ca5e2923402744ad8d16 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 20 Jul 2016 08:30:43 +0100 Subject: [PATCH] Updated names for speakers in scripts. --- data/missions/alba/10 - alba defence #5.json | 2 +- .../clarke/04 - clarke defence #4.json | 11 ++++- .../clarke/06 - clarke defence #6.json | 10 +++++ .../coyote/01 - coyote assault #1.json | 43 ++++++++++++++++++- .../coyote/03 - coyote assault #3.json | 22 +++++++++- .../missions/krasst/01 - infiltration #5.json | 1 + .../rothan/01 - rothan defence #1.json | 2 +- .../rothan/02 - rothan defence #2.json | 11 ++++- .../temper/01 - pirate uprising #1.json | 10 ++++- .../temper/02 - pirate uprising #2.json | 10 ++++- .../temper/03 - pirate uprising #3.json | 9 +++- .../temper/05 - pirate uprising #5.json | 10 ++++- .../trilliack/02 - trilliack defence #2.json | 2 +- .../trilliack/04 - traitor hunt #3.json | 8 ++-- data/missions/warro/04 - evacuation #4.json | 12 +++++- data/missions/warro/05 - evacuation #5.json | 13 +++++- 16 files changed, 154 insertions(+), 22 deletions(-) diff --git a/data/missions/alba/10 - alba defence #5.json b/data/missions/alba/10 - alba defence #5.json index 3ba1469..8afd6dd 100644 --- a/data/missions/alba/10 - alba defence #5.json +++ b/data/missions/alba/10 - alba defence #5.json @@ -22,7 +22,7 @@ "player" : { "type" : "ATAF", "side" : "SIDE_ALLIES", - "pilot" : "Cdr. Estelle de Dodds", + "pilot" : "Cdr. Estelle de Winter", "squadron" : "White Knights", "x" : 25, "y" : 25 diff --git a/data/missions/clarke/04 - clarke defence #4.json b/data/missions/clarke/04 - clarke defence #4.json index f363284..efeb097 100644 --- a/data/missions/clarke/04 - clarke defence #4.json +++ b/data/missions/clarke/04 - clarke defence #4.json @@ -25,12 +25,19 @@ }, "fighters" : [ { - "name" : "ALLIES", + "name" : "Koonan", + "types" : "ATAF", + "side" : "SIDE_ALLIES", + "x" : 10, + "y" : 10, + "scatter" : 500 + }, + { + "name" : "Todd", "types" : "ATAF", "side" : "SIDE_ALLIES", "x" : 10, "y" : 10, - "number" : 2, "scatter" : 500 }, { diff --git a/data/missions/clarke/06 - clarke defence #6.json b/data/missions/clarke/06 - clarke defence #6.json index 64581fc..21cd3be 100644 --- a/data/missions/clarke/06 - clarke defence #6.json +++ b/data/missions/clarke/06 - clarke defence #6.json @@ -45,6 +45,16 @@ "scatter" : 10000, "flags" : "+EF_AI_TARGET" }, + { + "name" : "Welch", + "groupName" : "twilightLancers", + "types" : "Kingfisher", + "side" : "SIDE_ALLIES", + "x" : -1, + "y" : -1, + "scatter" : 600, + "active" : 0 + }, { "groupName" : "twilightLancers", "types" : "TAF;Ray;Kingfisher;Hammerhead", diff --git a/data/missions/coyote/01 - coyote assault #1.json b/data/missions/coyote/01 - coyote assault #1.json index ebc8776..9a583fc 100644 --- a/data/missions/coyote/01 - coyote assault #1.json +++ b/data/missions/coyote/01 - coyote assault #1.json @@ -22,9 +22,48 @@ }, "fighters" : [ { - "name" : "ATAF", + "name" : "de Winter", + "types" : "ATAF", + "side" : "SIDE_ALLIES", + "x" : 25, + "y" : 25, + "scatter" : 500, + "flags" : "+EF_AI_LEADER", + "aiFlags" : "+AIF_UNLIMITED_RANGE" + }, + { + "name" : "Dodds", + "types" : "ATAF", + "side" : "SIDE_ALLIES", + "x" : 25, + "y" : 25, + "scatter" : 500, + "flags" : "+EF_AI_LEADER", + "aiFlags" : "+AIF_UNLIMITED_RANGE" + }, + { + "name" : "Koonan", + "types" : "ATAF", + "side" : "SIDE_ALLIES", + "x" : 25, + "y" : 25, + "scatter" : 500, + "flags" : "+EF_AI_LEADER", + "aiFlags" : "+AIF_UNLIMITED_RANGE" + }, + { + "name" : "Taylor", + "types" : "ATAF", + "side" : "SIDE_ALLIES", + "x" : 25, + "y" : 25, + "scatter" : 500, + "flags" : "+EF_AI_LEADER", + "aiFlags" : "+AIF_UNLIMITED_RANGE" + }, + { + "name" : "Todd", "types" : "ATAF", - "number" : 5, "side" : "SIDE_ALLIES", "x" : 25, "y" : 25, diff --git a/data/missions/coyote/03 - coyote assault #3.json b/data/missions/coyote/03 - coyote assault #3.json index fa8cd41..cb13bcc 100644 --- a/data/missions/coyote/03 - coyote assault #3.json +++ b/data/missions/coyote/03 - coyote assault #3.json @@ -49,12 +49,30 @@ "scatter" : 5000 }, { - "name" : "ATAFs", + "name" : "de Winter", "types" : "ATAF", "side" : "SIDE_ALLIES", "x" : 25, "y" : 25, - "number" : 5, + "scatter" : 500, + "active" : 0 + }, + { + "name" : "Dodds", + "types" : "ATAF", + "side" : "SIDE_ALLIES", + "x" : 25, + "y" : 25, + "scatter" : 500, + "active" : 0 + }, + { + "name" : "ATAF", + "types" : "ATAF", + "side" : "SIDE_ALLIES", + "x" : 25, + "y" : 25, + "number" : 3, "scatter" : 500, "active" : 0 }, diff --git a/data/missions/krasst/01 - infiltration #5.json b/data/missions/krasst/01 - infiltration #5.json index 170ff0a..717e46a 100644 --- a/data/missions/krasst/01 - infiltration #5.json +++ b/data/missions/krasst/01 - infiltration #5.json @@ -82,6 +82,7 @@ }, { "groupName" : "ZakGroup", + "name" : "Unique Sphinx", "types" : "Unique Sphinx", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/rothan/01 - rothan defence #1.json b/data/missions/rothan/01 - rothan defence #1.json index 4c1e35c..91c10c9 100644 --- a/data/missions/rothan/01 - rothan defence #1.json +++ b/data/missions/rothan/01 - rothan defence #1.json @@ -60,7 +60,7 @@ }, "fighters" : [ { - "name" : "ALLIES", + "name" : "Taylor", "types" : "ATAF", "side" : "SIDE_ALLIES", "x" : 25, diff --git a/data/missions/rothan/02 - rothan defence #2.json b/data/missions/rothan/02 - rothan defence #2.json index f4d88b7..9c7c2ed 100644 --- a/data/missions/rothan/02 - rothan defence #2.json +++ b/data/missions/rothan/02 - rothan defence #2.json @@ -45,13 +45,22 @@ "number" : 3, "scatter" : 500 }, + { + "name" : "Fox", + "groupName" : "Irregular Nomads", + "types" : "Kingfisher", + "side" : "SIDE_ALLIES", + "x" : 30, + "y" : 1, + "active" : 0 + }, { "groupName" : "Irregular Nomads", "types" : "TAF;Ray;Kingfisher;Hammerhead;Rook", "side" : "SIDE_ALLIES", "x" : 30, "y" : 1, - "number" : 4, + "number" : 3, "active" : 0 }, { diff --git a/data/missions/temper/01 - pirate uprising #1.json b/data/missions/temper/01 - pirate uprising #1.json index 325a6e2..b4718fb 100644 --- a/data/missions/temper/01 - pirate uprising #1.json +++ b/data/missions/temper/01 - pirate uprising #1.json @@ -21,7 +21,15 @@ "fighters" : [ { "types" : "TAF", - "number" : 4, + "name" : "Heywood", + "side" : "SIDE_ALLIES", + "x" : 25, + "y" : 25, + "scatter" : 250 + }, + { + "types" : "TAF", + "number" : 3, "side" : "SIDE_ALLIES", "x" : 25, "y" : 25, diff --git a/data/missions/temper/02 - pirate uprising #2.json b/data/missions/temper/02 - pirate uprising #2.json index ee59363..149b6b7 100644 --- a/data/missions/temper/02 - pirate uprising #2.json +++ b/data/missions/temper/02 - pirate uprising #2.json @@ -22,7 +22,15 @@ "fighters" : [ { "types" : "TAF", - "number" : 4, + "name" : "Heywood", + "side" : "SIDE_ALLIES", + "x" : 25, + "y" : 25, + "scatter" : 250 + }, + { + "types" : "TAF", + "number" : 3, "side" : "SIDE_ALLIES", "x" : 25, "y" : 25, diff --git a/data/missions/temper/03 - pirate uprising #3.json b/data/missions/temper/03 - pirate uprising #3.json index 7decb7e..30ed905 100644 --- a/data/missions/temper/03 - pirate uprising #3.json +++ b/data/missions/temper/03 - pirate uprising #3.json @@ -52,7 +52,14 @@ }, { "types" : "TAF", - "number" : 2, + "name" : "Strickland", + "side" : "SIDE_ALLIES", + "x" : 25, + "y" : 25, + "scatter" : 300 + }, + { + "types" : "TAF", "side" : "SIDE_ALLIES", "x" : 25, "y" : 25, diff --git a/data/missions/temper/05 - pirate uprising #5.json b/data/missions/temper/05 - pirate uprising #5.json index fb87e32..bf37912 100644 --- a/data/missions/temper/05 - pirate uprising #5.json +++ b/data/missions/temper/05 - pirate uprising #5.json @@ -23,9 +23,17 @@ "y" : 20 }, "fighters" : [ + { + "name" : "Heywood", + "types" : "TAF", + "side" : "SIDE_ALLIES", + "x" : 20, + "y" : 20, + "scatter" : 1000 + }, { "types" : "TAF;Ray;Rook;Hammerhead", - "number" : 12, + "number" : 11, "side" : "SIDE_ALLIES", "x" : 20, "y" : 20, diff --git a/data/missions/trilliack/02 - trilliack defence #2.json b/data/missions/trilliack/02 - trilliack defence #2.json index 2d867fe..087c3fc 100644 --- a/data/missions/trilliack/02 - trilliack defence #2.json +++ b/data/missions/trilliack/02 - trilliack defence #2.json @@ -86,7 +86,7 @@ "function" : "ENEMIES_KILLED 75", "lines" : [ "MSG_BOX Wingmate;How many of these bastards did Tzac hire?!", - "MSG_BOX Lovelace;Whatever the number, we'll make sure we send a clear message it wasn't enough!" + "MSG_BOX UNF Lovelace;Whatever the number, we'll make sure we send a clear message it wasn't enough!" ] }, { diff --git a/data/missions/trilliack/04 - traitor hunt #3.json b/data/missions/trilliack/04 - traitor hunt #3.json index f25cbbc..f5bc958 100644 --- a/data/missions/trilliack/04 - traitor hunt #3.json +++ b/data/missions/trilliack/04 - traitor hunt #3.json @@ -89,26 +89,26 @@ { "function" : "TIME 1", "lines" : [ - "MSG_BOX D'ath;Looks like we've got a welcoming committee heading our way." + "MSG_BOX D'Ath;Looks like we've got a welcoming committee heading our way." ] }, { "function" : "TIME 30", "lines" : [ - "MSG_BOX D'ath;Remember: we need to disable the Drachma. Target the guns and engines, only. We don't want to destroy it." + "MSG_BOX D'Ath;Remember: we need to disable the Drachma. Target the guns and engines, only. We don't want to destroy it." ] }, { "function" : "ENEMIES_SURRENDERED 1", "lines" : [ - "MSG_BOX D'ath;Some of them are surrendering. Disable their fighters, and we'll deal with them later. Don't kill them!" + "MSG_BOX D'Ath;Some of them are surrendering. Disable their fighters, and we'll deal with them later. Don't kill them!" ] }, { "function" : "ALL_OBJECTIVES_COMPLETE", "lines" : [ "WAIT 1", - "MSG_BOX D'ath;Control, traitors have been dealt with, and the Drachma has been disabled. She's ready for boarding.", + "MSG_BOX D'Ath;Control, traitors have been dealt with, and the Drachma has been disabled. She's ready for boarding.", "MSG_BOX Control;Acknowledged. Shuttles are on their way.", "WAIT_MSG_BOX", "COMPLETE_MISSION" diff --git a/data/missions/warro/04 - evacuation #4.json b/data/missions/warro/04 - evacuation #4.json index 3c4c1a4..eec7f64 100644 --- a/data/missions/warro/04 - evacuation #4.json +++ b/data/missions/warro/04 - evacuation #4.json @@ -61,9 +61,17 @@ "scatter" : 500 }, { - "name" : "ATAF", + "name" : "de Winter", + "types" : "ATAF", + "side" : "SIDE_ALLIES", + "x" : 10, + "y" : 10, + "scatter" : 500, + "aiFlags" : "+AIF_UNLIMITED_RANGE" + }, + { + "name" : "Koonan", "types" : "ATAF", - "number" : 2, "side" : "SIDE_ALLIES", "x" : 10, "y" : 10, diff --git a/data/missions/warro/05 - evacuation #5.json b/data/missions/warro/05 - evacuation #5.json index 5d9d177..566dc80 100644 --- a/data/missions/warro/05 - evacuation #5.json +++ b/data/missions/warro/05 - evacuation #5.json @@ -69,9 +69,18 @@ "aiFlags" : "+AIF_MOVES_TO_LEADER" }, { - "name" : "ATAF", + "name" : "Taylor", + "types" : "ATAF", + "side" : "SIDE_ALLIES", + "x" : 40, + "y" : 40, + "scatter" : 500, + "flags" : "+EF_AI_LEADER", + "aiFlags" : "+AIF_UNLIMITED_RANGE" + }, + { + "name" : "Todd", "types" : "ATAF", - "number" : 2, "side" : "SIDE_ALLIES", "x" : 40, "y" : 40,