Some more changes and prepared the release files

Fixed the screenshot save path
Cleaned up the effects reduction code and moved it to a separate method
2022-08-23 00:04:28 +01:00 · 2022-08-22 22:13:12 +01:00 · 2022-08-22 22:11:45 +01:00 · 2022-08-22 19:40:53 +01:00 · 2022-08-21 23:49:36 +01:00 · 2022-08-21 23:47:37 +01:00
582 changed files with 64839 additions and 6768 deletions
--- a/.github/stale.yml
+++ b/.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
--- a/.gitignore
+++ b/.gitignore
@ -3,6 +3,7 @@
 *.ko
 *.obj
 *.elf
+*.mo

 # Precompiled Headers
 *.gch
@ -33,5 +34,14 @@ tbftss
 *.dSYM/

 # folders
+bin
 dist
-dev
+dev/*
+build/*
+!dev/screenshots
+!dev/stats.sh
+
+# Misc
+.DS_Store
+
+/.errors
--- a/140
+++ b/140
@ -1,5 +1,143 @@
 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
+	* Made ATAFs immortal by default (low impact on difficulty)
+	* Lowered difficulty of some missions
+
+0.92
+
+	* Campaign tweaks and bug fixes
+
+0.91
+
+	* New music track by Vehicle
+	* Added effects when bullets hit targets
+	* Updated Mantis sprite
+	* Updated UNF Corvette 02 sprite
+	* Player (and team) now face direction of nearest target at start of mission
+	* Performance improvements, via i18n updates
+	* Misc. tweaks and fixes
+
+0.9
+
+	* Added final campaign missions
+	* Added final challenges
+	* Enabled all trophies
+	* Added new sound effects
+
+0.8
+
+	* New campaign missions
+	* New challenges
+	* Added optional missions, set in Pandoran space
+	* New trophies and stats
+
+0.7
+
+	* Added trophies
+	* New campaign missions
+	* New challenges
+	* Added new INF fighter: the Angel (rarely used)
+	* Messagebox speakers are now highlighted
+	* New Capital Ships
+
+0.6
+
+	* New Campaign missions
+	* Added new fighters: Blizzard, Razor, Shale, SK-31, and SK-34, part of the troublesome Kingdom of Tzac
+	* Added control remapping
+	* Added mines
+	* New game mode: Challenges
+	* Added i18n support
+	* Added start of German translation
+
 0.51

 	* Fixed a mission loading bug on Linux.
@ -18,7 +156,7 @@ Changelog
 	* Misc. AI, mission, and bug fixes

 0.4
-	
+
 	* Added mouse + keyboard controls (replaces keyboard-only method)
 	* Added new craft: Kingfisher, Mantis, Rook, Hammerhead, Khepri, Scarab, Thunderhead.
 	* Added laser cannon - highly effective against shields
--- a/README-OS4.md
+++ b/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
+
--- a/README.md
+++ b/README.md
@ -2,67 +2,108 @@

 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) is where all the dev work happens. Stable(ish) releases will go in to 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

+## SCREENSHOTS
+
+Screenshots from various versions can be found here: https://github.com/stephenjsweeney/tbftss/tree/master/dev/screenshots
+
 ## CREDITS

 ### GRAPHICS

-gfx/planets/earth.png - modified 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/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/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

 All other graphics are CC BY-NC-SA 3.0, with the following attribution: Copyright 2015-2016, Stephen J Sweeney | www.battleforthesolarsystem.com

-### DATA FILES (with the exception of Roboto font)
+<img src="gfx/by-nc-sa.png?raw=true" alt="CC BY-NC-SA logo" width="125">

-CC BY-NC-SA 3.0, with the following attribution: Copyright 2015-2016, Stephen J Sweeney | www.battleforthesolarsystem.com
+### DATA FILES
+
+* 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)
+
+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

-* 18380__inferno__hvrl.ogg - hvrl, by inferno - https://freesound.org/people/inferno/sounds/18380/
-* 18382__inferno__hvylas.ogg - hvylas, by inferno - https://freesound.org/people/inferno/sounds/18382/
-* 42106__marcuslee__laser-wrath-4.ogg - Laser Wrath 4, by marcusless - https://freesound.org/people/marcuslee/sounds/42106/
-* 47252__nthompson__bad-explosion.ogg - bad explosion, by nthompson - https://freesound.org/people/nthompson/sounds/47252/
-* 49678__ejfortin__energy-short-sword-7.ogg - Energy Short Sword, by ejfortin - https://freesound.org/people/ejfortin/sounds/49678/
-* 56246__q-k__latch-04.ogg - Latch_04, by Q.K. - https://freesound.org/people/Q.K./sounds/56246/
-* 65787__iwilldstroyu__laserrocket.ogg - laserrocket, by iwilldstroyu - https://freesound.org/people/iwilldstroyu/sounds/65787/
-* 77087__supraliminal__laser-short.ogg - Laser short, by Supraliminal - https://freesound.org/people/Supraliminal/sounds/77087/
-* 88275__s-dij__gbc-reload-06.ogg - GBC_Reload_06, by S_Dij - https://freesound.org/people/S_Dij/sounds/88275/
-* 146725__fins__laser.ogg - laser, by fins - https://freesound.org/people/fins/sounds/146725/
-* 162265__qubodup__explosive.ogg - Explosive, by qubodup - https://freesound.org/people/qubodup/sounds/162265/
-* 178064__jorickhoofd__slam-door-shut.ogg - Slam door shut, by jorickhoofd - https://freesound.org/people/jorickhoofd/sounds/178064/
-* 207322__animationisaac__short-explosion.ogg - Short explosion, by animationIsaac - https://freesound.org/people/animationIsaac/sounds/207322/
-* 242856__plasterbrain__nuclear-alarm.ogg - Nuclear Alarm, by plasterbrain - https://freesound.org/people/plasterbrain/sounds/242856/
-* 249300__suntemple__access-denied.ogg - Access Denied, by suntemple - https://freesound.org/people/suntemple/sounds/249300/
-* 254071__tb0y298__firework-explosion.ogg - Firework Explosion, by TB0Y298 - https://freesound.org/people/TB0Y298/sounds/254071/
-* 257786__xtrgamr__mouse-click.ogg - Mouse click, by xtrgamr - https://freesound.org/people/xtrgamr/sounds/257786/
-* 263621__jamesabdulrahman__permission-to-panic.ogg - Permission to panic?, by jamesabdulrahman - https://freesound.org/people/jamesabdulrahman/sounds/263621/
-* 268344__julien-matthey__jm-noiz-laser-01.ogg - JM_NOIZ_Laser 01.wav, by Julien Matthey - https://freesound.org/people/Julien%20Matthey/sounds/268344/
-* 275151__bird-man__gun-shot.ogg - Gun Shot.wav, by Bird_man - https://freesound.org/people/Bird_man/sounds/275151/
-* 321104__nsstudios__blip2.ogg - blip2, by nsstudios - https://freesound.org/people/nsstudios/sounds/321104/
-* 321906__bruce965__walkie-talkie-roger-beep.ogg - Walkie Talkie - Roger Beep, by bruce965 - https://freesound.org/people/bruce965/sounds/321906/
-* 322603__clippysounds__glass-break.ogg - Glass Break, by clippysounds - https://freesound.org/people/clippysounds/sounds/322603/
-* 276912__pauldihor__transform.ogg - transform, by PaulDihor - https://freesound.org/people/PaulDihor/sounds/276912/
-* 329359__bassoonrckr__reed-guillotine.ogg - Bassoon Reed Making Tool Sounds, by Reed Guillotine.wav - https://freesound.org/people/bassoonrckr/sounds/329359/
-* 251431__onlytheghosts__fusion-gun-flash0-by-onlytheghosts.ogg - fusion-gun_flash0_by_OnlyTheGhosts.wav, by OnlyTheGhosts - https://freesound.org/people/OnlyTheGhosts/sounds/251431/
-* 172591__timbre__zapitydooda.ogg - d1clsstf.wav, by wildweasel - https://freesound.org/people/wildweasel/sounds/39030/
-* 39030__wildweasel__d1clsstf.ogg - push_button_switch_07.wav, by joedeshon - https://freesound.org/people/joedeshon/sounds/139061/
+* 000000_large_explosion.ogg - created by combining
+  * EXPLODE.WAV, by dkmedic (CC-0) - https://freesound.org/people/dkmedic/sounds/104447/
+  * Huge rocket launcher.wav, by CGEffex (CC-BY) https://freesound.org/people/CGEffex/sounds/100772/
+* 18380__inferno__hvrl.ogg - hvrl, by inferno (CC-Sampling+) - https://freesound.org/people/inferno/sounds/18380/
+* 18382__inferno__hvylas.ogg - hvylas, by inferno (CC-Sampling+) - https://freesound.org/people/inferno/sounds/18382/
+* 42106__marcuslee__laser-wrath-4.ogg - Laser Wrath 4, by marcusless (CC-Sampling+) - https://freesound.org/people/marcuslee/sounds/42106/
+* 47252__nthompson__bad-explosion.ogg - bad explosion, by nthompson (CC-0) - https://freesound.org/people/nthompson/sounds/47252/
+* 49678__ejfortin__energy-short-sword-7.ogg - Energy Short Sword, by ejfortin (CC-Sampling+) - https://freesound.org/people/ejfortin/sounds/49678/
+* 56246__q-k__latch-04.ogg - Latch_04, by Q.K. (CC-0) - https://freesound.org/people/Q.K./sounds/56246/
+* 65787__iwilldstroyu__laserrocket.ogg - laserrocket, by iwilldstroyu (CC-0) - https://freesound.org/people/iwilldstroyu/sounds/65787/
+* 77087__supraliminal__laser-short.ogg - Laser short, by Supraliminal (CC-0) - https://freesound.org/people/Supraliminal/sounds/77087/
+* 88275__s-dij__gbc-reload-06.ogg - GBC_Reload_06, by S_Dij (CC-BY) - https://freesound.org/people/S_Dij/sounds/88275/
+* 146725__fins__laser.ogg - laser, by fins (CC-0) - https://freesound.org/people/fins/sounds/146725/
+* 162265__qubodup__explosive.ogg - Explosive, by qubodup (CC-0) - https://freesound.org/people/qubodup/sounds/162265/
+* 178064__jorickhoofd__slam-door-shut.ogg - Slam door shut, by jorickhoofd (CC-BY) - https://freesound.org/people/jorickhoofd/sounds/178064/
+* 207322__animationisaac__short-explosion.ogg - Short explosion, by animationIsaac (CC-0) - https://freesound.org/people/animationIsaac/sounds/207322/
+* 242856__plasterbrain__nuclear-alarm.ogg - Nuclear Alarm, by plasterbrain (CC-0) - https://freesound.org/people/plasterbrain/sounds/242856/
+* 249300__suntemple__access-denied.ogg - Access Denied, by suntemple (CC-0) - https://freesound.org/people/suntemple/sounds/249300/
+* 254071__tb0y298__firework-explosion.ogg - Firework Explosion, by TB0Y298 (CC-BY) - https://freesound.org/people/TB0Y298/sounds/254071/
+* 257786__xtrgamr__mouse-click.ogg - Mouse click, by xtrgamr (CC-BY) - https://freesound.org/people/xtrgamr/sounds/257786/
+* 263621__jamesabdulrahman__permission-to-panic.ogg - Permission to panic?, by jamesabdulrahman (CC-BY) - https://freesound.org/people/jamesabdulrahman/sounds/263621/
+* 268344__julien-matthey__jm-noiz-laser-01.ogg - JM_NOIZ_Laser 01.wav, by Julien Matthey (CC-0) - https://freesound.org/people/Julien%20Matthey/sounds/268344/
+* 275151__bird-man__gun-shot.ogg - Gun Shot.wav, by Bird_man (CC-0) - https://freesound.org/people/Bird_man/sounds/275151/
+* 321104__nsstudios__blip2.ogg - blip2, by nsstudios (CC-BY) - https://freesound.org/people/nsstudios/sounds/321104/
+* 321906__bruce965__walkie-talkie-roger-beep.ogg - Walkie Talkie - Roger Beep, by bruce965 (CC-0) - https://freesound.org/people/bruce965/sounds/321906/
+* 322603__clippysounds__glass-break.ogg - Glass Break, by clippysounds (CC-BY) - https://freesound.org/people/clippysounds/sounds/322603/
+* 276912__pauldihor__transform.ogg - transform, by PaulDihor (CC-0) - https://freesound.org/people/PaulDihor/sounds/276912/
+* 329359__bassoonrckr__reed-guillotine.ogg - Reed Guillotine.wav, by bassoonrckr (CC-0) - https://freesound.org/people/bassoonrckr/sounds/329359/
+* 251431__onlytheghosts__fusion-gun-flash0-by-onlytheghosts.ogg - fusion-gun_flash0_by_OnlyTheGhosts.wav, by OnlyTheGhosts (CC-BY) - https://freesound.org/people/OnlyTheGhosts/sounds/251431/
+* 172591__timbre__zapitydooda.ogg - d1clsstf.wav, by wildweasel (CC-BY) - https://freesound.org/people/wildweasel/sounds/39030/
+* 39030__wildweasel__d1clsstf.ogg - push_button_switch_07.wav, by joedeshon (CC-BY) - https://freesound.org/people/joedeshon/sounds/139061/
+* 278142__ricemaster__effect-notify.ogg - effect_notify.wav, by ricemaster (CC-0) - https://freesound.org/people/ricemaster/sounds/278142/
+* 254174__kwahmah-02__s.ogg - s.wav, by kwahmah_02 (CC-0) - https://freesound.org/people/kwahmah_02/sounds/254174/
+* 172870__escortmarius__carbidexplosion.ogg - carbidexplosion.wav, by escortmarius (CC-BY) - https://freesound.org/people/escortmarius/sounds/172870/
+* 320181__dland__hint.ogg - hint.wav, by dland (CC-0) - https://freesound.org/people/dland/sounds/320181/
+* 62491__benboncan__dslr-click.ogg - DSLR Click.wav, by Benboncan (CC-BY) - https://freesound.org/people/Benboncan/sounds/62491/
+* 154934__klawykogut__empty-gun-shot.ogg - Empty Gun Shot, by KlawyKogut (CC-0) - https://freesound.org/people/KlawyKogut/sounds/154934/
+* 107786__leviclaassen__beepbeep.ogg - beepbeep.wav, by leviclaassen (CC-BY) - https://freesound.org/people/leviclaassen/sounds/107786/
+* 33785__jobro__4-beep-b.ogg - 4 beep b.wav, by jobro (CC-BY) - https://freesound.org/people/jobro/sounds/33785/
+* 255729__manholo__inception-stab-l.ogg - inception-stab-l.wav, by manholo (CC-BY) - https://freesound.org/people/manholo/sounds/255729/
+* 000000_tow-rope-attach.ogg - creating by combining:
+	01857 close noise fastener.wav, by Robinhood76 (CC-BY-NC) - https://freesound.org/people/Robinhood76/sounds/98880/
+	Clean Revolver Reload, by Dredile (CC-0) - https://freesound.org/people/Dredile/sounds/177863/
+* 246420__oceanictrancer__game-sound-effect-menu.ogg - game sound effect -> menu, by oceanictrancer (CC-0) - https://freesound.org/people/oceanictrancer/sounds/246420/
+* 146311__jgeralyn__shortailenliketone2-lower.ogg - shortailenliketone2_lower.aif, by jgeralyn (CC-BY) - https://freesound.org/people/jgeralyn/sounds/146311/
+

 ### MUSIC

-* Battle in the winter.mp3, by Johan Brodd - http://opengameart.org/content/battle-in-the-winter
-* battleThemeA.mp3, by cynicmusic.com | pixelsphere.org - http://opengameart.org/content/battle-theme-a
-* determination.mp3, by artisticdude - http://opengameart.org/content/determination
-* heroism.ogg, by Edward J. Blakeley (http://www.edwardblakeley.com/) - http://opengameart.org/content/heroism
-* InnerCore_Low.ogg - Gundatsch - https://soundcloud.com/gundatsch
-* Pressure.ogg, by yd - http://opengameart.org/content/pressure
-* Rise of Spirit, by Alexandr Zhelanov - https://soundcloud.com/alexandr-zhelanov
-* Showdown.mp3, by el-corleo - http://opengameart.org/content/showdown
-* track-1.mp3, by Alexandr Zhelanov - https://soundcloud.com/alexandr-zhelanov
-* track-3.mp3, by Alexandr Zhelanov - https://soundcloud.com/alexandr-zhelanov
-* track-4.mp3, by Alexandr Zhelanov - https://soundcloud.com/alexandr-zhelanov
-* DST-RailJet-LongSeamlessLoop.ogg, by Deceased Superior Technician - http://opengameart.org/content/railjet-long-seamless-loop
+* Battle in the winter.mp3, by Johan Brodd (CC-BY) - http://opengameart.org/content/battle-in-the-winter
+* battleThemeA.mp3, by cynicmusic.com | pixelsphere.org (CC-0) - http://opengameart.org/content/battle-theme-a
+* determination.mp3, by artisticdude (CC-0) - http://opengameart.org/content/determination
+* heroism.ogg, by Edward J. Blakeley (GPL 3.0) - http://opengameart.org/content/heroism
+* InnerCore_Low.ogg - Gundatsch (CC-BY) - https://soundcloud.com/gundatsch
+* Pressure.ogg, by yd (CC-0) - http://opengameart.org/content/pressure
+* Rise of spirit.ogg, by Alexandr Zhelanov (CC-0) - https://soundcloud.com/alexandr-zhelanov
+* Showdown.mp3, by el-corleo (CC-BY) - http://opengameart.org/content/showdown
+* track-3.mp3, by Alexandr Zhelanov (CC-BY) - https://soundcloud.com/alexandr-zhelanov
+* track-4.mp3, by Alexandr Zhelanov (CC-BY) - https://soundcloud.com/alexandr-zhelanov
+* DST-RailJet-LongSeamlessLoop.ogg, by Deceased Superior Technician (CC-BY) - http://opengameart.org/content/railjet-long-seamless-loop
+* covert_operations.mp3, by artisticdude (CC-0) - http://opengameart.org/content/covert-operations
+* Tactical Pursuit.mp3, by Matthew Pablo (CC-BY) - http://opengameart.org/content/tactical-pursuit
+* Vehicle - OGA - Col Legno.ogg, by Vehicle (CC-0) - http://opengameart.org/content/col-legno
+* Her Violet Eyes.mp3, by tgfcoder (CC-BY) https://twitter.com/tgfcoder
+
+## ABOUT
+
+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 &copy; 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 &copy; 2009-2016, Stephen J Sweeney, All Rights Reserved.
--- a/README_DEV.md
+++ b/README_DEV.md
@ -1,10 +1,10 @@
 # DEVELOPMENT / DEBUG Stuff

-You can run the game with
+You can run the game with:

 `./tbftss -debug`

-to access some (rather crude) debugging and development stuff, activated by pressing certain keys on the keyboard. Press the following keys to toggle the states (see the console for output). Note to porters - you shouldn't distribute the game in this state (either as a hard compile or run script), as it could result in unexpected behaviour.
+to access some (rather crude) debugging and development stuff, activated by pressing certain keys on the keyboard. Press the following keys to toggle the states (see the console for output). Note to packagers - you shouldn't distribute the game in this state (either as a hard compile or run script), as it could result in unexpected behaviour.

 * [1] - Make the player immortal
 * [2] - Unlimited missiles
@ -14,4 +14,10 @@ to access some (rather crude) debugging and development stuff, activated by pres
 * [6] - Immediately complete the current mission

 * [9] - Show the current frames per second
-* [0] - Take a screenshot once per second. Assumes the existance of dev/screenshots/tmp relative to the game's binary
+* [0] - Take a screenshot once per second, saving to /tmp/tbftss on Linux.
+
+By default, the game will output INFO level messages, or greater. To reduce to WARN level messages, you can use:
+
+`./tbftss -warn`
+
+Note that using `-debug` will automatically output DEBUG level messages.
--- a/STATS.md
+++ b/STATS.md
@ -0,0 +1,17 @@
+# Statistics
+
+* Lines of code: 19897
+* Size of source: 586K
+* Size of data: 750K
+* Size of graphics: 3.5M
+* Size of sound: 805K
+* Size of music: 56M
+
+* Number of missions: 81 (inc. optional)
+* Number of challenges: 93
+* Number of spacecraft: 50
+* Number of trophies: 44
+
+* Translatable strings: 1029
+
+* Number of GIT revisions: 1472
--- a/build/buildAll.sh
+++ b/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
--- a/build/linux/build.sh
+++ b/build/linux/build.sh
@ -1,50 +0,0 @@
-#!/bin/bash -e
-
-cd `dirname $0`
-
-BUILDROOT="build/linux"
-OUT="$BUILDROOT/tbftss"
-
-cd ../..
-
-VERSION=$1
-REVISION=$2
-SIZE=0
-
-make clean
-make
-make dist
-
-mkdir -p $OUT
-rm -rf $OUT/*
-
-mkdir -p $OUT/DEBIAN
-
-mkdir -p $OUT/usr/bin
-cp tbftss $OUT/usr/bin
-
-mkdir -p $OUT/opt/tbftss
-cp -r data $OUT/opt/tbftss
-cp -r gfx $OUT/opt/tbftss
-cp -r music $OUT/opt/tbftss
-cp -r sound $OUT/opt/tbftss
-cp -r manual $OUT/opt/tbftss
-
-SIZE=`du -bs $OUT | cut -f -1`
-SIZE=`expr $SIZE / 1024`
-
-sed \
-e "s/\${version}/$VERSION-$REVISION/" \
-e "s/\${size}/$SIZE/" \
-$BUILDROOT/control > $OUT/DEBIAN/control
-
-cd $BUILDROOT
-
-dpkg-deb --build tbftss
-
-mv tbftss.deb tbftss-${VERSION}-${REVISION}.i386.deb
-alien -r --bump=0 tbftss-${VERSION}-${REVISION}.i386.deb
-
-mv *.deb *.rpm ../../dist
-
-rm -rf tbftss
--- a/build/linux/control
+++ b/build/linux/control
@ -1,11 +0,0 @@
-Source: tbftss
-Package: tbftss
-Version: ${version}
-Section: games
-Priority: optional
-Installed-Size: ${size}
-Architecture: i386
-Depends: libsdl2-2.0-0, libsdl2-image-2.0-0, libsdl2-mixer-2.0-0, libsdl2-ttf-2.0-0
-Maintainer: stephenjsweeney@battleforthesolarsystem.com
-Description: 2D mission-based space shooter, based on the Battle for the Solar System space opera novel trilogy. 
-Homepage: www.battleforthesolarsystem.com/games/pw
--- a/build/win32/build.sh
+++ b/build/win32/build.sh
@ -1,39 +0,0 @@
-#!/bin/bash -e
-
-cd `dirname $0`
-
-BUILDROOT="build/win32"
-OUT="$BUILDROOT/tbftss"
-
-cd ../..
-
-VERSION=$1
-REVISION=$2
-SIZE=0
-
-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 CHANGELOG $OUT
-cp LICENSE $OUT
-cp README.md $OUT
-
-cp /usr/x86_64-w64-mingw32/bin/*.dll $OUT
-
-cd $BUILDROOT
-
-zip -r tbftss-${VERSION}-${REVISION}.win32.zip tbftss
-
-mv *.zip ../../dist
-
-rm -rf tbftss
--- a/common.mk
+++ b/common.mk
@ -1,39 +1,60 @@
-VERSION = 0.51
-REVISION = $(shell date +"%y%m%d")
+VERSION = 1.5
+REVISION = 1
+LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
+
+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

-SEARCHPATH += src/ src/battle src/draw src/game src/galaxy src/json src/system src/test
 vpath %.c $(SEARCHPATH)
 vpath %.h $(SEARCHPATH)

 DEPS += defs.h structs.h

-OBJS += ai.o
-OBJS += battle.o bullets.o
-OBJS += capitalShips.o challenges.o cJSON.o
-OBJS += debris.o dev.o draw.o
-OBJS += effects.o entities.o extractionPoint.o
-OBJS += fighters.o
-OBJS += galacticMap.o game.o
-OBJS += hud.o
-OBJS += init.o input.o io.o items.o
-OBJS += load.o locations.o lookup.o
-OBJS += main.o messageBox.o mission.o missionInfo.o modalDialog.o
-OBJS += objectives.o options.o
-OBJS += player.o
-OBJS += quadtree.o
-OBJS += radar.o rope.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 += util.o
-OBJS += waypoints.o widgets.o
+_OBJS += ai.o atlas.o
+_OBJS += battle.o bullets.o
+_OBJS += capitalShips.o challengeHome.o challenges.o cJSON.o controls.o credits.o
+_OBJS += debris.o dev.o draw.o
+_OBJS += effects.o entities.o
+_OBJS += fighters.o fighterDatabase.o
+_OBJS += galacticMap.o game.o
+_OBJS += hud.o
+_OBJS += i18n.o init.o input.o io.o items.o
+_OBJS += jumpgate.o
+_OBJS += load.o locations.o lookup.o
+_OBJS += main.o messageBox.o mine.o mission.o missionInfo.o modalDialog.o
+_OBJS += objectives.o options.o
+_OBJS += player.o
+_OBJS += quadtree.o
+_OBJS += radar.o resources.o rope.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 += util.o
+_OBJS += waypoints.o widgets.o
+
+OBJS = $(patsubst %,$(OUT)/%,$(_OBJS))

 # top-level rule to create the program.
-all: $(PROG)
+all: $(PROG) $(LOCALE_MO)

 # compiling other source files.
-%.o: %.c %.h $(DEPS)
-	$(CC) $(CFLAGS) $(CXXFLAGS) -c $<
+$(OUT)/%.o: %.c %.h $(DEPS)
+	@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)
+	$(RM) $(OBJS) $(PROG) $(LOCALE_MO)
+
--- a/data/app/config.json
+++ b/data/app/config.json
@ -1,8 +1,45 @@
 {
 	"winWidth" : 1280,
 	"winHeight" : 720,
-	"vSync" : 1,
+	"effects" : 0,
 	"fullscreen" : 0,
 	"musicVolume" : 8,
-	"soundVolume" : 10
+	"soundVolume" : 10,
+	"controls" : {
+		"keys" : {
+			"CONTROL_FIRE" : 0,
+			"CONTROL_ACCELERATE" : 0,
+			"CONTROL_BOOST" : 26,
+			"CONTROL_ECM" : 7,
+			"CONTROL_BRAKE" : 22,
+			"CONTROL_TARGET" : 4,
+			"CONTROL_MISSILE" : 44,
+			"CONTROL_GUNS" : 29,
+			"CONTROL_RADAR" : 27,
+			"CONTROL_PREV_FIGHTER" : 4,
+			"CONTROL_NEXT_FIGHTER" : 7,
+			"CONTROL_SCREENSHOT" : 69
+		},
+		"mouse" : 	{
+			"CONTROL_FIRE" : 1,
+			"CONTROL_ACCELERATE" : 3,
+			"CONTROL_BOOST" : 0,
+			"CONTROL_ECM" : 0,
+			"CONTROL_BRAKE" : 0,
+			"CONTROL_TARGET" : 0,
+			"CONTROL_MISSILE" : 2,
+			"CONTROL_GUNS" : 4,
+			"CONTROL_RADAR" : 5,
+			"CONTROL_PREV_FIGHTER" : 4,
+			"CONTROL_NEXT_FIGHTER" : 5,
+			"CONTROL_SCREENSHOT" : 0
+		}
+	},
+	"gameplay" : {
+		"friendlyFire" : 0,
+		"autoSwitchPlayerTarget" : 1,
+		"missileReTarget" : 0,
+		"healthBars" : 1
+	}
 }
+
--- a/data/atlas/atlas.json
+++ b/data/atlas/atlas.json
--- a/data/battle/bullets.json
+++ b/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"
--- a/data/battle/items.json
+++ b/data/battle/items.json
@ -1,10 +1,67 @@
 [
 	{
-		"name" : "crate",
+		"defName" : "crate",
+		"name" : "a crate",
 		"texture" : "gfx/items/crate.png"
 	},
 	{
-		"name" : "smallCrate",
+		"defName" : "smallCrate",
+		"name" : "a small crate",
 		"texture" : "gfx/items/smallCrate.png"
+	},
+	{
+		"defName" : "powerCore01",
+		"name" : "a power core",
+		"texture" : "gfx/items/powerCore01.png"
+	},
+	{
+		"defName" : "powerCore02",
+		"name" : "a power core",
+		"texture" : "gfx/items/powerCore02.png"
+	},
+	{
+		"defName" : "powerCore03",
+		"name" : "a power core",
+		"texture" : "gfx/items/powerCore03.png"
+	},
+	{
+		"defName" : "coin01",
+		"name" : "a coin",
+		"texture" : "gfx/items/coin01.png"
+	},
+	{
+		"defName" : "coin02",
+		"name" : "a coin",
+		"texture" : "gfx/items/coin02.png"
+	},
+	{
+		"defName" : "diamond01",
+		"name" : "a diamond",
+		"texture" : "gfx/items/diamond01.png"
+	},
+	{
+		"defName" : "diamond02",
+		"name" : "a diamond",
+		"texture" : "gfx/items/diamond02.png"
+	},
+	{
+		"defName" : "diamond03",
+		"name" : "a diamond",
+		"texture" : "gfx/items/diamond03.png"
+	},
+	{
+		"defName" : "gem01",
+		"name" : "a gem",
+		"texture" : "gfx/items/gem01.png"
+	},
+	{
+		"defName" : "gem02",
+		"name" : "a gem",
+		"texture" : "gfx/items/gem02.png"
+	},
+	{
+		"defName" : "gem03",
+		"name" : "a gem",
+		"texture" : "gfx/items/gem03.png"
 	}
 ]
--- a/data/capitalShips/csnCorvette01.json
+++ b/data/capitalShips/csnCorvette01.json
@ -10,56 +10,56 @@
 			"texture" : "gfx/capitalShips/csnCorvette01/core.png",
 			"x" : 0,
 			"y" : -140,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette01/component1.png",
 			"x" : 0,
 			"y" : -200,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette01/component2.png",
 			"x" : -34,
 			"y" : 25,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette01/component2.png",
 			"x" : 34,
 			"y" : 25,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette01/component2.png",
 			"x" : -16,
 			"y" : 25,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette01/component2.png",
 			"x" : 16,
 			"y" : 25,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette01/component3.png",
 			"x" : -23,
 			"y" : 242,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette01/component3.png",
 			"x" : 23,
 			"y" : 242,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"engines" : [
@ -68,35 +68,35 @@
 			"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
 			"x" : -150,
 			"y" : 293,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
 			"x" : 150,
 			"y" : 293,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
 			"x" : -90,
 			"y" : 293,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
 			"x" : 90,
 			"y" : 293,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
 			"x" : 0,
 			"y" : 296,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"guns" : [
@ -107,7 +107,7 @@
 			"y" : 200,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -118,7 +118,7 @@
 			"y" : 200,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -129,7 +129,7 @@
 			"y" : 100,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -140,7 +140,7 @@
 			"y" : 100,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -151,7 +151,7 @@
 			"y" : -50,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -162,7 +162,7 @@
 			"y" : 175,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		}
--- a/data/capitalShips/csnCorvette02.json
+++ b/data/capitalShips/csnCorvette02.json
@ -10,49 +10,49 @@
 			"texture" : "gfx/capitalShips/csnCorvette02/core.png",
 			"x" : 0,
 			"y" : -140,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette02/component1.png",
 			"x" : -105,
 			"y" : 195,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette02/component1.png",
 			"x" : 105,
 			"y" : 195,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette02/component2.png",
 			"x" : -25,
 			"y" : 18,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette02/component3.png",
 			"x" : 25,
 			"y" : 18,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette02/component4.png",
 			"x" : -67,
 			"y" : -117,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 100,
 			"texture" : "gfx/capitalShips/csnCorvette02/component5.png",
 			"x" : 67,
 			"y" : -117,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"engines" : [
@ -61,28 +61,28 @@
 			"texture" : "gfx/capitalShips/csnCorvette02/engine1.png",
 			"x" : -70,
 			"y" : 253,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/csnCorvette02/engine2.png",
 			"x" : -25,
 			"y" : 247,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/csnCorvette02/engine2.png",
 			"x" : 25,
 			"y" : 247,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/csnCorvette02/engine1.png",
 			"x" : 70,
 			"y" : 253,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"guns" : [
@ -93,7 +93,7 @@
 			"y" : -225,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -104,7 +104,7 @@
 			"y" : -60,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -115,7 +115,7 @@
 			"y" : -60,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -126,7 +126,7 @@
 			"y" : 70,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -137,7 +137,7 @@
 			"y" : 110,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -148,7 +148,7 @@
 			"y" : 110,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -159,7 +159,7 @@
 			"y" : 240,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -170,7 +170,7 @@
 			"y" : 240,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		}
--- a/data/capitalShips/hmsCorvette01.json
+++ b/data/capitalShips/hmsCorvette01.json
@ -0,0 +1,156 @@
+{
+	"name" : "HMS Corvette 01",
+	"health" : 0,
+	"shield" : 500,
+	"shieldRechargeRate" : 60,
+	"texture" : "gfx/capitalShips/hmsCorvette01/body.png",
+	"components" : [
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette01/core.png",
+			"x" : 0,
+			"y" : -140,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette01/component1.png",
+			"x" : 16,
+			"y" : -38,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette01/component1.png",
+			"x" : -16,
+			"y" : -38,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette01/component2.png",
+			"x" : -44,
+			"y" : 4,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette01/component2.png",
+			"x" : 44,
+			"y" : 4,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette01/component2.png",
+			"x" : 43,
+			"y" : 75,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette01/component2.png",
+			"x" : -43,
+			"y" : 75,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		}
+	],
+	"engines" : [
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette01/engine1.png",
+			"x" : -112,
+			"y" : 295,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette01/engine1.png",
+			"x" : 112,
+			"y" : 295,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette01/engine2.png",
+			"x" : -25,
+			"y" : 120,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette01/engine3.png",
+			"x" : 25,
+			"y" : 120,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		}
+	],
+	"guns" : [
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : -75,
+			"y" : -50,
+			"reloadTime" : 10,
+			"type" : "BT_PLASMA",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : 75,
+			"y" : -50,
+			"reloadTime" : 10,
+			"type" : "BT_PLASMA",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : -125,
+			"y" : 200,
+			"reloadTime" : 10,
+			"type" : "BT_PLASMA",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : 125,
+			"y" : 200,
+			"reloadTime" : 10,
+			"type" : "BT_PLASMA",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : 0,
+			"y" : -250,
+			"reloadTime" : 40,
+			"type" : "BT_ROCKET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : 0,
+			"y" : 70,
+			"reloadTime" : 40,
+			"type" : "BT_ROCKET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		}
+	]
+}
--- a/data/capitalShips/hmsCorvette02.json
+++ b/data/capitalShips/hmsCorvette02.json
@ -0,0 +1,156 @@
+{
+	"name" : "HMS Corvette 02",
+	"health" : 0,
+	"shield" : 500,
+	"shieldRechargeRate" : 60,
+	"texture" : "gfx/capitalShips/hmsCorvette02/body.png",
+	"components" : [
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette02/core.png",
+			"x" : 0,
+			"y" : -110,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette02/component1.png",
+			"x" : -28,
+			"y" : -16,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette02/component1.png",
+			"x" : 28,
+			"y" : -16,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette02/component2.png",
+			"x" : -182,
+			"y" : -40,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette02/component2.png",
+			"x" : 182,
+			"y" : -40,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette02/component3.png",
+			"x" : -122,
+			"y" : 165,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 100,
+			"texture" : "gfx/capitalShips/hmsCorvette02/component3.png",
+			"x" : 122,
+			"y" : 165,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		}
+	],
+	"engines" : [
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette02/engine01.png",
+			"x" : -125,
+			"y" : 200,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette02/engine01.png",
+			"x" : 125,
+			"y" : 200,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette02/engine01.png",
+			"x" : -178,
+			"y" : 20,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		},
+		{
+			"health" : 150,
+			"texture" : "gfx/capitalShips/hmsCorvette02/engine01.png",
+			"x" : 178,
+			"y" : 20,
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
+		}
+	],
+	"guns" : [
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : -218,
+			"y" : -90,
+			"reloadTime" : 10,
+			"type" : "BT_PLASMA",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : 218,
+			"y" : -90,
+			"reloadTime" : 10,
+			"type" : "BT_PLASMA",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : -200,
+			"y" : 150,
+			"reloadTime" : 10,
+			"type" : "BT_PLASMA",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : 200,
+			"y" : 150,
+			"reloadTime" : 10,
+			"type" : "BT_PLASMA",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : -50,
+			"y" : -120,
+			"reloadTime" : 40,
+			"type" : "BT_ROCKET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		},
+		{
+			"health" : 250,
+			"texture" : "gfx/capitalShips/common/cannon01.png",
+			"x" : 50,
+			"y" : -120,
+			"reloadTime" : 40,
+			"type" : "BT_ROCKET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
+			"missiles" : 9999
+		}
+	]
+}
--- a/data/capitalShips/infCorvette01.json
+++ b/data/capitalShips/infCorvette01.json
@ -10,56 +10,56 @@
 			"texture" : "gfx/capitalShips/infCorvette01/component1.png",
 			"x" : -27,
 			"y" : 100,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette01/component2.png",
 			"x" : 27,
 			"y" : 100,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette01/component3.png",
 			"x" : 20,
 			"y" : -17,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette01/component3.png",
 			"x" : -20,
 			"y" : -17,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette01/component4.png",
 			"x" : -21,
 			"y" : -64,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette01/component5.png",
 			"x" : 21,
 			"y" : -64,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette01/component6.png",
 			"x" : -22,
 			"y" : -243,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette01/component6.png",
 			"x" : 22,
 			"y" : -243,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"engines" : [
@ -68,21 +68,21 @@
 			"texture" : "gfx/capitalShips/infCorvette01/engine1.png",
 			"x" : -50,
 			"y" : 285,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette01/engine1.png",
 			"x" : 50,
 			"y" : 285,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette01/engine2.png",
 			"x" : 0,
 			"y" : 280,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"guns" : [
@ -93,7 +93,7 @@
 			"y" : 170,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -104,7 +104,7 @@
 			"y" : -150,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -115,7 +115,7 @@
 			"y" : 50,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -125,7 +125,7 @@
 			"y" : 50,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -135,7 +135,7 @@
 			"y" : -60,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -145,7 +145,7 @@
 			"y" : -60,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		}
 	]
--- a/data/capitalShips/infCorvette02.json
+++ b/data/capitalShips/infCorvette02.json
@ -10,63 +10,63 @@
 			"texture" : "gfx/capitalShips/infCorvette02/core.png",
 			"x" : 0,
 			"y" : -80,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/component1.png",
 			"x" : -32,
 			"y" : -75,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/component1.png",
 			"x" : 32,
 			"y" : -75,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/component2.png",
 			"x" : -95,
 			"y" : 195,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/component2.png",
 			"x" : 95,
 			"y" : 195,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/component3.png",
 			"x" : -30,
 			"y" : 210,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/component3.png",
 			"x" : 30,
 			"y" : 210,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/component4.png",
 			"x" : -24,
 			"y" : -20,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/component4.png",
 			"x" : 24,
 			"y" : -20,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"guns" : [
@ -77,7 +77,7 @@
 			"y" : 200,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -88,7 +88,7 @@
 			"y" : 200,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -99,7 +99,7 @@
 			"y" : 200,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -110,7 +110,7 @@
 			"y" : 0,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -121,7 +121,7 @@
 			"y" : 100,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -132,7 +132,7 @@
 			"y" : -125,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -143,7 +143,7 @@
 			"y" : -125,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		}
@ -154,28 +154,28 @@
 			"texture" : "gfx/capitalShips/infCorvette02/engine1.png",
 			"x" : -75,
 			"y" : 275,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/engine2.png",
 			"x" : -20,
 			"y" : 275,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/engine3.png",
 			"x" : 20,
 			"y" : 275,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/infCorvette02/engine4.png",
 			"x" : 75,
 			"y" : 275,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	]
 }
--- a/data/capitalShips/list.json
+++ b/data/capitalShips/list.json
@ -1,8 +0,0 @@
-[
-	"data/capitalShips/csnCorvette01.json",
-	"data/capitalShips/csnCorvette02.json",
-	"data/capitalShips/unfCorvette01.json",
-	"data/capitalShips/unfCorvette02.json",
-	"data/capitalShips/infCorvette01.json",
-	"data/capitalShips/infCorvette02.json"
-]
--- a/data/capitalShips/unfCorvette01.json
+++ b/data/capitalShips/unfCorvette01.json
@ -10,63 +10,63 @@
 			"texture" : "gfx/capitalShips/unfCorvette01/core.png",
 			"x" : 0,
 			"y" : -100,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette01/component1.png",
 			"x" : -42,
 			"y" : -36,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette01/component1.png",
 			"x" : 42,
 			"y" : -36,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette01/component2.png",
 			"x" : -40,
 			"y" : -8,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette01/component2.png",
 			"x" : 40,
 			"y" : -8,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette01/component3.png",
 			"x" : -40,
 			"y" : 68,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette01/component4.png",
 			"x" : 40,
 			"y" : 68,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette01/component5.png",
 			"x" : -40,
 			"y" : 128,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette01/component5.png",
 			"x" : 40,
 			"y" : 128,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"engines" : [
@ -75,28 +75,28 @@
 			"texture" : "gfx/capitalShips/unfCorvette01/engine1.png",
 			"x" : -112,
 			"y" : 281,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/unfCorvette01/engine1.png",
 			"x" : 112,
 			"y" : 281,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/unfCorvette01/engine2.png",
 			"x" : -34,
 			"y" : 268,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/unfCorvette01/engine2.png",
 			"x" : 34,
 			"y" : 268,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"guns" : [
@ -107,7 +107,7 @@
 			"y" : -250,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -118,7 +118,7 @@
 			"y" : -250,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -129,7 +129,7 @@
 			"y" : 20,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -139,7 +139,7 @@
 			"y" : 20,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -149,7 +149,7 @@
 			"y" : 100,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -160,7 +160,7 @@
 			"y" : 100,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -171,7 +171,7 @@
 			"y" : 180,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -181,7 +181,7 @@
 			"y" : 180,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		}
 	]
--- a/data/capitalShips/unfCorvette02.json
+++ b/data/capitalShips/unfCorvette02.json
@ -10,49 +10,49 @@
 			"texture" : "gfx/capitalShips/unfCorvette01/core.png",
 			"x" : 0,
 			"y" : -100,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette02/component1.png",
 			"x" : -22,
 			"y" : -24,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette02/component1.png",
 			"x" : 22,
 			"y" : -24,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette02/component2.png",
 			"x" : -86,
 			"y" : 188,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette02/component2.png",
 			"x" : 86,
 			"y" : 188,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette02/component3.png",
 			"x" : -43,
 			"y" : 151,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 50,
 			"texture" : "gfx/capitalShips/unfCorvette02/component3.png",
 			"x" : 43,
 			"y" : 151,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"engines" : [
@ -61,28 +61,28 @@
 			"texture" : "gfx/capitalShips/unfCorvette02/engine1.png",
 			"x" : -100,
 			"y" : 286,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/unfCorvette02/engine1.png",
 			"x" : 100,
 			"y" : 286,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/unfCorvette02/engine2.png",
 			"x" : -35,
 			"y" : 289,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		},
 		{
 			"health" : 150,
 			"texture" : "gfx/capitalShips/unfCorvette02/engine2.png",
 			"x" : 35,
 			"y" : 289,
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC"
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
 		}
 	],
 	"guns" : [
@ -93,7 +93,7 @@
 			"y" : -250,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -104,7 +104,7 @@
 			"y" : 30,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -115,7 +115,7 @@
 			"y" : 30,
 			"reloadTime" : 40,
 			"type" : "BT_ROCKET",
-			"flags" : "EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
 			"missiles" : 9999
 		},
@ -126,7 +126,7 @@
 			"y" : 30,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -136,7 +136,7 @@
 			"y" : -70,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -146,7 +146,7 @@
 			"y" : -70,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -156,7 +156,7 @@
 			"y" : 170,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -166,7 +166,7 @@
 			"y" : 210,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		},
 		{
@ -176,7 +176,7 @@
 			"y" : 210,
 			"reloadTime" : 10,
 			"type" : "BT_PLASMA",
-			"flags" : "EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
+			"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
 			"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 		}
 	]
--- a/data/challenges/01.json
+++ b/data/challenges/01.json
@ -0,0 +1,44 @@
+{
+	"name" : "Destroy all Darts #1",
+	"description" : "Destroy all Darts #1",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Nymph",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 30,
+		"killLimit" : 5,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 30
+			},
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 15
+			},
+			{
+				"type" : "CHALLENGE_SHOT_ACCURACY",
+				"value" : 75
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"name" : "Dart",
+			"types" : "Simple Dart",
+			"side" : "SIDE_PIRATE",
+			"x" : 25,
+			"y" : 22,
+			"number" : 5,
+			"scatter" : 1000
+		}
+	]
+}
--- a/data/challenges/02.json
+++ b/data/challenges/02.json
@ -0,0 +1,44 @@
+{
+	"name" : "Destroy all Darts #2",
+	"description" : "Destroy all Darts #2",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Nymph",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 25,
+		"killLimit" : 5,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 25
+			},
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 12
+			},
+			{
+				"type" : "CHALLENGE_SHOT_ACCURACY",
+				"value" : 50
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"name" : "Dart",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"x" : 25,
+			"y" : 22,
+			"number" : 5,
+			"scatter" : 1000
+		}
+	]
+}
--- a/data/challenges/03.json
+++ b/data/challenges/03.json
@ -0,0 +1,44 @@
+{
+	"name" : "Destroy all Darts #3",
+	"description" : "Destroy all Darts #3",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Nymph",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 45,
+		"killLimit" : 3,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 20
+			},
+			{
+				"type" : "CHALLENGE_ARMOUR",
+				"value" : 80
+			},
+			{
+				"type" : "CHALLENGE_SHOT_ACCURACY",
+				"value" : 50
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"name" : "Nymph",
+			"types" : "Nymph",
+			"side" : "SIDE_TZAC",
+			"x" : 25,
+			"y" : 22,
+			"number" : 3,
+			"scatter" : 1000
+		}
+	]
+}
--- a/data/challenges/04.json
+++ b/data/challenges/04.json
@ -0,0 +1,45 @@
+{
+	"name" : "Destroy all Lynxes",
+	"description" : "Destroy all Lynxes",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Ray",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 120,
+		"killLimit" : 5,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 90
+			},
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 120
+			},
+			{
+				"type" : "CHALLENGE_SHOT_ACCURACY",
+				"value" : 80
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"name" : "Lynx",
+			"types" : "Lynx",
+			"side" : "SIDE_TZAC",
+			"x" : 25,
+			"y" : 25,
+			"number" : 5,
+			"scatter" : 2000,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE"
+		}
+	]
+}
--- a/data/challenges/05.json
+++ b/data/challenges/05.json
@ -0,0 +1,64 @@
+{
+	"name" : "Disable all targets",
+	"description" : "Disable all targets",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Hyena-A",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"objectives" : [
+		{
+			"description" : "Do not destroy targets",
+			"targetName" : "TAF",
+			"targetValue" : 1,
+			"targetType" : "TT_DESTROY",
+			"isCondition" : 1
+		}
+	],
+	"challenge" : {
+		"timeLimit" : 90,
+		"killLimit" : 6,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 90
+			},
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 45
+			},
+			{
+				"type" : "CHALLENGE_DISABLE",
+				"value" : 6
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"name" : "TAF",
+			"types" : "TAF",
+			"side" : "SIDE_TZAC",
+			"x" : 25,
+			"y" : 25,
+			"number" : 2,
+			"scatter" : 4000,
+			"flags" : "+EF_NO_KILL+EF_MUST_DISABLE+EF_MISSION_TARGET+EF_AI_LEADER"
+		},
+		{
+			"name" : "Dart",
+			"types" : "Dart",
+			"side" : "SIDE_TZAC",
+			"x" : 25,
+			"y" : 25,
+			"number" : 4,
+			"scatter" : 4000,
+			"aiFlags" : "+AIF_MOVES_TO_LEADER"
+		}
+	]
+}
--- a/data/challenges/06.json
+++ b/data/challenges/06.json
@ -0,0 +1,47 @@
+{
+	"name" : "60 second battle",
+	"description" : "60 second battle",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Hammerhead",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"epic" : {
+		"fighterLimit" : 5
+	},
+	"challenge" : {
+		"timeLimit" : 60,
+		"killLimit" : 20,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 12
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 15
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 20
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"name" : "Pirate",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"x" : 25,
+			"y" : 25,
+			"number" : 20,
+			"scatter" : 5000
+		}
+	]
+}
--- a/data/challenges/07.json
+++ b/data/challenges/07.json
@ -0,0 +1,122 @@
+{
+	"name" : "Pass all Waypoints",
+	"description" : "Pass all Waypoints",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"waypointAutoAdvance" : 1,
+	"player" : {
+		"type" : "Nymph",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"waypointLimit" : 5,
+		"timeLimit" : 120,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 80
+			},
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 120
+			},
+			{
+				"type" : "CHALLENGE_ARMOUR",
+				"value" : 100
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"groupName" : "RT1",
+			"types" : "Rocket Turret",
+			"x" : 30,
+			"y" : 30,
+			"side" : "SIDE_TZAC",
+			"scatter" : 1000,
+			"number" : 2
+		},
+		{
+			"groupName" : "RT1",
+			"types" : "Rocket Turret",
+			"x" : 30,
+			"y" : 20,
+			"side" : "SIDE_TZAC",
+			"scatter" : 1000,
+			"number" : 2
+		},
+		{
+			"groupName" : "RT2",
+			"types" : "Rocket Turret",
+			"x" : 20,
+			"y" : 20,
+			"side" : "SIDE_TZAC",
+			"scatter" : 1000,
+			"number" : 2
+		},
+		{
+			"groupName" : "RT3",
+			"types" : "Rocket Turret",
+			"x" : 20,
+			"y" : 30,
+			"side" : "SIDE_TZAC",
+			"scatter" : 1000,
+			"number" : 2
+		},
+		{
+			"groupName" : "RT4",
+			"types" : "Rocket Turret",
+			"x" : 25,
+			"y" : 25,
+			"side" : "SIDE_TZAC",
+			"scatter" : 1000,
+			"number" : 2,
+			"active" : 0
+		}
+	],
+	"entities" : [
+		{
+			"type" : "ET_WAYPOINT",
+			"x" : 30,
+			"y" : 30,
+			"active" : 0
+		},
+		{
+			"type" : "ET_WAYPOINT",
+			"x" : 30,
+			"y" : 20,
+			"active" : 0
+		},
+		{
+			"type" : "ET_WAYPOINT",
+			"x" : 20,
+			"y" : 20,
+			"active" : 0
+		},
+		{
+			"type" : "ET_WAYPOINT",
+			"x" : 20,
+			"y" : 30,
+			"active" : 0
+		},
+		{
+			"type" : "ET_WAYPOINT",
+			"x" : 25,
+			"y" : 25,
+			"active" : 0
+		}
+	],
+	"script" : [
+		{
+			"function" : "Waypoint #4",
+			"lines" : [
+				"ACTIVATE_ENTITY_GROUPS RT4"
+			]
+		}
+	]
+}
--- a/data/challenges/08.json
+++ b/data/challenges/08.json
@ -0,0 +1,54 @@
+{
+	"name" : "Defend Jumpgate",
+	"description" : "Defend Jumpgate",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Leopard",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 90,
+		"killLimit" : 12,
+		"escapeLimit" : 12,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 6
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 9
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 12
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"groupName" : "Dart",
+			"types" : "Dart",
+			"x" : 25,
+			"y" : 28,
+			"side" : "SIDE_TZAC",
+			"scatter" : 5000,
+			"number" : 12,
+			"flags" : "+EF_RETREATING",
+			"aiFlags" : "+AIF_GOAL_JUMPGATE+AIF_UNLIMITED_RANGE+AIF_DEFENSIVE+AIF_COVERS_RETREAT"
+		}
+	],
+	"entities" : [
+		{
+			"type" : "ET_JUMPGATE",
+			"x" : 25.1,
+			"y" : 25.1
+		}
+	]
+}
--- a/data/challenges/09.json
+++ b/data/challenges/09.json
@ -0,0 +1,75 @@
+{
+	"name" : "Collect Packages",
+	"description" : "Collect Packages",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Firefly",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"epic" : {
+		"fighterLimit" : 3
+	},
+	"challenge" : {
+		"timeLimit" : 900,
+		"itemLimit" : 50,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_ITEMS",
+				"value" : 25
+			},
+			{
+				"type" : "CHALLENGE_ITEMS",
+				"value" : 40
+			},
+			{
+				"type" : "CHALLENGE_ITEMS",
+				"value" : 50
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"groupName" : "Shuttle",
+			"types" : "Shuttle",
+			"x" : 25,
+			"y" : 25,
+			"side" : "SIDE_ALLIES",
+			"flags" : "+EF_AI_TARGET",
+			"scatter" : 500
+		},
+		{
+			"groupName" : "Dart",
+			"types" : "Dart",
+			"x" : 25,
+			"y" : 25,
+			"side" : "SIDE_TZAC",
+			"scatter" : 10000,
+			"number" : 9999,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE"
+		}
+	],
+	"items" : [
+		{
+			"number" : 50,
+			"type" : "RANDOM",
+			"x" : 25,
+			"y" : 25,
+			"scatter" : 5000,
+			"flags" : "+EF_MISSION_TARGET"
+		}
+	],
+	"script" : [
+		{
+			"function" : "ALLIES_KILLED 1",
+			"lines" : [
+				"END_CHALLENGE"
+			]
+		}
+	]
+}
--- a/data/challenges/10.json
+++ b/data/challenges/10.json
@ -0,0 +1,65 @@
+{
+	"name" : "Rescue Civilians",
+	"description" : "Rescue Civilians",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Tug",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"rescueLimit" : 8,
+		"timeLimit" : 300,
+		"allowPlayerDeath" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_RESCUE",
+				"value" : 4
+			},
+			{
+				"type" : "CHALLENGE_RESCUE",
+				"value" : 5
+			},
+			{
+				"type" : "CHALLENGE_RESCUE",
+				"value" : 8
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"types" : "Civilian",
+			"x" : 25,
+			"y" : 25,
+			"side" : "SIDE_ALLIES",
+			"flags" : "+EF_DISABLED+EF_NO_KILL",
+			"number" : 8,
+			"scatter" : 5000
+		}
+	],
+	"entities" : [
+		{
+			"name" : "Jumpgate",
+			"type" : "ET_JUMPGATE",
+			"x" : 25,
+			"y" : 25
+		}
+	],
+	"spawners" : [
+		{
+			"name" : "spawner",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"interval" : 30,
+			"total" : -1,
+			"step" : 1,
+			"offscreen" : 1,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE"
+		}
+	]
+}
--- a/data/challenges/11.json
+++ b/data/challenges/11.json
@ -0,0 +1,49 @@
+{
+	"name" : "Destroy INF Klondike and INF Canfield",
+	"description" : "Destroy INF Klondike and INF Canfield",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "ATAF",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"killLimit" : 2,
+		"timeLimit" : 90,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 50
+			},
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 90
+			},
+			{
+				"type" : "CHALLENGE_SHOT_ACCURACY",
+				"value" : 90
+			}
+		]
+	},
+	"capitalShips" : [
+		{
+			"name" : "INF Klondike",
+			"types" : "INF Corvette 01",
+			"side" : "SIDE_PANDORAN",
+			"x" : 23,
+			"y" : 23
+		},
+		{
+			"name" : "INF Canfield",
+			"types" : "INF Corvette 01",
+			"side" : "SIDE_PANDORAN",
+			"x" : 27,
+			"y" : 27
+		}
+	]
+}
--- a/data/challenges/12.json
+++ b/data/challenges/12.json
@ -0,0 +1,53 @@
+{
+	"name" : "Collect packages",
+	"description" : "Collect packages",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Shuttle",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"itemLimit" : 8,
+		"timeLimit" : 105,
+		"allowPlayerDeath" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_ITEMS",
+				"value" : 3
+			},
+			{
+				"type" : "CHALLENGE_ITEMS",
+				"value" : 5
+			},
+			{
+				"type" : "CHALLENGE_ITEMS",
+				"value" : 8
+			}
+		]
+	},
+	"items" : [
+		{
+			"number" : 8,
+			"type" : "RANDOM",
+			"x" : 25,
+			"y" : 25,
+			"scatter" : 5000,
+			"flags" : "+EF_MISSION_TARGET"
+		}
+	],
+	"entities" : [
+		{
+			"type" : "ET_MINE",
+			"number" : 750,
+			"x" : 25,
+			"y" : 25,
+			"scatter" : 10000
+		}
+	]
+}
--- a/data/challenges/13.json
+++ b/data/challenges/13.json
@ -0,0 +1,44 @@
+{
+	"name" : "Turret Takedown",
+	"description" : "Turret Takedown",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Lynx",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"killLimit" : 12,
+		"timeLimit" : 135,
+		"allowPlayerDeath" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 5
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 10
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 12
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"types" : "Rocket Turret",
+			"side" : "SIDE_TZAC",
+			"x" : 25,
+			"y" : 25,
+			"number" : 12,
+			"scatter" : 5000
+		}
+	]
+}
--- a/data/challenges/14.json
+++ b/data/challenges/14.json
@ -0,0 +1,45 @@
+{
+	"name" : "Swarms of Swarmers",
+	"description" : "Swarms of Swarmers",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Rapid Plasma Turret",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 0,
+		"allowPlayerDeath" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_SURVIVE",
+				"value" : 30
+			},
+			{
+				"type" : "CHALLENGE_SURVIVE",
+				"value" : 60
+			},
+			{
+				"type" : "CHALLENGE_SURVIVE",
+				"value" : 70
+			}
+		]
+	},
+	"spawners" : [
+		{
+			"name" : "spawner",
+			"types" : "Swarmer",
+			"side" : "SIDE_PANDORAN",
+			"interval" : 1,
+			"total" : -1,
+			"step" : 1,
+			"offscreen" : 1,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE"
+		}
+	]
+}
--- a/data/challenges/15.json
+++ b/data/challenges/15.json
@ -0,0 +1,84 @@
+{
+	"name" : "Piracy",
+	"description" : "Piracy",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Dart",
+		"side" : "SIDE_PIRATE",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25,
+		"flags" : "+EF_COLLECTS_ITEMS"
+	},
+	"challenge" : {
+		"timeLimit" : 300,
+		"itemLimit" : 25,
+		"allowPlayerDeath" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_ITEMS",
+				"value" : 10
+			},
+			{
+				"type" : "CHALLENGE_ITEMS",
+				"value" : 25
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 15
+			}
+		]
+	},
+	"spawners" : [
+		{
+			"name" : "spawner",
+			"types" : "Shuttle",
+			"side" : "SIDE_ALLIES",
+			"interval" : 10,
+			"total" : -1,
+			"step" : 2,
+			"offscreen" : 1,
+			"flags" : "+EF_DROPS_ITEMS+EF_MISSION_TARGET",
+			"aiFlags" : "AIF_DEFENSIVE"
+		},
+		{
+			"name" : "spawner",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"interval" : 5,
+			"total" : -1,
+			"step" : 1,
+			"offscreen" : 1,
+			"flags" : "+EF_COLLECTS_ITEMS",
+			"aiFlags" : "+AIF_UNLIMITED_RANGE+AIF_COLLECTS_ITEMS"
+		},
+		{
+			"name" : "tafSpawner",
+			"types" : "TAF",
+			"side" : "SIDE_ALLIES",
+			"interval" : 12,
+			"total" : -1,
+			"step" : 1,
+			"offscreen" : 1,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE",
+			"active" : 0
+		}
+	],
+	"script" : [
+		{
+			"function" : "TIME 1",
+			"lines" : [
+				"MSG_BOX Boss;Blow apart those shuttles and grab the spoils before the CSN gets here. No fighting over the packages, you dogs, this is a team effort."
+			]
+		},
+		{
+			"function" : "TIME 10",
+			"lines" : [
+				"ACTIVATE_SPAWNER 1 tafSpawner"
+			]
+		}
+	]
+}
--- a/data/challenges/16.json
+++ b/data/challenges/16.json
@ -0,0 +1,55 @@
+{
+	"name" : "Swelling the Ranks",
+	"description" : "Swelling the Ranks",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Scarab",
+		"side" : "SIDE_PANDORAN",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 240,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 120
+			},
+			{
+				"type" : "CHALLENGE_ROCKET_ACCURACY",
+				"value" : 75
+			},
+			{
+				"type" : "CHALLENGE_ARMOUR",
+				"value" : 80
+			}
+		]
+	},
+	"capitalShips" : [
+		{
+			"name" : "CSN Denier",
+			"types" : "CSN Corvette 01",
+			"side" : "SIDE_ALLIES",
+			"x" : 20,
+			"y" : 25
+		}
+	],
+	"script" : [
+		{
+			"function" : "CAP_DISABLED CSN Denier",
+			"lines" : [
+				"END_CHALLENGE"
+			]
+		},
+		{
+			"function" : "CAPITAL_SHIPS_DESTROYED 1",
+			"lines" : [
+				"FAIL_CHALLENGE"
+			]
+		}
+	]
+}
--- a/data/challenges/17.json
+++ b/data/challenges/17.json
@ -0,0 +1,73 @@
+{
+	"name" : "Most Wanted",
+	"description" : "Most Wanted",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Shale",
+		"side" : "SIDE_TZAC",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25,
+		"flags" : "+EF_MUST_DISABLE+EF_RETREATING"
+	},
+	"challenge" : {
+		"timeLimit" : 120,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 120
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 2
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 3
+			}
+		]
+	},
+	"entities" : [
+		{
+			"type" : "ET_JUMPGATE",
+			"side" : "SIDE_NONE",
+			"x" : 25,
+			"y" : 25,
+			"flags" : "EF_DISABLED+EF_NO_HEALTH_BAR"
+		}
+	],
+	"spawners" : [
+		{
+			"name" : "spawner",
+			"types" : "Ray",
+			"side" : "SIDE_ALLIES",
+			"interval" : 15,
+			"total" : 8,
+			"step" : 1,
+			"offscreen" : 1
+		}
+	],
+	"script" : [
+		{
+			"function" : "TIME 1",
+			"lines" : [
+				"MSG_BOX Help;The jumpgate will come online in just under 2 minutes, for 5 SECONDS ONLY! Evade the CSN until then."
+			]
+		},
+		{
+			"function" : "TIME 114",
+			"lines" : [
+				"ACTIVATE_JUMPGATE 1"
+			]
+		},
+		{
+			"function" : "TIME 119",
+			"lines" : [
+				"ACTIVATE_JUMPGATE 0"
+			]
+		}
+	]
+}
--- a/data/challenges/18.json
+++ b/data/challenges/18.json
@ -0,0 +1,72 @@
+{
+	"name" : "Solo Patrol",
+	"description" : "Solo Patrol",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"waypointAutoAdvance" : 1,
+	"player" : {
+		"type" : "TAF",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 300,
+		"waypointLimit" : 5,
+		"clearWaypointEnemies" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 300
+			},
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 240
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 19
+			}
+		]
+	},
+	"spawners" : [
+		{
+			"name" : "spawner",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"interval" : 12,
+			"total" : -1,
+			"step" : 1,
+			"offscreen" : 1,
+			"aiFlags" : "AIF_UNLIMITED_RANGE",
+			"active" : 0
+		}
+	],
+	"entities" : [
+		{
+			"type" : "ET_WAYPOINT",
+			"x" : 25,
+			"y" : 25,
+			"scatter" : 10000,
+			"number" : 5,
+			"active" : 0
+		}
+	],
+	"script" : [
+		{
+			"function" : "Waypoint #1",
+			"lines" : [
+				"ACTIVATE_SPAWNER 1 spawner"
+			]
+		},
+		{
+			"function" : "Waypoint #5",
+			"lines" : [
+				"ACTIVATE_SPAWNER 0 spawner"
+			]
+		}
+	]
+}
--- a/data/challenges/19.json
+++ b/data/challenges/19.json
@ -0,0 +1,46 @@
+{
+	"name" : "Set Phasers to Stun",
+	"description" : "Set Phasers to Stun",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Angel",
+		"side" : "SIDE_PANDORAN",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"allowPlayerDeath" : 1,
+		"disableLimit" : 5,
+		"timeLimit" : 180,
+		"eliminateThreats" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_DISABLE",
+				"value" : 2
+			},
+			{
+				"type" : "CHALLENGE_DISABLE",
+				"value" : 4
+			},
+			{
+				"type" : "CHALLENGE_DISABLE",
+				"value" : 5
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"types" : "Khepri",
+			"side" : "SIDE_ALLIES",
+			"x" : 25,
+			"y" : 25,
+			"scatter" : 12000,
+			"number" : 5,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE+AIF_DROPS_MINES"
+		}
+	]
+}
--- a/data/challenges/20.json
+++ b/data/challenges/20.json
@ -0,0 +1,43 @@
+{
+	"name" : "No survivors",
+	"description" : "No survivors",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Scarab",
+		"side" : "SIDE_PANDORAN",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"killLimit" : 25,
+		"timeLimit" : 210,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 20
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 25
+			},
+			{
+				"type" : "CHALLENGE_ROCKET_ACCURACY",
+				"value" : 80
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"types" : "Civilian",
+			"side" : "SIDE_ALLIES",
+			"x" : 25,
+			"y" : 25,
+			"scatter" : 5000,
+			"number" : 25
+		}
+	]
+}
--- a/data/challenges/21.json
+++ b/data/challenges/21.json
@ -0,0 +1,57 @@
+{
+	"name" : "Initiation",
+	"description" : "Initiation",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Dart",
+		"side" : "SIDE_PIRATE",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25,
+		"flags" : "+EF_COLLECTS_ITEMS"
+	},
+	"challenge" : {
+		"timeLimit" : 120,
+		"playerItemLimit" : 8,
+		"allowPlayerDeath" : 1,
+		"isDeathMatch" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 3
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 6
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 8
+			}
+		]
+	},
+	"spawners" : [
+		{
+			"name" : "spawner",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"interval" : 5,
+			"total" : -1,
+			"step" : 1,
+			"offscreen" : 1,
+			"flags" : "+EF_COLLECTS_ITEMS+EF_DROPS_ITEMS",
+			"aiFlags" : "+AIF_UNLIMITED_RANGE+AIF_COLLECTS_ITEMS"
+		}
+	],
+	"script" : [
+		{
+			"function" : "TIME 1",
+			"lines" : [
+				"MSG_BOX Boss;Three kills to join the team, dogs! Don't forget to collect the kill!"
+			]
+		}
+	]
+}
--- a/data/challenges/22.json
+++ b/data/challenges/22.json
@ -0,0 +1,45 @@
+{
+	"name" : "Destroy all Darts #4",
+	"description" : "Destroy all Darts #4",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Shale",
+		"side" : "SIDE_TZAC",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 30,
+		"killLimit" : 5,
+		"noMissiles" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 30
+			},
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 27
+			},
+			{
+				"type" : "CHALLENGE_SHOT_ACCURACY",
+				"value" : 55
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"name" : "Dart",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"x" : 25,
+			"y" : 22,
+			"number" : 5,
+			"scatter" : 1000
+		}
+	]
+}
--- a/data/challenges/23.json
+++ b/data/challenges/23.json
@ -0,0 +1,76 @@
+{
+	"name" : "Surrender!",
+	"description" : "Surrender!",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Ray",
+		"side" : "SIDE_TZAC",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"allowPlayerDeath" : 1,
+		"timeLimit" : 120,
+		"surrenderLimit" : 5,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_SURRENDER",
+				"value" : 2
+			},
+			{
+				"type" : "CHALLENGE_SURRENDER",
+				"value" : 4
+			},
+			{
+				"type" : "CHALLENGE_SURRENDER",
+				"value" : 5
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"types" : "Nymph",
+			"side" : "SIDE_MERC",
+			"x" : 25,
+			"y" : 20,
+			"scatter" : 2000,
+			"aiFlags" : "+AIF_SURRENDERS"
+		},
+		{
+			"types" : "Firefly",
+			"side" : "SIDE_MERC",
+			"x" : 25,
+			"y" : 20,
+			"scatter" : 2000,
+			"aiFlags" : "+AIF_SURRENDERS"
+		},
+		{
+			"types" : "Lynx",
+			"side" : "SIDE_MERC",
+			"x" : 25,
+			"y" : 20,
+			"scatter" : 2000,
+			"aiFlags" : "+AIF_SURRENDERS"
+		},
+		{
+			"types" : "Hyena-A",
+			"side" : "SIDE_MERC",
+			"x" : 25,
+			"y" : 20,
+			"scatter" : 2000,
+			"aiFlags" : "+AIF_SURRENDERS"
+		},
+		{
+			"types" : "Leopard",
+			"side" : "SIDE_MERC",
+			"x" : 25,
+			"y" : 20,
+			"scatter" : 2000,
+			"aiFlags" : "+AIF_SURRENDERS"
+		}
+	]
+}
--- a/data/challenges/24.json
+++ b/data/challenges/24.json
@ -0,0 +1,58 @@
+{
+	"name" : "Gate Smasher",
+	"description" : "Gate Smasher",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Scarab",
+		"side" : "SIDE_PANDORAN",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 35
+	},
+	"challenge" : {
+		"timeLimit" : 60,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 60
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 5
+			},
+			{
+				"type" : "CHALLENGE_ARMOUR",
+				"value" : 100
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"types" : "Rapid Plasma Turret",
+			"side" : "SIDE_ALLIES",
+			"x" : 25,
+			"y" : 30,
+			"scatter" : 1000,
+			"number" : 5
+		}
+	],
+	"entities" : [
+		{
+			"type" : "ET_JUMPGATE",
+			"side" : "SIDE_ALLIES",
+			"x" : 25,
+			"y" : 30
+		}
+	],
+	"script" : [
+		{
+			"function" : "JUMPGATE_HEALTH 1",
+			"lines" : [
+				"END_CHALLENGE"
+			]
+		}
+	]
+}
--- a/data/challenges/25.json
+++ b/data/challenges/25.json
@ -0,0 +1,52 @@
+{
+	"name" : "Minefield Race",
+	"description" : "Minefield Race",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"waypointAutoAdvance" : 1,
+	"player" : {
+		"type" : "Shuttle",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 120,
+		"waypointLimit" : 12,
+		"allowPlayerDeath" : 1,
+		"noBoost" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_WAYPOINTS",
+				"value" : 5
+			},
+			{
+				"type" : "CHALLENGE_WAYPOINTS",
+				"value" : 10
+			},
+			{
+				"type" : "CHALLENGE_WAYPOINTS",
+				"value" : 12
+			}
+		]
+	},
+	"entities" : [
+		{
+			"type" : "ET_WAYPOINT",
+			"x" : 25,
+			"y" : 25,
+			"number" : 12,
+			"scatter" : 2000
+		},
+		{
+			"type" : "ET_MINE",
+			"x" : 25,
+			"y" : 25,
+			"number" : 100,
+			"scatter" : 4000
+		}
+	]
+}
--- a/data/challenges/26.json
+++ b/data/challenges/26.json
@ -0,0 +1,46 @@
+{
+	"name" : "Surrender! #2",
+	"description" : "Surrender! #2",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "SK-34",
+		"side" : "SIDE_TZAC",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"allowPlayerDeath" : 1,
+		"timeLimit" : 90,
+		"disableLimit" : 4,
+		"eliminateThreats" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_SURRENDER",
+				"value" : 3
+			},
+			{
+				"type" : "CHALLENGE_SURRENDER",
+				"value" : 4
+			},
+			{
+				"type" : "CHALLENGE_DISABLE",
+				"value" : 4
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"types" : "Rook",
+			"side" : "SIDE_ALLIES",
+			"x" : 25,
+			"y" : 20,
+			"scatter" : 3000,
+			"number" : 4,
+			"aiFlags" : "+AIF_SURRENDERS"
+		}
+	]
+}
--- a/data/challenges/27.json
+++ b/data/challenges/27.json
@ -0,0 +1,84 @@
+{
+	"name" : "Piracy #2",
+	"description" : "Piracy #2",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Dart",
+		"side" : "SIDE_PIRATE",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25,
+		"flags" : "+EF_COLLECTS_ITEMS"
+	},
+	"challenge" : {
+		"timeLimit" : 180,
+		"playerItemLimit" : 10,
+		"allowPlayerDeath" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 5
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 8
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 10
+			}
+		]
+	},
+	"spawners" : [
+		{
+			"name" : "spawner",
+			"types" : "Shuttle",
+			"side" : "SIDE_ALLIES",
+			"interval" : 10,
+			"total" : -1,
+			"step" : 2,
+			"offscreen" : 1,
+			"flags" : "+EF_DROPS_ITEMS+EF_MISSION_TARGET",
+			"aiFlags" : "AIF_DEFENSIVE"
+		},
+		{
+			"name" : "spawner",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"interval" : 10,
+			"total" : -1,
+			"step" : 1,
+			"offscreen" : 1,
+			"flags" : "+EF_COLLECTS_ITEMS",
+			"aiFlags" : "+AIF_UNLIMITED_RANGE+AIF_COLLECTS_ITEMS"
+		},
+		{
+			"name" : "csnSpawner",
+			"types" : "TAF;Kingfisher;Ray;Rook",
+			"side" : "SIDE_ALLIES",
+			"interval" : 12,
+			"total" : -1,
+			"step" : 1,
+			"offscreen" : 1,
+			"aiFlags" : "+AIF_UNLIMITED_RANGE",
+			"active" : 0
+		}
+	],
+	"script" : [
+		{
+			"function" : "TIME 1",
+			"lines" : [
+				"MSG_BOX Boss;Get those packages from those shuttles. Every man for himself!"
+			]
+		},
+		{
+			"function" : "TIME 10",
+			"lines" : [
+				"ACTIVATE_SPAWNER 1 csnSpawner"
+			]
+		}
+	]
+}
--- a/data/challenges/28.json
+++ b/data/challenges/28.json
@ -0,0 +1,44 @@
+{
+	"name" : "Shoot 'Em Up",
+	"description" : "Shoot 'Em Up",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "ATAF",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 240,
+		"killLimit" : 120,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 100
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 115
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_KILLS",
+				"value" : 120
+			}
+		]
+	},
+	"spawners" : [
+		{
+			"name" : "spawner",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"interval" : 10,
+			"total" : 120,
+			"step" : 10,
+			"offscreen" : 1
+		}
+	]
+}
--- a/data/challenges/29.json
+++ b/data/challenges/29.json
@ -0,0 +1,57 @@
+{
+	"name" : "Initiation #2",
+	"description" : "Initiation #2",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Unarmed Dart",
+		"side" : "SIDE_PIRATE",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25,
+		"flags" : "+EF_COLLECTS_ITEMS"
+	},
+	"challenge" : {
+		"timeLimit" : 240,
+		"playerItemLimit" : 4,
+		"allowPlayerDeath" : 1,
+		"isDeathMatch" : 1,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 1
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 2
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 4
+			}
+		]
+	},
+	"spawners" : [
+		{
+			"name" : "spawner",
+			"types" : "Dart",
+			"side" : "SIDE_PIRATE",
+			"interval" : 5,
+			"total" : -1,
+			"step" : 1,
+			"offscreen" : 1,
+			"flags" : "+EF_COLLECTS_ITEMS+EF_DROPS_ITEMS",
+			"aiFlags" : "+AIF_UNLIMITED_RANGE+AIF_COLLECTS_ITEMS"
+		}
+	],
+	"script" : [
+		{
+			"function" : "TIME 1",
+			"lines" : [
+				"MSG_BOX Boss;Sorry we couldn't get you a working ship, but do your best, eh? Ha ha!"
+			]
+		}
+	]
+}
--- a/data/challenges/30.json
+++ b/data/challenges/30.json
@ -0,0 +1,43 @@
+{
+	"name" : "Feast",
+	"description" : "Feast",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Shuttle",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"timeLimit" : 240,
+		"playerItemLimit" : 100,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 70
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 95
+			},
+			{
+				"type" : "CHALLENGE_PLAYER_ITEMS",
+				"value" : 100
+			}
+		]
+	},
+	"items" : [
+		{
+			"number" : 100,
+			"type" : "RANDOM",
+			"x" : 25,
+			"y" : 25,
+			"scatter" : 3000,
+			"flags" : "+EF_MISSION_TARGET"
+		}
+	]
+}
--- a/data/challenges/31.json
+++ b/data/challenges/31.json
@ -0,0 +1,44 @@
+{
+	"name" : "Bomber vs Bomber",
+	"description" : "Bomber vs Bomber",
+	"background" : "AUTO",
+	"planet" : "AUTO",
+	"music" : "AUTO",
+	"player" : {
+		"type" : "Khepri",
+		"side" : "SIDE_ALLIES",
+		"pilot" : "-",
+		"squadron" : "-",
+		"x" : 25,
+		"y" : 25
+	},
+	"challenge" : {
+		"noMissiles" : 1,
+		"timeLimit" : 90,
+		"killLimit" : 4,
+		"challenges" : [
+			{
+				"type" : "CHALLENGE_TIME",
+				"value" : 60
+			},
+			{
+				"type" : "CHALLENGE_ARMOUR",
+				"value" : 100
+			},
+			{
+				"type" : "CHALLENGE_ROCKET_ACCURACY",
+				"value" : 100
+			}
+		]
+	},
+	"fighters" : [
+		{
+			"types" : "Scarab;Hammerhead;Lynx",
+			"side" : "SIDE_TZAC",
+			"number" : 4,
+			"x" : 25,
+			"y" : 25,
+			"scatter" : 3000
+		}
+	]
+}
--- a/data/craft/civilian.json
+++ b/data/craft/civilian.json
@ -1,11 +1,10 @@
 {
 	"name" : "Civilian",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
-	"shield" : 0,
-	"speed" : 2,
-	"reloadTime" : 0,
-	"shieldRechargeRate" : 0,
+	"speed" : 1.85,
 	"texture" : "gfx/craft/civilian01.png",
 	"flags" : "EF_MISSION_TARGET+EF_RETREATING+EF_TAKES_DAMAGE",
-	"aiFlags" : "AIF_GOAL_EXTRACTION+AIF_AVOIDS_COMBAT+AIF_FOLLOWS_PLAYER"
+	"aiFlags" : "AIF_GOAL_JUMPGATE+AIF_AVOIDS_COMBAT+AIF_FOLLOWS_PLAYER"
 }
--- a/data/craft/infTug.json
+++ b/data/craft/infTug.json
@ -0,0 +1,11 @@
+{
+	"name" : "INF Tug",
+	"description" : "",
+	"affiliation" : "",
+	"health" : 50,
+	"speed" : 1.85,
+	"reloadTime" : 10,
+	"texture" : "gfx/craft/infTug.png",
+	"flags" : "EF_HAS_ROPE+EF_TAKES_DAMAGE",
+	"aiFlags" : "AIF_AVOIDS_COMBAT+AIF_TOWS"
+}
--- a/data/craft/list.json
+++ b/data/craft/list.json
@ -1,7 +0,0 @@
-[
-	"data/craft/civilian.json",
-	"data/craft/tug.json",
-	"data/craft/shuttle.json",
-	"data/craft/supplyShip.json",
-	"data/craft/munitionsTransport.json"
-]
--- a/data/craft/munitionsTransport.json
+++ b/data/craft/munitionsTransport.json
@ -1,10 +1,11 @@
 {
 	"name" : "Munitions Transport",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 150,
 	"shield" : 50,
 	"speed" : 1.5,
 	"reloadTime" : 10,
-	"shieldRechargeRate" : 0,
 	"texture" : "gfx/craft/munitionsTransport.png",
 	"flags" : "EF_TAKES_DAMAGE",
 	"aiFlags" : "AIF_AVOIDS_COMBAT"
--- a/data/craft/shuttle.json
+++ b/data/craft/shuttle.json
@ -1,11 +1,12 @@
 {
 	"name" : "Shuttle",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
 	"shield" : 15,
 	"speed" : 2,
-	"reloadTime" : 0,
 	"shieldRechargeRate" : 60,
 	"texture" : "gfx/craft/shuttle.png",
-	"flags" : "EF_COLLECTS_ITEMS+EF_TAKES_DAMAGE",
+	"flags" : "EF_COLLECTS_ITEMS+EF_TAKES_DAMAGE+EF_NO_EPIC",
 	"aiFlags" : "AIF_AVOIDS_COMBAT+AIF_COLLECTS_ITEMS"
 }
--- a/data/craft/supplyShip.json
+++ b/data/craft/supplyShip.json
@ -1,5 +1,7 @@
 {
 	"name" : "Supply Ship",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 150,
 	"shield" : 50,
 	"speed" : 1.5,
--- a/data/craft/tug.json
+++ b/data/craft/tug.json
@ -1,10 +1,10 @@
 {
 	"name" : "Tug",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 50,
-	"shield" : 0,
 	"speed" : 1.85,
 	"reloadTime" : 10,
-	"shieldRechargeRate" : 0,
 	"texture" : "gfx/craft/tug.png",
 	"guns" : [
 		{
--- a/data/credits/credits.json
+++ b/data/credits/credits.json
@ -0,0 +1,316 @@
+[
+	"0 30 MAIN PROGRAMMING",
+	"0 24 Stephen J Sweeney",
+
+	"75 30 ADDITIONAL CODE",
+	"0 24 Richard Sweeney",
+
+	"75 30 GRAPHICS",
+
+	"30 24 Main Graphics",
+	"0 24 Stephen J Sweeney (CC BY-NC-SA 3.0)",
+
+	"30 24 gfx/planets/earth.png",
+	"0 24 Derived from the the Blue Marble NASA photograph",
+	"0 24 visibleearth.nasa.gov/view.php?id=57723",
+
+	"30 24 gfx/trophies/bronze.png",
+	"0 24 Dervied from Trophy icon, by Lorc (CC BY 3.0)",
+	"0 24 game-icons.net/lorc/originals/trophy.html",
+
+	"30 24 gfx/trophies/gold.png",
+	"0 24 Dervied from Trophy icon, by Lorc (CC BY 3.0)",
+	"0 24 game-icons.net/lorc/originals/trophy.html",
+
+	"30 24 gfx/trophies/platinum.png",
+	"0 24 Dervied from Trophy icon, by Lorc (CC BY 3.0)",
+	"0 24 game-icons.net/lorc/originals/trophy.html",
+
+	"30 24 gfx/trophies/silver.png",
+	"0 24 Dervied from Trophy icon, by Lorc (CC BY 3.0)",
+	"0 24 game-icons.net/lorc/originals/trophy.html",
+
+	"30 24 gfx/trophies/unearned.png",
+	"0 24 Dervied from Trophy icon, by Lorc (CC BY 3.0)",
+	"0 24 game-icons.net/lorc/originals/trophy.html",
+
+	"75 30 TRANSLATIONS",
+	"30 24 Lumidify Productions (German)",
+	"0 24 ekrempel (German)",
+	"0 24 oriolhub (Catalan)",
+
+	"75 30 DEVELOPMENT SOFTWARE",
+
+	"75 28 Simple DirectMedia Layer",
+	"0 24 Created by Sam Lantinga",
+	"0 24 Developed by the SDL Community",
+
+	"75 28 GCC",
+	"0 24 GNU Compiler Collection",
+	"0 24 Developed by the GNU Project",
+
+	"75 28 The GIMP",
+	"0 24 GNU Image Manipulation Program",
+	"0 24 Created by Spencer Kimball and Peter Mattis",
+	"0 24 Developed by The GIMP Development Team",
+
+	"75 28 Kate",
+	"0 24 KDE Advanced Text Editor",
+	"0 24 Developed by the KDE Team",
+
+	"75 28 Audacity",
+	"0 24 Created by Dominic Mazzoni and Roger Dannenberg",
+	"0 24 Developed by The Audacity Team",
+
+	"75 30 FONTS",
+
+	"30 24 data/fonts/Roboto-Medium.ttf",
+	"0 24 by Christian Robertson",
+	"0 24 Licensed under the Apache License, version 2.0",
+
+	"30 24 data/fonts/Khosrau.ttf",
+	"0 24 by Fereydoun Rostam.",
+	"0 24 www.dafont.com/khosrau.font",
+
+	"75 30 SOUND EFFECTS",
+
+	"30 24 000000_large_explosion.ogg",
+	"0 24 created by combining:",
+	"0 24 EXPLODE.WAV, by dkmedic (CC-0)",
+	"0 24 freesound.org/people/dkmedic/sounds/104447/",
+	"0 24 Huge rocket launcher.wav, by CGEffex (CC-BY)",
+	"0 24 freesound.org/people/CGEffex/sounds/100772/",
+
+	"30 24 18380__inferno__hvrl.ogg",
+	"0 24 hvrl, by inferno (CC-Sampling+)",
+	"0 24 freesound.org/people/inferno/sounds/18380/",
+
+	"30 24 18382__inferno__hvylas.ogg",
+	"0 24 hvylas, by inferno (CC-Sampling+)",
+	"0 24 freesound.org/people/inferno/sounds/18382/",
+
+	"30 24 42106__marcuslee__laser-wrath-4.ogg",
+	"0 24 Laser Wrath 4, by marcusless (CC-Sampling+)",
+	"0 24 freesound.org/people/marcuslee/sounds/42106/",
+
+	"30 24 47252__nthompson__bad-explosion.ogg",
+	"0 24 bad explosion, by nthompson (CC-0)",
+	"0 24 freesound.org/people/nthompson/sounds/47252/",
+
+	"30 24 49678__ejfortin__energy-short-sword-7.ogg",
+	"0 24 Energy Short Sword, by ejfortin (CC-Sampling+)",
+	"0 24 freesound.org/people/ejfortin/sounds/49678/",
+
+	"30 24 56246__q-k__latch-04.ogg",
+	"0 24 Latch_04, by Q.K. (CC-0)",
+	"0 24 freesound.org/people/Q.K./sounds/56246/",
+
+	"30 24 65787__iwilldstroyu__laserrocket.ogg",
+	"0 24 laserrocket, by iwilldstroyu (CC-0)",
+	"0 24 freesound.org/people/iwilldstroyu/sounds/65787/",
+
+	"30 24 77087__supraliminal__laser-short.ogg",
+	"0 24 Laser short, by Supraliminal (CC-0)",
+	"0 24 freesound.org/people/Supraliminal/sounds/77087/",
+
+	"30 24 88275__s-dij__gbc-reload-06.ogg",
+	"0 24 GBC_Reload_06, by S_Dij (CC-BY)",
+	"0 24 freesound.org/people/S_Dij/sounds/88275/",
+
+	"30 24 146725__fins__laser.ogg",
+	"0 24 laser, by fins (CC-0)",
+	"0 24 freesound.org/people/fins/sounds/146725/",
+
+	"30 24 162265__qubodup__explosive.ogg",
+	"0 24 Explosive, by qubodup (CC-0)",
+	"0 24 freesound.org/people/qubodup/sounds/162265/",
+
+	"30 24 178064__jorickhoofd__slam-door-shut.ogg",
+	"0 24 Slam door shut, by jorickhoofd (CC-BY)",
+	"0 24 freesound.org/people/jorickhoofd/sounds/178064/",
+
+	"30 24 207322__animationisaac__short-explosion.ogg",
+	"0 24 Short explosion, by animationIsaac (CC-0)",
+	"0 24 freesound.org/people/animationIsaac/sounds/207322/",
+
+	"30 24 242856__plasterbrain__nuclear-alarm.ogg",
+	"0 24 Nuclear Alarm, by plasterbrain (CC-0)",
+	"0 24 freesound.org/people/plasterbrain/sounds/242856/",
+
+	"30 24 249300__suntemple__access-denied.ogg",
+	"0 24 Access Denied, by suntemple (CC-0)",
+	"0 24 freesound.org/people/suntemple/sounds/249300/",
+
+	"30 24 254071__tb0y298__firework-explosion.ogg",
+	"0 24 Firework Explosion, by TB0Y298 (CC-BY)",
+	"0 24 freesound.org/people/TB0Y298/sounds/254071/",
+
+	"30 24 257786__xtrgamr__mouse-click.ogg",
+	"0 24 Mouse click, by xtrgamr (CC-BY)",
+	"0 24 freesound.org/people/xtrgamr/sounds/257786/",
+
+	"30 24 263621__jamesabdulrahman__permission-to-panic.ogg",
+	"0 24 Permission to panic?, by jamesabdulrahman (CC-BY)",
+	"0 24 freesound.org/people/jamesabdulrahman/sounds/263621/",
+
+	"30 24 268344__julien-matthey__jm-noiz-laser-01.ogg",
+	"0 24 JM_NOIZ_Laser 01.wav, by Julien Matthey (CC-0)",
+	"0 24 freesound.org/people/Julien%20Matthey/sounds/268344/",
+
+	"30 24 275151__bird-man__gun-shot.ogg",
+	"0 24 Gun Shot.wav, by Bird_man (CC-0)",
+	"0 24 freesound.org/people/Bird_man/sounds/275151/",
+
+	"30 24 321104__nsstudios__blip2.ogg",
+	"0 24 blip2, by nsstudios (CC-BY)",
+	"0 24 freesound.org/people/nsstudios/sounds/321104/",
+
+	"30 24 321906__bruce965__walkie-talkie-roger-beep.ogg",
+	"0 24 Walkie Talkie - Roger Beep, by bruce965 (CC-0)",
+	"0 24 freesound.org/people/bruce965/sounds/321906/",
+
+	"30 24 322603__clippysounds__glass-break.ogg",
+	"0 24 Glass Break, by clippysounds (CC-BY)",
+	"0 24 freesound.org/people/clippysounds/sounds/322603/",
+
+	"30 24 276912__pauldihor__transform.ogg",
+	"0 24 transform, by PaulDihor (CC-0)",
+	"0 24 freesound.org/people/PaulDihor/sounds/276912/",
+
+	"30 24 329359__bassoonrckr__reed-guillotine.ogg",
+	"0 24 Reed Guillotine.wav, by bassoonrckr (CC-0)",
+	"0 24 freesound.org/people/bassoonrckr/sounds/329359/",
+
+	"30 24 251431__onlytheghosts__fusion-gun-flash0-by-onlytheghosts.ogg",
+	"0 24 fusion-gun_flash0_by_OnlyTheGhosts.wav, by OnlyTheGhosts (CC-BY)",
+	"0 24 freesound.org/people/OnlyTheGhosts/sounds/251431/",
+
+	"30 24 172591__timbre__zapitydooda.ogg",
+	"0 24 d1clsstf.wav, by wildweasel (CC-BY)",
+	"0 24 freesound.org/people/wildweasel/sounds/39030/",
+
+	"30 24 39030__wildweasel__d1clsstf.ogg",
+	"0 24 push_button_switch_07.wav, by joedeshon (CC-BY)",
+	"0 24 freesound.org/people/joedeshon/sounds/139061/",
+
+	"30 24 278142__ricemaster__effect-notify.ogg",
+	"0 24 effect_notify.wav, by ricemaster (CC-0)",
+	"0 24 freesound.org/people/ricemaster/sounds/278142/",
+
+	"30 24 254174__kwahmah-02__s.ogg",
+	"0 24 s.wav, by kwahmah_02 (CC-0)",
+	"0 24 freesound.org/people/kwahmah_02/sounds/254174/",
+
+	"30 24 172870__escortmarius__carbidexplosion.ogg",
+	"0 24 carbidexplosion.wav, by escortmarius (CC-BY)",
+	"0 24 freesound.org/people/escortmarius/sounds/172870/",
+
+	"30 24 320181__dland__hint.ogg",
+	"0 24 hint.wav, by dland (CC-0)",
+	"0 24 freesound.org/people/dland/sounds/320181/",
+
+	"30 24 62491__benboncan__dslr-click.ogg",
+	"0 24 DSLR Click.wav, by Benboncan (CC-BY)",
+	"0 24 freesound.org/people/Benboncan/sounds/62491/",
+
+	"30 24 154934__klawykogut__empty-gun-shot.ogg",
+	"0 24 Empty Gun Shot, by KlawyKogut (CC-0)",
+	"0 24 freesound.org/people/KlawyKogut/sounds/154934/",
+
+	"30 24 107786__leviclaassen__beepbeep.ogg",
+	"0 24 beepbeep.wav, by leviclaassen (CC-BY)",
+	"0 24 freesound.org/people/leviclaassen/sounds/107786/",
+
+	"30 24 33785__jobro__4-beep-b.ogg",
+	"0 24 4 beep b.wav, by jobro (CC-BY)",
+	"0 24 freesound.org/people/jobro/sounds/33785/",
+
+	"30 24 255729__manholo__inception-stab-l.ogg",
+	"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 - 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/",
+	"0 24 Clean Revolver Reload",
+	"0 24 by Dredile (CC-0)",
+	"0 24 freesound.org/people/Dredile/sounds/177863/",
+
+	"30 24 246420__oceanictrancer__game-sound-effect-menu.ogg",
+	"0 24 game sound effect -> menu, by oceanictrancer (CC-0)",
+	"0 24 freesound.org/people/oceanictrancer/sounds/246420/",
+
+	"30 24 146311__jgeralyn__shortailenliketone2-lower.ogg",
+	"0 24 shortailenliketone2_lower.aif, by jgeralyn (CC-BY)",
+	"0 24 freesound.org/people/jgeralyn/sounds/146311/",
+
+	"75 30 MUSIC",
+
+	"30 24 Battle in the winter.mp3",
+	"0 24 Johan Brodd (CC-BY)",
+	"0 24 opengameart.org/content/battle-in-the-winter",
+
+	"30 24 battleThemeA.mp3",
+	"0 24 cynicmusic.com | pixelsphere.org (CC-0)",
+	"0 24 opengameart.org/content/battle-theme-a",
+
+	"30 24 determination.mp3",
+	"0 24 artisticdude (CC-0)",
+	"0 24 opengameart.org/content/determination",
+
+	"30 24 heroism.ogg",
+	"0 24 Edward J. Blakeley (GPL 3.0)",
+	"0 24 opengameart.org/content/heroism",
+
+	"30 24 InnerCore_Low.ogg",
+	"0 24 Gundatsch (CC-BY)",
+	"0 24 soundcloud.com/gundatsch",
+
+	"30 24 Pressure.ogg",
+	"0 24 yd (CC-0)",
+	"0 24 opengameart.org/content/pressure",
+
+	"30 24 Rise of Spirit.ogg",
+	"0 24 Alexandr Zhelanov (CC-0)",
+	"0 24 soundcloud.com/alexandr-zhelanov",
+
+	"30 24 Showdown.mp3",
+	"0 24 el-corleo (CC-BY)",
+	"0 24 opengameart.org/content/showdown",
+
+	"30 24 track-3.mp3",
+	"0 24 Alexandr Zhelanov (CC-BY)",
+	"0 24 soundcloud.com/alexandr-zhelanov",
+
+	"30 24 track-4.mp3",
+	"0 24 Alexandr Zhelanov (CC-BY)",
+	"0 24 soundcloud.com/alexandr-zhelanov",
+
+	"30 24 DST-RailJet-LongSeamlessLoop.ogg",
+	"0 24 Deceased Superior Technician (CC-BY)",
+	"0 24 opengameart.org/content/railjet-long-seamless-loop",
+
+	"30 24 covert_operations.mp3",
+	"0 24 artisticdude (CC-0)",
+	"0 24 opengameart.org/content/covert-operations",
+
+	"30 24 Tactical Pursuit.mp3",
+	"0 24 Matthew Pablo (CC-BY)",
+	"0 24 opengameart.org/content/tactical-pursuit",
+
+	"30 24 Vehicle - OGA - Col Legno.ogg",
+	"0 24 Vehicle (CC-0)",
+	"0 24 opengameart.org/content/col-legno",
+
+	"30 24 Her Violet Eyes.mp3",
+	"0 24 tgfcoder (CC-BY)",
+	"0 24 twitter.com/tgfcoder",
+
+	"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-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"
+]
--- a/data/fighters/angel.json
+++ b/data/fighters/angel.json
@ -0,0 +1,35 @@
+{
+	"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,
+	"reloadTime" : 15,
+	"shieldRechargeRate" : 55,
+	"texture" : "gfx/fighters/angel.png",
+	"guns" : [
+		{
+			"type" : "BT_PLASMA",
+			"x" : -10,
+			"y" : 0
+		},
+		{
+			"type" : "BT_PLASMA",
+			"x" : 10,
+			"y" : 0
+		},
+		{
+			"type" : "BT_MAG",
+			"x" : -4,
+			"y" : -6
+		},
+		{
+			"type" : "BT_MAG",
+			"x" : 4,
+			"y" : -6
+		}
+	],
+	"missiles" : 3,
+	"flags" : "EF_TAKES_DAMAGE"
+}
--- a/data/fighters/ataf.json
+++ b/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,
@ -59,6 +61,6 @@
 		}
 	],
 	"missiles" : 4,
-	"flags" : "EF_NO_EPIC+EF_TAKES_DAMAGE",
+	"flags" : "EF_NO_EPIC+EF_TAKES_DAMAGE+EF_IMMORTAL",
 	"aiFlags" : "AIF_UNLIMITED_RANGE"
 }
--- a/data/fighters/blizzard.json
+++ b/data/fighters/blizzard.json
@ -0,0 +1,41 @@
+{
+	"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,
+	"reloadTime" : 14,
+	"shieldRechargeRate" : 45,
+	"texture" : "gfx/fighters/blizzard.png",
+	"combinedGuns" : 1,
+	"guns" : [
+		{
+			"type" : "BT_PLASMA",
+			"x" : -14,
+			"y" : 0
+		},
+		{
+			"type" : "BT_PLASMA",
+			"x" : 14,
+			"y" : 0
+		},
+		{
+			"type" : "BT_PARTICLE",
+			"x" : -8,
+			"y" : 0
+		},
+		{
+			"type" : "BT_PARTICLE",
+			"x" : 8,
+			"y" : 0
+		},
+		{
+			"type" : "BT_PARTICLE",
+			"x" : 0,
+			"y" : 0
+		}
+	],
+	"missiles" : 5,
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
+}
--- a/data/fighters/cannonDart.json
+++ b/data/fighters/cannonDart.json
@ -1,10 +1,10 @@
 {
-	"name" : "CannonDart",
+	"name" : "Cannon Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
-	"shield" : 0,
 	"speed" : 2.1,
 	"reloadTime" : 24,
-	"shieldRechargeRate" : 0,
 	"texture" : "gfx/fighters/dart01.png",
 	"guns" : [
 		{
--- a/data/fighters/dart.json
+++ b/data/fighters/dart.json
@ -1,10 +1,10 @@
 {
 	"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,
-	"shield" : 0,
 	"speed" : 2.1,
 	"reloadTime" : 24,
-	"shieldRechargeRate" : 0,
 	"texture" : "gfx/fighters/dart01.png",
 	"guns" : [
 		{
@ -19,5 +19,5 @@
 		}
 	],
 	"missiles" : 2,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/firefly.json
+++ b/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,
@ -25,5 +27,5 @@
 	],
 	"combinedGuns" : 1,
 	"missiles" : 3,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/hammerhead.json
+++ b/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,
@ -24,6 +26,6 @@
 		}
 	],
 	"missiles" : 6,
-	"flags" : "EF_TAKES_DAMAGE",
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER",
 	"aiFlags" : "AIF_MISSILE_BOAT+AIF_DEFENSIVE"
 }
--- a/data/fighters/hyenaA.json
+++ b/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,
@ -29,5 +31,5 @@
 		}
 	],
 	"missiles" : 4,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/hyenaB.json
+++ b/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,
@ -29,5 +31,5 @@
 		}
 	],
 	"missiles" : 4,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/jackal.json
+++ b/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,
@ -19,5 +21,5 @@
 		}
 	],
 	"missiles" : 3,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/khepri.json
+++ b/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,
@ -29,6 +31,6 @@
 		}
 	],
 	"missiles" : 8,
-	"flags" : "EF_TAKES_DAMAGE",
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER",
 	"aiFlags" : "AIF_MISSILE_BOAT+AIF_DEFENSIVE"
 }
--- a/data/fighters/kingfisher.json
+++ b/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,
@ -29,5 +31,5 @@
 		}
 	],
 	"missiles" : 4,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/leopard.json
+++ b/data/fighters/leopard.json
@ -1,12 +1,20 @@
 {
 	"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,
 	"reloadTime" : 16,
 	"shieldRechargeRate" : 70,
 	"texture" : "gfx/fighters/leopard.png",
+	"combinedGuns" : 1,
 	"guns" : [
+		{
+			"type" : "BT_PARTICLE",
+			"x" : 0,
+			"y" : -16
+		},
 		{
 			"type" : "BT_PLASMA",
 			"x" : -12,
@ -16,13 +24,8 @@
 			"type" : "BT_PLASMA",
 			"x" : 12,
 			"y" : -12
-		},
-		{
-			"type" : "BT_PLASMA",
-			"x" : 0,
-			"y" : -16
 		}
 	],
 	"missiles" : 3,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/list.json
+++ b/data/fighters/list.json
@ -1,26 +0,0 @@
-[
-	"data/fighters/ataf.json",
-	"data/fighters/dart.json",
-	"data/fighters/jackal.json",
-	"data/fighters/simpleDart.json",
-	"data/fighters/sphinx.json",
-	"data/fighters/staticDart.json",
-	"data/fighters/taf.json",
-	"data/fighters/unarmedDart.json",
-	"data/fighters/ray.json",
-	"data/fighters/nymph.json",
-	"data/fighters/firefly.json",
-	"data/fighters/hyenaA.json",
-	"data/fighters/hyenaB.json",
-	"data/fighters/leopard.json",
-	"data/fighters/kingfisher.json",
-	"data/fighters/mantis.json",
-	"data/fighters/rook.json",
-	"data/fighters/thunderhead.json",
-	"data/fighters/scarab.json",
-	"data/fighters/hammerhead.json",
-	"data/fighters/khepri.json",
-	"data/fighters/cannonDart.json",
-	"data/fighters/missileDart.json",
-	"data/fighters/lynx.json"
-]
--- a/data/fighters/lynx.json
+++ b/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,
@ -24,6 +26,6 @@
 		}
 	],
 	"missiles" : 6,
-	"flags" : "EF_TAKES_DAMAGE",
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER",
 	"aiFlags" : "AIF_MISSILE_BOAT+AIF_DEFENSIVE"
 }
--- a/data/fighters/mantis.json
+++ b/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,
@ -30,5 +32,5 @@
 	],
 	"combinedGuns" : 1,
 	"missiles" : 6,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/missileDart.json
+++ b/data/fighters/missileDart.json
@ -1,10 +1,10 @@
 {
-	"name" : "MissileDart",
+	"name" : "Missile Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
-	"shield" : 0,
 	"speed" : 2.1,
 	"reloadTime" : 24,
-	"shieldRechargeRate" : 0,
 	"texture" : "gfx/fighters/dart01.png",
 	"missiles" : 999,
 	"flags" : "EF_TAKES_DAMAGE"
--- a/data/fighters/nymph.json
+++ b/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,
@ -19,5 +21,5 @@
 		}
 	],
 	"missiles" : 3,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/ray.json
+++ b/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,
@ -29,5 +31,5 @@
 		}
 	],
 	"missiles" : 4,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/razor.json
+++ b/data/fighters/razor.json
@ -0,0 +1,31 @@
+{
+	"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,
+	"reloadTime" : 22,
+	"shieldRechargeRate" : 35,
+	"texture" : "gfx/fighters/razor.png",
+	"guns" : [
+		{
+			"type" : "BT_PARTICLE",
+			"x" : 0,
+			"y" : -4
+		},
+		{
+			"type" : "BT_PLASMA",
+			"x" : -12,
+			"y" : -2
+		},
+		{
+			"type" : "BT_PLASMA",
+			"x" : 12,
+			"y" : -2
+		}
+	],
+	"combinedGuns" : 1,
+	"missiles" : 4,
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
+}
--- a/data/fighters/rocketDart.json
+++ b/data/fighters/rocketDart.json
@ -0,0 +1,19 @@
+{
+	"name" : "Rocket Dart",
+	"description" : "",
+	"affiliation" : "",
+	"health" : 15,
+	"speed" : 2.1,
+	"reloadTime" : 35,
+	"texture" : "gfx/fighters/dart01.png",
+	"guns" : [
+		{
+			"type" : "BT_ROCKET",
+			"x" : 0,
+			"y" : 0
+		}
+	],
+	"missiles" : 6,
+	"flags" : "EF_TAKES_DAMAGE",
+	"aiFlags" : "AIF_MISSILE_BOAT"
+}
--- a/data/fighters/rook.json
+++ b/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,
@ -7,6 +9,11 @@
 	"shieldRechargeRate" : 45,
 	"texture" : "gfx/fighters/rook.png",
 	"guns" : [
+		{
+			"type" : "BT_PLASMA",
+			"x" : 0,
+			"y" : 0
+		},
 		{
 			"type" : "BT_PLASMA",
 			"x" : -9,
@ -29,5 +36,5 @@
 		}
 	],
 	"missiles" : 4,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/scarab.json
+++ b/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,
@ -24,6 +26,6 @@
 		}
 	],
 	"missiles" : 8,
-	"flags" : "EF_TAKES_DAMAGE",
-	"aiFlags" : "AIF_MISSILE_BOAT+AIF_DEFENSIVE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER",
+	"aiFlags" : "AIF_MISSILE_BOAT+AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
 }
--- a/data/fighters/shale.json
+++ b/data/fighters/shale.json
@ -0,0 +1,30 @@
+{
+	"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,
+	"reloadTime" : 18,
+	"shieldRechargeRate" : 20,
+	"texture" : "gfx/fighters/shale.png",
+	"guns" : [
+		{
+			"type" : "BT_PARTICLE",
+			"x" : -12,
+			"y" : -2
+		},
+		{
+			"type" : "BT_PARTICLE",
+			"x" : 0,
+			"y" : -2
+		},
+		{
+			"type" : "BT_PARTICLE",
+			"x" : 12,
+			"y" : -2
+		}
+	],
+	"missiles" : 3,
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
+}
--- a/data/fighters/simpleDart.json
+++ b/data/fighters/simpleDart.json
@ -1,10 +1,10 @@
 {
-	"name" : "SimpleDart",
+	"name" : "Simple Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
-	"shield" : 0,
 	"speed" : 2.1,
 	"reloadTime" : 24,
-	"shieldRechargeRate" : 0,
 	"texture" : "gfx/fighters/dart01.png",
 	"guns" : [
 		{
@ -19,5 +19,5 @@
 		}
 	],
 	"missiles" : 2,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/sk31.json
+++ b/data/fighters/sk31.json
@ -0,0 +1,35 @@
+{
+	"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,
+	"reloadTime" : 15,
+	"shieldRechargeRate" : 45,
+	"texture" : "gfx/fighters/sk31.png",
+	"guns" : [
+		{
+			"type" : "BT_PLASMA",
+			"x" : -12,
+			"y" : -12
+		},
+		{
+			"type" : "BT_PLASMA",
+			"x" : 12,
+			"y" : -12
+		},
+		{
+			"type" : "BT_LASER",
+			"x" : -4,
+			"y" : -12
+		},
+		{
+			"type" : "BT_LASER",
+			"x" : 6,
+			"y" : -12
+		}
+	],
+	"missiles" : 5,
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
+}
--- a/data/fighters/sk34.json
+++ b/data/fighters/sk34.json
@ -0,0 +1,35 @@
+{
+	"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,
+	"reloadTime" : 17,
+	"shieldRechargeRate" : 45,
+	"texture" : "gfx/fighters/sk34.png",
+	"guns" : [
+		{
+			"type" : "BT_PLASMA",
+			"x" : -12,
+			"y" : -12
+		},
+		{
+			"type" : "BT_PLASMA",
+			"x" : 12,
+			"y" : -12
+		},
+		{
+			"type" : "BT_MAG",
+			"x" : -4,
+			"y" : -12
+		},
+		{
+			"type" : "BT_MAG",
+			"x" : 6,
+			"y" : -12
+		}
+	],
+	"missiles" : 6,
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
+}
--- a/data/fighters/sphinx.json
+++ b/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,
@ -29,5 +31,5 @@
 		}
 	],
 	"missiles" : 2,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/staticDart.json
+++ b/data/fighters/staticDart.json
@ -1,10 +1,10 @@
 {
-	"name" : "StaticDart",
+	"name" : "Static Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
-	"shield" : 0,
 	"speed" : 0,
 	"reloadTime" : 24,
-	"shieldRechargeRate" : 0,
 	"texture" : "gfx/fighters/dart01.png",
 	"flags" : "EF_TAKES_DAMAGE"
 }
--- a/data/fighters/swarmer.json
+++ b/data/fighters/swarmer.json
@ -0,0 +1,19 @@
+{
+	"name" : "Swarmer",
+	"description" : "",
+	"affiliation" : "",
+	"health" : 5,
+	"speed" : 2,
+	"reloadTime" : 8,
+	"texture" : "gfx/fighters/swarmer.png",
+	"guns" : [
+		{
+			"type" : "BT_PARTICLE",
+			"x" : 0,
+			"y" : 0
+		}
+	],
+	"deathType" : "DT_SIMPLE",
+	"flags" : "EF_TAKES_DAMAGE",
+	"aiFlags" : "AIF_UNLIMITED_RANGE"
+}
--- a/data/fighters/taf.json
+++ b/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,
@ -19,5 +21,5 @@
 		}
 	],
 	"missiles" : 4,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/thunderhead.json
+++ b/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,
@ -35,5 +37,5 @@
 	],
 	"combinedGuns" : 1,
 	"missiles" : 4,
-	"flags" : "EF_TAKES_DAMAGE"
+	"flags" : "EF_TAKES_DAMAGE+EF_COMMON_FIGHTER"
 }
--- a/data/fighters/unarmedDart.json
+++ b/data/fighters/unarmedDart.json
@ -1,10 +1,10 @@
 {
-	"name" : "UnarmedDart",
+	"name" : "Unarmed Dart",
+	"description" : "",
+	"affiliation" : "",
 	"health" : 15,
-	"shield" : 0,
 	"speed" : 2.1,
 	"reloadTime" : 24,
-	"shieldRechargeRate" : 0,
 	"texture" : "gfx/fighters/dart01.png",
 	"flags" : "EF_TAKES_DAMAGE"
 }
--- a/data/fighters/zakSphinx.json
+++ b/data/fighters/zakSphinx.json
@ -0,0 +1,36 @@
+{
+	"name" : "Unique Sphinx",
+	"description" : "",
+	"affiliation" : "",
+	"health" : 999,
+	"shield" : 999,
+	"speed" : 1.6,
+	"reloadTime" : 14,
+	"shieldRechargeRate" : 0,
+	"texture" : "gfx/fighters/zakSphinx.png",
+	"guns" : [
+		{
+			"type" : "BT_PLASMA",
+			"x" : 0,
+			"y" : -4
+		},
+		{
+			"type" : "BT_PLASMA",
+			"x" : 9,
+			"y" : 0
+		},
+		{
+			"type" : "BT_PLASMA",
+			"x" : -9,
+			"y" : 0
+		},
+		{
+			"type" : "BT_LASER",
+			"x" : 0,
+			"y" : 0
+		}
+	],
+	"missiles" : 2,
+	"flags" : "EF_TAKES_DAMAGE+EF_IMMORTAL+EF_MISSION_TARGET+EF_AI_LEADER",
+	"aiFlags" : "+AIF_WANDERS+AIF_UNLIMITED_RANGE+AIF_ZAK_SUSPICIOUS"
+}
--- a/data/fonts/Khosrau.ttf
+++ b/data/fonts/Khosrau.ttf
--- a/data/galaxy/starSystems.json
+++ b/data/galaxy/starSystems.json
@ -82,13 +82,15 @@
        "name": "Trilliack",
        "side" : "SIDE_UNF",
        "x": 501,
-        "y": 312
+        "y": 312,
+        "fallsToPandorans" : 1
      },
      {
        "name": "Alba",
        "side" : "SIDE_UNF",
        "x": 465,
-        "y": 235
+        "y": 235,
+        "fallsToPandorans" : 1
      },
      {
        "name": "Aster",
@ -121,7 +123,8 @@
        "name": "Rothan",
        "side" : "SIDE_UNF",
        "x": 366,
-        "y": 298
+        "y": 298,
+        "fallsToPandorans" : 1
      },
      {
        "name": "Donesta",
@ -143,15 +146,17 @@
      },
      {
        "name": "Mace",
-        "side" : "SIDE_UNF",
+        "side" : "SIDE_TZAC",
        "x": 444,
-        "y": 359
+        "y": 359,
+        "fallsToPandorans" : 1
      },
      {
        "name": "Clarke",
        "side" : "SIDE_UNF",
        "x": 398,
-        "y": 84
+        "y": 84,
+        "fallsToPandorans" : 1
      },
      {
        "name": "Adetton",
--- a/Show More
+++ b/Show More