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

Added AUTO option for music. Reorganised music for easier scanning.

This commit is contained in:
Steve 2016-03-03 16:16:12 +00:00
parent 92a9cd7ce6
commit c8dd06dcdc
66 changed files with 158 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -9,7 +9,7 @@ vpath %.h $(SEARCHPATH)
DEPS += defs.h structs.h DEPS += defs.h structs.h
OBJS += ai.o OBJS += ai.o
OBJS += background.o battle.o bullets.o OBJS += battle.o bullets.o
OBJS += capitalShips.o challengeHome.o challenges.o cJSON.o OBJS += capitalShips.o challengeHome.o challenges.o cJSON.o
OBJS += debris.o dev.o draw.o OBJS += debris.o dev.o draw.o
OBJS += effects.o entities.o extractionPoint.o OBJS += effects.o entities.o extractionPoint.o
@ -22,7 +22,7 @@ OBJS += main.o messageBox.o mission.o missionInfo.o modalDialog.o
OBJS += objectives.o options.o OBJS += objectives.o options.o
OBJS += player.o OBJS += player.o
OBJS += quadtree.o OBJS += quadtree.o
OBJS += radar.o rope.o OBJS += radar.o resources.o rope.o
OBJS += save.o script.o sound.o starfield.o starSystems.o stats.o OBJS += save.o script.o sound.o starfield.o starSystems.o stats.o
OBJS += testMission.o textures.o text.o title.o transition.o OBJS += testMission.o textures.o text.o title.o transition.o
OBJS += util.o OBJS += util.o

2
data/challenges/01.json
View File

