From e0fb778c106a9e312d411ced8c29eae9d2bc5973 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 18 May 2016 12:23:42 +0100 Subject: [PATCH] SIDE_REBEL -> SIDE_TZAC --- data/challenges/03.json | 2 +- data/challenges/04.json | 2 +- data/challenges/05.json | 4 ++-- data/challenges/07.json | 10 ++++---- data/challenges/08.json | 2 +- data/challenges/09.json | 2 +- data/challenges/13.json | 2 +- data/challenges/17.json | 2 +- data/challenges/22.json | 2 +- data/galaxy/starSystems.json | 2 +- data/missions/alba/04 - alba defence #1.json | 6 ++--- data/missions/alba/05 - alba defence #2.json | 10 ++++---- .../antomis/01 - antomis defence #1.json | 12 +++++----- .../antomis/02 - antomis offence #1.json | 6 ++--- .../aster/01 - return to aster #1.json | 4 ++-- .../aster/02 - return to aster #2.json | 4 ++-- .../aster/03 - return to aster #3.json | 4 ++-- data/missions/aster/04 - aster assault.json | 24 +++++++++---------- .../donesta/01 - donesta defence #1.json | 10 ++++---- .../donesta/02 - donesta offence #1.json | 4 ++-- .../granada/03 - suspect packages #3.json | 4 ++-- .../missions/india/01 - india defence #1.json | 6 ++--- .../missions/india/02 - india defence #2.json | 2 +- data/missions/mace/01 - mace assault #1.json | 10 ++++---- data/missions/mace/02 - mace assault #2.json | 10 ++++---- data/missions/mace/03 - mace assault #3.json | 6 ++--- data/missions/mace/04 - mace assault #4.json | 10 ++++---- .../rothan/02 - rothan defence #2.json | 6 ++--- .../rothan/03 - rothan defence #3.json | 10 ++++---- .../rothan/04 - rothan offence #1.json | 6 ++--- .../missions/tigris/01 - infiltration #3.json | 4 ++-- .../trilliack/01 - trilliack defence #1.json | 6 ++--- .../trilliack/02 - trilliack defence #2.json | 2 +- src/battle/fighters.c | 2 +- src/defs.h | 2 +- src/system/lookup.c | 4 +++- 36 files changed, 103 insertions(+), 101 deletions(-) diff --git a/data/challenges/03.json b/data/challenges/03.json index 3907207..f7ee5b5 100644 --- a/data/challenges/03.json +++ b/data/challenges/03.json @@ -34,7 +34,7 @@ { "name" : "Nymph", "types" : "Nymph", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 22, "number" : 3, diff --git a/data/challenges/04.json b/data/challenges/04.json index 500301c..9c96b92 100644 --- a/data/challenges/04.json +++ b/data/challenges/04.json @@ -34,7 +34,7 @@ { "name" : "Lynx", "types" : "Lynx", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 25, "number" : 5, diff --git a/data/challenges/05.json b/data/challenges/05.json index ae68300..689f5cd 100644 --- a/data/challenges/05.json +++ b/data/challenges/05.json @@ -43,7 +43,7 @@ { "name" : "TAF", "types" : "TAF", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 25, "number" : 2, @@ -53,7 +53,7 @@ { "name" : "Dart", "types" : "Dart", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 25, "number" : 4, diff --git a/data/challenges/07.json b/data/challenges/07.json index 8117359..df1c92a 100644 --- a/data/challenges/07.json +++ b/data/challenges/07.json @@ -37,7 +37,7 @@ "types" : "Rocket Turret", "x" : 30, "y" : 30, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 1000, "number" : 2 }, @@ -46,7 +46,7 @@ "types" : "Rocket Turret", "x" : 30, "y" : 20, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 1000, "number" : 2 }, @@ -55,7 +55,7 @@ "types" : "Rocket Turret", "x" : 20, "y" : 20, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 1000, "number" : 2 }, @@ -64,7 +64,7 @@ "types" : "Rocket Turret", "x" : 20, "y" : 30, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 1000, "number" : 2 }, @@ -73,7 +73,7 @@ "types" : "Rocket Turret", "x" : 25, "y" : 25, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 1000, "number" : 2, "active" : 0 diff --git a/data/challenges/08.json b/data/challenges/08.json index 38997bd..b7bac25 100644 --- a/data/challenges/08.json +++ b/data/challenges/08.json @@ -37,7 +37,7 @@ "types" : "Dart", "x" : 25, "y" : 28, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 5000, "number" : 12, "flags" : "+EF_RETREATING", diff --git a/data/challenges/09.json b/data/challenges/09.json index 12e96e8..dcedc44 100644 --- a/data/challenges/09.json +++ b/data/challenges/09.json @@ -48,7 +48,7 @@ "types" : "Dart", "x" : 25, "y" : 25, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 10000, "number" : 9999, "aiFlags" : "+AIF_UNLIMITED_RANGE" diff --git a/data/challenges/13.json b/data/challenges/13.json index 985fd25..3657618 100644 --- a/data/challenges/13.json +++ b/data/challenges/13.json @@ -34,7 +34,7 @@ "fighters" : [ { "types" : "Rocket Turret", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 25, "number" : 12, diff --git a/data/challenges/17.json b/data/challenges/17.json index 268b2ba..a218b74 100644 --- a/data/challenges/17.json +++ b/data/challenges/17.json @@ -6,7 +6,7 @@ "music" : "AUTO", "player" : { "type" : "Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "pilot" : "-", "squadron" : "-", "x" : 25, diff --git a/data/challenges/22.json b/data/challenges/22.json index 33d71a0..2e1cd44 100644 --- a/data/challenges/22.json +++ b/data/challenges/22.json @@ -6,7 +6,7 @@ "music" : "AUTO", "player" : { "type" : "Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "pilot" : "-", "squadron" : "-", "x" : 25, diff --git a/data/galaxy/starSystems.json b/data/galaxy/starSystems.json index 76ee51f..bd70080 100644 --- a/data/galaxy/starSystems.json +++ b/data/galaxy/starSystems.json @@ -144,7 +144,7 @@ }, { "name": "Mace", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x": 444, "y": 359, "fallsToPandorans" : 1 diff --git a/data/missions/alba/04 - alba defence #1.json b/data/missions/alba/04 - alba defence #1.json index a18ff60..0432c51 100644 --- a/data/missions/alba/04 - alba defence #1.json +++ b/data/missions/alba/04 - alba defence #1.json @@ -40,7 +40,7 @@ "groupName" : "Rebels-1", "types" : "Shale", "number" : 4, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 8, "scatter" : 500, @@ -50,7 +50,7 @@ "groupName" : "Rebels-2", "types" : "Shale", "number" : 5, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 28, "y" : 37, "scatter" : 500, @@ -60,7 +60,7 @@ "groupName" : "Rebels-3", "types" : "Shale", "number" : 6, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 12, "y" : 25, "scatter" : 500, diff --git a/data/missions/alba/05 - alba defence #2.json b/data/missions/alba/05 - alba defence #2.json index e250b0a..9738b25 100644 --- a/data/missions/alba/05 - alba defence #2.json +++ b/data/missions/alba/05 - alba defence #2.json @@ -49,7 +49,7 @@ { "types" : "Shale;Razor;SK-31;SK-34", "number" : 5, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 12, "scatter" : 500 @@ -58,7 +58,7 @@ "groupName" : "Rebels-1", "types" : "Shale;Razor;SK-31;SK-34", "number" : 4, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 20, "y" : -1, "scatter" : 500, @@ -69,7 +69,7 @@ "groupName" : "Rebels-1", "types" : "Shale;Razor;SK-31;SK-34", "number" : 4, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : -1, "scatter" : 500, @@ -80,7 +80,7 @@ "groupName" : "Rebels-2", "types" : "Shale;Razor;SK-31;SK-34", "number" : 48, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -1, "y" : 35, "scatter" : 8500, @@ -127,7 +127,7 @@ "groupName" : "CapShips", "name" : "HMS 821-283", "types" : "HMS Corvette 01", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -1, "y" : 35, "flags" : "+EF_AI_LEADER", diff --git a/data/missions/antomis/01 - antomis defence #1.json b/data/missions/antomis/01 - antomis defence #1.json index 70e4550..cfaf45e 100644 --- a/data/missions/antomis/01 - antomis defence #1.json +++ b/data/missions/antomis/01 - antomis defence #1.json @@ -63,7 +63,7 @@ }, { "types" : "Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : 5, "number" : 6, @@ -72,7 +72,7 @@ }, { "types" : "Khepri", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : 5, "scatter" : 350, @@ -81,7 +81,7 @@ { "groupName" : "Rebels-1", "types" : "SK-31;Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : 52, "number" : 4, @@ -92,7 +92,7 @@ { "groupName" : "Rebels-1", "types" : "Khepri", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : 52, "number" : 2, @@ -103,7 +103,7 @@ { "groupName" : "Rebels-2", "types" : "SK-31;Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : -2, "number" : 4, @@ -114,7 +114,7 @@ { "groupName" : "Rebels-2", "types" : "Khepri", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : -2, "number" : 2, diff --git a/data/missions/antomis/02 - antomis offence #1.json b/data/missions/antomis/02 - antomis offence #1.json index 8991c46..b2144b4 100644 --- a/data/missions/antomis/02 - antomis offence #1.json +++ b/data/missions/antomis/02 - antomis offence #1.json @@ -66,7 +66,7 @@ { "name" : "Tzac Commander", "types" : "SK-31", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 35, "y" : 25, "scatter" : 1000, @@ -76,7 +76,7 @@ { "name" : "Tzac Commander", "types" : "SK-34", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 35, "y" : 25, "scatter" : 1000, @@ -86,7 +86,7 @@ { "groupName" : "Rebels-1", "types" : "Shale;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 35, "y" : 25, "number" : 8, diff --git a/data/missions/aster/01 - return to aster #1.json b/data/missions/aster/01 - return to aster #1.json index 10d56ab..64d4b3f 100644 --- a/data/missions/aster/01 - return to aster #1.json +++ b/data/missions/aster/01 - return to aster #1.json @@ -76,7 +76,7 @@ { "groupName" : "Rebels", "types" : "Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 10, "y" : 51, "number" : 4, @@ -87,7 +87,7 @@ { "groupName" : "Rebels", "types" : "Khepri", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 10, "y" : 51, "number" : 8, diff --git a/data/missions/aster/02 - return to aster #2.json b/data/missions/aster/02 - return to aster #2.json index 1a299ab..0a1bddc 100644 --- a/data/missions/aster/02 - return to aster #2.json +++ b/data/missions/aster/02 - return to aster #2.json @@ -34,7 +34,7 @@ }, { "types" : "Khepri", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 30, "number" : 5, @@ -44,7 +44,7 @@ }, { "types" : "Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 35, "number" : 3, diff --git a/data/missions/aster/03 - return to aster #3.json b/data/missions/aster/03 - return to aster #3.json index 24ad9cb..3e0c404 100644 --- a/data/missions/aster/03 - return to aster #3.json +++ b/data/missions/aster/03 - return to aster #3.json @@ -33,7 +33,7 @@ "entities" : [ { "name" : "Mine", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "type" : "ET_SHADOW_MINE", "number" : 65, "x" : 25, @@ -45,7 +45,7 @@ { "name" : "spawner", "types" : "Dart", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "interval" : 30, "total" : -1, "step" : 2, diff --git a/data/missions/aster/04 - aster assault.json b/data/missions/aster/04 - aster assault.json index 6ca880e..a60136a 100644 --- a/data/missions/aster/04 - aster assault.json +++ b/data/missions/aster/04 - aster assault.json @@ -83,7 +83,7 @@ { "groupName" : "Rebels", "types" : "SK-31;SK-34;Shale;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 10, "y" : 10, "scatter" : 500, @@ -93,7 +93,7 @@ { "groupName" : "Rebels", "types" : "SK-31;SK-34;Shale;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 10, "y" : 10, "scatter" : 5000, @@ -104,7 +104,7 @@ { "groupName" : "Rebels", "types" : "SK-31;SK-34;Shale;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 20, "y" : 20, "scatter" : 500, @@ -114,7 +114,7 @@ { "groupName" : "Rebels", "types" : "SK-31;SK-34;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 20, "y" : 20, "scatter" : 5000, @@ -125,7 +125,7 @@ { "groupName" : "Rebels", "types" : "SK-31;SK-34;Shale;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : 30, "scatter" : 500, @@ -135,7 +135,7 @@ { "groupName" : "Rebels", "types" : "SK-31;SK-34;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : 30, "scatter" : 5000, @@ -146,7 +146,7 @@ { "groupName" : "Rebels", "types" : "SK-31;SK-34;Shale;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 40, "y" : 40, "scatter" : 500, @@ -156,7 +156,7 @@ { "groupName" : "Rebels", "types" : "SK-31;SK-34;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 40, "y" : 40, "scatter" : 5000, @@ -170,7 +170,7 @@ "groupName" : "CapShips", "name" : "HMS 281-024", "types" : "HMS Corvette 01", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 10, "y" : 10, "flags" : "+EF_AI_IGNORE+EF_AI_LEADER" @@ -179,7 +179,7 @@ "groupName" : "CapShips", "name" : "HMS 121-008", "types" : "HMS Corvette 02", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 20, "y" : 20, "flags" : "+EF_AI_IGNORE+EF_AI_LEADER" @@ -188,7 +188,7 @@ "groupName" : "CapShips", "name" : "HMS 711-555", "types" : "HMS Corvette 02", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : 30, "flags" : "+EF_AI_IGNORE+EF_AI_LEADER" @@ -197,7 +197,7 @@ "groupName" : "CapShips", "name" : "HMS 613-910", "types" : "HMS Corvette 01", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 40, "y" : 40, "flags" : "+EF_AI_IGNORE+EF_AI_LEADER" diff --git a/data/missions/donesta/01 - donesta defence #1.json b/data/missions/donesta/01 - donesta defence #1.json index 4b8bc4c..2efd0c4 100644 --- a/data/missions/donesta/01 - donesta defence #1.json +++ b/data/missions/donesta/01 - donesta defence #1.json @@ -42,7 +42,7 @@ { "types" : "Shale", "number" : 6, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 20, "y" : 40, "scatter" : 2500, @@ -52,7 +52,7 @@ "groupName" : "Rebels-1", "types" : "SK-31", "number" : 8, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -10, "y" : 35, "scatter" : 2500, @@ -64,7 +64,7 @@ "groupName" : "Rebels-1", "types" : "Khepri", "number" : 6, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 51, "scatter" : 2500, @@ -76,7 +76,7 @@ "groupName" : "Rebels-1", "types" : "Khepri", "number" : 6, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -1, "y" : 51, "scatter" : 2500, @@ -88,7 +88,7 @@ "groupName" : "Rebels-1", "types" : "Khepri", "number" : 6, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -10, "y" : 0, "scatter" : 2500, diff --git a/data/missions/donesta/02 - donesta offence #1.json b/data/missions/donesta/02 - donesta offence #1.json index cb753ef..773bc55 100644 --- a/data/missions/donesta/02 - donesta offence #1.json +++ b/data/missions/donesta/02 - donesta offence #1.json @@ -39,7 +39,7 @@ { "groupName" : "Rebels-1", "types" : "Khepri", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 15, "y" : 25, "number" : 5, @@ -49,7 +49,7 @@ { "name" : "Tzac Commander", "types" : "Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 15, "y" : 25, "flags" : "+EF_AI_LEADER+EF_MISSION_TARGET", diff --git a/data/missions/granada/03 - suspect packages #3.json b/data/missions/granada/03 - suspect packages #3.json index b6b56d5..2b7c1cf 100644 --- a/data/missions/granada/03 - suspect packages #3.json +++ b/data/missions/granada/03 - suspect packages #3.json @@ -98,7 +98,7 @@ "name" : "Tzac Commander", "groupName" : "skirmishGroup", "types" : "Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 15, "y" : 40, "flags" : "EF_NO_KILL+EF_MISSION_TARGET", @@ -107,7 +107,7 @@ { "groupName" : "skirmishGroup", "types" : "Razor;Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "number" : 8, "x" : 15, "y" : 40, diff --git a/data/missions/india/01 - india defence #1.json b/data/missions/india/01 - india defence #1.json index 75b4338..60ff425 100644 --- a/data/missions/india/01 - india defence #1.json +++ b/data/missions/india/01 - india defence #1.json @@ -53,7 +53,7 @@ }, { "types" : "Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 30, "scatter" : 1000, @@ -63,7 +63,7 @@ { "groupName" : "Rebels-2", "types" : "Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : 51, "scatter" : 1000, @@ -74,7 +74,7 @@ { "groupName" : "Rebels-3", "types" : "Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 20, "y" : 51, "scatter" : 1000, diff --git a/data/missions/india/02 - india defence #2.json b/data/missions/india/02 - india defence #2.json index a92031b..0eaf959 100644 --- a/data/missions/india/02 - india defence #2.json +++ b/data/missions/india/02 - india defence #2.json @@ -73,7 +73,7 @@ { "name" : "dartSpawner", "types" : "Dart;Dart;Rocket Dart", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "interval" : 30, "total" : 125, "step" : 20, diff --git a/data/missions/mace/01 - mace assault #1.json b/data/missions/mace/01 - mace assault #1.json index 02a2259..1d0d2ff 100644 --- a/data/missions/mace/01 - mace assault #1.json +++ b/data/missions/mace/01 - mace assault #1.json @@ -53,7 +53,7 @@ { "types" : "Rapid Plasma Turret", "number" : 8, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 10, "y" : 25, "scatter" : 700 @@ -61,7 +61,7 @@ { "types" : "Shale;Razor", "number" : 7, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 30, "y" : 28, "aiFlags" : "+AIF_UNLIMITED_RANGE", @@ -71,7 +71,7 @@ "groupName" : "Rebels-1", "types" : "SK-31;SK-34", "number" : 7, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 28, "aiFlags" : "+AIF_UNLIMITED_RANGE", @@ -82,7 +82,7 @@ "groupName" : "Rebels-2", "types" : "Blizzard", "number" : 5, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 20, "y" : 25, "aiFlags" : "+AIF_UNLIMITED_RANGE", @@ -94,7 +94,7 @@ { "name" : "Jumpgate", "type" : "ET_JUMPGATE", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 10, "y" : 25 } diff --git a/data/missions/mace/02 - mace assault #2.json b/data/missions/mace/02 - mace assault #2.json index 474a667..eafbbf3 100644 --- a/data/missions/mace/02 - mace assault #2.json +++ b/data/missions/mace/02 - mace assault #2.json @@ -54,7 +54,7 @@ { "types" : "Shale", "number" : 5, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 15, "y" : 35, "scatter" : 600, @@ -64,7 +64,7 @@ "groupName" : "Cap02", "types" : "Shale", "number" : 5, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 15, "y" : 35, "scatter" : 600, @@ -75,7 +75,7 @@ "groupName" : "Rebels-2", "types" : "Shale", "number" : 15, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 15, "y" : 51, "scatter" : 600, @@ -87,7 +87,7 @@ { "name" : "HMS 781-110", "types" : "HMS Corvette 01", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 15, "y" : 35, "flags" : "+EF_AI_LEADER" @@ -96,7 +96,7 @@ "groupName" : "Cap02", "name" : "HMS 781-041", "types" : "HMS Corvette 02", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 15, "y" : 51, "flags" : "+EF_AI_LEADER", diff --git a/data/missions/mace/03 - mace assault #3.json b/data/missions/mace/03 - mace assault #3.json index 60b91b1..b0dab88 100644 --- a/data/missions/mace/03 - mace assault #3.json +++ b/data/missions/mace/03 - mace assault #3.json @@ -57,7 +57,7 @@ { "groupName" : "Destroy", "types" : "Shale;SK-31;SK-34;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 25, "scatter" : 15000, @@ -67,7 +67,7 @@ { "groupName" : "Disable", "types" : "Shale;SK-31;SK-34;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 25, "scatter" : 15000, @@ -78,7 +78,7 @@ { "groupName" : "Destroy", "types" : "Rapid Plasma Turret;Rocket Turret", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 25, "scatter" : 8000, diff --git a/data/missions/mace/04 - mace assault #4.json b/data/missions/mace/04 - mace assault #4.json index b4c8f3f..011406b 100644 --- a/data/missions/mace/04 - mace assault #4.json +++ b/data/missions/mace/04 - mace assault #4.json @@ -72,7 +72,7 @@ }, { "types" : "Rapid Plasma Turret", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 35, "y" : 25, "scatter" : 1000, @@ -80,7 +80,7 @@ }, { "types" : "Blizzard;Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 35, "y" : 25, "scatter" : 500, @@ -101,7 +101,7 @@ "groupName" : "ChristabelGroup", "name" : "Christabel", "types" : "Shuttle", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : -1, "flags" : "+EF_RETREATING+EF_MUST_DISABLE+EF_NO_THREAT+EF_MISSION_TARGET+EF_AI_TARGET+EF_AI_LEADER", @@ -111,7 +111,7 @@ { "groupName" : "ChristabelGroup", "types" : "Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : -1, "number" : 2, @@ -136,7 +136,7 @@ { "name" : "rebelSpawner", "types" : "Dart;Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "interval" : 3, "total" : 15, "step" : 1, diff --git a/data/missions/rothan/02 - rothan defence #2.json b/data/missions/rothan/02 - rothan defence #2.json index 5b9fd3b..ba0680a 100644 --- a/data/missions/rothan/02 - rothan defence #2.json +++ b/data/missions/rothan/02 - rothan defence #2.json @@ -58,7 +58,7 @@ "name" : "Rebel", "groupName" : "Rebels", "types" : "Firefly;Nymphs", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -1, "y" : -1, "number" : 5, @@ -69,7 +69,7 @@ "name" : "Rebel", "groupName" : "Rebels", "types" : "Firefly;Nymphs", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 15, "y" : -1, "number" : 5, @@ -80,7 +80,7 @@ "name" : "Rebel", "groupName" : "Rebels", "types" : "Firefly;Nymphs", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -1, "y" : 15, "number" : 5, diff --git a/data/missions/rothan/03 - rothan defence #3.json b/data/missions/rothan/03 - rothan defence #3.json index 340a80f..761c063 100644 --- a/data/missions/rothan/03 - rothan defence #3.json +++ b/data/missions/rothan/03 - rothan defence #3.json @@ -62,7 +62,7 @@ "types" : "Shale", "x" : 5, "y" : 5, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 2500, "number" : 7, "flags" : "EF_TAKES_DAMAGE", @@ -73,7 +73,7 @@ "types" : "Shale", "x" : 15, "y" : -1, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 2500, "number" : 4, "flags" : "EF_TAKES_DAMAGE", @@ -85,7 +85,7 @@ "types" : "Khepri", "x" : 15, "y" : -1, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 2500, "number" : 6, "flags" : "EF_TAKES_DAMAGE", @@ -97,7 +97,7 @@ "types" : "Razor", "x" : -1, "y" : 15, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 2500, "number" : 4, "flags" : "EF_TAKES_DAMAGE", @@ -109,7 +109,7 @@ "types" : "Khepri", "x" : 15, "y" : -1, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "scatter" : 2500, "number" : 6, "flags" : "EF_TAKES_DAMAGE", diff --git a/data/missions/rothan/04 - rothan offence #1.json b/data/missions/rothan/04 - rothan offence #1.json index ce75e1e..c6c5505 100644 --- a/data/missions/rothan/04 - rothan offence #1.json +++ b/data/missions/rothan/04 - rothan offence #1.json @@ -69,7 +69,7 @@ { "groupName" : "Rebels-1", "types" : "Shale;SK-31;SK-34", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : 15, "number" : 10, @@ -79,7 +79,7 @@ "name" : "Tzac Commander", "groupName" : "CommanderGroup", "types" : "Shale", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -2, "y" : 25, "scatter" : 500, @@ -90,7 +90,7 @@ { "groupName" : "CommanderGroup", "types" : "Shale;Razor", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -2, "y" : 25, "number" : 5, diff --git a/data/missions/tigris/01 - infiltration #3.json b/data/missions/tigris/01 - infiltration #3.json index 671911b..f027e21 100644 --- a/data/missions/tigris/01 - infiltration #3.json +++ b/data/missions/tigris/01 - infiltration #3.json @@ -74,7 +74,7 @@ { "groupName" : "Tzac-1", "types" : "Shale;Razor;SK-31;SK-34;Khepri", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 25, "y" : -1, "scatter" : 500, @@ -106,7 +106,7 @@ { "name" : "Tzac-Spawner", "types" : "Shale;Razor;SK-31;SK-34;Khepri", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "interval" : 1, "total" : 32, "step" : 1, diff --git a/data/missions/trilliack/01 - trilliack defence #1.json b/data/missions/trilliack/01 - trilliack defence #1.json index db3419a..cf3a528 100644 --- a/data/missions/trilliack/01 - trilliack defence #1.json +++ b/data/missions/trilliack/01 - trilliack defence #1.json @@ -35,7 +35,7 @@ "groupName" : "Rebels-1", "types" : "Shale;Razor;Khepri", "number" : 6, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 20, "y" : 20, "scatter" : 500, @@ -45,7 +45,7 @@ "groupName" : "Rebels-2", "types" : "Shale;SK-31;Khepri", "number" : 6, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : -1, "y" : 20, "scatter" : 500, @@ -56,7 +56,7 @@ "groupName" : "Rebels-3", "types" : "Shale;Razor;Khepri", "number" : 6, - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "x" : 20, "y" : -1, "scatter" : 500, diff --git a/data/missions/trilliack/02 - trilliack defence #2.json b/data/missions/trilliack/02 - trilliack defence #2.json index a78d1d6..590f616 100644 --- a/data/missions/trilliack/02 - trilliack defence #2.json +++ b/data/missions/trilliack/02 - trilliack defence #2.json @@ -65,7 +65,7 @@ { "name" : "dartSpawner", "types" : "Dart;Dart;Rocket Dart", - "side" : "SIDE_REBEL", + "side" : "SIDE_TZAC", "interval" : 30, "total" : 200, "step" : 20, diff --git a/src/battle/fighters.c b/src/battle/fighters.c index 2e8474b..9b07e99 100644 --- a/src/battle/fighters.c +++ b/src/battle/fighters.c @@ -70,7 +70,7 @@ Entity *spawnFighter(char *name, int x, int y, int side) e->aiAggression = 3 + rand() % 2; break; - case SIDE_REBEL: + case SIDE_TZAC: e->aiAggression = 1 + rand() % 3; break; } diff --git a/src/defs.h b/src/defs.h index 01d309b..fd1294e 100644 --- a/src/defs.h +++ b/src/defs.h @@ -204,7 +204,7 @@ enum { SIDE_NONE, SIDE_ALLIES, - SIDE_REBEL, + SIDE_TZAC, SIDE_PANDORAN, SIDE_PIRATE, SIDE_MERC, diff --git a/src/system/lookup.c b/src/system/lookup.c index 692f806..2c2f3d1 100644 --- a/src/system/lookup.c +++ b/src/system/lookup.c @@ -114,11 +114,13 @@ void initLookups(void) addLookup("SIDE_NONE", SIDE_NONE); addLookup("SIDE_ALLIES", SIDE_ALLIES); addLookup("SIDE_PIRATE", SIDE_PIRATE); - addLookup("SIDE_REBEL", SIDE_REBEL); + addLookup("SIDE_TZAC", SIDE_TZAC); addLookup("SIDE_MERC", SIDE_MERC); addLookup("SIDE_PANDORAN", SIDE_PANDORAN); addLookup("SIDE_CSN", SIDE_CSN); addLookup("SIDE_UNF", SIDE_UNF); + /* for compatibility with older saves */ + addLookup("SIDE_REBEL", SIDE_TZAC); addLookup("SND_PARTICLE", SND_PARTICLE); addLookup("SND_PLASMA", SND_PLASMA);