walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Double health / shield values of all craft.

This commit is contained in:
Steve 2015-11-22 16:57:53 +00:00
parent 84e0b88d00
commit 444ffaeffa
25 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/fighters/ataf.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "ATAF", "name" : "ATAF",
"health" : 75, "health" : 150,
"shield" : 2500, "shield" : 2500,
"speed" : 2.5, "speed" : 2.5,
"reloadTime" : 8, "reloadTime" : 8,

2
data/fighters/civilian.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "Civilian", "name" : "Civilian",
"health" : 10, "health" : 20,
"shield" : 0, "shield" : 0,
"speed" : 2, "speed" : 2,
"reloadTime" : 0, "reloadTime" : 0,

2
data/fighters/dart.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "Dart", "name" : "Dart",
"health" : 10, "health" : 20,
"shield" : 0, "shield" : 0,
"speed" : 2.25, "speed" : 2.25,
"reloadTime" : 24, "reloadTime" : 24,

4
data/fighters/firefly.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Firefly", "name" : "Firefly",
"health" : 35, "health" : 70,
"shield" : 35, "shield" : 70,
"speed" : 1.9, "speed" : 1.9,
"reloadTime" : 25, "reloadTime" : 25,
"shieldRechargeRate" : 30, "shieldRechargeRate" : 30,

4
data/fighters/hammerhead.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Hammerhead", "name" : "Hammerhead",
"health" : 40, "health" : 80,
"shield" : 35, "shield" : 70,
"speed" : 1.5, "speed" : 1.5,
"reloadTime" : 25, "reloadTime" : 25,
"shieldRechargeRate" : 60, "shieldRechargeRate" : 60,

4
data/fighters/hyenaA.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Hyena-A", "name" : "Hyena-A",
"health" : 60, "health" : 120,
"shield" : 30, "shield" : 60,
"speed" : 1.85, "speed" : 1.85,
"reloadTime" : 15, "reloadTime" : 15,
"shieldRechargeRate" : 40, "shieldRechargeRate" : 40,

4
data/fighters/hyenaB.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Hyena-B", "name" : "Hyena-B",
"health" : 60, "health" : 120,
"shield" : 30, "shield" : 60,
"speed" : 1.85, "speed" : 1.85,
"reloadTime" : 15, "reloadTime" : 15,
"shieldRechargeRate" : 40, "shieldRechargeRate" : 40,

4
data/fighters/jackal.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Jackal", "name" : "Jackal",
"health" : 50, "health" : 100,
"shield" : 50, "shield" : 100,
"speed" : 2, "speed" : 2,
"reloadTime" : 14, "reloadTime" : 14,
"shieldRechargeRate" : 45, "shieldRechargeRate" : 45,

4
data/fighters/khepri.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Khepri", "name" : "Khepri",
"health" : 40, "health" : 80,
"shield" : 35, "shield" : 70,
"speed" : 1.5, "speed" : 1.5,
"reloadTime" : 25, "reloadTime" : 25,
"shieldRechargeRate" : 60, "shieldRechargeRate" : 60,

4
data/fighters/kingfisher.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Kingfisher", "name" : "Kingfisher",
"health" : 45, "health" : 90,
"shield" : 45, "shield" : 90,
"speed" : 1.75, "speed" : 1.75,
"reloadTime" : 16, "reloadTime" : 16,
"shieldRechargeRate" : 60, "shieldRechargeRate" : 60,

4
data/fighters/leopard.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Leopard", "name" : "Leopard",
"health" : 100, "health" : 200,
"shield" : 75, "shield" : 150,
"speed" : 1.6, "speed" : 1.6,
"reloadTime" : 16, "reloadTime" : 16,
"shieldRechargeRate" : 70, "shieldRechargeRate" : 70,

4
data/fighters/mantis.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Mantis", "name" : "Mantis",
"health" : 35, "health" : 70,
"shield" : 50, "shield" : 100,
"speed" : 1.9, "speed" : 1.9,
"reloadTime" : 25, "reloadTime" : 25,
"shieldRechargeRate" : 35, "shieldRechargeRate" : 35,

4
data/fighters/nymph.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Nymph", "name" : "Nymph",
"health" : 30, "health" : 60,
"shield" : 25, "shield" : 50,
"speed" : 2.1, "speed" : 2.1,
"reloadTime" : 14, "reloadTime" : 14,
"shieldRechargeRate" : 30, "shieldRechargeRate" : 30,

4
data/fighters/ray.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Ray", "name" : "Ray",
"health" : 45, "health" : 90,
"shield" : 45, "shield" : 90,
"speed" : 1.75, "speed" : 1.75,
"reloadTime" : 16, "reloadTime" : 16,
"shieldRechargeRate" : 60, "shieldRechargeRate" : 60,