@ -3,7 +3,7 @@
"description" : "Destroy all Darts", "description" : "Destroy all Darts",
"background" : "AUTO", "background" : "AUTO",
"planet" : "AUTO", "planet" : "AUTO",
"music" : "", "music" : "AUTO",
"player" : { "player" : {
"type" : "Nymph", "type" : "Nymph",
"side" : "SIDE_ALLIES", "side" : "SIDE_ALLIES",

2
data/challenges/02.json
View File

@ -3,7 +3,7 @@
"description" : "Destroy all Darts", "description" : "Destroy all Darts",
"background" : "AUTO", "background" : "AUTO",
"planet" : "AUTO", "planet" : "AUTO",
"music" : "", "music" : "AUTO",
"player" : { "player" : {
"type" : "Nymph", "type" : "Nymph",
"side" : "SIDE_ALLIES", "side" : "SIDE_ALLIES",

2
data/challenges/03.json
View File

@ -3,7 +3,7 @@
"description" : "Destroy all Darts", "description" : "Destroy all Darts",
"background" : "AUTO", "background" : "AUTO",
"planet" : "AUTO", "planet" : "AUTO",
"music" : "", "music" : "AUTO",
"player" : { "player" : {
"type" : "Nymph", "type" : "Nymph",
"side" : "SIDE_ALLIES", "side" : "SIDE_ALLIES",

2
data/challenges/04.json
View File

@ -3,7 +3,7 @@
"description" : "Destroy all Lynxes", "description" : "Destroy all Lynxes",
"background" : "AUTO", "background" : "AUTO",
"planet" : "AUTO", "planet" : "AUTO",
"music" : "", "music" : "AUTO",
"player" : { "player" : {
"type" : "Ray", "type" : "Ray",
"side" : "SIDE_ALLIES", "side" : "SIDE_ALLIES",

2
data/challenges/05.json
View File

@ -3,7 +3,7 @@
"description" : "Disable all targets", "description" : "Disable all targets",
"background" : "AUTO", "background" : "AUTO",
"planet" : "AUTO", "planet" : "AUTO",
"music" : "", "music" : "AUTO",
"player" : { "player" : {
"type" : "Hyena-A", "type" : "Hyena-A",
"side" : "SIDE_ALLIES", "side" : "SIDE_ALLIES",

2
data/challenges/06.json
View File

@ -3,7 +3,7 @@
"description" : "60 second battle", "description" : "60 second battle",
"background" : "AUTO", "background" : "AUTO",
"planet" : "AUTO", "planet" : "AUTO",
"music" : "", "music" : "AUTO",
"player" : { "player" : {
"type" : "Hammerhead", "type" : "Hammerhead",
"side" : "SIDE_ALLIES", "side" : "SIDE_ALLIES",

2
data/missions/alba/01 - patrol #1.json
View File

@ -4,7 +4,7 @@
"requires" : 8, "requires" : 8,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/torelli.png", "planet" : "gfx/planets/torelli.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

2
data/missions/alba/02 - patrol #2.json
View File

@ -4,7 +4,7 @@
"requires" : 13, "requires" : 13,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/torelli.png", "planet" : "gfx/planets/torelli.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

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

@ -4,7 +4,7 @@
"requires" : 4, "requires" : 4,
"background" : "gfx/backgrounds/background04.jpg", "background" : "gfx/backgrounds/background04.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"epic" : { "epic" : {
"fighterLimit" : 12 "fighterLimit" : 12
}, },

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

@ -4,7 +4,7 @@
"requires" : 12, "requires" : 12,
"background" : "gfx/backgrounds/background04.jpg", "background" : "gfx/backgrounds/background04.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

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

@ -4,7 +4,7 @@
"requires" : 18, "requires" : 18,
"background" : "gfx/backgrounds/background04.jpg", "background" : "gfx/backgrounds/background04.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

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

@ -4,7 +4,7 @@
"requires" : 2, "requires" : 2,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/mythos.png", "planet" : "gfx/planets/mythos.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

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

@ -4,7 +4,7 @@
"requires" : 4, "requires" : 4,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/mythos.png", "planet" : "gfx/planets/mythos.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"epic" : { "epic" : {
"fighterLimit" : 12 "fighterLimit" : 12
}, },

2
data/missions/coyote/03 - coyote assault #3.json
View File

@ -4,7 +4,7 @@
"requires" : 8, "requires" : 8,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/mythos.png", "planet" : "gfx/planets/mythos.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"epic" : { "epic" : {
"fighterLimit" : 12 "fighterLimit" : 12
}, },

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

@ -4,7 +4,7 @@
"requires" : 3, "requires" : 3,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/determination.mp3", "music" : "music/battle/determination.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Retrieve all packages", "description" : "Retrieve all packages",

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

@ -4,7 +4,7 @@
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"requires" : 4, "requires" : 4,
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/determination.mp3", "music" : "music/battle/determination.mp3",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

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

@ -4,7 +4,7 @@
"requires" : 12, "requires" : 12,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/determination.mp3", "music" : "music/battle/determination.mp3",
"manualComplete" : 1, "manualComplete" : 1,
"player" : { "player" : {
"pilot" : "Lt. Cdr. Daniel Carr", "pilot" : "Lt. Cdr. Daniel Carr",

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

@ -4,7 +4,7 @@
"requires" : 17, "requires" : 17,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/track-4.mp3", "music" : "music/battle/track-4.mp3",
"manualComplete" : 1, "manualComplete" : 1,
"player" : { "player" : {
"pilot" : "Lt. Cdr. Daniel Carr", "pilot" : "Lt. Cdr. Daniel Carr",

2
data/missions/iliad/01 - iliad defence #1.json
View File

@ -4,7 +4,7 @@
"requires" : 13, "requires" : 13,
"background" : "gfx/backgrounds/background01.jpg", "background" : "gfx/backgrounds/background01.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/track-3.mp3", "music" : "music/battle/track-3.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Destroy incoming bombers", "description" : "Destroy incoming bombers",

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

@ -4,7 +4,7 @@
"requires" : 18, "requires" : 18,
"background" : "gfx/backgrounds/background01.jpg", "background" : "gfx/backgrounds/background01.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"epic" : { "epic" : {
"fighterLimit" : 12 "fighterLimit" : 12
}, },

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

@ -4,7 +4,7 @@
"requires" : 19, "requires" : 19,
"background" : "gfx/backgrounds/background01.jpg", "background" : "gfx/backgrounds/background01.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"objectives" : [ "objectives" : [
{ {
"description" : "Destroy munitions transports", "description" : "Destroy munitions transports",

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

@ -4,7 +4,7 @@
"requires" : 21, "requires" : 21,
"background" : "gfx/backgrounds/background01.jpg", "background" : "gfx/backgrounds/background01.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/heroism.ogg", "music" : "music/battle/heroism.ogg",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

2
data/missions/iliad/05 - iliad defence #5.json
View File

@ -4,7 +4,7 @@
"requires" : 26, "requires" : 26,
"background" : "gfx/backgrounds/background01.jpg", "background" : "gfx/backgrounds/background01.jpg",
"planet" : "gfx/planets/bluePlanet.png", "planet" : "gfx/planets/bluePlanet.png",
"music" : "music/DST-RailJet-LongSeamlessLoop.ogg", "music" : "music/battle/DST-RailJet-LongSeamlessLoop.ogg",
"epic" : { "epic" : {
"fighterLimit" : 12 "fighterLimit" : 12
}, },

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

@ -4,7 +4,7 @@
"requires" : 28, "requires" : 28,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/spirit.png", "planet" : "gfx/planets/spirit.png",
"music" : "music/InnerCore_Low.ogg", "music" : "music/battle/InnerCore_Low.ogg",
"player" : { "player" : {
"type" : "TAF", "type" : "TAF",
"pilot" : "", "pilot" : "",

2
data/missions/sol/01 - free flight.json
View File

@ -3,7 +3,7 @@
"description" : "A simple test flight. Get used to piloting your fighter, without threat of attack or any other dangers to face. There are no objectives to complete in this mission, so you may quit it at any time and move on to the next one.", "description" : "A simple test flight. Get used to piloting your fighter, without threat of attack or any other dangers to face. There are no objectives to complete in this mission, so you may quit it at any time and move on to the next one.",
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/earth.png", "planet" : "gfx/planets/earth.png",
"music" : "music/Battle in the winter.mp3", "music" : "music/battle/Battle in the winter.mp3",
"player" : { "player" : {
"type" : "TAF", "type" : "TAF",
"side" : "SIDE_ALLIES", "side" : "SIDE_ALLIES",

2
data/missions/sol/02 - weapons.json
View File

@ -3,7 +3,7 @@
"description" : "Practice using your fighter's weapons against a stationary target.", "description" : "Practice using your fighter's weapons against a stationary target.",
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/earth.png", "planet" : "gfx/planets/earth.png",
"music" : "music/Battle in the winter.mp3", "music" : "music/battle/Battle in the winter.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Destroy Dart", "description" : "Destroy Dart",

2
data/missions/sol/03 - moving target.json
View File

@ -3,7 +3,7 @@
"description" : "Most targets you face in the field will be moving. This course gives you the chance to practice taking down an enemy that moves around.", "description" : "Most targets you face in the field will be moving. This course gives you the chance to practice taking down an enemy that moves around.",
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/earth.png", "planet" : "gfx/planets/earth.png",
"music" : "music/Battle in the winter.mp3", "music" : "music/battle/Battle in the winter.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Eliminate Dart", "description" : "Eliminate Dart",

2
data/missions/sol/04 - armed target.json
View File

@ -3,7 +3,7 @@
"description" : "Face off against an opponent that is armed. The enemy in this course is a Dart, kitted out with twin particle cannons. It shouldn't prove too difficult a challenge.", "description" : "Face off against an opponent that is armed. The enemy in this course is a Dart, kitted out with twin particle cannons. It shouldn't prove too difficult a challenge.",
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/earth.png", "planet" : "gfx/planets/earth.png",
"music" : "music/Battle in the winter.mp3", "music" : "music/battle/Battle in the winter.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Eliminate Dart", "description" : "Eliminate Dart",

2
data/missions/sol/05 - ecm.json
View File

@ -3,7 +3,7 @@
"description" : "Practice using your ECM in the next encounter. The Dart here is equipped with missiles, which will home in on you. You can thwart these attacks by careful use of your ECM. Once you are done practicing, you can destroy the Dart and move on.", "description" : "Practice using your ECM in the next encounter. The Dart here is equipped with missiles, which will home in on you. You can thwart these attacks by careful use of your ECM. Once you are done practicing, you can destroy the Dart and move on.",
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/earth.png", "planet" : "gfx/planets/earth.png",
"music" : "music/Battle in the winter.mp3", "music" : "music/battle/Battle in the winter.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Eliminate Dart", "description" : "Eliminate Dart",

2
data/missions/sol/06 - mag.json
View File

@ -3,7 +3,7 @@
"description" : "Use your mag cannons to disable the enemy Dart. Disabling enemy craft and bringing the target in alive is sometimes an important step in securing lasting victory.", "description" : "Use your mag cannons to disable the enemy Dart. Disabling enemy craft and bringing the target in alive is sometimes an important step in securing lasting victory.",
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/earth.png", "planet" : "gfx/planets/earth.png",
"music" : "music/Battle in the winter.mp3", "music" : "music/battle/Battle in the winter.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Disable Dart", "description" : "Disable Dart",

2
data/missions/sol/07 - wingmates.json
View File

@ -3,7 +3,7 @@
"description" : "Battle along side two team mates to take on 3 enemy fighters.", "description" : "Battle along side two team mates to take on 3 enemy fighters.",
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/earth.png", "planet" : "gfx/planets/earth.png",
"music" : "music/Battle in the winter.mp3", "music" : "music/battle/Battle in the winter.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Eliminate Darts", "description" : "Eliminate Darts",

2
data/missions/sol/08 - final.json
View File

@ -3,7 +3,7 @@
"description" : "Take on three enemy targets single handedly. Once again, these are Darts equipped with simple particle cannons. A single TAF should not find itself outclassed here, so long as the enemy are not allowed to gain the upper hand.", "description" : "Take on three enemy targets single handedly. Once again, these are Darts equipped with simple particle cannons. A single TAF should not find itself outclassed here, so long as the enemy are not allowed to gain the upper hand.",
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/earth.png", "planet" : "gfx/planets/earth.png",
"music" : "music/Battle in the winter.mp3", "music" : "music/battle/Battle in the winter.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Eliminate Darts", "description" : "Eliminate Darts",

2
data/missions/temper/01 - pirate uprising #1.json
View File

@ -3,7 +3,7 @@
"description" : "The Pandoran's push in to Independent space has led to a surge in pirate activity along the Confederation border. The threat needs to be dealt with immediately, starting with cutting back on the enemy presense at Temper.", "description" : "The Pandoran's push in to Independent space has led to a surge in pirate activity along the Confederation border. The threat needs to be dealt with immediately, starting with cutting back on the enemy presense at Temper.",
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/spirit.png", "planet" : "gfx/planets/spirit.png",
"music" : "music/battleThemeA.mp3", "music" : "music/battle/battleThemeA.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Eliminate Darts", "description" : "Eliminate Darts",

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

@ -4,7 +4,7 @@
"requires" : 1, "requires" : 1,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/spirit.png", "planet" : "gfx/planets/spirit.png",
"music" : "music/battleThemeA.mp3", "music" : "music/battle/battleThemeA.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Eliminate Darts", "description" : "Eliminate Darts",

2
data/missions/temper/03 - pirate uprising #3.json
View File

@ -4,7 +4,7 @@
"requires" : 3, "requires" : 3,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/spirit.png", "planet" : "gfx/planets/spirit.png",
"music" : "music/battleThemeA.mp3", "music" : "music/battle/battleThemeA.mp3",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

2
data/missions/temper/04 - pirate uprising #4.json
View File

@ -4,7 +4,7 @@
"requires" : 5, "requires" : 5,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/spirit.png", "planet" : "gfx/planets/spirit.png",
"music" : "music/battleThemeA.mp3", "music" : "music/battle/battleThemeA.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Eliminate pirate leaders", "description" : "Eliminate pirate leaders",

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

@ -4,7 +4,7 @@
"requires" : 8, "requires" : 8,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/spirit.png", "planet" : "gfx/planets/spirit.png",
"music" : "music/battleThemeA.mp3", "music" : "music/battle/battleThemeA.mp3",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

2
data/missions/warro/01 - evacuation #1.json
View File

@ -4,7 +4,7 @@
"requires" : 3, "requires" : 3,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/oracleIX.png", "planet" : "gfx/planets/oracleIX.png",
"music" : "music/determination.mp3", "music" : "music/battle/determination.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Rescue all civilians", "description" : "Rescue all civilians",

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

@ -4,7 +4,7 @@
"requires" : 8, "requires" : 8,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/oracleIX.png", "planet" : "gfx/planets/oracleIX.png",
"music" : "music/determination.mp3", "music" : "music/battle/determination.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Rescue all civilians", "description" : "Rescue all civilians",

2
data/missions/warro/03 - evacuation #3.json
View File

@ -4,7 +4,7 @@
"requires" : 8, "requires" : 8,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/oracleIX.png", "planet" : "gfx/planets/oracleIX.png",
"music" : "music/determination.mp3", "music" : "music/battle/determination.mp3",
"objectives" : [ "objectives" : [
{ {
"description" : "Rescue all civilians", "description" : "Rescue all civilians",

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

@ -4,7 +4,7 @@
"requires" : 13, "requires" : 13,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/oracleIX.png", "planet" : "gfx/planets/oracleIX.png",
"music" : "music/determination.mp3", "music" : "music/battle/determination.mp3",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

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

@ -4,7 +4,7 @@
"requires" : 22, "requires" : 22,
"background" : "gfx/backgrounds/background03.jpg", "background" : "gfx/backgrounds/background03.jpg",
"planet" : "gfx/planets/oracleIX.png", "planet" : "gfx/planets/oracleIX.png",
"music" : "music/track-4.mp3", "music" : "music/battle/track-4.mp3",
"manualComplete" : 1, "manualComplete" : 1,
"objectives" : [ "objectives" : [
{ {

0
music/Battle in the winter.mp3 → music/battle/Battle in the winter.mp3
View File

0
music/DST-RailJet-LongSeamlessLoop.ogg → music/battle/DST-RailJet-LongSeamlessLoop.ogg
View File

0
music/InnerCore_Low.ogg → music/battle/InnerCore_Low.ogg
View File

0
music/Showdown.mp3 → music/battle/Showdown.mp3
View File

0
music/battleThemeA.mp3 → music/battle/battleThemeA.mp3
View File

0
music/determination.mp3 → music/battle/determination.mp3
View File

0
music/heroism.ogg → music/battle/heroism.ogg
View File

0
music/track-1.mp3 → music/battle/track-1.mp3
View File

0
music/track-3.mp3 → music/battle/track-3.mp3
View File

0
music/track-4.mp3 → music/battle/track-4.mp3
View File

0
music/Pressure.ogg → music/main/Pressure.ogg
View File

0
music/Rise of spirit.ogg → music/main/Rise of spirit.ogg
View File

0
music/covert_operations.mp3 → music/main/covert_operations.mp3
View File

2
src/challenges/challengeHome.c
View File

@ -99,7 +99,7 @@ void initChallengeHome(void)
endSectionTransition(); endSectionTransition();
playMusic("music/covert_operations.mp3"); playMusic("music/main/covert_operations.mp3");
} }
static void unlockChallenges(void) static void unlockChallenges(void)

58
src/draw/draw.c
View File

@ -20,6 +20,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "draw.h" #include "draw.h"
static PointF backgroundPoint[4];
void initBackground(void)
{
backgroundPoint[0].x = -SCREEN_WIDTH / 2;
backgroundPoint[0].y = -SCREEN_HEIGHT / 2;
backgroundPoint[1].x = SCREEN_WIDTH / 2;
backgroundPoint[1].y = -SCREEN_HEIGHT / 2;
backgroundPoint[2].x = -SCREEN_WIDTH / 2;
backgroundPoint[2].y = SCREEN_HEIGHT / 2;
backgroundPoint[3].x = SCREEN_WIDTH / 2;
backgroundPoint[3].y = SCREEN_HEIGHT / 2;
}
void prepareScene(void) void prepareScene(void)
{ {
SDL_SetRenderTarget(app.renderer, app.backBuffer); SDL_SetRenderTarget(app.renderer, app.backBuffer);
@ -125,6 +142,47 @@ void drawCircle(int cx, int cy, int radius, int r, int g, int b, int a)
SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_NONE); SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_NONE);
} }
void scrollBackground(float x, float y)
{
int i;
for (i = 0 ; i < 4 ; i++)
{
backgroundPoint[i].x += x;
backgroundPoint[i].y += y;
if (backgroundPoint[i].x < 0)
{
backgroundPoint[i].x += (SCREEN_WIDTH * 2);
}
if (backgroundPoint[i].x >= SCREEN_WIDTH)
{
backgroundPoint[i].x -= (SCREEN_WIDTH * 2);
}
if (backgroundPoint[i].y < 0)
{
backgroundPoint[i].y += (SCREEN_HEIGHT * 2);
}
if (backgroundPoint[i].y >= SCREEN_HEIGHT)
{
backgroundPoint[i].y -= (SCREEN_HEIGHT * 2);
}
}
}
void drawBackground(SDL_Texture *texture)
{
int i;
for (i = 0 ; i < 4 ; i++)
{
blitScaled(texture, backgroundPoint[i].x, backgroundPoint[i].y, SCREEN_WIDTH, SCREEN_HEIGHT);
}
}
void saveScreenshot(void) void saveScreenshot(void)
{ {
static int i = 0; static int i = 0;

2
src/galaxy/galacticMap.c
View File

@ -113,7 +113,7 @@ void initGalacticMap(void)
endSectionTransition(); endSectionTransition();
playMusic("music/Pressure.ogg"); playMusic("music/main/Pressure.ogg");
} }
static void updatePandoranAdvance(void) static void updatePandoranAdvance(void)

27
src/galaxy/mission.c
View File

@ -32,6 +32,7 @@ static char **toTypeArray(char *types, int *numTypes);
static void loadEpicData(cJSON *node); static void loadEpicData(cJSON *node);
static char *getAutoBackground(char *filename); static char *getAutoBackground(char *filename);
static char *getAutoPlanet(char *filename); static char *getAutoPlanet(char *filename);
static char *getAutoMusic(char *filename);
Mission *loadMissionMeta(char *filename) Mission *loadMissionMeta(char *filename)
{ {
@ -146,8 +147,6 @@ void loadMission(char *filename)
loadLocations(cJSON_GetObjectItem(root, "locations")); loadLocations(cJSON_GetObjectItem(root, "locations"));
STRNCPY(music, cJSON_GetObjectItem(root, "music")->valuestring, MAX_DESCRIPTION_LENGTH);
if (cJSON_GetObjectItem(root, "epic")) if (cJSON_GetObjectItem(root, "epic"))
{ {
loadEpicData(cJSON_GetObjectItem(root, "epic")); loadEpicData(cJSON_GetObjectItem(root, "epic"));
@ -165,7 +164,13 @@ void loadMission(char *filename)
initScript(cJSON_GetObjectItem(root, "script")); initScript(cJSON_GetObjectItem(root, "script"));
/* planet and background loading must come last, so AUTO works properly */ /* music, planet, and background loading must come last, so AUTO works properly */
STRNCPY(music, cJSON_GetObjectItem(root, "music")->valuestring, MAX_DESCRIPTION_LENGTH);
if (strcmp(music, "AUTO") == 0)
{
STRNCPY(music, getAutoMusic(filename), MAX_DESCRIPTION_LENGTH);
}
background = cJSON_GetObjectItem(root, "background")->valuestring; background = cJSON_GetObjectItem(root, "background")->valuestring;
if (strcmp(background, "AUTO") == 0) if (strcmp(background, "AUTO") == 0)
@ -251,6 +256,22 @@ static char *getAutoPlanet(char *filename)
return getPlanetTextureName(hash); return getPlanetTextureName(hash);
} }
static char *getAutoMusic(char *filename)
{
int hash;
if (!game.currentMission->challengeData.isChallenge)
{
hash = hashcode(game.selectedStarSystem);
}
else
{
hash = hashcode(filename);
}
return getMusicFilename(hash);
}
void completeMission(void) void completeMission(void)
{ {
if (battle.status == MS_IN_PROGRESS) if (battle.status == MS_IN_PROGRESS)

1
src/galaxy/mission.h
View File

@ -53,6 +53,7 @@ extern void updateStarSystemMissions(void);
extern void updateChallengeMissions(void); extern void updateChallengeMissions(void);
extern char *getBackgroundTextureName(int n); extern char *getBackgroundTextureName(int n);
extern char *getPlanetTextureName(int n); extern char *getPlanetTextureName(int n);
extern char *getMusicFilename(int n);
extern Battle battle; extern Battle battle;
extern Entity *player; extern Entity *player;

2
src/game/title.c
View File

@ -88,7 +88,7 @@ void initTitle(void)
endSectionTransition(); endSectionTransition();
playMusic("music/Rise of spirit.ogg"); playMusic("music/main/Rise of spirit.ogg");
} }
static void initFighters(void) static void initFighters(void)

3
src/system/init.c
View File

@ -121,6 +121,7 @@ void initGameSystem(void)
initFonts, initFonts,
initInput, initInput,
initLookups, initLookups,
initResources,
initSounds, initSounds,
initWidgets, initWidgets,
initGame, initGame,
@ -292,7 +293,7 @@ void cleanup(void)
destroyWidgets(); destroyWidgets();
destroyBackground(); destroyResources();
TTF_Quit(); TTF_Quit();

3
src/system/init.h
View File

@ -48,6 +48,7 @@ extern void initStarSystems(void);
extern void initChallenges(void); extern void initChallenges(void);
extern void initWidgets(void); extern void initWidgets(void);
extern void initBackground(void); extern void initBackground(void);
extern void initResources(void);
extern void destroyLookups(void); extern void destroyLookups(void);
extern void destroyFonts(void); extern void destroyFonts(void);
extern void destroySounds(void); extern void destroySounds(void);
@ -61,7 +62,7 @@ extern void destroyBattle(void);
extern void destroyTextures(void); extern void destroyTextures(void);
extern void destroyGalacticMap(void); extern void destroyGalacticMap(void);
extern void destroyWidgets(void); extern void destroyWidgets(void);
extern void destroyBackground(void); extern void destroyResources(void);
extern void expireTexts(int all); extern void expireTexts(int all);
extern void initInput(void); extern void initInput(void);
extern void initModalDialog(void); extern void initModalDialog(void);

74
src/draw/background.c → src/system/resources.c
View File

@ -18,20 +18,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "background.h" #include "resources.h"
static PointF backgroundPoint[4];
char **backgrounds; char **backgrounds;
char **planets; char **planets;
char **musicFiles;
int numBackgrounds; int numBackgrounds;
int numPlanets; int numPlanets;
int numMusicFiles;
void initBackground(void) void initResources(void)
{ {
char **filenames; char **filenames;
int i; int i;
numBackgrounds = numPlanets = 0; numBackgrounds = numPlanets = numMusicFiles = 0;
filenames = getFileList(getFileLocation("gfx/backgrounds"), &numBackgrounds); filenames = getFileList(getFileLocation("gfx/backgrounds"), &numBackgrounds);
backgrounds = malloc(sizeof(char*) * numBackgrounds); backgrounds = malloc(sizeof(char*) * numBackgrounds);
@ -41,6 +42,8 @@ void initBackground(void)
backgrounds[i] = malloc(sizeof(char) * MAX_FILENAME_LENGTH); backgrounds[i] = malloc(sizeof(char) * MAX_FILENAME_LENGTH);
sprintf(backgrounds[i], "gfx/backgrounds/%s", filenames[i]); sprintf(backgrounds[i], "gfx/backgrounds/%s", filenames[i]);
SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "'%s' added to AUTO resources list", filenames[i]);
free(filenames[i]); free(filenames[i]);
} }
@ -54,63 +57,28 @@ void initBackground(void)
planets[i] = malloc(sizeof(char) * MAX_FILENAME_LENGTH); planets[i] = malloc(sizeof(char) * MAX_FILENAME_LENGTH);
sprintf(planets[i], "gfx/planets/%s", filenames[i]); sprintf(planets[i], "gfx/planets/%s", filenames[i]);
SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "'%s' added to AUTO resources list", filenames[i]);
free(filenames[i]); free(filenames[i]);
} }
free(filenames); free(filenames);
backgroundPoint[0].x = -SCREEN_WIDTH / 2; filenames = getFileList(getFileLocation("music/battle/"), &numMusicFiles);
backgroundPoint[0].y = -SCREEN_HEIGHT / 2;
backgroundPoint[1].x = SCREEN_WIDTH / 2; musicFiles = malloc(sizeof(char*) * numMusicFiles);
backgroundPoint[1].y = -SCREEN_HEIGHT / 2;
backgroundPoint[2].x = -SCREEN_WIDTH / 2; for (i = 0 ; i < numMusicFiles ; i++)
backgroundPoint[2].y = SCREEN_HEIGHT / 2;
backgroundPoint[3].x = SCREEN_WIDTH / 2;
backgroundPoint[3].y = SCREEN_HEIGHT / 2;
}
void scrollBackground(float x, float y)
{
int i;
for (i = 0 ; i < 4 ; i++)
{ {
backgroundPoint[i].x += x; musicFiles[i] = malloc(sizeof(char) * MAX_FILENAME_LENGTH);
backgroundPoint[i].y += y; sprintf(musicFiles[i], "music/battle/%s", filenames[i]);
if (backgroundPoint[i].x < 0) SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "'%s' added to AUTO resources list", filenames[i]);
{
backgroundPoint[i].x += (SCREEN_WIDTH * 2);
}
if (backgroundPoint[i].x >= SCREEN_WIDTH) free(filenames[i]);
{
backgroundPoint[i].x -= (SCREEN_WIDTH * 2);
}
if (backgroundPoint[i].y < 0)
{
backgroundPoint[i].y += (SCREEN_HEIGHT * 2);
}
if (backgroundPoint[i].y >= SCREEN_HEIGHT)
{
backgroundPoint[i].y -= (SCREEN_HEIGHT * 2);
}
} }
}
void drawBackground(SDL_Texture *texture)
{
int i;
for (i = 0 ; i < 4 ; i++) free(filenames);
{
blitScaled(texture, backgroundPoint[i].x, backgroundPoint[i].y, SCREEN_WIDTH, SCREEN_HEIGHT);
}
} }
char *getBackgroundTextureName(int i) char *getBackgroundTextureName(int i)
@ -123,8 +91,14 @@ char *getPlanetTextureName(int i)
return planets[i % numPlanets]; return planets[i % numPlanets];
} }
void destroyBackground(void) char *getMusicFilename(int i)
{
return musicFiles[i % numMusicFiles];
}
void destroyResources(void)
{ {
free(backgrounds); free(backgrounds);
free(planets); free(planets);
free(musicFiles);
} }

0
src/draw/background.h → src/system/resources.h
View File