diff --git a/data/missions/alba/02 - patrol #2.json b/data/missions/alba/02 - patrol #2.json index d4e4108..feef62d 100644 --- a/data/missions/alba/02 - patrol #2.json +++ b/data/missions/alba/02 - patrol #2.json @@ -16,10 +16,11 @@ }, { "description" : "Destroy Pandoran fighters", - "targetName" : "Pandoran", - "targetValue" : 3, + "targetValue" : 1, + "targetName" : "ENEMY", "targetType" : "TT_DESTROY", - "active" : 0 + "active" : 0, + "isEliminateAll" : 1 } ], "player" : { @@ -38,7 +39,6 @@ "scatter" : 350 }, { - "name" : "Pandoran", "types" : "Jackal", "number" : 3, "side" : "SIDE_PANDORAN", diff --git a/data/missions/alba/05 - alba defence #2.json b/data/missions/alba/05 - alba defence #2.json index 3bdfdbb..ab5247b 100644 --- a/data/missions/alba/05 - alba defence #2.json +++ b/data/missions/alba/05 - alba defence #2.json @@ -101,7 +101,6 @@ }, { "groupName" : "Pandorans", - "name" : "Pandoran", "types" : "Jackal;Sphinx;Mantis;Thunderhead", "number" : 24, "side" : "SIDE_PANDORAN", @@ -114,7 +113,6 @@ }, { "groupName" : "Pandorans", - "name" : "Pandoran", "types" : "Jackal;Sphinx;Mantis;Thunderhead", "number" : 24, "side" : "SIDE_PANDORAN", diff --git a/data/missions/alba/10 - alba defence #5.json b/data/missions/alba/10 - alba defence #5.json index cf6ad55..b311d73 100644 --- a/data/missions/alba/10 - alba defence #5.json +++ b/data/missions/alba/10 - alba defence #5.json @@ -45,7 +45,6 @@ "scatter" : 5000 }, { - "name" : "Pandoran", "types" : "Jackal;Scarab;Mantis;Sphinx;Thunderhead;Shale;Razor;SK-31;SK-34;Blizzard;Khepri", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/antomis/03 - antomis defence #2.json b/data/missions/antomis/03 - antomis defence #2.json index b485c6d..289d511 100644 --- a/data/missions/antomis/03 - antomis defence #2.json +++ b/data/missions/antomis/03 - antomis defence #2.json @@ -51,7 +51,6 @@ "flags" : "+EF_AI_TARGET" }, { - "name" : "Pandoran", "types" : "Jackal;Scarab;Mantis;Sphinx;Thunderhead", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/clarke/01 - clarke defence #1.json b/data/missions/clarke/01 - clarke defence #1.json index bf3b768..c952d3c 100644 --- a/data/missions/clarke/01 - clarke defence #1.json +++ b/data/missions/clarke/01 - clarke defence #1.json @@ -34,7 +34,6 @@ "scatter" : 5000 }, { - "name" : "Pandoran", "types" : "Jackal;Sphinx", "side" : "SIDE_PANDORAN", "x" : 35, diff --git a/data/missions/clarke/02 - clarke defence #2.json b/data/missions/clarke/02 - clarke defence #2.json index 05b0c01..85be4c2 100644 --- a/data/missions/clarke/02 - clarke defence #2.json +++ b/data/missions/clarke/02 - clarke defence #2.json @@ -46,7 +46,7 @@ "scatter" : 500 }, { - "name" : "Pandoran", + "groupName" : "Pandoran", "types" : "Jackal;Sphinx;Mantis", "side" : "SIDE_PANDORAN", "x" : 20, diff --git a/data/missions/clarke/03 - clarke defence #3.json b/data/missions/clarke/03 - clarke defence #3.json index dc0d351..068380d 100644 --- a/data/missions/clarke/03 - clarke defence #3.json +++ b/data/missions/clarke/03 - clarke defence #3.json @@ -60,7 +60,7 @@ "aiFlags" : "+AIF_MOVES_TO_LEADER" }, { - "name" : "Pandoran", + "groupName" : "Pandoran", "types" : "Jackal;Sphinx;Mantis", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/clarke/04 - clarke defence #4.json b/data/missions/clarke/04 - clarke defence #4.json index f60b831..a12e623 100644 --- a/data/missions/clarke/04 - clarke defence #4.json +++ b/data/missions/clarke/04 - clarke defence #4.json @@ -41,7 +41,6 @@ "scatter" : 500 }, { - "name" : "Pandoran", "types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab", "side" : "SIDE_PANDORAN", "x" : 25, @@ -51,7 +50,6 @@ "aiFlags" : "+AIF_MOVES_TO_LEADER" }, { - "name" : "Pandoran", "types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab", "side" : "SIDE_PANDORAN", "x" : 40, @@ -61,7 +59,6 @@ "aiFlags" : "+AIF_MOVES_TO_LEADER" }, { - "name" : "Pandoran", "types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab", "side" : "SIDE_PANDORAN", "x" : 25, @@ -71,7 +68,6 @@ "aiFlags" : "+AIF_MOVES_TO_LEADER" }, { - "name" : "Pandoran", "groupName" : "reinforcements", "types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab", "side" : "SIDE_PANDORAN", @@ -83,7 +79,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "reinforcements-2", "types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab", "side" : "SIDE_PANDORAN", diff --git a/data/missions/clarke/05 - clarke defence #5.json b/data/missions/clarke/05 - clarke defence #5.json index e8883c9..378010a 100644 --- a/data/missions/clarke/05 - clarke defence #5.json +++ b/data/missions/clarke/05 - clarke defence #5.json @@ -69,7 +69,6 @@ "scatter" : 600 }, { - "name" : "Pandoran", "groupName" : "group-1", "types" : "Jackal;Mantis", "side" : "SIDE_PANDORAN", @@ -79,7 +78,6 @@ "scatter" : 600 }, { - "name" : "Pandoran", "groupName" : "group-2", "types" : "Jackal;Mantis", "side" : "SIDE_PANDORAN", diff --git a/data/missions/clarke/06 - clarke defence #6.json b/data/missions/clarke/06 - clarke defence #6.json index 300a4c3..34c375e 100644 --- a/data/missions/clarke/06 - clarke defence #6.json +++ b/data/missions/clarke/06 - clarke defence #6.json @@ -34,7 +34,6 @@ "scatter" : 10000 }, { - "name" : "Pandoran", "types" : "Jackal;Mantis;Sphinx;Scarab;Thunderhead", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/coyote/01 - coyote assault #1.json b/data/missions/coyote/01 - coyote assault #1.json index 9590dd5..608c8ef 100644 --- a/data/missions/coyote/01 - coyote assault #1.json +++ b/data/missions/coyote/01 - coyote assault #1.json @@ -9,9 +9,10 @@ "objectives" : [ { "description" : "Destroy all enemy targets", - "targetName" : "Pandoran", + "targetName" : "ENEMY", "targetValue" : 100, - "targetType" : "TT_DESTROY" + "targetType" : "TT_DESTROY", + "isEliminateAll" : 1 } ], "player" : { @@ -81,7 +82,6 @@ "aiFlags" : "+AIF_MOVES_TO_LEADER" }, { - "name" : "Pandoran", "types" : "Jackal;Sphinx;Nymph", "number" : 25, "side" : "SIDE_PANDORAN", @@ -90,7 +90,6 @@ "scatter" : 2500 }, { - "name" : "Pandoran", "groupName" : "pandoran-2", "types" : "Jackal;Sphinx;Nymph", "number" : 25, @@ -101,7 +100,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "pandoran-3", "types" : "Jackal;Sphinx;Nymph", "number" : 25, @@ -112,7 +110,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "pandoran-4", "types" : "Nymph", "number" : 25, diff --git a/data/missions/coyote/02 - coyote assault #2.json b/data/missions/coyote/02 - coyote assault #2.json index fe47741..49b48b6 100644 --- a/data/missions/coyote/02 - coyote assault #2.json +++ b/data/missions/coyote/02 - coyote assault #2.json @@ -34,7 +34,6 @@ "scatter" : 5000 }, { - "name" : "Pandoran", "types" : "Jackal;Mantis;Sphinx", "side" : "SIDE_PANDORAN", "x" : 35, diff --git a/data/missions/coyote/03 - coyote assault #3.json b/data/missions/coyote/03 - coyote assault #3.json index f3faff5..db0f9fe 100644 --- a/data/missions/coyote/03 - coyote assault #3.json +++ b/data/missions/coyote/03 - coyote assault #3.json @@ -41,7 +41,7 @@ "scatter" : 5000 }, { - "name" : "Pandoran", + "groupName" : "Pandoran", "types" : "Jackal;Mantis;Sphinx", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/donesta/03 - donesta defence #2.json b/data/missions/donesta/03 - donesta defence #2.json index dfe8af7..5dc4b99 100644 --- a/data/missions/donesta/03 - donesta defence #2.json +++ b/data/missions/donesta/03 - donesta defence #2.json @@ -35,7 +35,6 @@ "scatter" : 5000 }, { - "name" : "Pandoran", "types" : "Firefly;Nymph;Nymph;Leopard;Hyena-A;Hyena-B", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/iliad/01 - iliad defence #1.json b/data/missions/iliad/01 - iliad defence #1.json index 0a95604..2e409d4 100644 --- a/data/missions/iliad/01 - iliad defence #1.json +++ b/data/missions/iliad/01 - iliad defence #1.json @@ -53,7 +53,6 @@ "flags" : "+EF_MISSION_TARGET" }, { - "name" : "ALLIES", "types" : "Firefly;Nymph;Leopard", "side" : "SIDE_ALLIES", "x" : 25, @@ -62,7 +61,7 @@ "scatter" : 1000 }, { - "name" : "Pandoran", + "groupName" : "Pandoran", "types" : "Jackal", "side" : "SIDE_PANDORAN", "x" : 27, @@ -71,7 +70,7 @@ "scatter" : 1000 }, { - "name" : "Pandoran", + "groupName" : "Pandoran", "types" : "Jackal", "side" : "SIDE_PANDORAN", "x" : 20, @@ -80,7 +79,7 @@ "scatter" : 1000 }, { - "name" : "Pandoran", + "groupName" : "Pandoran", "types" : "Jackal", "side" : "SIDE_PANDORAN", "x" : 35, diff --git a/data/missions/iliad/02 - iliad defence #2.json b/data/missions/iliad/02 - iliad defence #2.json index 687d2d2..384303a 100644 --- a/data/missions/iliad/02 - iliad defence #2.json +++ b/data/missions/iliad/02 - iliad defence #2.json @@ -34,7 +34,6 @@ "scatter" : 5000 }, { - "name" : "Pandoran", "types" : "Jackal", "side" : "SIDE_PANDORAN", "x" : 35, diff --git a/data/missions/iliad/03 - iliad defence #3.json b/data/missions/iliad/03 - iliad defence #3.json index 174342b..97e5d57 100644 --- a/data/missions/iliad/03 - iliad defence #3.json +++ b/data/missions/iliad/03 - iliad defence #3.json @@ -42,7 +42,6 @@ "scatter" : 500 }, { - "name" : "Pandoran", "types" : "Jackal;Sphinx;Thunderhead", "side" : "SIDE_PANDORAN", "x": 25, @@ -75,7 +74,6 @@ "aiFlags" : "+AIF_MOVES_TO_LEADER" }, { - "name" : "Pandoran", "groupName" : "Reinforcements-1", "types" : "Jackal;Sphinx;Thunderhead", "side" : "SIDE_PANDORAN", @@ -87,7 +85,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "Reinforcements-2", "types" : "Jackal;Sphinx;Thunderhead", "side" : "SIDE_PANDORAN", diff --git a/data/missions/iliad/04 - iliad defence #4.json b/data/missions/iliad/04 - iliad defence #4.json index 9dd1c28..2908ef0 100644 --- a/data/missions/iliad/04 - iliad defence #4.json +++ b/data/missions/iliad/04 - iliad defence #4.json @@ -81,7 +81,6 @@ "aiFlags" : "+AIF_MOVES_TO_LEADER" }, { - "name" : "Pandoran", "types" : "Jackal;Sphinx;Mantis", "side" : "SIDE_PANDORAN", "x": 18, @@ -91,7 +90,6 @@ "aiFlags" : "+AIF_UNLIMITED_RANGE" }, { - "name" : "Pandoran", "groupName" : "Pandorans-2", "types" : "Jackal;Sphinx;Mantis", "side" : "SIDE_PANDORAN", @@ -103,7 +101,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "AstraEscorts", "types" : "Jackal;Sphinx;Mantis", "side" : "SIDE_PANDORAN", @@ -115,7 +112,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "BustRagEscorts", "types" : "Jackal;Sphinx;Mantis", "side" : "SIDE_PANDORAN", @@ -127,7 +123,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "Scarabs", "types" : "Scarab", "side" : "SIDE_PANDORAN", diff --git a/data/missions/iliad/05 - iliad defence #5.json b/data/missions/iliad/05 - iliad defence #5.json index fc35106..87820df 100644 --- a/data/missions/iliad/05 - iliad defence #5.json +++ b/data/missions/iliad/05 - iliad defence #5.json @@ -37,7 +37,6 @@ "flags" : "+EF_AI_TARGET" }, { - "name" : "Pandoran", "types" : "Jackal;Mantis;Sphinx;Scarab", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/rothan/05 - rothan defence #4.json b/data/missions/rothan/05 - rothan defence #4.json index 8d45613..d6f4afb 100644 --- a/data/missions/rothan/05 - rothan defence #4.json +++ b/data/missions/rothan/05 - rothan defence #4.json @@ -35,7 +35,6 @@ "scatter" : 5000 }, { - "name" : "Pandoran", "types" : "Jackal;Scarab;Mantis;Swarmer;Swarmer", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/rothan/06 - rothan defence #5.json b/data/missions/rothan/06 - rothan defence #5.json index 3fcf14a..baaec55 100644 --- a/data/missions/rothan/06 - rothan defence #5.json +++ b/data/missions/rothan/06 - rothan defence #5.json @@ -49,7 +49,6 @@ "flags" : "+EF_AI_TARGET" }, { - "name" : "Pandoran", "types" : "Jackal;Scarab;Mantis;Thunderhead;Dart;Khepri;Swarmer", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/trilliack/07 - trilliack defence #4.json b/data/missions/trilliack/07 - trilliack defence #4.json index 841c0ca..b17eca0 100644 --- a/data/missions/trilliack/07 - trilliack defence #4.json +++ b/data/missions/trilliack/07 - trilliack defence #4.json @@ -36,7 +36,6 @@ "scatter" : 5000 }, { - "name" : "Pandoran", "types" : "Jackal;Mantis;Sphinx;Thunderhead;Shale;Razor;SK-31;SK-34;Blizzard", "side" : "SIDE_PANDORAN", "x" : 25, diff --git a/data/missions/warro/04 - evacuation #4.json b/data/missions/warro/04 - evacuation #4.json index eec7f64..8ecef7b 100644 --- a/data/missions/warro/04 - evacuation #4.json +++ b/data/missions/warro/04 - evacuation #4.json @@ -89,7 +89,6 @@ "scatter" : 500 }, { - "name" : "Pandoran", "groupName" : "Pandorans-1", "types" : "Jackal;Sphinx;Mantis;Nymph;Firefly", "number" : 12, @@ -112,7 +111,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "Pandorans-2", "types" : "Jackal;Sphinx;Mantis;Nymph;Firefly", "number" : 12, @@ -135,7 +133,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "Pandorans-3", "types" : "Jackal;Sphinx;Mantis;Nymph;Firefly", "number" : 24, diff --git a/data/missions/warro/05 - evacuation #5.json b/data/missions/warro/05 - evacuation #5.json index 4e62eda..671c239 100644 --- a/data/missions/warro/05 - evacuation #5.json +++ b/data/missions/warro/05 - evacuation #5.json @@ -89,7 +89,6 @@ "aiFlags" : "+AIF_UNLIMITED_RANGE" }, { - "name" : "Pandoran", "types" : "Jackal;Sphinx;Mantis;Thunderhead", "number" : 8, "side" : "SIDE_PANDORAN", @@ -99,7 +98,6 @@ "aiFlags" : "+AIF_MOVES_TO_LEADER" }, { - "name" : "Pandoran", "groupName" : "GramStar", "types" : "Jackal;Sphinx;Mantis;Thunderhead", "number" : 14, @@ -111,7 +109,6 @@ "active" : 0 }, { - "name" : "Pandoran", "groupName" : "DragonTrident", "types" : "Jackal;Sphinx;Mantis;Thunderhead", "number" : 14,