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

Replaced "Dummy" missions with manual complete flag.

This commit is contained in:
Steve 2016-01-25 15:09:14 +00:00
parent a251459413
commit e31f39d3a9
13 changed files with 17 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/missions/clarke/02 - clarke defence #2.json
View File

@ -5,6 +5,7 @@
"background" : "gfx/backgrounds/background04.jpg",
"planet" : "gfx/planets/bluePlanet.png",
"music" : "music/heroism.ogg",
"manualComplete" : 1,
"objectives" : [
{
"description" : "Destroy INF Dirk",
@ -24,13 +25,6 @@
"targetValue" : 4,
"targetType" : "TT_DESTROY",
"active": 0
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"player" : {

8
data/missions/clarke/03 - clarke defence #3.json
View File

@ -5,6 +5,7 @@
"background" : "gfx/backgrounds/background04.jpg",
"planet" : "gfx/planets/bluePlanet.png",
"music" : "music/heroism.ogg",
"manualComplete" : 1,
"objectives" : [
{
"description" : "Destroy INF Khopesh",
@ -36,13 +37,6 @@
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"isCondition": 1
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"player" : {

8
data/missions/coyote/01 - coyote assault #1.json
View File

@ -5,19 +5,13 @@
"background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/mythos.png",
"music" : "music/heroism.ogg",
"manualComplete" : 1,
"objectives" : [
{
"description" : "Destroy all enemy targets",
"targetName" : "Pandoran",
"targetValue" : 100,
"targetType" : "TT_DESTROY"
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"player" : {

8
data/missions/granada/02 - suspect packages #2.json
View File

@ -5,6 +5,7 @@
"requires" : 4,
"planet" : "gfx/planets/bluePlanet.png",
"music" : "music/determination.mp3",
"manualComplete" : 1,
"objectives" : [
{
"description" : "Check all wayponts",
@ -40,13 +41,6 @@
"targetValue" : 7,
"targetType" : "TT_DESTROY",
"active" : 0
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"player" : {

8
data/missions/granada/03 - suspect packages #3.json
View File

@ -5,6 +5,7 @@
"background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/bluePlanet.png",
"music" : "music/determination.mp3",
"manualComplete" : 1,
"player" : {
"pilot" : "Lt. Cdr. Daniel Carr",
"squadron" : "Iron Patriots",
@ -54,13 +55,6 @@
"targetType" : "TT_DESTROY",
"active" : 0,
"isCondition" : 1
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"fighters" : [

8
data/missions/granada/04 - pirate smash.json
View File

@ -5,6 +5,7 @@
"background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/bluePlanet.png",
"music" : "music/track-4.mp3",
"manualComplete" : 1,
"player" : {
"pilot" : "Lt. Cdr. Daniel Carr",
"squadron" : "Iron Patriots",
@ -31,13 +32,6 @@
"targetName" : "Dart",
"targetValue" : 48,
"targetType" : "TT_DESTROY"
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"fighters" : [

8
data/missions/iliad/04 - iliad defence #4.json
View File

@ -5,6 +5,7 @@
"background" : "gfx/backgrounds/background01.jpg",
"planet" : "gfx/planets/bluePlanet.png",
"music" : "music/heroism.ogg",
"manualComplete" : 1,
"objectives" : [
{
"description" : "Protect UNF Lady Jane Grey",
@ -47,13 +48,6 @@
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"isEliminateAll" : 1
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"player" : {

8
data/missions/temper/05 - pirate uprising #5.json
View File

@ -5,19 +5,13 @@
"background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/spirit.png",
"music" : "music/battleThemeA.mp3",
"manualComplete" : 1,
"objectives" : [
{
"description" : "Destroy all pirate forces",
"targetName" : "Dart",
"targetValue" : 88,
"targetType" : "TT_DESTROY"
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"player" : {

8
data/missions/warro/04 - evacuation #4.json
View File

@ -5,6 +5,7 @@
"background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/oracleIX.png",
"music" : "music/determination.mp3",
"manualComplete" : 1,
"objectives" : [
{
"description" : "Rescue first civilian group",
@ -40,13 +41,6 @@
"targetValue" : 3,
"targetType" : "TT_DESTROY",
"isCondition" : 1
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"player" : {

8
data/missions/warro/05 - evacuation #5.json
View File

@ -5,6 +5,7 @@
"background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/oracleIX.png",
"music" : "music/track-4.mp3",
"manualComplete" : 1,
"objectives" : [
{
"description" : "Destroy INF Thunderbolt",
@ -47,13 +48,6 @@
"targetType" : "TT_DESTROY",
"active" : 0,
"isEliminateAll" : 1
},
{
"description" : "DUMMY",
"targetName" : "DUMMY",
"targetValue" : 1,
"targetType" : "TT_DESTROY",
"active" : 0
}
],
"player" : {

2
src/battle/objectives.c
View File

@ -61,7 +61,7 @@ void doObjectives(void)
if (battle.status == MS_IN_PROGRESS)
{
if (numHiddenObjectives == 0 && battle.numObjectivesTotal > 0 && battle.numObjectivesComplete == battle.numObjectivesTotal)
if (!battle.manualComplete && numHiddenObjectives == 0 && battle.numObjectivesTotal > 0 && battle.numObjectivesComplete == battle.numObjectivesTotal)
{
completeMission();

5
src/galaxy/mission.c
View File

@ -72,6 +72,11 @@ void loadMission(char *filename)
loadEpicData(cJSON_GetObjectItem(root, "epic"));
}
if (cJSON_GetObjectItem(root, "manualComplete"))
{
battle.manualComplete = cJSON_GetObjectItem(root, "manualComplete")->valueint;
}
if (cJSON_GetObjectItem(root, "unwinnable"))
{
battle.unwinnable = cJSON_GetObjectItem(root, "unwinnable")->valueint;

1
src/structs.h
View File

@ -278,6 +278,7 @@ typedef struct {
int epic;
int epicFighterLimit;
int playerSelect;
int manualComplete;
int unwinnable;
int missionFinishedTimer;
int boostTimer;