4
data/fighters/rook.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Rook", "name" : "Rook",
"health" : 75, "health" : 150,
"shield" : 55, "shield" : 110,
"speed" : 1.6, "speed" : 1.6,
"reloadTime" : 12, "reloadTime" : 12,
"shieldRechargeRate" : 45, "shieldRechargeRate" : 45,

4
data/fighters/scarab.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Scarab", "name" : "Scarab",
"health" : 125, "health" : 250,
"shield" : 35, "shield" : 70,
"speed" : 1.5, "speed" : 1.5,
"reloadTime" : 25, "reloadTime" : 25,
"shieldRechargeRate" : 60, "shieldRechargeRate" : 60,

4
data/fighters/shuttle.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Shuttle", "name" : "Shuttle",
"health" : 10, "health" : 20,
"shield" : 10, "shield" : 20,
"speed" : 1.9, "speed" : 1.9,
"reloadTime" : 0, "reloadTime" : 0,
"shieldRechargeRate" : 60, "shieldRechargeRate" : 60,

2
data/fighters/simpleDart.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "SimpleDart", "name" : "SimpleDart",
"health" : 10, "health" : 20,
"shield" : 0, "shield" : 0,
"speed" : 2.25, "speed" : 2.25,
"reloadTime" : 24, "reloadTime" : 24,

4
data/fighters/sphinx.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Sphinx", "name" : "Sphinx",
"health" : 75, "health" : 150,
"shield" : 50, "shield" : 100,
"speed" : 1.5, "speed" : 1.5,
"reloadTime" : 14, "reloadTime" : 14,
"shieldRechargeRate" : 60, "shieldRechargeRate" : 60,

2
data/fighters/staticDart.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "StaticDart", "name" : "StaticDart",
"health" : 10, "health" : 20,
"shield" : 0, "shield" : 0,
"speed" : 0, "speed" : 0,
"reloadTime" : 24, "reloadTime" : 24,

4
data/fighters/taf.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "TAF", "name" : "TAF",
"health" : 25, "health" : 50,
"shield" : 25, "shield" : 50,
"speed" : 2, "speed" : 2,
"reloadTime" : 16, "reloadTime" : 16,
"shieldRechargeRate" : 50, "shieldRechargeRate" : 50,

4
data/fighters/thunderhead.json
View File

@ -1,7 +1,7 @@
{ {
"name" : "Thunderhead", "name" : "Thunderhead",
"health" : 60, "health" : 120,
"shield" : 45, "shield" : 90,
"speed" : 1.5, "speed" : 1.5,
"reloadTime" : 12, "reloadTime" : 12,
"shieldRechargeRate" : 65, "shieldRechargeRate" : 65,

2
data/fighters/tug.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "Tug", "name" : "Tug",
"health" : 35, "health" : 70,
"shield" : 0, "shield" : 0,
"speed" : 1.8, "speed" : 1.8,
"reloadTime" : 10, "reloadTime" : 10,

2
data/fighters/unarmedDart.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "UnarmedDart", "name" : "UnarmedDart",
"health" : 10, "health" : 20,
"shield" : 0, "shield" : 0,
"speed" : 2.25, "speed" : 2.25,
"reloadTime" : 24, "reloadTime" : 24,

4
src/battle/fighters.c
View File

@ -624,8 +624,8 @@ static void loadFighterDef(char *filename)
STRNCPY(f->name, cJSON_GetObjectItem(root, "name")->valuestring, MAX_NAME_LENGTH); STRNCPY(f->name, cJSON_GetObjectItem(root, "name")->valuestring, MAX_NAME_LENGTH);
STRNCPY(f->defName, 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->health = f->maxHealth = cJSON_GetObjectItem(root, "health")->valueint;
f->shield = f->maxShield = cJSON_GetObjectItem(root, "shield")->valueint * 2; f->shield = f->maxShield = cJSON_GetObjectItem(root, "shield")->valueint;
f->speed = cJSON_GetObjectItem(root, "speed")->valuedouble; f->speed = cJSON_GetObjectItem(root, "speed")->valuedouble;
f->reloadTime = cJSON_GetObjectItem(root, "reloadTime")->valueint; f->reloadTime = cJSON_GetObjectItem(root, "reloadTime")->valueint;
f->shieldRechargeRate = cJSON_GetObjectItem(root, "shieldRechargeRate")->valueint; f->shieldRechargeRate = cJSON_GetObjectItem(root, "shieldRechargeRate")->valueint;