From 7f055102bf9ee556b2c6ab99437e6289abb2d634 Mon Sep 17 00:00:00 2001 From: Steve Date: Sat, 26 Dec 2015 21:08:53 +0000 Subject: [PATCH] Split space craft into separate lists. --- data/{fighters => craft}/civilian.json | 0 data/craft/list.json | 7 +++++++ .../munitionsTransport.json} | 5 ++--- data/{fighters => craft}/shuttle.json | 0 data/{fighters => craft}/supplyShip.json | 0 data/{fighters => craft}/tug.json | 0 data/fighters/list.json | 8 +------- data/turrets/list.json | 3 +++ data/{fighters => turrets}/rocketTurret.json | 0 gfx/craft/munitionsShip.png | Bin 4554 -> 4499 bytes gfx/craft/supplyShip.png | Bin 9838 -> 9691 bytes src/battle/fighters.c | 16 ++++++++++++---- 12 files changed, 25 insertions(+), 14 deletions(-) rename data/{fighters => craft}/civilian.json (100%) create mode 100644 data/craft/list.json rename data/{fighters/munitionsShip.json => craft/munitionsTransport.json} (60%) rename data/{fighters => craft}/shuttle.json (100%) rename data/{fighters => craft}/supplyShip.json (100%) rename data/{fighters => craft}/tug.json (100%) create mode 100644 data/turrets/list.json rename data/{fighters => turrets}/rocketTurret.json (100%) diff --git a/data/fighters/civilian.json b/data/craft/civilian.json similarity index 100% rename from data/fighters/civilian.json rename to data/craft/civilian.json diff --git a/data/craft/list.json b/data/craft/list.json new file mode 100644 index 0000000..f2f3af9 --- /dev/null +++ b/data/craft/list.json @@ -0,0 +1,7 @@ +[ + "data/craft/civilian.json", + "data/craft/tug.json", + "data/craft/shuttle.json", + "data/craft/supplyShip.json", + "data/craft/munitionsTransport.json" +] diff --git a/data/fighters/munitionsShip.json b/data/craft/munitionsTransport.json similarity index 60% rename from data/fighters/munitionsShip.json rename to data/craft/munitionsTransport.json index e68dba6..9417b6a 100644 --- a/data/fighters/munitionsShip.json +++ b/data/craft/munitionsTransport.json @@ -1,12 +1,11 @@ { - "name" : "Munitions Ship", + "name" : "Munitions Transport", "health" : 125, "shield" : 0, "speed" : 1.5, "reloadTime" : 10, "shieldRechargeRate" : 0, - "textureName" : "gfx/craft/munitionsShip.png", - "deathType" : "DT_NO_SPIN", + "textureName" : "gfx/craft/munitionsTransport.png", "flags" : "EF_TAKES_DAMAGE", "aiFlags" : "AIF_AVOIDS_COMBAT" } diff --git a/data/fighters/shuttle.json b/data/craft/shuttle.json similarity index 100% rename from data/fighters/shuttle.json rename to data/craft/shuttle.json diff --git a/data/fighters/supplyShip.json b/data/craft/supplyShip.json similarity index 100% rename from data/fighters/supplyShip.json rename to data/craft/supplyShip.json diff --git a/data/fighters/tug.json b/data/craft/tug.json similarity index 100% rename from data/fighters/tug.json rename to data/craft/tug.json diff --git a/data/fighters/list.json b/data/fighters/list.json index 787be24..3920926 100644 --- a/data/fighters/list.json +++ b/data/fighters/list.json @@ -13,9 +13,6 @@ "data/fighters/hyenaA.json", "data/fighters/hyenaB.json", "data/fighters/leopard.json", - "data/fighters/civilian.json", - "data/fighters/tug.json", - "data/fighters/shuttle.json", "data/fighters/kingfisher.json", "data/fighters/mantis.json", "data/fighters/rook.json", @@ -24,8 +21,5 @@ "data/fighters/hammerhead.json", "data/fighters/khepri.json", "data/fighters/cannonDart.json", - "data/fighters/missileDart.json", - "data/fighters/rocketTurret.json", - "data/fighters/supplyShip.json", - "data/fighters/munitionsShip.json" + "data/fighters/missileDart.json" ] diff --git a/data/turrets/list.json b/data/turrets/list.json new file mode 100644 index 0000000..d03a964 --- /dev/null +++ b/data/turrets/list.json @@ -0,0 +1,3 @@ +[ + "data/turrets/rocketTurret.json" +] diff --git a/data/fighters/rocketTurret.json b/data/turrets/rocketTurret.json similarity index 100% rename from data/fighters/rocketTurret.json rename to data/turrets/rocketTurret.json diff --git a/gfx/craft/munitionsShip.png b/gfx/craft/munitionsShip.png index 92b331e021fa9ef1e5d5948530587cd6414d63e1..258c3fc085474c739256c310bef178eab0656271 100644 GIT binary patch literal 4499 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 literal 4554 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 diff --git a/gfx/craft/supplyShip.png b/gfx/craft/supplyShip.png index fb1c72a937b907d6d4c01e444c186151973ecf29..8fd26701642668932dbf173d54bc6f77625da48c 100644 GIT binary patch literal 9691 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 diff --git a/src/battle/fighters.c b/src/battle/fighters.c index f292634..a379222 100644 --- a/src/battle/fighters.c +++ b/src/battle/fighters.c @@ -28,6 +28,7 @@ static void straightDie(void); static void randomizeDart(Entity *dart); static void randomizeDartGuns(Entity *dart); static void loadFighterDef(char *filename); +static void loadFighterDefList(char *filename); static Entity *getFighterDef(char *name); static Entity defHead, *defTail; @@ -596,16 +597,23 @@ static Entity *getFighterDef(char *name) } void loadFighterDefs(void) +{ + memset(&defHead, 0, sizeof(Entity)); + defTail = &defHead; + + loadFighterDefList("data/fighters/list.json"); + loadFighterDefList("data/craft/list.json"); + loadFighterDefList("data/turrets/list.json"); +} + +static void loadFighterDefList(char *filename) { cJSON *root, *node; char *text; - text = readFile(getFileLocation("data/fighters/list.json")); + text = readFile(getFileLocation(filename)); root = cJSON_Parse(text); - memset(&defHead, 0, sizeof(Entity)); - defTail = &defHead; - for (node = root->child ; node != NULL ; node = node->next) { loadFighterDef(node->valuestring);