Some more changes and prepared the release files

Update ca.po

.github/stale.yml

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

.gitignore

@@ -44,3 +44,4 @@ build/*
 # Misc
 .DS_Store
 
+/.errors

CHANGELOG

@@ -1,5 +1,19 @@
 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
@@ -28,7 +42,7 @@ Changelog
 	* 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
 
@@ -60,7 +74,7 @@ Changelog
 	* Campaign tweaks and bugs fixes
 
 0.95
-	
+
 	* AI fixes
 	* Campaign tweaks and bugs fixes
 	* Reset entity owner when detaching tow rope
@@ -78,11 +92,11 @@ Changelog
 	* 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
@@ -92,7 +106,7 @@ Changelog
 	* Misc. tweaks and fixes
 
 0.9
-	
+
 	* Added final campaign missions
 	* Added final challenges
 	* Enabled all trophies
@@ -142,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

README-OS4.md

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

README.md

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

common.mk

@@ -1,16 +1,24 @@
-VERSION = 1.4
-REVISION = 0
+VERSION = 1.5
+REVISION = 1
 LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
 
 OUT = bin
 
-SEARCHPATH += src/ src/battle src/challenges src/draw src/game src/galaxy src/json src/system src/test
+SEARCHPATH += src
+SEARCHPATH += src/battle
+SEARCHPATH += src/challenges
+SEARCHPATH += src/game
+SEARCHPATH += src/galaxy
+SEARCHPATH += src/json
+SEARCHPATH += src/system
+SEARCHPATH += src/test
+
 vpath %.c $(SEARCHPATH)
 vpath %.h $(SEARCHPATH)
 
 DEPS += defs.h structs.h
 
-_OBJS += ai.o
+_OBJS += ai.o atlas.o
 _OBJS += battle.o bullets.o
 _OBJS += capitalShips.o challengeHome.o challenges.o cJSON.o controls.o credits.o
 _OBJS += debris.o dev.o draw.o
@@ -42,8 +50,11 @@ $(OUT)/%.o: %.c %.h $(DEPS)
 	$(CC) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<
 	
 %.mo: %.po
+ifneq ($(shell uname), AmigaOS)
 	msgfmt -c -o $@ $<
+endif
 	
 # cleaning everything that can be automatically recreated with "make".
 clean:
 	$(RM) $(OBJS) $(PROG) $(LOCALE_MO)
+

data/app/config.json

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

data/credits/credits.json

@@ -1,84 +1,86 @@
 [
 	"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/",
@@ -206,7 +208,7 @@
 	"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/",
@@ -222,7 +224,7 @@
 	"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/",
@@ -242,73 +244,73 @@
 	"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-2016, Stephen J Sweeney, Some Rights Reserved. The Battle for the Solar System and all related materials (including, but not limited to, characters, setting, and story elements) are (C) 2009-2016, Stephen J Sweeney, All Rights Reserved.",
-	
+
+	"150 24 This is a work of fiction. Names, characters, businesses, places, events and incidents are either the products of the author's imagination or used in a fictitious manner. Any resemblance to actual persons, living or dead, or actual events is purely coincidental. The Battle for the Solar System : The Pandoran War is (C) 2015-2019, Stephen J Sweeney, Some Rights Reserved. The Battle for the Solar System and all related materials (including, but not limited to, characters, setting, and story elements) are (C) 2009-2016, Stephen J Sweeney, All Rights Reserved.",
+
 	"500 30 www.battleforthesolarsystem.com"
 ]

data/locale/characters.dat

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

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

@@ -1,6 +1,6 @@
 {
 	"name" : "Pirate Uprising #1",
-	"description" : "The Pandoran's push in to Independent space has led to a surge in pirate activity along the Confederation border. The threat needs to be dealt with immediately, starting with cutting back on the enemy presence at Temper.",
+	"description" : "The Pandorans' push in to Independent space has led to a surge in pirate activity along the Confederation border. The threat needs to be dealt with immediately, starting with cutting back on the enemy presence at Temper.",
 	"background" : "gfx/backgrounds/background03.jpg",
 	"planet" : "gfx/planets/spirit.png",
 	"music" : "music/battle/battleThemeA.mp3",

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

@@ -121,15 +121,15 @@
 			"lines" : [
 				"ACTIVATE_ENTITY_GROUPS group4",
 				"WAIT 3",
-				"MSG_BOX Strickland; Another group. That tallies with the numbers we were expecting."
+				"MSG_BOX Strickland;Another group. That tallies with the numbers we were expecting."
 			]
 		},
 		{
 			"function" : "ALL_OBJECTIVES_COMPLETE",
 			"lines" : [
 				"WAIT 2",
-				"MSG_BOX Strickland; Looks like that was the last of 'em.",
-				"MSG_BOX Strickland; Spirit, this is Commander Strickland. Opposing forces have been defeated.",
+				"MSG_BOX Strickland;Looks like that was the last of 'em.",
+				"MSG_BOX Strickland;Spirit, this is Commander Strickland. Opposing forces have been defeated.",
 				"MSG_BOX Spirit Orbital;Acknowledged. Good work out there, Commander. Thanks to you, Temper will be a safer system, and we can focus on shoring up our defenses against the Pandoran forces. Come on home.",
 				"WAIT_MSG_BOX",
 				"COMPLETE_MISSION"

data/widgets/options.json

@@ -4,12 +4,23 @@
 		"group" : "options",
 		"type" : "WT_SELECT",
 		"text" : "Window Size",
-		"options" : "640 x 360;1280 x 720;1600 x 900;1920 x 1080",
+		"options" : "1280 x 720;1600 x 900;1920 x 1080;2560 x 1440;3840 x 2160;",
 		"x" : -1,
 		"y" : 175,
 		"w" : 400,
 		"h": 34
 	},
+	{
+		"name" : "effects",
+		"group" : "options",
+		"type" : "WT_SELECT",
+		"text" : "Effects Reduction",
+		"options" : "0;1;2;3",
+		"x" : -1,
+		"y" : 225,
+		"w" : 400,
+		"h": 34
+	},
 	{
 		"name" : "soundVolume",
 		"group" : "options",
@@ -17,7 +28,7 @@
 		"text" : "Sound Volume",
 		"options" : "0;1;2;3;4;5;6;7;8;9;10",
 		"x" : -1,
-		"y" : 250,
+		"y" : 275,
 		"w" : 400,
 		"h": 34
 	},
@@ -64,3 +75,4 @@
 		"h": 34
 	}
 ]
+

data/widgets/starSystem.json

@@ -12,11 +12,12 @@
 	{
 		"name" : "close",
 		"group" : "starSystem",
-		"type" : "WT_BUTTON",
+		"type" : "WT_IMG_BUTTON",
 		"text" : "X",
-		"x" : 1060,
-		"y" : 98,
-		"w" : 34,
-		"h": 34
+		"x" : 1040,
+		"y" : 75,
+		"w" : 32,
+		"h": 32,
+		"texture" : "gfx/widgets/close.png"
 	}
 ]