From 444ffaeffaf5176de857d2211ee5859d09079a35 Mon Sep 17 00:00:00 2001 From: Steve Date: Sun, 22 Nov 2015 16:57:53 +0000 Subject: [PATCH] Double health / shield values of all craft. --- data/fighters/ataf.json | 2 +- data/fighters/civilian.json | 2 +- data/fighters/dart.json | 2 +- data/fighters/firefly.json | 4 ++-- data/fighters/hammerhead.json | 4 ++-- data/fighters/hyenaA.json | 4 ++-- data/fighters/hyenaB.json | 4 ++-- data/fighters/jackal.json | 4 ++-- data/fighters/khepri.json | 4 ++-- data/fighters/kingfisher.json | 4 ++-- data/fighters/leopard.json | 4 ++-- data/fighters/mantis.json | 4 ++-- data/fighters/nymph.json | 4 ++-- data/fighters/ray.json | 4 ++-- data/fighters/rook.json | 4 ++-- data/fighters/scarab.json | 4 ++-- data/fighters/shuttle.json | 4 ++-- data/fighters/simpleDart.json | 2 +- data/fighters/sphinx.json | 4 ++-- data/fighters/staticDart.json | 2 +- data/fighters/taf.json | 4 ++-- data/fighters/thunderhead.json | 4 ++-- data/fighters/tug.json | 2 +- data/fighters/unarmedDart.json | 2 +- src/battle/fighters.c | 4 ++-- 25 files changed, 43 insertions(+), 43 deletions(-) diff --git a/data/fighters/ataf.json b/data/fighters/ataf.json index 4312778..4fda35b 100644 --- a/data/fighters/ataf.json +++ b/data/fighters/ataf.json @@ -1,6 +1,6 @@ { "name" : "ATAF", - "health" : 75, + "health" : 150, "shield" : 2500, "speed" : 2.5, "reloadTime" : 8, diff --git a/data/fighters/civilian.json b/data/fighters/civilian.json index c4df807..70dfd78 100644 --- a/data/fighters/civilian.json +++ b/data/fighters/civilian.json @@ -1,6 +1,6 @@ { "name" : "Civilian", - "health" : 10, + "health" : 20, "shield" : 0, "speed" : 2, "reloadTime" : 0, diff --git a/data/fighters/dart.json b/data/fighters/dart.json index 21ba942..57a37c1 100644 --- a/data/fighters/dart.json +++ b/data/fighters/dart.json @@ -1,6 +1,6 @@ { "name" : "Dart", - "health" : 10, + "health" : 20, "shield" : 0, "speed" : 2.25, "reloadTime" : 24, diff --git a/data/fighters/firefly.json b/data/fighters/firefly.json index 1866be8..78b82b1 100644 --- a/data/fighters/firefly.json +++ b/data/fighters/firefly.json @@ -1,7 +1,7 @@ { "name" : "Firefly", - "health" : 35, - "shield" : 35, + "health" : 70, + "shield" : 70, "speed" : 1.9, "reloadTime" : 25, "shieldRechargeRate" : 30, diff --git a/data/fighters/hammerhead.json b/data/fighters/hammerhead.json index 84a1594..2b099aa 100644 --- a/data/fighters/hammerhead.json +++ b/data/fighters/hammerhead.json @@ -1,7 +1,7 @@ { "name" : "Hammerhead", - "health" : 40, - "shield" : 35, + "health" : 80, + "shield" : 70, "speed" : 1.5, "reloadTime" : 25, "shieldRechargeRate" : 60, diff --git a/data/fighters/hyenaA.json b/data/fighters/hyenaA.json index 19bdf97..465b38a 100644 --- a/data/fighters/hyenaA.json +++ b/data/fighters/hyenaA.json @@ -1,7 +1,7 @@ { "name" : "Hyena-A", - "health" : 60, - "shield" : 30, + "health" : 120, + "shield" : 60, "speed" : 1.85, "reloadTime" : 15, "shieldRechargeRate" : 40, diff --git a/data/fighters/hyenaB.json b/data/fighters/hyenaB.json index be48eae..fe33b7c 100644 --- a/data/fighters/hyenaB.json +++ b/data/fighters/hyenaB.json @@ -1,7 +1,7 @@ { "name" : "Hyena-B", - "health" : 60, - "shield" : 30, + "health" : 120, + "shield" : 60, "speed" : 1.85, "reloadTime" : 15, "shieldRechargeRate" : 40, diff --git a/data/fighters/jackal.json b/data/fighters/jackal.json index e2c16dd..0d3200d 100644 --- a/data/fighters/jackal.json +++ b/data/fighters/jackal.json @@ -1,7 +1,7 @@ { "name" : "Jackal", - "health" : 50, - "shield" : 50, + "health" : 100, + "shield" : 100, "speed" : 2, "reloadTime" : 14, "shieldRechargeRate" : 45, diff --git a/data/fighters/khepri.json b/data/fighters/khepri.json index f55b8d4..a55acd5 100644 --- a/data/fighters/khepri.json +++ b/data/fighters/khepri.json @@ -1,7 +1,7 @@ { "name" : "Khepri", - "health" : 40, - "shield" : 35, + "health" : 80, + "shield" : 70, "speed" : 1.5, "reloadTime" : 25, "shieldRechargeRate" : 60, diff --git a/data/fighters/kingfisher.json b/data/fighters/kingfisher.json index d3857a5..a47d47f 100644 --- a/data/fighters/kingfisher.json +++ b/data/fighters/kingfisher.json @@ -1,7 +1,7 @@ { "name" : "Kingfisher", - "health" : 45, - "shield" : 45, + "health" : 90, + "shield" : 90, "speed" : 1.75, "reloadTime" : 16, "shieldRechargeRate" : 60, diff --git a/data/fighters/leopard.json b/data/fighters/leopard.json index 63b36c8..47f1be0 100644 --- a/data/fighters/leopard.json +++ b/data/fighters/leopard.json @@ -1,7 +1,7 @@ { "name" : "Leopard", - "health" : 100, - "shield" : 75, + "health" : 200, + "shield" : 150, "speed" : 1.6, "reloadTime" : 16, "shieldRechargeRate" : 70, diff --git a/data/fighters/mantis.json b/data/fighters/mantis.json index 16226df..b2ee49b 100644 --- a/data/fighters/mantis.json +++ b/data/fighters/mantis.json @@ -1,7 +1,7 @@ { "name" : "Mantis", - "health" : 35, - "shield" : 50, + "health" : 70, + "shield" : 100, "speed" : 1.9, "reloadTime" : 25, "shieldRechargeRate" : 35, diff --git a/data/fighters/nymph.json b/data/fighters/nymph.json index 50b2e2c..687f413 100644 --- a/data/fighters/nymph.json +++ b/data/fighters/nymph.json @@ -1,7 +1,7 @@ { "name" : "Nymph", - "health" : 30, - "shield" : 25, + "health" : 60, + "shield" : 50, "speed" : 2.1, "reloadTime" : 14, "shieldRechargeRate" : 30, diff --git a/data/fighters/ray.json b/data/fighters/ray.json index ffd7489..2bc4f13 100644 --- a/data/fighters/ray.json +++ b/data/fighters/ray.json @@ -1,7 +1,7 @@ { "name" : "Ray", - "health" : 45, - "shield" : 45, + "health" : 90, + "shield" : 90, "speed" : 1.75, "reloadTime" : 16, "shieldRechargeRate" : 60, diff --git a/data/fighters/rook.json b/data/fighters/rook.json index e9aa865..1a6f533 100644 --- a/data/fighters/rook.json +++ b/data/fighters/rook.json @@ -1,7 +1,7 @@ { "name" : "Rook", - "health" : 75, - "shield" : 55, + "health" : 150, + "shield" : 110, "speed" : 1.6, "reloadTime" : 12, "shieldRechargeRate" : 45, diff --git a/data/fighters/scarab.json b/data/fighters/scarab.json index a839e1d..9f7ec09 100644 --- a/data/fighters/scarab.json +++ b/data/fighters/scarab.json @@ -1,7 +1,7 @@ { "name" : "Scarab", - "health" : 125, - "shield" : 35, + "health" : 250, + "shield" : 70, "speed" : 1.5, "reloadTime" : 25, "shieldRechargeRate" : 60, diff --git a/data/fighters/shuttle.json b/data/fighters/shuttle.json index 88b7805..a1f0b3a 100644 --- a/data/fighters/shuttle.json +++ b/data/fighters/shuttle.json @@ -1,7 +1,7 @@ { "name" : "Shuttle", - "health" : 10, - "shield" : 10, + "health" : 20, + "shield" : 20, "speed" : 1.9, "reloadTime" : 0, "shieldRechargeRate" : 60, diff --git a/data/fighters/simpleDart.json b/data/fighters/simpleDart.json index 5590074..8288fed 100644 --- a/data/fighters/simpleDart.json +++ b/data/fighters/simpleDart.json @@ -1,6 +1,6 @@ { "name" : "SimpleDart", - "health" : 10, + "health" : 20, "shield" : 0, "speed" : 2.25, "reloadTime" : 24, diff --git a/data/fighters/sphinx.json b/data/fighters/sphinx.json index f0e6666..1b1862d 100644 --- a/data/fighters/sphinx.json +++ b/data/fighters/sphinx.json @@ -1,7 +1,7 @@ { "name" : "Sphinx", - "health" : 75, - "shield" : 50, + "health" : 150, + "shield" : 100, "speed" : 1.5, "reloadTime" : 14, "shieldRechargeRate" : 60, diff --git a/data/fighters/staticDart.json b/data/fighters/staticDart.json index b0a493c..d4dd6ae 100644 --- a/data/fighters/staticDart.json +++ b/data/fighters/staticDart.json @@ -1,6 +1,6 @@ { "name" : "StaticDart", - "health" : 10, + "health" : 20, "shield" : 0, "speed" : 0, "reloadTime" : 24, diff --git a/data/fighters/taf.json b/data/fighters/taf.json index a84b3b1..af2a112 100644 --- a/data/fighters/taf.json +++ b/data/fighters/taf.json @@ -1,7 +1,7 @@ { "name" : "TAF", - "health" : 25, - "shield" : 25, + "health" : 50, + "shield" : 50, "speed" : 2, "reloadTime" : 16, "shieldRechargeRate" : 50, diff --git a/data/fighters/thunderhead.json b/data/fighters/thunderhead.json index 02dac9a..d30bd16 100644 --- a/data/fighters/thunderhead.json +++ b/data/fighters/thunderhead.json @@ -1,7 +1,7 @@ { "name" : "Thunderhead", - "health" : 60, - "shield" : 45, + "health" : 120, + "shield" : 90, "speed" : 1.5, "reloadTime" : 12, "shieldRechargeRate" : 65, diff --git a/data/fighters/tug.json b/data/fighters/tug.json index 47251a3..baf9383 100644 --- a/data/fighters/tug.json +++ b/data/fighters/tug.json @@ -1,6 +1,6 @@ { "name" : "Tug", - "health" : 35, + "health" : 70, "shield" : 0, "speed" : 1.8, "reloadTime" : 10, diff --git a/data/fighters/unarmedDart.json b/data/fighters/unarmedDart.json index 95c8572..cfc1e1d 100644 --- a/data/fighters/unarmedDart.json +++ b/data/fighters/unarmedDart.json @@ -1,6 +1,6 @@ { "name" : "UnarmedDart", - "health" : 10, + "health" : 20, "shield" : 0, "speed" : 2.25, "reloadTime" : 24, diff --git a/src/battle/fighters.c b/src/battle/fighters.c index 17963e1..d2973ee 100644 --- a/src/battle/fighters.c +++ b/src/battle/fighters.c @@ -624,8 +624,8 @@ static void loadFighterDef(char *filename) STRNCPY(f->name, cJSON_GetObjectItem(root, "name")->valuestring, MAX_NAME_LENGTH); STRNCPY(f->defName, cJSON_GetObjectItem(root, "name")->valuestring, MAX_NAME_LENGTH); - f->health = f->maxHealth = cJSON_GetObjectItem(root, "health")->valueint * 2; - f->shield = f->maxShield = cJSON_GetObjectItem(root, "shield")->valueint * 2; + f->health = f->maxHealth = cJSON_GetObjectItem(root, "health")->valueint; + f->shield = f->maxShield = cJSON_GetObjectItem(root, "shield")->valueint; f->speed = cJSON_GetObjectItem(root, "speed")->valuedouble; f->reloadTime = cJSON_GetObjectItem(root, "reloadTime")->valueint; f->shieldRechargeRate = cJSON_GetObjectItem(root, "shieldRechargeRate")->valueint;