Some more changes and prepared the release files

Update ca.po

.github/stale.yml

@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 335
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 30
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - help+wanted
+# Label to use when marking an issue as stale
+staleLabel: invalid
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: true

.gitignore

@@ -34,7 +34,14 @@ tbftss
 *.dSYM/
 
 # folders
+bin
 dist
 dev/*
+build/*
 !dev/screenshots
 !dev/stats.sh
+
+# Misc
+.DS_Store
+
+/.errors

CHANGELOG

@@ -1,5 +1,90 @@
 Changelog
 
+1.5.1
+
+	* Updated Catalan translation (thanks, oriolhub)
+	* Misc bug and compile fixes.
+
+1.5
+
+	* Game now renders at chosen resolution instead of scaling up from 1280 x 720
+	* Added command line switch -size to allow for custom window sizes.
+		- For example: -size 900x600 for a width and height of 900 x 600.
+	* Minimum resolution is now 1280 x 720
+	* Graphics and fonts now use texture atlases to help with performance.
+	* Misc. bug fixes.
+
+1.4
+
+	* Add Mac make file
+	* Added ca, da, es, fr, it, nl, pl, and sv po files, created using Google Translate (quality will be low; used as a starting point).
+	* Numerous compile and runtime fixes.
+
+1.3
+
+	* Added a fighter database, to view information about the in-game fighters
+
+1.2
+
+	* Reduced missile damage from 75pts to 50pts.
+	* Rebalanced some missions, due to missile damage reduction.
+	* Fixed numerous mission bugs.
+	* Surrendering vessels will now fly away slower, to allow the player to catch them more easily.
+	* Music pauses when window focus is lost.
+
+1.11
+
+	* Uncoupled event handling from frame rate.
+	* Show move-like directional cursor when dragging galactic map.
+
+1.1
+
+	* Epic missions now have limited "lives". A player can only be killed a certain number of times before they automatically fail the mission. This is to discourage reckless play.
+
+1.01
+
+	* Corrected "Nation of Tzac" to "Kingdom of Tzac" in a few cases
+	* Fixed broken REVISION makefile macro when git is not available
+
+1.0
+
+	* Campaign fixes
+	* Mouse is now restricted to game window when in battle
+	* Campaign missions can now be freely played after finishing the game
+	* Some trophy requirements were reduced, to make them easier to get
+
+0.99
+
+	* Fixed a bug with switching guns when ship has no guns
+	* Made Bodyguard and Team Player trophies easier to achieve
+	* Campaign tweaks and bugs fixes
+
+0.98
+
+	* Campaign tweaks and bugs fixes
+	* Challenge updates
+
+0.97
+
+	* Campaign tweaks and bugs fixes
+	* Challenge updates
+
+0.96
+
+	* Campaign tweaks and bugs fixes
+
+0.95
+
+	* AI fixes
+	* Campaign tweaks and bugs fixes
+	* Reset entity owner when detaching tow rope
+
+0.94
+
+	* Campaign tweaks and bug fixes
+	* Challenge tweaks and fixes
+	* Stats bug fix
+
 0.93
 
 	* Campaign tweaks and bug fixes

README-OS4.md

@@ -0,0 +1,50 @@
+# The Battle for the Solar System : The Pandoran War
+
+This is the port of the "The Battle for the Solar System : The Pandoran War" 
+v1.50.1 for the AmigaOS 4. 
+
+The Pandoran War is a 2D mission-based space shooter based on the BATTLE FOR 
+THE SOLAR SYSTEM space opera and set between books two and three: THE THIRD 
+SIDE and THE ATTTRIBUTE OF THE STRONG. The game features many missions, 
+with many different objectives and craft.
+
+It requires a fast system to play the game as fast as possible, and a 
+graphics card that supports either opengl/opengles2 with SDL2.
+It is tested and runs well on X5000/40 with a RadeonRX 550. 
+
+This archive does not contain any data files. In order to play the game, you 
+need to download the data  separately. From the following website download
+the "tbftss-1.5.1.linux-x86_64.tar.gz" file.
+
+https://www.battleforthesolarsystem.com/games/pw/#downloads
+
+To install it, extract the data file anywhere at you hard disk
+and copy over all the files from this archive. A requester will show up
+to replace some files, which you need to confirm for all of them.
+
+If you like the game and would like to support its developer, you can go and
+buy it at:
+https://parallelrealities.itch.io/tbftss-the-pandoran-war
+
+### How to make it faster
+
+The game should run in 60fps but on my test system I get around 30fps with all 
+the effects enabled. That's why I introduced an option at the Options screen, 
+named "Effects Reduction" with values from 0 to 3. With 0 you have full effects
+everywhere, and with 3 you have less effects shown. That increases a lot the 
+speed, but you might still see slowdowns in situations where there is a lot of 
+action on the screen.
+
+It is recommended to open the SDL2 prefs and set the Driver to opengl/opengl2 
+depending your gfx card and the drivers you have installed.
+
+On my system "Batching Mode: enabled" leads to some crashes. I recommend you 
+to  set this to default. But feel free to experiment with it, in case it
+works better for you.
+
+I'd love to hear how it works on your system.
+ 
+### Changelog
+1.50.1r1 (2022-08-22)
+* First release
+

README.md

@@ -2,9 +2,9 @@
 
 2D mission-based space shooter, based on the Battle for the Solar System space opera novel trilogy.
 
-The develop branch on GitHub (https://github.com/stephenjsweeney/tbftss/tree/develop) is where all the dev work happens. Stable(ish) releases will go in to master (https://github.com/stephenjsweeney/tbftss/tree/master).
+![Alt text](dev/screenshots/v0.6-06.png?raw=true "Screenshot")
 
-You can support development of this game by purchasing one of the books in the trilogy: www.battleforthesolarsystem.com/purchase/
+The develop branch on GitHub (https://github.com/stephenjsweeney/tbftss/tree/develop) is where all the dev work happens. Stable(ish) releases will go in to master (https://github.com/stephenjsweeney/tbftss/tree/master).
 
 Website: www.battleforthesolarsystem.com
 Email: stephenjsweeney@battleforthesolarsystem.com
@@ -17,22 +17,26 @@ Screenshots from various versions can be found here: https://github.com/stephenj
 
 ### GRAPHICS
 
-gfx/planets/earth.png - derived from the the Blue Marble NASA photograph: http://visibleearth.nasa.gov/view.php?id=57723
+* gfx/planets/earth.png - derived from the the Blue Marble NASA photograph: http://visibleearth.nasa.gov/view.php?id=57723
-gfx/trophies/bronze.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
+* gfx/trophies/bronze.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
-gfx/trophies/gold.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
+* gfx/trophies/gold.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
-gfx/trophies/platinum.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
+* gfx/trophies/platinum.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
-gfx/trophies/silver.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
+* gfx/trophies/silver.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
-gfx/trophies/unearned.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
+* gfx/trophies/unearned.png - dervied from Trophy icon, by Lorc (CC BY 3.0): http://game-icons.net/lorc/originals/trophy.html
 
 All other graphics are CC BY-NC-SA 3.0, with the following attribution: Copyright 2015-2016, Stephen J Sweeney | www.battleforthesolarsystem.com
 
+<img src="gfx/by-nc-sa.png?raw=true" alt="CC BY-NC-SA logo" width="125">
+
 ### DATA FILES
 
-data/fonts/Roboto-Medium.ttf, by Christian Robertson. Licensed under the Apache License, version 2.0
+* data/fonts/Roboto-Medium.ttf, by Christian Robertson. Licensed under the Apache License, version 2.0
-data/fonts/Khosrau.ttf, by Fereydoun Rostam. Free for non-commercial use (http://www.dafont.com/khosrau.font)
+* data/fonts/Khosrau.ttf, by Fereydoun Rostam. Free for non-commercial use (http://www.dafont.com/khosrau.font)
 
 All other data files are CC BY-NC-SA 3.0, with the following attribution: Copyright 2015-2016, Stephen J Sweeney | www.battleforthesolarsystem.com
 
+<img src="gfx/by-nc-sa.png?raw=true" alt="CC BY-NC-SA logo" width="125">
+
 ### SOUND
 
 * 000000_large_explosion.ogg - created by combining

STATS.md

@@ -1,17 +1,17 @@
 # Statistics
 
-* Lines of code: 18771
+* Lines of code: 19897
-* Size of source: 572K
+* Size of source: 586K
-* Size of data: 734K
+* Size of data: 750K
-* Size of graphics: 3.7M
+* Size of graphics: 3.5M
-* Size of sound: 638K
+* Size of sound: 805K
-* Size of music: 55M
+* Size of music: 56M
 
 * Number of missions: 81 (inc. optional)
-* Number of challenges: 75
+* Number of challenges: 93
 * Number of spacecraft: 50
 * Number of trophies: 44
 
-* Translatable strings: 982
+* Translatable strings: 1029
 
-* Number of GIT revisions: 1315
+* Number of GIT revisions: 1472

build/buildAll.sh

@@ -1,11 +0,0 @@
-#!/bin/bash -e
-
-VERSION=`egrep 'VERSION = ([0-9.+])' ../common.mk | awk '{print $3}'`
-REVISION=`date +"%y%m%d"`
-
-mkdir -p ../dist
-rm -rf ../dist/*
-
-linux/build.sh $VERSION $REVISION
-
-win32/build.sh $VERSION $REVISION

build/linux/build.sh

@@ -1,20 +0,0 @@
-#!/bin/bash -e
-
-cd `dirname $0`
-
-BUILDROOT="build/linux"
-
-cd ../..
-
-VERSION=$1
-REVISION=$2
-SIZE=0
-
-make clean
-make src-dist
-
-make clean
-make LOCALE_DIR=locale
-make dist
-
-rm -rf tbftss

build/win32/build.sh

@@ -1,40 +0,0 @@
-#!/bin/bash -e
-
-cd `dirname $0`
-
-BUILDROOT="build/win32"
-
-cd ../..
-
-VERSION=$1
-REVISION=$2
-FOLDER="tbftss-$1"
-OUT="$BUILDROOT/$FOLDER"
-
-make -f makefile.win32 clean
-make -f makefile.win32
-
-mkdir -p $OUT
-rm -rf $OUT/*
-
-cp tbftss.exe $OUT
-
-cp -r data $OUT
-cp -r gfx $OUT
-cp -r music $OUT
-cp -r sound $OUT
-cp -r manual $OUT
-cp -r locale $OUT
-cp LICENSE $OUT
-cp CHANGELOG $OUT
-cp README.md $OUT
-
-cp /usr/x86_64-w64-mingw32/bin/*.dll $OUT
-
-cd $BUILDROOT
-
-zip -r tbftss-${VERSION}-${REVISION}.win32.zip $FOLDER
-
-mv *.zip ../../dist
-
-rm -rf $FOLDER

common.mk

@@ -1,44 +1,60 @@
-VERSION = 0.93
+VERSION = 1.5
-REVISION = $(shell date +"%y%m%d")
+REVISION = 1
 LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
 
-SEARCHPATH += src/ src/battle src/challenges src/draw src/game src/galaxy src/json src/system src/test
+OUT = bin
+
+SEARCHPATH += src
+SEARCHPATH += src/battle
+SEARCHPATH += src/challenges
+SEARCHPATH += src/game
+SEARCHPATH += src/galaxy
+SEARCHPATH += src/json
+SEARCHPATH += src/system
+SEARCHPATH += src/test
+
 vpath %.c $(SEARCHPATH)
 vpath %.h $(SEARCHPATH)
 
 DEPS += defs.h structs.h
 
-OBJS += ai.o
+_OBJS += ai.o atlas.o
-OBJS += battle.o bullets.o
+_OBJS += battle.o bullets.o
-OBJS += capitalShips.o challengeHome.o challenges.o cJSON.o controls.o credits.o
+_OBJS += capitalShips.o challengeHome.o challenges.o cJSON.o controls.o credits.o
-OBJS += debris.o dev.o draw.o
+_OBJS += debris.o dev.o draw.o
-OBJS += effects.o entities.o
+_OBJS += effects.o entities.o
-OBJS += fighters.o
+_OBJS += fighters.o fighterDatabase.o
-OBJS += galacticMap.o game.o
+_OBJS += galacticMap.o game.o
-OBJS += hud.o
+_OBJS += hud.o
-OBJS += i18n.o init.o input.o io.o items.o
+_OBJS += i18n.o init.o input.o io.o items.o
-OBJS += jumpgate.o
+_OBJS += jumpgate.o
-OBJS += load.o locations.o lookup.o
+_OBJS += load.o locations.o lookup.o
-OBJS += main.o messageBox.o mine.o mission.o missionInfo.o modalDialog.o
+_OBJS += main.o messageBox.o mine.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 resources.o rope.o
+_OBJS += radar.o resources.o rope.o
-OBJS += save.o script.o sound.o spawners.o starfield.o starSystems.o stats.o
+_OBJS += save.o script.o sound.o spawners.o starfield.o starSystems.o stats.o
-OBJS += testMission.o textures.o text.o title.o transition.o trophies.o
+_OBJS += testMission.o textures.o text.o title.o transition.o trophies.o
-OBJS += util.o
+_OBJS += util.o
-OBJS += waypoints.o widgets.o
+_OBJS += waypoints.o widgets.o
+
+OBJS = $(patsubst %,$(OUT)/%,$(_OBJS))
 
 # top-level rule to create the program.
 all: $(PROG) $(LOCALE_MO)
 
 # compiling other source files.
-%.o: %.c %.h $(DEPS)
+$(OUT)/%.o: %.c %.h $(DEPS)
-	$(CC) $(CFLAGS) $(CXXFLAGS) -c $<
+	@mkdir -p $(OUT)
+	$(CC) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<
 	
 %.mo: %.po
+ifneq ($(shell uname), AmigaOS)
 	msgfmt -c -o $@ $<
+endif
 	
 # cleaning everything that can be automatically recreated with "make".
 clean:
 	$(RM) $(OBJS) $(PROG) $(LOCALE_MO)
+

data/app/config.json

@@ -1,6 +1,7 @@
 {
 	"winWidth" : 1280,
 	"winHeight" : 720,
+	"effects" : 0,
 	"fullscreen" : 0,
 	"musicVolume" : 8,
 	"soundVolume" : 10,
@@ -41,3 +42,4 @@
 		"healthBars" : 1
 	}
 }
+

data/battle/bullets.json

@@ -17,7 +17,7 @@
 	
 	{
 		"type" : "BT_MISSILE",
-		"damage" : 75,
+		"damage" : 50,
 		"texture" : "gfx/bullets/missile.png",
 		"sound" : "SND_MISSILE",
 		"flags" : "BF_ENGINE+BF_EXPLODES"

data/challenges/10.json

@@ -15,6 +15,7 @@
 	"challenge" : {
 		"rescueLimit" : 8,
 		"timeLimit" : 300,
+		"allowPlayerDeath" : 1,
 		"challenges" : [
 			{
 				"type" : "CHALLENGE_RESCUE",

data/challenges/18.json

@@ -14,17 +14,17 @@
 		"y" : 25
 	},
 	"challenge" : {
-		"timeLimit" : 240,
+		"timeLimit" : 300,
 		"waypointLimit" : 5,
 		"clearWaypointEnemies" : 1,
 		"challenges" : [
 			{
 				"type" : "CHALLENGE_TIME",
-				"value" : 240
+				"value" : 300
 			},
 			{
 				"type" : "CHALLENGE_TIME",
-				"value" : 180
+				"value" : 240
 			},
 			{
 				"type" : "CHALLENGE_PLAYER_KILLS",

data/challenges/25.json

@@ -16,6 +16,7 @@
 	"challenge" : {
 		"timeLimit" : 120,
 		"waypointLimit" : 12,
+		"allowPlayerDeath" : 1,
 		"noBoost" : 1,
 		"challenges" : [
 			{

data/challenges/28.json

@@ -13,7 +13,7 @@
 		"y" : 25
 	},
 	"challenge" : {
-		"timeLimit" : 210,
+		"timeLimit" : 240,
 		"killLimit" : 120,
 		"challenges" : [
 			{

data/challenges/29.json

@@ -14,7 +14,7 @@
 		"flags" : "+EF_COLLECTS_ITEMS"
 	},
 	"challenge" : {
-		"timeLimit" : 180,
+		"timeLimit" : 240,
 		"playerItemLimit" : 4,
 		"allowPlayerDeath" : 1,
 		"isDeathMatch" : 1,

data/challenges/31.json

@@ -5,7 +5,7 @@
 	"planet" : "AUTO",
 	"music" : "AUTO",
 	"player" : {
-		"type" : "Hammerhead",
+		"type" : "Khepri",
 		"side" : "SIDE_ALLIES",
 		"pilot" : "-",
 		"squadron" : "-",
@@ -33,7 +33,7 @@
 	},
 	"fighters" : [
 		{
-			"types" : "Scarab;Khepri;Lynx",
+			"types" : "Scarab;Hammerhead;Lynx",
 			"side" : "SIDE_TZAC",
 			"number" : 4,
 			"x" : 25,

data/craft/civilian.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Civilian",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
 	"speed" : 1.85,
 	"texture" : "gfx/craft/civilian01.png",

data/craft/infTug.json

@@ -1,5 +1,7 @@
 {
 	"name" : "INF Tug",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 50,
 	"speed" : 1.85,
 	"reloadTime" : 10,

data/craft/munitionsTransport.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Munitions Transport",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 150,
 	"shield" : 50,
 	"speed" : 1.5,

data/craft/shuttle.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Shuttle",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
 	"shield" : 15,
 	"speed" : 2,

data/craft/supplyShip.json

@@ -1,11 +1,13 @@
 {
 	"name" : "Supply Ship",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 150,
 	"shield" : 50,
 	"speed" : 1.5,
 	"reloadTime" : 10,
 	"shieldRechargeRate" : 0,
-	"texture" : "gfx/craft/pandoranSupplyShip.png",
+	"texture" : "gfx/craft/supplyShip.png",
 	"deathType" : "DT_NO_SPIN",
 	"flags" : "EF_TAKES_DAMAGE",
 	"aiFlags" : "AIF_AVOIDS_COMBAT"

data/craft/tug.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Tug",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 50,
 	"speed" : 1.85,
 	"reloadTime" : 10,

data/credits/credits.json

@@ -36,6 +36,8 @@
 
 	"75 30 TRANSLATIONS",
 	"30 24 Lumidify Productions (German)",
+	"0 24 ekrempel (German)",
+	"0 24 oriolhub (Catalan)",
 
 	"75 30 DEVELOPMENT SOFTWARE",
 
@@ -227,7 +229,7 @@
 	"0 24 inception-stab-l.wav, by manholo (CC-BY)",
 	"0 24 freesound.org/people/manholo/sounds/255729/",
 
-	"30 24 000000_tow-rope-attach.ogg - creating by combining:",
+	"30 24 000000_tow-rope-attach.ogg - created by combining:",
 	"0 24 01857 close noise fastener.wav",
 	"0 24 by Robinhood76 (CC-BY-NC)",
 	"0 24 freesound.org/people/Robinhood76/sounds/98880/",
@@ -308,7 +310,7 @@
 	"75 30 SPECIAL THANKS",
 	"0 24 akien-mga, bentley, Bertram25, ChliHug, Imerion, nnesse, ptitSeb, Szunti",
 
-	"150 24 This is a work of fiction. Names, characters, businesses, places, events and incidents are either the products of the author's imagination or used in a fictitious manner. Any resemblance to actual persons, living or dead, or actual events is purely coincidental. The Battle for the Solar System : The Pandoran War is (C) 2015-2016, Stephen J Sweeney, Some Rights Reserved. The Battle for the Solar System and all related materials (including, but not limited to, characters, setting, and story elements) are (C) 2009-2016, Stephen J Sweeney, All Rights Reserved.",
+	"150 24 This is a work of fiction. Names, characters, businesses, places, events and incidents are either the products of the author's imagination or used in a fictitious manner. Any resemblance to actual persons, living or dead, or actual events is purely coincidental. The Battle for the Solar System : The Pandoran War is (C) 2015-2019, Stephen J Sweeney, Some Rights Reserved. The Battle for the Solar System and all related materials (including, but not limited to, characters, setting, and story elements) are (C) 2009-2016, Stephen J Sweeney, All Rights Reserved.",
 
 	"500 30 www.battleforthesolarsystem.com"
 ]

data/fighters/angel.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Angel",
+	"description" : "One of the oldest starfighters created by the Mitikas Empire, the Angel is rarely seen, due to it being retired in 2599. A handful of Independent Worlds continue to operate the fighter, having purchased them from the empire prior to Mitikas pulling them from service. Even so, they are quite often held back from deployment, acting as reserves to bulk up numbers. Angels are notable for being the first INF fighter to be equipped with mag cannons, and for being somewhat smaller than most of the nation's other fighters. Also of note is the appearance, the fighter sporting a purple colour scheme, as opposed to the reds of more recent INF craft.",
+	"affiliation" : "INF",
 	"health" : 40,
 	"shield" : 40,
 	"speed" : 1.8,

data/fighters/ataf.json

@@ -1,5 +1,7 @@
 {
 	"name" : "ATAF",
+	"description" : "The Advanced Tactical Assault Fighter (ATAF) is the single most powerful single-seat starfighter in existence. Only five have so far been manufactured owing to their tremendous development costs (each one said to be on par with a carrier). Their existence and even those selected to participate in the training program have been a closely guarded secret within the CSN. It is the spiritual successor to the TAF upon which a great deal of its design was based.",
+	"affiliation" : "CSN",
 	"health" : 150,
 	"shield" : 2500,
 	"speed" : 2.25,

data/fighters/blizzard.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Blizzard",
+	"description" : "Like many other heavy-class starfighters, the Blizzard relies on firepower to make up for its somewhat sluggish performance in battle. In this respect, it is equipped with five cannons and five missiles, making it a formidable opponent in battle. The fighter is rarely seen outside of Mace, however, its primary function being the protection of Tzac's home system.",
+	"affiliation" : "Tzac",
 	"health" : 120,
 	"shield" : 70,
 	"speed" : 1.85,

data/fighters/cannonDart.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Cannon Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
 	"speed" : 2.1,
 	"reloadTime" : 24,

data/fighters/dart.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Dart",
+	"description" : "The Dart is a very common, general purpose vessel that is used commonly by both the public and by the underworld. Because of its relatively low costs and ease of maintenance, it is highly favoured by criminal organisations. It is usually sold as a single-seat, unarmed vessel, but can be purchased in a great variety of modified states, including that with an extra seat and with a number of armaments; missiles usually being attached to the tips of each of the four fins.",
+	"affiliation" : "N/A",
 	"health" : 15,
 	"speed" : 2.1,
 	"reloadTime" : 24,

data/fighters/firefly.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Firefly",
+	"description" : "A relatively new starfighter, only introduced in the last seventeen years or so, the Firefly benefits from an overall reduction in manufacturing costs, while still maintaining the same defensive capabilities as other light-class fighters. It also benefits from slightly increased offensive measures, featuring two plasma cannons and one additional particle cannon. The fighter was greeted very positively when it was introduced and many hundreds were constructed exclusively for use by the UNF.",
+	"affiliation" : "UNF",
 	"health" : 50,
 	"shield" : 50,
 	"speed" : 1.85,

data/fighters/hammerhead.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Hammerhead",
+	"description" : "Of all the bombers that the CSN can offer, the Hammerhead is one of the most well known. Slow, but sure, the Hammerhead is packed to the gills with rockets, missiles and torpedoes, making it a formidable and dangerous opponent within a conflict zone. Escorted by a wing of TAFs or Rays, a Hammerhead need only get in to range of a target to unleash a volley of rockets that would prove truly devastating. Hammerheads feature two seats, one for the pilot and one to aid with targeting and handling armaments. It also has room for an optional rear gunner.",
+	"affiliation" : "CSN",
 	"health" : 60,
 	"shield" : 50,
 	"speed" : 1.7,

data/fighters/hyenaA.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Hyena-A",
+	"description" : "The Hyena is a new starfighter, introduced in the last 15 years and was constructed specifically for use by the United Naval Forces. Like most other medium-class starfighters, it treads the line between light and heavy-classes, offering high speeds and manoeuvrability, dense armour and shielding, and presenting high offensive capabilities. The Hyena is typically identified as Hyena-A or Hyena-B, depending on whether it is equipped with mag cannons or laser cannons.",
+	"affiliation" : "UNF",
 	"health" : 90,
 	"shield" : 45,
 	"speed" : 1.85,

data/fighters/hyenaB.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Hyena-B",
+	"description" : "The Hyena is a new starfighter, introduced in the last 15 years and was constructed specifically for use by the United Naval Forces. Like most other medium-class starfighters, it treads the line between light and heavy-classes, offering high speeds and manoeuvrability, dense armour and shielding, and presenting high offensive capabilities. The Hyena is typically identified as Hyena-A or Hyena-B, depending on whether it is equipped with mag cannons or laser cannons.",
+	"affiliation" : "UNF",
 	"health" : 90,
 	"shield" : 45,
 	"speed" : 1.85,

data/fighters/jackal.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Jackal",
+	"description" : "The greatest mass produced starfighter in the Imperial Naval Forces, the Jackal, like the TAF, is lightly armoured and shielded, but fast. Like other INF starfighters it has been through a rapid variation process in the last few years, as a result of the Imperial Civil War.",
+	"affiliation" : "INF",
 	"health" : 75,
 	"shield" : 75,
 	"speed" : 2,

data/fighters/khepri.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Khepri",
+	"description" : "The Khepri is a bomber, designed and built by the Kingdom of Tzac. It is an enchanced derivative of the Imperial Scarab.",
+	"affiliation" : "Tzac",
 	"health" : 60,
 	"shield" : 50,
 	"speed" : 1.7,

data/fighters/kingfisher.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Kingfisher",
+	"description" : "The Kingfisher is a medium-class, CSN starfighter, built to complement the Ray (although it arrived two years later than scheduled). Whereas the Ray features two mag cannons in addition to its plasma cannons, the Kingfisher is equipped with laser cannons. Also, unlike the Ray, the Kingfisher is a single seat fighter.",
+	"affiliation" : "CSN",
 	"health" : 65,
 	"shield" : 65,
 	"speed" : 1.85,

data/fighters/leopard.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Leopard",
+	"description" : "Originally developed in 2580, the Leopard was redesigned from the ground up, to act as the United Naval Forces primary heavy starfighter. It is more powerful than the Sphinx and Rook, but shares their inherent weaknesses, such as poor handling and sluggish engines. Aside from bombers, it is the only UNF fighter craft to feature two pilot seats. It is also the only fighter in existence to feature plasma cannons on the port and starboard sides, operated by the second pilot. Budget restrictions meant that a third frontal plasma cannon was replaced by a particle cannon.",
+	"affiliation" : "UNF",
 	"health" : 125,
 	"shield" : 75,
 	"speed" : 1.7,

data/fighters/lynx.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Lynx",
+	"description" : "The Lynx was a latecomer to the UNF's spacecraft compliment, the organisation purchasing Hammerheads from the CSN and, on occasion, Khepris from the Kingdom of Tzac. Neither were desirable longterm solutions, and so the Lynx was developed to fill the gap in the navy's offerings. The bomber was heavily inspired by the Hammerhead, with the UNF having found success in the use of the CSN craft in the past, and wished to continue that way.",
+	"affiliation" : "UNF",
 	"health" : 75,
 	"shield" : 50,
 	"speed" : 1.7,

data/fighters/mantis.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Mantis",
+	"description" : "So called because of the likeness of its two upper struts to that of a praying mantis, this is one of the most well recognised starfighters in the INF. A medium starfighter, like the Confederation's own Ray, the Mantis is not only better armed, featuring an extra set of offensive weaponry, but is also faster. Like other Imperial starfighters, it has seen a great number of stable variants emerge in the past few years.",
+	"affiliation" : "INF",
 	"health" : 50,
 	"shield" : 75,
 	"speed" : 1.85,

data/fighters/missileDart.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Missile Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
 	"speed" : 2.1,
 	"reloadTime" : 24,

data/fighters/nymph.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Nymph",
+	"description" : "A light class starfighter, constructed for use by the United Naval Forces. With the exception of the ATAFs, one of the latest designed and constructed starfighters in recent years.",
+	"affiliation" : "UNF",
 	"health" : 45,
 	"shield" : 40,
 	"speed" : 2,

data/fighters/ray.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Ray",
+	"description" : "A well armed, armoured and shielded fighter, the Ray compliments a squadron of TAFs well, although it is not as fast nor as manoeuvrable. The Ray is so called due to its outward appearance being quite similar to that of Manta Ray. It also features two seats, though it is possible to fly with one crew members.",
+	"affiliation" : "CSN",
 	"health" : 70,
 	"shield" : 70,
 	"speed" : 1.85,

data/fighters/razor.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Razor",
+	"description" : "The Razor is a medium-class starfighter, built and deployed by the Kingdom of Tzac. The fighter has a long service history, though it has likely undergone a number of updates and modifications to the base specification since its first appearance in 2571. Like most other Tzac starfighters, the current variation id of the fighter is not known, thought it could lie around F or G.",
+	"affiliation" : "Tzac",
 	"health" : 45,
 	"shield" : 55,
 	"speed" : 1.75,

data/fighters/rocketDart.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Rocket Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
 	"speed" : 2.1,
 	"reloadTime" : 35,

data/fighters/rook.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Rook",
+	"description" : "The most heavily armed and boosting the greatest defences of all the starfighters in the CSN, the Rook generally only sees action during significant missions and operations, where its increased power can bring many benefits. It is, however, the slowest of all the CSN's starfighters and some pilots have complained that it feels very sluggish in combat.",
+	"affiliation" : "CSN",
 	"health" : 110,
 	"shield" : 80,
 	"speed" : 1.7,

data/fighters/scarab.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Scarab",
+	"description" : "A scarab beetle-shaped bomber, generally used to launch a hail of rockets and missiles at targets. Slow, but quite well armoured and shielded. As with the Hammerhead, it relies on starfighter support to protect it during operations.",
+	"affiliation" : "INF",
 	"health" : 80,
 	"shield" : 65,
 	"speed" : 1.7,

data/fighters/shale.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Shale",
+	"description" : "The Shale is a light-class starfighter, based on the Nymph. It is believed to have been constructed by Tzac based on leaked information about the initial design elements of the Nymph. As such, it follows a similar form factor, but differs in both its colour scheme (green, instead of white and blue) and armaments, being equipped with three rapid-fire particle cannons, instead of the Nymph's two plasma cannons. Tzac denied any involvement in the theft of the Nymph's construction details, attesting that it believed the design documents were for a new type of Dart, and as such were not governed by any sort of intergalactic trade secrets.",
+	"affiliation" : "Tzac",
 	"health" : 50,
 	"shield" : 50,
 	"speed" : 2,

data/fighters/simpleDart.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Simple Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
 	"speed" : 2.1,
 	"reloadTime" : 24,

data/fighters/sk31.json

@@ -1,5 +1,7 @@
 {
 	"name" : "SK-31",
+	"description" : "The SK-31 is a medium-class starfighter, built and deployed by the Kingdom of Tzac. Unlike the Razor and SK-34, the SK-31 is equipped with two laser cannons, to enable it to disrupt the shields of its target and make it easier to either destroy or disable. It is unknown what the SK in the fighter's name stands for, and whether or not the 31 refers to an iteration or other internal identifier.",
+	"affiliation" : "Tzac",
 	"health" : 85,
 	"shield" : 50,
 	"speed" : 1.8,

data/fighters/sk34.json

@@ -1,5 +1,7 @@
 {
 	"name" : "SK-34",
+	"description" : "The SK-34 is a medium-class starfighter, built and deployed by the Kingdom of Tzac. Though its exterior appearance is very different to the SK-31, it features similar internal specifications. Unlike the SK-31, however, it is equipped with Mag cannons, instead of lasers. As with the SK-34, it is unknown what the SK in the fighter's name stands for, and whether or not the 34 refers to an iteration or other internal identifier.",
+	"affiliation" : "Tzac",
 	"health" : 100,
 	"shield" : 45,
 	"speed" : 1.7,

data/fighters/sphinx.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Sphinx",
+	"description" : "The Imperial Naval Forces answer to the Rook, the Sphinx is more heavily armed, but equally as fast and protected. Generally a single seated craft, the Sphinx can also accept a rear gunner, making it more difficult for opponents to tail it.",
+	"affiliation" : "INF",
 	"health" : 110,
 	"shield" : 75,
 	"speed" : 1.85,

data/fighters/staticDart.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Static Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
 	"speed" : 0,
 	"reloadTime" : 24,

data/fighters/swarmer.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Swarmer",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 5,
 	"speed" : 2,
 	"reloadTime" : 8,

data/fighters/taf.json

@@ -1,5 +1,7 @@
 {
 	"name" : "TAF",
+	"description" : "An all round, multi purpose, single-seat starfighter, the TAF is the most well known and highest produced starfighter within the CSN. Both lightly armoured and shielded, the TAF is easy to handle in the hands of a rookie and praised even by the most experienced of pilots. It makes up for its lack of armour, shielding and armaments by benefiting from good speeds and ease of manoeuvrability.",
+	"affiliation" : "CSN",
 	"health" : 35,
 	"shield" : 35,
 	"speed" : 2,

data/fighters/thunderhead.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Thunderhead",
+	"description" : "The Thunderhead evolved from an original concept design for a new bomber, of which it still shares some features (such as a generous supply of missiles and torpedo hardpoints). It is faster than the Scarab bombers, but a lot slower than the Sphinx. It is, however, better armoured and shielded than both. It is rarely seen on the field, as it is now considered old, costly to maintain and has in recent years been superseded by the Sphinx. Despite this, it remains a formidable opponent and its offensive measures means that it is able to take down light-class vessels with ease.",
+	"affiliation" : "INF",
 	"health" : 90,
 	"shield" : 65,
 	"speed" : 1.7,

data/fighters/unarmedDart.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Unarmed Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
 	"speed" : 2.1,
 	"reloadTime" : 24,

data/fighters/zakSphinx.json

@@ -1,5 +1,7 @@
 {
 	"name" : "Unique Sphinx",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 999,
 	"shield" : 999,
 	"speed" : 1.6,

data/locale/characters.dat

@@ -0,0 +1 @@
+Ö&|_# POfileorTBFS:handWCpygt2015-6,JwsbuGNUL3.Emj@c/"IV\RMD8+v?x;=%!AYq()'kH[]KzQX4Z79*àéí¡Çóè·úïçüºòÉÒÍÀ°æåøÆÅØ<>öÄäßÜá¿ñÁÊûâîôÈêùœÙìëęąłćżńśźŻŚŁĆÖ

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

@@ -16,10 +16,11 @@
 		},
 		{
 			"description" : "Destroy Pandoran fighters",
-			"targetName" : "Pandoran",
+			"targetValue" : 1,
-			"targetValue" : 3,
+			"targetName" : "ENEMY",
 			"targetType" : "TT_DESTROY",
-			"active" : 0
+			"active" : 0,
+			"isEliminateAll" : 1
 		}
 	],
 	"player" : {

data/missions/alba/04 - alba defence #1.json

@@ -14,11 +14,25 @@
 			"targetType" : "TT_WAYPOINT"
 		},
 		{
-			"description" : "Eliminate all enemy targets",
+			"description" : "Defeat Tzac group #1",
-			"targetName" : "ENEMY",
+			"targetName" : "Rebels-1",
-			"targetValue" : 1,
+			"targetValue" : 4,
 			"targetType" : "TT_DESTROY",
-			"isEliminateAll" : 1
+			"active" : 0
+		},
+		{
+			"description" : "Defeat Tzac group #2",
+			"targetName" : "Rebels-2",
+			"targetValue" : 5,
+			"targetType" : "TT_DESTROY",
+			"active" : 0
+		},
+		{
+			"description" : "Defeat Tzac group #3",
+			"targetName" : "Rebels-3",
+			"targetValue" : 6,
+			"targetType" : "TT_DESTROY",
+			"active" : 0
 		}
 	],
 	"player" : {
@@ -86,15 +100,17 @@
 	],
 	"script" : [
 		{
-			"function" : "TIME 0",
+			"function" : "TIME 1",
 			"lines" : [
-				"ACTIVATE_NEXT_WAYPOINT"
+				"ACTIVATE_NEXT_WAYPOINT",
+				"MSG_BOX Rice;Three Tzac fighter groups has been sighted in the area. We need to hunt them down and eliminate them."
 			]
 		},
 		{
 			"function" : "Waypoint #1",
 			"lines" : [
 				"ACTIVATE_ENTITY_GROUPS Rebels-1",
+				"ACTIVATE_OBJECTIVES Defeat Tzac group #1",
 				"MSG_BOX Wingmate;Enemies sighted.",
 				"MSG_BOX Rice;Break and attack, people!"
 			]
@@ -110,6 +126,7 @@
 			"function" : "Waypoint #2",
 			"lines" : [
 				"ACTIVATE_ENTITY_GROUPS Rebels-2",
+				"ACTIVATE_OBJECTIVES Defeat Tzac group #2",
 				"MSG_BOX Rice;Second group located."
 			]
 		},
@@ -124,6 +141,7 @@
 			"function" : "Waypoint #3",
 			"lines" : [
 				"ACTIVATE_ENTITY_GROUPS Rebels-3",
+				"ACTIVATE_OBJECTIVES Defeat Tzac group #3",
 				"MSG_BOX Rice;Final group spotted."
 			]
 		},

data/missions/alba/05 - alba defence #2.json

@@ -35,7 +35,7 @@
 		"pilot" : "1st Lt. Curtis Rice",
 		"squadron" : "Eightballers",
 		"x" : 25,
-		"y" : 5
+		"y" : 15
 	},
 	"fighters" : [
 		{
@@ -43,7 +43,7 @@
 			"number" : 11,
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
-			"y" : 5,
+			"y" : 15,
 			"scatter" : 500
 		},
 		{
@@ -51,7 +51,7 @@
 			"number" : 5,
 			"side" : "SIDE_TZAC",
 			"x" : 25,
-			"y" : 12,
+			"y" : 22,
 			"scatter" : 500
 		},
 		{
@@ -79,28 +79,49 @@
 		{
 			"groupName" : "Rebels-2",
 			"types" : "Shale;Razor;SK-31;SK-34",
-			"number" : 48,
+			"number" : 24,
 			"side" : "SIDE_TZAC",
-			"x" : -1,
+			"x" : 20,
-			"y" : 35,
+			"y" : -1,
-			"scatter" : 8500,
+			"scatter" : 500,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE",
+			"active" : 0
+		},
+		{
+			"groupName" : "Rebels-2",
+			"types" : "Shale;Razor;SK-31;SK-34",
+			"number" : 24,
+			"side" : "SIDE_TZAC",
+			"x" : 20,
+			"y" : -1,
+			"scatter" : 500,
 			"flags" : "+EF_AI_TARGET",
 			"aiFlags" : "+AIF_MOVES_TO_LEADER",
 			"active" : 0
 		},
 		{
 			"groupName" : "Pandorans",
-			"name" : "Pandoran",
 			"types" : "Jackal;Sphinx;Mantis;Thunderhead",
-			"number" : 48,
+			"number" : 24,
 			"side" : "SIDE_PANDORAN",
-			"x" : 51,
+			"x" : 30,
-			"y" : 35,
+			"y" : -1,
-			"scatter" : 8500,
+			"scatter" : 500,
 			"flags" : "+EF_AI_TARGET",
 			"aiFlags" : "+AIF_MOVES_TO_LEADER",
 			"active" : 0
 		},
+		{
+			"groupName" : "Pandorans",
+			"types" : "Jackal;Sphinx;Mantis;Thunderhead",
+			"number" : 24,
+			"side" : "SIDE_PANDORAN",
+			"x" : 30,
+			"y" : -1,
+			"scatter" : 500,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE",
+			"active" : 0
+		},
 		{
 			"groupName" : "White Knights",
 			"name" : "de Winter",
@@ -128,8 +149,8 @@
 			"name" : "HMS 821-283",
 			"types" : "HMS Corvette 01",
 			"side" : "SIDE_TZAC",
-			"x" : -1,
+			"x" : 20,
-			"y" : 35,
+			"y" : -1,
 			"flags" : "+EF_AI_LEADER",
 			"active" : 0
 		},
@@ -138,12 +159,20 @@
 			"name" : "INF Burnside",
 			"types" : "INF Corvette 02",
 			"side" : "SIDE_PANDORAN",
-			"x" : 51,
+			"x" : 30,
-			"y" : 35,
+			"y" : -1,
 			"flags" : "+EF_AI_LEADER",
 			"active" : 0
 		}
 	],
+	"entities" : [
+		{
+			"type" : "ET_JUMPGATE",
+			"x" : 25,
+			"y" : 48,
+			"flags" : "+EF_DISABLED"
+		}
+	],
 	"script" : [
 		{
 			"function" : "TIME 1",
@@ -190,7 +219,7 @@
 			]
 		},
 		{
-			"function" : "OBJECTIVES_COMPLETE 3",
+			"function" : "ALL_OBJECTIVES_COMPLETE",
 			"lines" : [
 				"WAIT 1",
 				"MSG_BOX Rice;I owe you my life, Knights.",

data/missions/alba/08 - alba defence #3.json

@@ -108,7 +108,7 @@
 			"types" : "HMS Corvette 01",
 			"x" : 15,
 			"y" : 15,
-			"flags" : "+EF_AI_TARGET"
+			"flags" : "+EF_AI_TARGET+EF_MISSION_TARGET"
 		}
 	],
 	"spawners" : [

data/missions/alba/09 - alba defence #4.json

@@ -70,7 +70,8 @@
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
 			"y" : -1,
-			"active" : 0
+			"active" : 0,
+			"flags" : "+EF_MISSION_TARGET"
 		},
 		{
 			"name" : "INF BC-41",
@@ -78,7 +79,8 @@
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
 			"y" : 51,
-			"active" : 0
+			"active" : 0,
+			"flags" : "+EF_MISSION_TARGET"
 		}
 	],
 	"spawners" : [
@@ -89,13 +91,14 @@
 			"interval" : 10,
 			"total" : -1,
 			"step" : 5,
+			"flags" : "EF_RETREATING+EF_TAKES_DAMAGE",
 			"aiFlags" : "+AIF_UNLIMITED_RANGE"
 		},
 		{
 			"name" : "pandoranSpawner",
 			"types" : "Jackal;Mantis;Sphinx;Thunderhead;Scarab;Shale;SK-31;SK-34;Razor;Blizzard;Khepri;Nymph;Hyena-A;Hyena-B;Firefly;Dart",
 			"side" : "SIDE_PANDORAN",
-			"interval" : 10,
+			"interval" : 12,
 			"total" : -1,
 			"step" : 2,
 			"aiFlags" : "+AIF_UNLIMITED_RANGE"

data/missions/alba/10 - alba defence #5.json

@@ -45,7 +45,6 @@
 			"scatter" : 5000
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Scarab;Mantis;Sphinx;Thunderhead;Shale;Razor;SK-31;SK-34;Blizzard;Khepri",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
@@ -177,7 +176,7 @@
 				"MSG_BOX Koonan;The anti-matter ball must've exploded in the atmosphere, and ignited it.",
 				"MSG_BOX de Winter;How ... how did the Pandorans know that would happen?!",
 				"MSG_BOX Koonan;I don't think they did; they just got lucky.",
-				"MSG_BOX Koonan;And now they use that against every planet they come to.",
+				"MSG_BOX Koonan;And now they'll use that against every planet they come to.",
 				"IMPORTANT_MSG_BOX CSN Leviathan;All forces, retreat immediately! Repeat: retreat immediately. White Knights, dock, and prepare for withdrawal.",
 				"MSG_BOX de Winter;...",
 				"IMPORTANT_MSG_BOX CSN Leviathan;White Knights, please acknowledge.",

data/missions/antomis/01 - antomis defence #1.json

@@ -31,6 +31,7 @@
 	},
 	"fighters" : [
 		{
+			"name" : "Wing Commander",
 			"types" : "Leopard",
 			"side" : "SIDE_ALLIES",
 			"x" : 20,

data/missions/antomis/02 - antomis offence #1.json

@@ -45,6 +45,7 @@
 	},
 	"fighters" : [
 		{
+			"name" : "Wing Commander",
 			"types" : "Leopard",
 			"side" : "SIDE_ALLIES",
 			"x" : 45,

data/missions/antomis/03 - antomis defence #2.json

@@ -6,7 +6,8 @@
 	"music" : "music/battle/Tactical Pursuit.mp3",
 	"requires" : 44,
 	"epic" : {
-		"fighterLimit" : 12
+		"fighterLimit" : 12,
+		"lives" : 12
 	},
 	"objectives" : [
 		{
@@ -51,7 +52,6 @@
 			"flags" : "+EF_AI_TARGET"
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Scarab;Mantis;Sphinx;Thunderhead",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
@@ -66,7 +66,8 @@
 			"types" : "INF Corvette 02",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
-			"y" : 10
+			"y" : 10,
+			"flags" : "+EF_MISSION_TARGET"
 		}
 	],
 	"script" : [

data/missions/aster/01 - return to aster #1.json

@@ -22,7 +22,7 @@
 			"active" : 0
 		},
 		{
-			"description" : "Defeat rebel forces",
+			"description" : "Defeat unidentified forces",
 			"targetName" : "Rebels",
 			"targetValue" : 12,
 			"targetType" : "TT_DESTROY",
@@ -134,7 +134,7 @@
 				"MSG_BOX CSN Florin;Incoming forces are on intercept vectors. We only need a few more minutes.",
 				"MSG_BOX Black;On it.",
 				"WAIT_MSG_BOX",
-				"ACTIVATE_OBJECTIVES Defeat rebel forces"
+				"ACTIVATE_OBJECTIVES Defeat unidentified forces"
 			]
 		},
 		{

data/missions/clarke/01 - clarke defence #1.json

@@ -6,7 +6,8 @@
 	"planet" : "gfx/planets/lewis.png",
 	"music" : "music/battle/Tactical Pursuit.mp3",
 	"epic" : {
-		"fighterLimit" : 12
+		"fighterLimit" : 12,
+		"lives" : 12
 	},
 	"objectives" : [
 		{
@@ -25,7 +26,6 @@
 	},
 	"fighters" : [
 		{
-			"name" : "ALLIES",
 			"types" : "Firefly;Nymph;Leopard;Hyena-A;Hyena-B",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
@@ -34,7 +34,6 @@
 			"scatter" : 5000
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Sphinx",
 			"side" : "SIDE_PANDORAN",
 			"x" : 35,

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

@@ -46,7 +46,7 @@
 			"scatter" : 500
 		},
 		{
-			"name" : "Pandoran",
+			"groupName" : "Pandoran",
 			"types" : "Jackal;Sphinx;Mantis",
 			"side" : "SIDE_PANDORAN",
 			"x" : 20,

data/missions/clarke/03 - clarke defence #3.json

@@ -50,7 +50,6 @@
 	},
 	"fighters" : [
 		{
-			"name" : "ALLIES",
 			"types" : "Firefly;Leopard;Lynx",
 			"side" : "SIDE_ALLIES",
 			"x" : 45,
@@ -60,7 +59,7 @@
 			"aiFlags" : "+AIF_MOVES_TO_LEADER"
 		},
 		{
-			"name" : "Pandoran",
+			"groupName" : "Pandoran",
 			"types" : "Jackal;Sphinx;Mantis",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,

data/missions/clarke/04 - clarke defence #4.json

@@ -41,7 +41,6 @@
 			"scatter" : 500
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
@@ -51,7 +50,6 @@
 			"aiFlags" : "+AIF_MOVES_TO_LEADER"
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab",
 			"side" : "SIDE_PANDORAN",
 			"x" : 40,
@@ -61,7 +59,6 @@
 			"aiFlags" : "+AIF_MOVES_TO_LEADER"
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
@@ -71,7 +68,6 @@
 			"aiFlags" : "+AIF_MOVES_TO_LEADER"
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "reinforcements",
 			"types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab",
 			"side" : "SIDE_PANDORAN",
@@ -83,7 +79,6 @@
 			"active" : 0
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "reinforcements-2",
 			"types" : "Jackal;Sphinx;Mantis;Thunderhead;Scarab",
 			"side" : "SIDE_PANDORAN",
@@ -102,7 +97,7 @@
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
 			"y" : 25,
-			"flags" : "EF_AI_LEADER"
+			"flags" : "+EF_AI_LEADER"
 		},
 		{
 			"name" : "INF Kongo",
@@ -110,7 +105,7 @@
 			"side" : "SIDE_PANDORAN",
 			"x" : 40,
 			"y" : 25,
-			"flags" : "EF_AI_LEADER"
+			"flags" : "+EF_AI_LEADER"
 		},
 		{
 			"name" : "INF Sharanga",
@@ -118,7 +113,7 @@
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
 			"y" : 40,
-			"flags" : "EF_AI_LEADER"
+			"flags" : "+EF_AI_LEADER"
 		}
 	],
 	"script" : [

data/missions/clarke/05 - clarke defence #5.json

@@ -69,7 +69,6 @@
 			"scatter" : 600
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "group-1",
 			"types" : "Jackal;Mantis",
 			"side" : "SIDE_PANDORAN",
@@ -79,7 +78,6 @@
 			"scatter" : 600
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "group-2",
 			"types" : "Jackal;Mantis",
 			"side" : "SIDE_PANDORAN",
@@ -160,7 +158,7 @@
 				"ACTIVATE_OBJECTIVES Destroy INF Alysha's Calling",
 				"WAIT_MSG_BOX",
 				"ACTIVATE_ENTITY_GROUPS swarmers-1",
-				"MSG_BOX CSN Thunderbird;Welch, we are tracking a large number of fast-moving heading your way. IDs don't match anything we currently have on record.",
+				"MSG_BOX CSN Thunderbird;Welch, we're tracking a large number of fast-moving objects heading your way. IDs don't match anything we currently have on record.",
 				"MSG_BOX Welch;Missiles?",
 				"MSG_BOX CSN Thunderbird;Too large. We'll relay more information as we get it. Be prepared to engage.",
 				"ACTIVATE_OBJECTIVES Destroy incoming threat"

data/missions/clarke/06 - clarke defence #6.json

@@ -17,7 +17,7 @@
 	],
 	"epic" : {
 		"fighterLimit" : 24,
-		"unlimitedEnemies" : 1
+		"kills" : 75
 	},
 	"player" : {
 		"type" : "Rook",
@@ -27,7 +27,6 @@
 	},
 	"fighters" : [
 		{
-			"name" : "ALLIES",
 			"types" : "TAF;Ray;Kingfisher;Hammerhead;Firefly;Nymph;Lynx;Hyena-A;Hyena-B",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
@@ -36,7 +35,6 @@
 			"scatter" : 10000
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Mantis;Sphinx;Scarab;Thunderhead",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,

data/missions/coyote/01 - coyote assault #1.json

@@ -9,9 +9,10 @@
 	"objectives" : [
 		{
 			"description" : "Destroy all enemy targets",
-			"targetName" : "Pandoran",
+			"targetName" : "ENEMY",
 			"targetValue" : 100,
-			"targetType" : "TT_DESTROY"
+			"targetType" : "TT_DESTROY",
+			"isEliminateAll" : 1
 		}
 	],
 	"player" : {
@@ -81,7 +82,6 @@
 			"aiFlags" : "+AIF_MOVES_TO_LEADER"
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Sphinx;Nymph",
 			"number" : 25,
 			"side" : "SIDE_PANDORAN",
@@ -90,7 +90,6 @@
 			"scatter" : 2500
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "pandoran-2",
 			"types" : "Jackal;Sphinx;Nymph",
 			"number" : 25,
@@ -101,7 +100,6 @@
 			"active" : 0
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "pandoran-3",
 			"types" : "Jackal;Sphinx;Nymph",
 			"number" : 25,
@@ -112,7 +110,6 @@
 			"active" : 0
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "pandoran-4",
 			"types" : "Nymph",
 			"number" : 25,

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

@@ -6,7 +6,8 @@
 	"planet" : "gfx/planets/mythos.png",
 	"music" : "music/battle/Tactical Pursuit.mp3",
 	"epic" : {
-		"fighterLimit" : 12
+		"fighterLimit" : 12,
+		"lives" : 12
 	},
 	"objectives" : [
 		{
@@ -25,7 +26,6 @@
 	},
 	"fighters" : [
 		{
-			"name" : "ALLIES",
 			"types" : "Firefly;Nymph;TAF;Ray;Leopard;Hyena-A;Hyena-B;Kingfisher",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
@@ -34,7 +34,6 @@
 			"scatter" : 5000
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Mantis;Sphinx",
 			"side" : "SIDE_PANDORAN",
 			"x" : 35,

data/missions/coyote/03 - coyote assault #3.json

@@ -7,7 +7,8 @@
 	"music" : "music/battle/Tactical Pursuit.mp3",
 	"epic" : {
 		"fighterLimit" : 12,
-		"unlimitedEnemies" : 1
+		"unlimitedEnemies" : 1,
+		"lives" : 12
 	},
 	"objectives" : [
 		{
@@ -32,7 +33,6 @@
 	},
 	"fighters" : [
 		{
-			"name" : "ALLIES",
 			"types" : "Firefly;Nymph;TAF;Ray;Leopard;Hyena-A;Hyena-B;Kingfisher",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
@@ -41,7 +41,7 @@
 			"scatter" : 5000
 		},
 		{
-			"name" : "Pandoran",
+			"groupName" : "Pandoran",
 			"types" : "Jackal;Mantis;Sphinx",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
@@ -81,7 +81,6 @@
 			"active" : 0
 		},
 		{
-			"name" : "ALLIES",
 			"types" : "Firefly;Nymph;TAF;Ray;Leopard;Hyena-A;Hyena-B;Kingfisher",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,

data/missions/donesta/03 - donesta defence #2.json

@@ -7,7 +7,8 @@
 	"music" : "music/battle/Tactical Pursuit.mp3",
 	"manualComplete" : 1,
 	"epic" : {
-		"fighterLimit" : 12
+		"fighterLimit" : 12,
+		"lives" : 12
 	},
 	"objectives" : [
 		{
@@ -26,7 +27,6 @@
 	},
 	"fighters" : [
 		{
-			"name" : "ALLIES",
 			"types" : "Firefly;Nymph;TAF;Ray;Leopard;Hyena-A;Hyena-B;Kingfisher;Rook",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
@@ -35,14 +35,13 @@
 			"scatter" : 5000
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Firefly;Nymph;Nymph;Leopard;Hyena-A;Hyena-B",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
 			"y" : 15,
 			"number" : 80,
 			"scatter" : 5000,
-			"flags" : "+EF_FRIENDLY_HEALTH_BAR"
+			"flags" : "+EF_FRIENDLY_HEALTH_BAR+EF_NO_PLAYER_TARGET"
 		}
 	],
 	"script" : [
@@ -50,7 +49,7 @@
 			"function" : "TIME 2",
 			"lines" : [
 				"MSG_BOX Wing Commander;Remember everyone: the Pandorans are using UNF fighters.",
-				"MSG_BOX Wing Commander;Using your radar and HUD is the way to go in this fight."
+				"MSG_BOX Wing Commander;Using your radar is the way to go in this fight."
 			]
 		},
 		{

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

@@ -130,7 +130,7 @@
 			"lines" : [
 				"WAIT 1",
 				"MSG_BOX Alexandria Orbital;Patrol, we have a major situation developing. A skirmish is taking place between a number of starfighters: Darts, Nymphs, and Fireflies.",
-				"MSG_BOX Carr;Pirates? Insurgents? Nation of Tzac?",
+				"MSG_BOX Carr;Pirates? Insurgents? Kingdom of Tzac?",
 				"WAIT_MSG_BOX",
 				"ACTIVATE_OBJECTIVES Disable pirate commander",
 				"ACTIVATE_OBJECTIVES Disable Tzac commander",

data/missions/iliad/01 - iliad defence #1.json

@@ -53,7 +53,6 @@
 			"flags" : "+EF_MISSION_TARGET"
 		},
 		{
-			"name" : "ALLIES",
 			"types" : "Firefly;Nymph;Leopard",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
@@ -62,7 +61,7 @@
 			"scatter" : 1000
 		},
 		{
-			"name" : "Pandoran",
+			"groupName" : "Pandoran",
 			"types" : "Jackal",
 			"side" : "SIDE_PANDORAN",
 			"x" : 27,
@@ -71,7 +70,7 @@
 			"scatter" : 1000
 		},
 		{
-			"name" : "Pandoran",
+			"groupName" : "Pandoran",
 			"types" : "Jackal",
 			"side" : "SIDE_PANDORAN",
 			"x" : 20,
@@ -80,7 +79,7 @@
 			"scatter" : 1000
 		},
 		{
-			"name" : "Pandoran",
+			"groupName" : "Pandoran",
 			"types" : "Jackal",
 			"side" : "SIDE_PANDORAN",
 			"x" : 35,

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

@@ -6,7 +6,8 @@
 	"planet" : "gfx/planets/diso.png",
 	"music" : "music/battle/Tactical Pursuit.mp3",
 	"epic" : {
-		"fighterLimit" : 12
+		"fighterLimit" : 12,
+		"lives" : 12
 	},
 	"objectives" : [
 		{
@@ -25,8 +26,7 @@
 	},
 	"fighters" : [
 		{
-			"name" : "ALLIES",
+			"types" : "Firefly;Nymph;Hyena-B",
-			"types" : "Firefly;Nymph",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
 			"y" : 24,
@@ -34,7 +34,6 @@
 			"scatter" : 5000
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal",
 			"side" : "SIDE_PANDORAN",
 			"x" : 35,

data/missions/iliad/03 - iliad defence #3.json

@@ -42,7 +42,6 @@
 			"scatter" : 500
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Sphinx;Thunderhead",
 			"side" : "SIDE_PANDORAN",
 			"x": 25,
@@ -75,7 +74,6 @@
 			"aiFlags" : "+AIF_MOVES_TO_LEADER"
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "Reinforcements-1",
 			"types" : "Jackal;Sphinx;Thunderhead",
 			"side" : "SIDE_PANDORAN",
@@ -87,7 +85,6 @@
 			"active" : 0
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "Reinforcements-2",
 			"types" : "Jackal;Sphinx;Thunderhead",
 			"side" : "SIDE_PANDORAN",
@@ -117,7 +114,7 @@
 				"WAIT_MSG_BOX",
 				"ACTIVATE_ENTITY_GROUPS Reinforcements-2",
 				"MSG_BOX Control;Strider, be advised that we are tracking a further three INF fighters heading your way.",
-				"MSG_BOX Strider;Dammit, spoke to soon ..."
+				"MSG_BOX Strider;Dammit, spoke too soon ..."
 			]
 		}
 	]

data/missions/iliad/04 - iliad defence #4.json

@@ -35,13 +35,6 @@
 			"targetType" : "TT_DESTROY",
 			"active" : 0
 		},
-		{
-			"description" : "Destroy INF Buster",
-			"targetName" : "INF Buster",
-			"targetValue" : 1,
-			"targetType" : "TT_DESTROY",
-			"active" : 0
-		},
 		{
 			"description" : "Eliminate all enemies",
 			"targetName" : "ENEMY",
@@ -88,7 +81,6 @@
 			"aiFlags" : "+AIF_MOVES_TO_LEADER"
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Sphinx;Mantis",
 			"side" : "SIDE_PANDORAN",
 			"x": 18,
@@ -98,17 +90,6 @@
 			"aiFlags" : "+AIF_UNLIMITED_RANGE"
 		},
 		{
-			"name" : "Pandoran",
-			"types" : "Jackal;Sphinx;Mantis",
-			"side" : "SIDE_PANDORAN",
-			"x": 1,
-			"y": 20,
-			"number" : 4,
-			"scatter" : 500,
-			"aiFlags" : "+AIF_UNLIMITED_RANGE"
-		},
-		{
-			"name" : "Pandoran",
 			"groupName" : "Pandorans-2",
 			"types" : "Jackal;Sphinx;Mantis",
 			"side" : "SIDE_PANDORAN",
@@ -120,7 +101,6 @@
 			"active" : 0
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "AstraEscorts",
 			"types" : "Jackal;Sphinx;Mantis",
 			"side" : "SIDE_PANDORAN",
@@ -132,25 +112,23 @@
 			"active" : 0
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "BustRagEscorts",
 			"types" : "Jackal;Sphinx;Mantis",
 			"side" : "SIDE_PANDORAN",
 			"x": 22,
 			"y": -2,
-			"number" : 8,
+			"number" : 10,
 			"scatter" : 2500,
 			"aiFlags" : "+AIF_MOVES_TO_LEADER",
 			"active" : 0
 		},
 		{
-			"name" : "Pandoran",
 			"groupName" : "Scarabs",
 			"types" : "Scarab",
 			"side" : "SIDE_PANDORAN",
 			"x": 25,
-			"y": -4,
+			"y": 52,
-			"number" : 12,
+			"number" : 8,
 			"scatter" : 2500,
 			"aiFlags" : "+AIF_UNLIMITED_RANGE",
 			"active" : 0
@@ -163,7 +141,7 @@
 			"side" : "SIDE_ALLIES",
 			"x" : 10,
 			"y" : 10,
-			"flags" : "EF_AI_LEADER+EF_AI_TARGET"
+			"flags" : "+EF_AI_LEADER+EF_AI_TARGET"
 		},
 		{
 			"name" : "UNF Joan of Arc",
@@ -171,33 +149,24 @@
 			"side" : "SIDE_ALLIES",
 			"x" : 11,
 			"y" : 11,
-			"flags" : "EF_AI_LEADER+EF_AI_TARGET"
+			"flags" : "+EF_AI_LEADER+EF_AI_TARGET"
 		},
 		{
 			"name" : "INF Astra",
 			"types" : "INF Corvette 02",
 			"side" : "SIDE_PANDORAN",
 			"x" : 10,
-			"y" : -5,
+			"y" : 52,
-			"flags" : "EF_AI_LEADER+EF_AI_TARGET",
+			"flags" : "+EF_AI_LEADER+EF_AI_TARGET",
 			"active" : 0
 		},
 		{
 			"name" : "INF Ragnarok",
 			"types" : "INF Corvette 01",
 			"side" : "SIDE_PANDORAN",
-			"x" : 21,
+			"x" : 17,
 			"y" : -5,
-			"flags" : "EF_AI_LEADER+EF_AI_TARGET",
+			"flags" : "+EF_AI_LEADER+EF_AI_TARGET",
-			"active" : 0
-		},
-		{
-			"name" : "INF Buster",
-			"types" : "INF Corvette 02",
-			"side" : "SIDE_PANDORAN",
-			"x" : 20,
-			"y" : -5,
-			"flags" : "EF_AI_LEADER+EF_AI_TARGET",
 			"active" : 0
 		}
 	],
@@ -229,9 +198,9 @@
 		{
 			"function" : "TIME 210",
 			"lines" : [
-				"ACTIVATE_ENTITIES INF Buster;INF Ragnarok",
+				"ACTIVATE_ENTITIES INF Ragnarok",
-				"ACTIVATE_OBJECTIVES Destroy INF Buster;Destroy INF Ragnarok",
+				"ACTIVATE_OBJECTIVES Destroy INF Ragnarok",
-				"MSG_BOX Control;Agamemnon's 1st, INF Buster and INF Ragnarok on approach. Determining escort groups ..."
+				"MSG_BOX Control;Agamemnon's 1st, INF Ragnarok on approach. Determining escort group ..."
 			]
 		},
 		{

data/missions/iliad/05 - iliad defence #5.json

@@ -7,7 +7,8 @@
 	"music" : "music/battle/Tactical Pursuit.mp3",
 	"epic" : {
 		"fighterLimit" : 12,
-		"unlimitedEnemies" : 1
+		"unlimitedEnemies" : 1,
+		"kills" : 25
 	},
 	"unwinnable" : 1,
 	"objectives" : [
@@ -27,7 +28,6 @@
 	},
 	"fighters" : [
 		{
-			"name" : "ALLIES",
 			"types" : "Firefly;Nymph;Lynx;Hyena-A;Hyena-B",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
@@ -37,7 +37,6 @@
 			"flags" : "+EF_AI_TARGET"
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Mantis;Sphinx;Scarab",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,

data/missions/mace/01 - mace assault #1.json

@@ -103,7 +103,7 @@
 			"function" : "TIME 2",
 			"lines" : [
 				"MSG_BOX Wolfenden;Our goal is the jumpgate. Expect a lot of resistance.",
-				"MSG_BOX Wolfenden;Once we're they, we need to destroy the control nodes to shut it down. Barclay, that's your job."
+				"MSG_BOX Wolfenden;Once we're there, we need to destroy the control nodes to shut it down. Barclay, that's your job."
 			]
 		},
 		{

data/missions/mace/02 - mace assault #2.json

@@ -41,15 +41,17 @@
 			"side" : "SIDE_ALLIES",
 			"x" : 5,
 			"y" : 45,
-			"scatter" : 500
+			"scatter" : 500,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE"
 		},
 		{
-			"types" : "Hammerhead;Lynx",
+			"types" : "Hammerhead;Lynx;Firefly;Ray",
-			"number" : 10,
+			"number" : 14,
 			"side" : "SIDE_ALLIES",
 			"x" : 5,
 			"y" : 45,
-			"scatter" : 500
+			"scatter" : 500,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE"
 		},
 		{
 			"types" : "Shale",
@@ -74,7 +76,7 @@
 		{
 			"groupName" : "Rebels-2",
 			"types" : "Shale",
-			"number" : 15,
+			"number" : 6,
 			"side" : "SIDE_TZAC",
 			"x" : 15,
 			"y" : 51,
@@ -107,7 +109,7 @@
 		{
 			"function" : "TIME 2",
 			"lines" : [
-				"MSG_BOX Lee;HMS 781-110 sighted. All fighters free to engage at will. Follow my lead."
+				"MSG_BOX Lee;HMS 781-110 sighted. All fighters free to engage at will."
 			]
 		},
 		{
@@ -125,13 +127,15 @@
 		{
 			"function" : "CAP_HEALTH HMS 781-041 3",
 			"lines" : [
+				"MSG_BOX Wingmate;Commander, a large group of Shales just arrived in the area",
+				"MSG_BOX Lee;Hell, they've called for backup. We should take them down before dealing with HMS 781-041",
 				"ACTIVATE_ENTITY_GROUPS Rebels-2"
 			]
 		},
 		{
 			"function" : "CAP_HEALTH HMS 781-041 1",
 			"lines" : [
-				"IMPORTANT_MSG_BOX HMS 781-041;This is HMS 781-041 of the Nation of Tzac! We surrender! Repeat, we surrender!",
+				"IMPORTANT_MSG_BOX HMS 781-041;This is HMS 781-041 of the Kingdom of Tzac! We surrender! Repeat, we surrender!",
 				"MSG_BOX Wingmate;Did anyone else get that?",
 				"MSG_BOX Lee;HMS 781-041, please repeat."
 			]

data/missions/phylent/01 - infiltration #1.json

@@ -10,7 +10,7 @@
 	"manualComplete" : 1,
 	"player" : {
 		"type" : "TAF",
-		"pilot" : "PJ Burgess",
+		"pilot" : "1st Lt. PJ Burgess",
 		"squadron" : "Drunken Bakers",
 		"side" : "SIDE_ALLIES",
 		"x" : 45,

data/missions/rothan/01 - rothan defence #1.json

@@ -108,8 +108,7 @@
 			"y" : 25,
 			"number" : 12,
 			"scatter" : 0,
-			"aiFlags" : "+AIF_MOVES_TO_LEADER",
+			"aiFlags" : "+AIF_MOVES_TO_LEADER"
-			"flags" : "+EF_AI_LEADER"
 		},
 		{
 			"types" : "Jackal;Sphinx;Thunderhead;Mantis",

data/missions/rothan/03 - rothan defence #3.json

@@ -37,7 +37,8 @@
 			"y" : 25,
 			"side" : "SIDE_ALLIES",
 			"scatter" : 500,
-			"number" : 2
+			"number" : 2,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE"
 		},
 		{
 			"name" : "Shipyard",
@@ -66,7 +67,7 @@
 			"scatter" : 2500,
 			"number" : 7,
 			"flags" : "EF_TAKES_DAMAGE",
-			"aiFlags" : "+AIF_UNLIMITED_RANGE+AIF_TARGET_FOCUS"
+			"aiFlags" : "+AIF_UNLIMITED_RANGE"
 		},
 		{
 			"groupName" : "Rebels-1",
@@ -77,7 +78,7 @@
 			"scatter" : 2500,
 			"number" : 4,
 			"flags" : "EF_TAKES_DAMAGE",
-			"aiFlags" : "+AIF_UNLIMITED_RANGE+AIF_TARGET_FOCUS",
+			"aiFlags" : "+AIF_UNLIMITED_RANGE",
 			"active" : 0
 		},
 		{
@@ -87,7 +88,7 @@
 			"y" : -1,
 			"side" : "SIDE_TZAC",
 			"scatter" : 2500,
-			"number" : 6,
+			"number" : 3,
 			"flags" : "EF_TAKES_DAMAGE",
 			"aiFlags" : "AIF_UNLIMITED_RANGE+AIF_TARGET_FOCUS+AIF_MISSILE_BOAT+AIF_LONG_RANGE_FIRE",
 			"active" : 0
@@ -101,7 +102,7 @@
 			"scatter" : 2500,
 			"number" : 4,
 			"flags" : "EF_TAKES_DAMAGE",
-			"aiFlags" : "+AIF_UNLIMITED_RANGE+AIF_TARGET_FOCUS",
+			"aiFlags" : "+AIF_UNLIMITED_RANGE",
 			"active" : 0
 		},
 		{
@@ -111,7 +112,7 @@
 			"y" : -1,
 			"side" : "SIDE_TZAC",
 			"scatter" : 2500,
-			"number" : 6,
+			"number" : 3,
 			"flags" : "EF_TAKES_DAMAGE",
 			"aiFlags" : "AIF_UNLIMITED_RANGE+AIF_TARGET_FOCUS+AIF_MISSILE_BOAT+AIF_LONG_RANGE_FIRE",
 			"active" : 0
@@ -124,7 +125,7 @@
 				"MSG_BOX Reid;We've got multiple incoming Tzac fighters. We need to prevent them from destroying the ships here.",
 				"MSG_BOX Wingmate;Any backup on the way?",
 				"MSG_BOX Reid;The threat warning came in too late for any other squadrons to assist us, but we have the turrets to assist us.",
-				"MSG_BOX Reid;Expect the Tzac forces to focus on destroying the tugs and shuttles."
+				"MSG_BOX Reid;Expect the Tzac bombers to focus on destroying the tugs and shuttles."
 			]
 		},
 		{

data/missions/rothan/05 - rothan defence #4.json

@@ -7,7 +7,8 @@
 	"planet" : "gfx/planets/rockford.png",
 	"music" : "music/battle/Tactical Pursuit.mp3",
 	"epic" : {
-		"fighterLimit" : 18
+		"fighterLimit" : 18,
+		"lives" : 12
 	},
 	"objectives" : [
 		{
@@ -26,7 +27,6 @@
 	},
 	"fighters" : [
 		{
-			"name" : "ALLIES",
 			"types" : "Firefly;Nymph;TAF;Ray;Leopard;Hyena-A;Hyena-B;Kingfisher;Rook",
 			"side" : "SIDE_ALLIES",
 			"x" : 25,
@@ -35,7 +35,6 @@
 			"scatter" : 5000
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Scarab;Mantis;Swarmer;Swarmer",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,

data/missions/rothan/06 - rothan defence #5.json

@@ -1,6 +1,6 @@
 {
 	"name" : "Rothan Defence #5",
-	"description" : "The Pandorans are pressing home their advantage, and closing in on Rothan's inhabitted planets. They must defeated, as a loss here would mean them starting a ground assault. Expect heavy resistance.",
+	"description" : "The Pandorans are pressing home their advantage, and closing in on Rothan's inhabited planets. They must defeated, as a loss here would mean them starting a ground assault. Expect heavy resistance.",
 	"requires" : 54,
 	"manualComplete" : 1,
 	"background" : "gfx/backgrounds/background05.jpg",
@@ -9,6 +9,7 @@
 	"unwinnable" : 1,
 	"epic" : {
 		"fighterLimit" : 18,
+		"kills" : 35,
 		"unlimitedEnemies" : 1
 	},
 	"objectives" : [
@@ -18,18 +19,6 @@
 			"targetValue" : 1,
 			"targetType" : "TT_DESTROY",
 			"isEliminateAll" : 1
-		},
-		{
-			"description" : "Destroy INF Mora",
-			"targetName" : "INF Mora",
-			"targetValue" : 1,
-			"targetType" : "TT_DESTROY"
-		},
-		{
-			"description" : "Destroy INF Karambit",
-			"targetName" : "INF Karambit",
-			"targetValue" : 1,
-			"targetType" : "TT_DESTROY"
 		}
 	],
 	"player" : {
@@ -49,7 +38,6 @@
 			"flags" : "+EF_AI_TARGET"
 		},
 		{
-			"name" : "Pandoran",
 			"types" : "Jackal;Scarab;Mantis;Thunderhead;Dart;Khepri;Swarmer",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,

data/missions/sampi-persei vii/01 - infiltration #2.json

@@ -25,7 +25,23 @@
 			"targetType" : "TT_ESCAPED"
 		},
 		{
-			"description" : "Kill civilians",
+			"description" : "Eliminate civilian group #1",
+			"targetName" : "ENEMY",
+			"targetValue" : 1,
+			"targetType" : "TT_DESTROY",
+			"isEliminateAll" : 1,
+			"active" : 0
+		},
+		{
+			"description" : "Eliminate civilian group #2",
+			"targetName" : "ENEMY",
+			"targetValue" : 1,
+			"targetType" : "TT_DESTROY",
+			"isEliminateAll" : 1,
+			"active" : 0
+		},
+		{
+			"description" : "Eliminate civilian group #3",
 			"targetName" : "ENEMY",
 			"targetValue" : 1,
 			"targetType" : "TT_DESTROY",
@@ -53,54 +69,6 @@
 			"number" : 8,
 			"flags" : "+EF_IMMORTAL",
 			"aiFlags" : "+AIF_MOVES_TO_LEADER+AIF_UNLIMITED_RANGE"
-		},
-		{
-			"groupName" : "Civ-1",
-			"types" : "Civilian",
-			"side" : "SIDE_ALLIES",
-			"x" : -1,
-			"y" : -1,
-			"scatter" : 500,
-			"number" : 8,
-			"flags" : "EF_RETREATING+EF_TAKES_DAMAGE",
-			"aiFlags" : "AIF_AVOIDS_COMBAT+AIF_WANDERS",
-			"active" : 0
-		},
-		{
-			"groupName" : "Civ-2",
-			"types" : "Civilian",
-			"side" : "SIDE_ALLIES",
-			"x" : 25,
-			"y" : -1,
-			"scatter" : 500,
-			"number" : 16,
-			"flags" : "EF_RETREATING+EF_TAKES_DAMAGE",
-			"aiFlags" : "AIF_AVOIDS_COMBAT+AIF_WANDERS",
-			"active" : 0
-		},
-		{
-			"groupName" : "Civ-3",
-			"types" : "Civilian",
-			"side" : "SIDE_ALLIES",
-			"x" : -1,
-			"y" : 25,
-			"scatter" : 500,
-			"number" : 8,
-			"flags" : "EF_RETREATING+EF_TAKES_DAMAGE",
-			"aiFlags" : "AIF_AVOIDS_COMBAT+AIF_MOVES_TO_LEADER",
-			"active" : 0
-		},
-		{
-			"groupName" : "Civ-3",
-			"types" : "Simple Dart",
-			"side" : "SIDE_ALLIES",
-			"x" : -1,
-			"y" : 25,
-			"scatter" : 500,
-			"number" : 3,
-			"flags" : "+EF_AI_LEADER",
-			"aiFlags" : "+AIF_WANDERS+AIF_DEFENSIVE",
-			"active" : 0
 		}
 	],
 	"entities" : [
@@ -111,6 +79,44 @@
 			"flags" : "EF_DISABLED+EF_NO_HEALTH_BAR"
 		}
 	],
+	"spawners" : [
+		{
+			"name" : "Civ-1",
+			"types" : "Civilian;Simple Dart",
+			"side" : "SIDE_ALLIES",
+			"interval" : 2,
+			"total" : 12,
+			"step" : 1,
+			"flags" : "EF_RETREATING+EF_TAKES_DAMAGE",
+			"aiFlags" : "AIF_DEFENSIVE+AIF_WANDERS",
+			"offscreen" : 1,
+			"active" : 0
+		},
+		{
+			"name" : "Civ-2",
+			"types" : "Civilian;Simple Dart",
+			"side" : "SIDE_ALLIES",
+			"interval" : 2,
+			"total" : 12,
+			"step" : 1,
+			"flags" : "EF_RETREATING+EF_TAKES_DAMAGE",
+			"aiFlags" : "AIF_DEFENSIVE+AIF_WANDERS",
+			"offscreen" : 1,
+			"active" : 0
+		},
+		{
+			"name" : "Civ-3",
+			"types" : "Civilian;Simple Dart",
+			"side" : "SIDE_ALLIES",
+			"interval" : 2,
+			"total" : 12,
+			"step" : 1,
+			"flags" : "EF_RETREATING+EF_TAKES_DAMAGE",
+			"aiFlags" : "AIF_DEFENSIVE+AIF_WANDERS",
+			"offscreen" : 1,
+			"active" : 0
+		}
+	],
 	"script" : [
 		{
 			"function" : "TIME 1",
@@ -121,14 +127,14 @@
 			]
 		},
 		{
-			"function" : "TIME 30",
+			"function" : "TIME 15",
 			"lines" : [
 				"PANDORAN_MSG_BOX Wing Commander;Report.",
 				"PANDORAN_MSG_BOX Wingmate;Nothing to report, Commander. All clear."
 			]
 		},
 		{
-			"function" : "TIME 60",
+			"function" : "TIME 30",
 			"lines" : [
 				"PANDORAN_MSG_BOX Wing Commander;Report.",
 				"PANDORAN_MSG_BOX Wingmate;Picking up signals. Medium-sized, appear to be unarmed.",
@@ -136,40 +142,45 @@
 				"PANDORAN_MSG_BOX Wing Commander;Moving towards targets. Prepare to engage.",
 				"WAIT_MSG_BOX",
 				"MSG_BOX Hicks;(Ah, hell! We're hunting civilians. I ... I can't refuse orders ...)",
-				"ACTIVATE_ENTITY_GROUPS Civ-1",
+				"ACTIVATE_SPAWNER 1 Civ-1",
-				"ACTIVATE_OBJECTIVES Kill civilians"
-			]
-		},
-		{
-			"function" : "ENEMIES_KILLED 8",
-			"lines" : [
-				"WAIT 1",
-				"MSG_BOX Hicks;(Better get back to the wing commander, before they think I'm slacking)",
-				"WAIT 30",
-				"PANDORAN_MSG_BOX Wingmate;More opposition detected.",
-				"PANDORAN_MSG_BOX Wing Commander;Follow my lead and eliminate all.",
-				"ACTIVATE_ENTITY_GROUPS Civ-2"
-			]
-		},
-		{
-			"function" : "ENEMIES_KILLED 32",
-			"lines" : [
-				"WAIT 30",
-				"PANDORAN_MSG_BOX Wing Commander;Report.",
-				"PANDORAN_MSG_BOX Wingmate;Nothing to report, Commander. All clear.",
 				"WAIT_MSG_BOX",
-				"WAIT 30",
+				"ACTIVATE_OBJECTIVES Eliminate civilian group #1"
-				"ACTIVATE_ENTITY_GROUPS Civ-3",
-				"PANDORAN_MSG_BOX Wingmate;Enemies signal detected. Some armed.",
-				"PANDORAN_MSG_BOX Wing Commander;Follow my lead and eliminate all."
 			]
 		},
 		{
 			"function" : "OBJECTIVES_COMPLETE 1",
+			"lines" : [
+				"WAIT 1",
+				"MSG_BOX Hicks;(Better get back to the wing commander, before they think I'm slacking)",
+				"WAIT 30",
+				"PANDORAN_MSG_BOX Wingmate;More opposition detected.",
+				"PANDORAN_MSG_BOX Wing Commander;Follow my lead and eliminate all.",
+				"ACTIVATE_SPAWNER 1 Civ-2",
+				"WAIT_MSG_BOX",
+				"ACTIVATE_OBJECTIVES Eliminate civilian group #2"
+			]
+		},
+		{
+			"function" : "OBJECTIVES_COMPLETE 2",
+			"lines" : [
+				"WAIT 15",
+				"PANDORAN_MSG_BOX Wing Commander;Report.",
+				"PANDORAN_MSG_BOX Wingmate;Nothing to report, Commander. All clear.",
+				"WAIT_MSG_BOX",
+				"WAIT 15",
+				"ACTIVATE_SPAWNER 1 Civ-3",
+				"PANDORAN_MSG_BOX Wingmate;Enemies signal detected. Some armed.",
+				"PANDORAN_MSG_BOX Wing Commander;Follow my lead and eliminate all.",
+				"WAIT_MSG_BOX",
+				"ACTIVATE_OBJECTIVES Eliminate civilian group #3"
+			]
+		},
+		{
+			"function" : "OBJECTIVES_COMPLETE 3",
 			"lines" : [
 				"WAIT 1",
 				"PANDORAN_MSG_BOX Wingmate;All opposition defeated.",
-				"WAIT 20",
+				"WAIT 15",
 				"PANDORAN_MSG_BOX Wing Commander;Sector clear. Head to jumpgate and exit the system.",
 				"MSG_BOX Hicks;(They're moving to the jumpgate. I should join them, and stick close.)",
 				"WAIT_MSG_BOX",

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

@@ -1,6 +1,6 @@
 {
 	"name" : "Pirate Uprising #1",
-	"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 presence at Temper.",
+	"description" : "The Pandorans' 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 presence at Temper.",
 	"background" : "gfx/backgrounds/background03.jpg",
 	"planet" : "gfx/planets/spirit.png",
 	"music" : "music/battle/battleThemeA.mp3",

data/missions/trilliack/03 - traitor hunt #1.json

@@ -10,7 +10,7 @@
 	"player" : {
 		"type" : "Hyena-A",
 		"side" : "SIDE_ALLIES",
-		"pilot" : "Malcolm D'Ath",
+		"pilot" : "Lt. Cdr. Malcolm D'Ath",
 		"squadron" : "Sparrows",
 		"x" : 45,
 		"y" : 25

data/missions/trilliack/04 - traitor hunt #3.json

@@ -10,7 +10,7 @@
 	"player" : {
 		"type" : "Hyena-A",
 		"side" : "SIDE_ALLIES",
-		"pilot" : "Malcolm D'Ath",
+		"pilot" : "Lt. Cdr. Malcolm D'Ath",
 		"squadron" : "Sparrows",
 		"x" : 10,
 		"y" : 10
@@ -47,7 +47,7 @@
 	"fighters" : [
 		{
 			"types" : "Ray;Firefly;Kingfisher;Hammerhead",
-			"number" : 8,
+			"number" : 12,
 			"side" : "SIDE_ALLIES",
 			"x" : 10,
 			"y" : 10,

data/missions/trilliack/05 - traitor hunt #5.json

@@ -10,7 +10,7 @@
 	"player" : {
 		"type" : "Hyena-A",
 		"side" : "SIDE_ALLIES",
-		"pilot" : "Malcolm D'Ath",
+		"pilot" : "Lt. Cdr. Malcolm D'Ath",
 		"squadron" : "Sparrows",
 		"x" : 5,
 		"y" : 45

data/missions/trilliack/06 - trilliack defence #3.json

@@ -9,7 +9,7 @@
 	"player" : {
 		"type" : "Leopard",
 		"side" : "SIDE_ALLIES",
-		"pilot" : "Malcolm D'Ath",
+		"pilot" : "Lt. Cdr. Malcolm D'Ath",
 		"squadron" : "Sparrows",
 		"x" : 41,
 		"y" : 25

data/missions/trilliack/07 - trilliack defence #4.json

@@ -16,6 +16,20 @@
 			"targetValue" : 1,
 			"targetType" : "TT_DESTROY",
 			"isEliminateAll" : 1
+		},
+		{
+			"description" : "Destroy HMS 711-444",
+			"targetName" : "HMS 711-444",
+			"targetValue" : 1,
+			"targetType" : "TT_DESTROY",
+			"active" : 0
+		},
+		{
+			"description" : "Destroy HMS 313-777",
+			"targetName" : "HMS 313-777",
+			"targetValue" : 1,
+			"targetType" : "TT_DESTROY",
+			"active" : 0
 		}
 	],
 	"player" : {
@@ -36,8 +50,7 @@
 			"scatter" : 5000
 		},
 		{
-			"name" : "Pandoran",
+			"types" : "Jackal;Mantis;Sphinx;Thunderhead;Shale;Razor;SK-31;SK-34;Blizzard",
-			"types" : "Jackal;Scarab;Mantis;Sphinx;Thunderhead;Shale;Razor;SK-31;SK-34;Blizzard;Khepri",
 			"side" : "SIDE_PANDORAN",
 			"x" : 25,
 			"y" : 15,
@@ -67,7 +80,8 @@
 			"types" : "CSN Corvette 02",
 			"side" : "SIDE_ALLIES",
 			"x" : 30,
-			"y" : 30
+			"y" : 30,
+			"flags" : "+EF_AI_TARGET"
 		},
 		{
 			"groupName" : "CapShips",
@@ -76,7 +90,7 @@
 			"side" : "SIDE_PANDORAN",
 			"x" : -1,
 			"y" : 35,
-			"flags" : "+EF_AI_TARGET",
+			"flags" : "+EF_AI_TARGET+EF_MISSION_TARGET",
 			"active" : 0
 		},
 		{
@@ -86,7 +100,7 @@
 			"side" : "SIDE_PANDORAN",
 			"x" : 51,
 			"y" : 35,
-			"flags" : "+EF_AI_TARGET",
+			"flags" : "+EF_AI_TARGET+EF_MISSION_TARGET",
 			"active" : 0
 		}
 	],
@@ -98,28 +112,48 @@
 			]
 		},
 		{
-			"function" : "ALLIES_KILLED 35",
+			"function" : "ALLIES_KILLED 25",
 			"lines" : [
 				"MSG_BOX Control;We're losing fighters, rapidly. We need to focus our efforts on dividing the enemy up and taking them down together.",
 				"MSG_BOX Wingmate;Picking up incoming Tzac corvettes.",
-				"ACTIVATE_ENTITY_GROUPS CapShips"
+				"ACTIVATE_ENTITY_GROUPS CapShips",
+				"MSG_BOX Control;We need to take down those capital ships, right away. Lt. Cdr. Dodds, lead the strike.",
+				"MSG_BOX Dodds;On it!",
+				"WAIT_MSG_BOX",
+				"ACTIVATE_OBJECTIVES Destroy HMS 711-444;Destroy HMS 313-777"
 			]
 		},
 		{
-			"function" : "ALLIES_KILLED 75",
+			"function" : "HMS 711-444",
 			"lines" : [
-				"MSG_BOX Control;More than half the fighter defence has been eliminated! We can't continue like this!"
+				"WAIT 1",
+				"MSG_BOX Dodds;HMS 711-444 has been taken down."
 			]
 		},
 		{
-			"function" : "ALLIES_KILLED 100",
+			"function" : "HMS 313-777",
+			"lines" : [
+				"WAIT 1",
+				"MSG_BOX Dodds;HMS 313-777 is out of the game."
+			]
+		},
+		{
+			"function" : "CAPITAL_SHIPS_LOST 1",
+			"lines" : [
+				"MSG_BOX Control;We're losing captial ships! We can't continue like this!"
+			]
+		},
+		{
+			"function" : "CAPITAL_SHIPS_LOST 2",
 			"lines" : [
 				"MSG_BOX Control;The Pandoran forces are closing in on Flint. They will commence planetary bombardment if allowed to get any closer."
 			]
 		},
 		{
-			"function" : "ALLIES_KILLED 120",
+			"function" : "CAPITAL_SHIPS_LOST 3",
 			"lines" : [
+				"MSG_BOX Dodds;Dammit! That's all three of our corvettes down!",
+				"WAIT 10",
 				"MSG_BOX CSN Griffin;Dodds, Commodore Parks has ordered that you pull out immediately.",
 				"MSG_BOX Dodds;Griffin, what the hell? We can take them!",
 				"MSG_BOX CSN Griffin;That's a negative, Dodds. You're to return to the carrier, and prepare for withdrawal.",