Trophy updates.

This commit is contained in:
Steve 2016-03-06 17:13:34 +00:00
parent 28ef43b632
commit 721ca3e110
4 changed files with 14 additions and 3 deletions

View File

@ -21,7 +21,8 @@
"id" : "CAMPAIGN_COYOTE", "id" : "CAMPAIGN_COYOTE",
"title" : "Coyote Ugly", "title" : "Coyote Ugly",
"description" : "Complete all missions at Coyote", "description" : "Complete all missions at Coyote",
"value" : "TROPHY_BRONZE" "value" : "TROPHY_BRONZE",
"hidden" : 1
}, },
{ {
"id" : "PANDORAN_FIRST", "id" : "PANDORAN_FIRST",
@ -54,9 +55,9 @@
"value" : "TROPHY_GOLD" "value" : "TROPHY_GOLD"
}, },
{ {
"id" : "FIRE_10000", "id" : "FIRE_100000",
"title" : "Your name's on one of these!", "title" : "Your name's on one of these!",
"description" : "Fire 10,000 shots", "description" : "Fire 100,000 shots",
"value" : "TROPHY_SILVER" "value" : "TROPHY_SILVER"
}, },
{ {
@ -64,5 +65,12 @@
"title" : "Dodge this!", "title" : "Dodge this!",
"description" : "Launch 1,000 missiles", "description" : "Launch 1,000 missiles",
"value" : "TROPHY_SILVER" "value" : "TROPHY_SILVER"
},
{
"id" : "ATAF_DESTROYED",
"title" : "Almost indestructable. Almost.",
"description" : "Be destroyed while piloting an ATAF",
"value" : "TROPHY_BRONZE",
"hidden" : 1
} }
] ]

View File

@ -105,6 +105,7 @@ static void loadTrophyData(char *filename)
STRNCPY(t->title, cJSON_GetObjectItem(node, "title")->valuestring, MAX_DESCRIPTION_LENGTH); STRNCPY(t->title, cJSON_GetObjectItem(node, "title")->valuestring, MAX_DESCRIPTION_LENGTH);
STRNCPY(t->description, cJSON_GetObjectItem(node, "description")->valuestring, MAX_DESCRIPTION_LENGTH); STRNCPY(t->description, cJSON_GetObjectItem(node, "description")->valuestring, MAX_DESCRIPTION_LENGTH);
t->value = lookup(cJSON_GetObjectItem(node, "value")->valuestring); t->value = lookup(cJSON_GetObjectItem(node, "value")->valuestring);
t->hidden = getJSONValue(node, "hidden", 0);
tail->next = t; tail->next = t;
tail = t; tail = t;

View File

@ -25,5 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern long lookup(char *name); extern long lookup(char *name);
extern char *readFile(char *filename); extern char *readFile(char *filename);
extern int getJSONValue(cJSON *node, char *name, int defValue);
extern Game game; extern Game game;

View File

@ -346,6 +346,7 @@ struct Trophy {
char title[MAX_DESCRIPTION_LENGTH]; char title[MAX_DESCRIPTION_LENGTH];
char description[MAX_DESCRIPTION_LENGTH]; char description[MAX_DESCRIPTION_LENGTH];
int value; int value;
int hidden;
int awarded; int awarded;
unsigned long awardDate; unsigned long awardDate;
int notify; int notify;