diff --git a/data/missions/alba/05 - alba defence #2.json b/data/missions/alba/05 - alba defence #2.json index a749d04..1c97f47 100644 --- a/data/missions/alba/05 - alba defence #2.json +++ b/data/missions/alba/05 - alba defence #2.json @@ -39,7 +39,6 @@ }, "fighters" : [ { - "name" : "Wingmate", "types" : "Leopard;Firefly;Nymph", "number" : 11, "side" : "SIDE_ALLIES", @@ -91,6 +90,7 @@ }, { "groupName" : "Pandorans", + "name" : "Pandoran", "types" : "Jackal;Sphinx;Mantis;Thunderhead", "number" : 48, "side" : "SIDE_PANDORAN", diff --git a/data/missions/clarke/06 - clarke defence #6.json b/data/missions/clarke/06 - clarke defence #6.json index 7899854..f120ee5 100644 --- a/data/missions/clarke/06 - clarke defence #6.json +++ b/data/missions/clarke/06 - clarke defence #6.json @@ -91,7 +91,7 @@ "function" : "TIME 2", "lines" : [ "MSG_BOX Wing Commander;The Twilight Lancers are on their way.", - "MSG_BOX Wingmate #62;Eight whole extra fighters? We might outnumber the enemy, but they still outgun us!", + "MSG_BOX Wingmate;Eight whole extra fighters? We might outnumber the enemy, but they still outgun us!", "MSG_BOX Wing Commander;At this point, any additional support is welcome. And we still have the support of Cleopatra and Artemis." ] }, @@ -107,17 +107,17 @@ "function" : "ENEMIES_KILLED 50", "lines" : [ "MSG_BOX Wing Commander;We're wearing them down. Keep up the pressure.", - "MSG_BOX Wingmate #31;Think they're pull back if we hit them hard enough?", + "MSG_BOX Wingmate;Think they're pull back if we hit them hard enough?", "MSG_BOX Wing Commander;Too early to speculate. Just concentrate on taking down their fighters." ] }, { "function" : "ENEMIES_KILLED 75", "lines" : [ - "MSG_BOX Wingmate #88;I've just been tailed by something I've never seen before! Small, highly maneuverable, rapid fire particle cannon.", + "MSG_BOX Wingmate;I've just been tailed by something I've never seen before! Small, highly maneuverable, rapid fire particle cannon.", "MSG_BOX Welch;Swarmers! The enemy have deployed them here, too!", "MSG_BOX Wing Commander;How many?", - "MSG_BOX Wingmate #82;Tracking a dozen, but the numbers are growing rapidly", + "MSG_BOX Wingmate;Tracking a dozen, but the numbers are growing rapidly", "WAIT_MSG_BOX", "ACTIVATE_SPAWNER 1 SwarmerSpawner" ] @@ -125,16 +125,16 @@ { "function" : "ALLIES_KILLED 150", "lines" : [ - "MSG_BOX Wingmate #88;I've lost count how many of these damn swarmers I've taken down.", - "MSG_BOX Wingmate #120;It's like fighting a hydra! You cut off one head, and two more spring up!" + "MSG_BOX Wingmate;I've lost count how many of these damn swarmers I've taken down.", + "MSG_BOX Wingmate;It's like fighting a hydra! You cut off one head, and two more spring up!" ] }, { "function" : "ALLIES_KILLED 195", "lines" : [ - "MSG_BOX Wingmate #181;There's too many of them!", - "MSG_BOX Wingmate #31;Keep fighting, we can still win this!", - "MSG_BOX Wingmate #111;They're everywhere! I--" + "MSG_BOX Wingmate;There's too many of them!", + "MSG_BOX Wingmate;Keep fighting, we can still win this!", + "MSG_BOX Wingmate;They're everywhere! I--" ] }, { diff --git a/data/missions/donesta/03 - donesta defence #2.json b/data/missions/donesta/03 - donesta defence #2.json index d8080fe..538b441 100644 --- a/data/missions/donesta/03 - donesta defence #2.json +++ b/data/missions/donesta/03 - donesta defence #2.json @@ -58,7 +58,7 @@ "lines" : [ "WAIT 1", "MSG_BOX Wing Commander;All enemies down.", - "MSG_BOX Wingmate #23;Let's hope we never see the day when they get hold of one of the ATAFs.", + "MSG_BOX Wingmate;Let's hope we never see the day when they get hold of one of the ATAFs.", "MSG_BOX Wing Commander;Agreed. Let's regroup and prepare for whatever's coming next.", "WAIT_MSG_BOX", "COMPLETE_MISSION" diff --git a/data/missions/iliad/05 - iliad defence #5.json b/data/missions/iliad/05 - iliad defence #5.json index 747c379..91c1848 100644 --- a/data/missions/iliad/05 - iliad defence #5.json +++ b/data/missions/iliad/05 - iliad defence #5.json @@ -84,8 +84,8 @@ "function" : "TIME 2", "lines" : [ "MSG_BOX Wing Commander;Stay sharp, people. We need to hold the line here!", - "MSG_BOX Wingmate #31;Oh my God, there's a lot of them ...", - "MSG_BOX Wingmate #82;Pair up, and take them down together. We stand a much better chance that way." + "MSG_BOX Wingmate;Oh my God, there's a lot of them ...", + "MSG_BOX Wingmate;Pair up, and take them down together. We stand a much better chance that way." ] }, { @@ -93,24 +93,24 @@ "lines" : [ "ACTIVATE_ENTITIES INF Qama;INF Seax;INF Mora;INF Sharpfinger", "MSG_BOX Wing Commander;Heads up, people. Four INF corvettes just entered the area.", - "MSG_BOX Wingmate #41;What's happened to all our own capital ships?!", + "MSG_BOX Wingmate;What's happened to all our own capital ships?!", "MSG_BOX Wing Commander;They've been scratched." ] }, { "function" : "ALLIES_KILLED 60", "lines" : [ - "MSG_BOX Wingmate #63;That Dust Brothers have been flagged." + "MSG_BOX Wingmate;That Dust Brothers have been flagged." ] }, { "function" : "ALLIES_KILLED 90", "lines" : [ - "MSG_BOX Wingmate #94;We have to sound the retreat!", + "MSG_BOX Wingmate;We have to sound the retreat!", "MSG_BOX Wing Commander;Mister, you remain where you are! We're not abando--", "WAIT_MSG_BOX", "WAIT 3", - "MSG_BOX Wingmate #98;The wing commander's dead." + "MSG_BOX Wingmate;The wing commander's dead." ] } ] diff --git a/data/missions/mace/01 - mace assault #1.json b/data/missions/mace/01 - mace assault #1.json index b4b610a..02a2259 100644 --- a/data/missions/mace/01 - mace assault #1.json +++ b/data/missions/mace/01 - mace assault #1.json @@ -42,7 +42,6 @@ "aiFlags" : "+AIF_UNLIMITED_RANGE" }, { - "name" : "Wingmate", "types" : "TAF;Ray", "number" : 6, "side" : "SIDE_ALLIES", diff --git a/data/missions/mace/02 - mace assault #2.json b/data/missions/mace/02 - mace assault #2.json index 6aa590d..046dfa7 100644 --- a/data/missions/mace/02 - mace assault #2.json +++ b/data/missions/mace/02 - mace assault #2.json @@ -37,7 +37,6 @@ ], "fighters" : [ { - "name" : "Wingmate", "types" : "Rook", "side" : "SIDE_ALLIES", "x" : 5, @@ -45,7 +44,6 @@ "scatter" : 500 }, { - "name" : "Wingmate", "types" : "Hammerhead;Lynx", "number" : 10, "side" : "SIDE_ALLIES", diff --git a/data/missions/rothan/05 - rothan defence #4.json b/data/missions/rothan/05 - rothan defence #4.json index 66becc8..a659824 100644 --- a/data/missions/rothan/05 - rothan defence #4.json +++ b/data/missions/rothan/05 - rothan defence #4.json @@ -48,7 +48,7 @@ { "function" : "TIME 2", "lines" : [ - "MSG_BOX Wingmate #6;Hell, they're outnumbering us, a good two-to-one!", + "MSG_BOX Wingmate;Hell, they're outnumbering us, a good two-to-one!", "MSG_BOX Wing Commander;There are Swarmers in their ranks, making up the bulk. Don't lose faith people, we can do this." ] },