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

Added ALL_OBJECTIVES_COMPLETE script command.

This commit is contained in:
Steve 2016-02-25 10:52:01 +00:00
parent 239845a279
commit e79d331599
12 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 3", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 1", "WAIT 1",
"MSG_BOX Carlyle;This is Carlyle. Enemy corvette has been destroyed. All other fighters scratched.", "MSG_BOX Carlyle;This is Carlyle. Enemy corvette has been destroyed. All other fighters scratched.",

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

@ -135,7 +135,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 4", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 1", "WAIT 1",
"MSG_BOX Carlyle;This is Carlyle. Enemy targets have been eliminated. Cleopatra still in one piece.", "MSG_BOX Carlyle;This is Carlyle. Enemy targets have been eliminated. Cleopatra still in one piece.",

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

@ -139,7 +139,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 1", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 1", "WAIT 1",
"MSG_BOX de Winter;Griffin, this is de Winter. All targets destroyed.", "MSG_BOX de Winter;Griffin, this is de Winter. All targets destroyed.",

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

@ -162,7 +162,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 4", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 2", "WAIT 2",
"MSG_BOX Carr;Alexandria, packaged delivered.", "MSG_BOX Carr;Alexandria, packaged delivered.",

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

@ -144,7 +144,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 5", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 2", "WAIT 2",
"MSG_BOX Carr;This is Carr, reporting operation successful. Bagged us two squadron commanders.", "MSG_BOX Carr;This is Carr, reporting operation successful. Bagged us two squadron commanders.",

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

@ -123,7 +123,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 3", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 2", "WAIT 2",
"MSG_BOX Carr;This is Carr. Reporting threat eliminated, operation successful.", "MSG_BOX Carr;This is Carr. Reporting threat eliminated, operation successful.",

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

@ -259,7 +259,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 4", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 2", "WAIT 2",
"MSG_BOX Williams;Control, this is Williams. Enemy capital ships have been destroyed, along with all other forces.", "MSG_BOX Williams;Control, this is Williams. Enemy capital ships have been destroyed, along with all other forces.",

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

@ -117,7 +117,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 1", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 2", "WAIT 2",
"MSG_BOX Strickland; Looks like that was the last of 'em.", "MSG_BOX Strickland; Looks like that was the last of 'em.",

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

@ -223,7 +223,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 4", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 1", "WAIT 1",
"MSG_BOX de Winter;Control, this is de Winter. All enemy forces have been destroyed.", "MSG_BOX de Winter;Control, this is de Winter. All enemy forces have been destroyed.",

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

@ -205,7 +205,7 @@
] ]
}, },
{ {
"function" : "OBJECTIVES_COMPLETE 5", "function" : "ALL_OBJECTIVES_COMPLETE",
"lines" : [ "lines" : [
"WAIT 2", "WAIT 2",
"MSG_BOX Taylor;Leviathan, this is Taylor. All targets have been eliminated.", "MSG_BOX Taylor;Leviathan, this is Taylor. All targets have been eliminated.",

4
src/battle/battle.c
View File

@ -135,6 +135,8 @@ static void doBattle(void)
battle.planet.x -= ssx * 0.05; battle.planet.x -= ssx * 0.05;
battle.planet.y -= ssy * 0.05; battle.planet.y -= ssy * 0.05;
doObjectives();
doHud(); doHud();
doStars(ssx, ssy); doStars(ssx, ssy);
@ -149,8 +151,6 @@ static void doBattle(void)
doPlayer(); doPlayer();
doObjectives();
if (player != NULL) if (player != NULL)
{ {
doLocations(); doLocations();

9
src/battle/objectives.c
View File

@ -101,13 +101,20 @@ void updateObjective(char *name, int type)
if (o->currentValue == o->targetValue) if (o->currentValue == o->targetValue)
{ {
completed++;
o->status = OS_COMPLETE; o->status = OS_COMPLETE;
addHudMessage(colors.green, "%s - Objective Complete!", o->description); addHudMessage(colors.green, "%s - Objective Complete!", o->description);
runScriptFunction(o->description); runScriptFunction(o->description);
runScriptFunction("OBJECTIVES_COMPLETE %d", ++completed); runScriptFunction("OBJECTIVES_COMPLETE %d", completed);
if (completed == battle.numObjectivesTotal)
{
runScriptFunction("ALL_OBJECTIVES_COMPLETE");
}
} }
} }