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

Added ability to hide objective numbers.

This commit is contained in:
Steve 2016-03-16 19:24:41 +00:00
parent 50cde212f4
commit 1b43e4908c
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/missions/clarke/05 - clarke defence #5.json
View File

@ -31,13 +31,15 @@
"targetName" : "swarmers-1", "targetName" : "swarmers-1",
"targetValue" : 24, "targetValue" : 24,
"targetType" : "TT_DESTROY", "targetType" : "TT_DESTROY",
"hideNumbers" : 1,
"active" : 0 "active" : 0
}, },
{ {
"description" : "Eliminate Swarmers", "description" : "Eliminate Swarmers",
"targetName" : "Swarmer", "targetName" : "Swarmer",
"targetValue" : 50, "targetValue" : 80,
"targetType" : "TT_DESTROY", "targetType" : "TT_DESTROY",
"hideNumbers" : 1,
"active" : 0 "active" : 0
} }
], ],
@ -118,9 +120,9 @@
"name" : "SwarmerSpawner", "name" : "SwarmerSpawner",
"types" : "Swarmer", "types" : "Swarmer",
"side" : "SIDE_PANDORAN", "side" : "SIDE_PANDORAN",
"interval" : 1, "interval" : 2,
"total" : 50, "total" : 80,
"step" : 1, "step" : 3,
"offscreen" : 1, "offscreen" : 1,
"active" : 0 "active" : 0
} }

2
src/battle/missionInfo.c
View File

@ -142,7 +142,7 @@ static void drawObjectives(void)
} }
drawText(SCREEN_WIDTH / 2 - 100, y, 22, TA_RIGHT, colors.white, o->description); drawText(SCREEN_WIDTH / 2 - 100, y, 22, TA_RIGHT, colors.white, o->description);
if (o->targetValue > 1 && !o->isCondition) if (o->targetValue > 1 && !o->isCondition && !o->hideNumbers)
{ {
drawText(SCREEN_WIDTH / 2, y, 22, TA_CENTER, colors.white, "%d / %d", o->currentValue, o->targetValue); drawText(SCREEN_WIDTH / 2, y, 22, TA_CENTER, colors.white, "%d / %d", o->currentValue, o->targetValue);
} }

15
src/battle/objectives.c
View File

@ -88,13 +88,16 @@ void updateObjective(char *name, int type)
{ {
o->currentValue++; o->currentValue++;
if (o->targetValue - o->currentValue <= 10) if (!o->hideNumbers)
{ {
addHudMessage(colors.cyan, "%s - %d / %d", o->description, o->currentValue, o->targetValue); if (o->targetValue - o->currentValue <= 10)
} {
else if (o->currentValue % 10 == 0) addHudMessage(colors.cyan, "%s - %d / %d", o->description, o->currentValue, o->targetValue);
{ }
addHudMessage(colors.cyan, "%s - %d / %d", o->description, o->currentValue, o->targetValue); else if (o->currentValue % 10 == 0)
{
addHudMessage(colors.cyan, "%s - %d / %d", o->description, o->currentValue, o->targetValue);
}
} }
if (o->currentValue == o->targetValue) if (o->currentValue == o->targetValue)

3
src/galaxy/mission.c
View File

@ -336,8 +336,9 @@ static void loadObjectives(cJSON *node)
o->targetType = lookup(cJSON_GetObjectItem(node, "targetType")->valuestring); o->targetType = lookup(cJSON_GetObjectItem(node, "targetType")->valuestring);
o->active = getJSONValue(node, "active", 1); o->active = getJSONValue(node, "active", 1);
o->isCondition = getJSONValue(node, "isCondition", 0); o->isCondition = getJSONValue(node, "isCondition", 0);
o->isEliminateAll = getJSONValue(node, "isEliminateAll", 0); o->isEliminateAll = getJSONValue(node, "isEliminateAll", 0);
o->hideNumbers = getJSONValue(node, "hideNumbers", 0);
if (o->isEliminateAll) if (o->isEliminateAll)
{ {
o->targetValue = 1; o->targetValue = 1;

1
src/structs.h
View File

@ -235,6 +235,7 @@ struct Objective {
int status; int status;
int isCondition; int isCondition;
int isEliminateAll; int isEliminateAll;
int hideNumbers;
Objective *next; Objective *next;
}; };