Merge branch 'main' into stable

.github/workflows/buildall.yml

@@ -0,0 +1,128 @@
+name: GLSMAC autobuild
+
+on:
+  push:
+    branches: [ "stable" ]
+  pull_request:
+    branches: [ "stable" ]
+
+jobs:
+
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      release_id: ${{ steps.create_release.outputs.id }}
+      ver: ${{ steps.info.outputs.ver }}
+      sha: ${{ steps.info.outputs.sha }}
+    steps:
+      - uses: benjlevesque/short-sha@v2.1
+        id: short-sha
+        with:
+          length: 7
+      - uses: dev-drprasad/delete-older-releases@v0.2.0
+        with:
+          keep_latest: 4
+          delete_tags: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: info
+        id: info
+        env:
+          ver: v0.3
+          sha: ${{ steps.short-sha.outputs.sha }}
+        run: |
+          echo ${{ env.ver }} ${{ env.sha }}
+          echo "ver=${{ env.ver }}" >> $GITHUB_OUTPUT
+          echo "sha=${{ env.sha }}" >> $GITHUB_OUTPUT
+      - name: create-release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.info.outputs.ver }}-${{ steps.info.outputs.sha }}
+          release_name: ${{ steps.info.outputs.ver }}-${{ steps.info.outputs.sha }}
+          draft: false
+          prerelease: false
+
+
+  build_linux:
+    needs: [prepare]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: install_dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install libfreetype-dev libsdl2-dev libsdl2-image-dev libglu-dev libglew-dev libossp-uuid-dev libyaml-cpp-dev
+      - name: prepare
+        run: |
+          mkdir build
+      - name: cmake
+        working-directory: ./build
+        run: cmake -DCMAKE_BUILD_TYPE=Portable64 ..
+      - name: make
+        working-directory: ./build
+        run: make
+      - name: data
+        working-directory: ./build
+        run: mv ../GLSMAC_data bin/
+      - name: pack
+        working-directory: ./build
+        run: tar -C bin -zcvf GLSMAC.tar.gz GLSMAC GLSMAC_data
+      - name: publish
+        uses: actions/upload-artifact@v3
+        with:
+          name: GLSMAC-linux64-bin
+          path: |
+            ./build/GLSMAC.tar.gz
+      - name: upload
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.prepare.outputs.upload_url }}
+          asset_path: ./build/GLSMAC.tar.gz
+          asset_name: GLSMAC-${{ needs.prepare.outputs.ver }}-linux64-${{ needs.prepare.outputs.sha }}.tar.gz
+          asset_content_type: application/gzip
+
+
+  build_windows:
+    needs: [prepare]
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: install_dependencies
+        run: |
+          choco install ninja
+      - name: prepare
+        run: |
+          mkdir build
+      - name: cmake
+        working-directory: ./build
+        run: cmake -G Ninja -DCMAKE_BUILD_TYPE=Portable64 -DVENDORED_DEPENDENCIES=1 ..
+      - name: make
+        working-directory: ./build
+        run: ninja
+      - name: data
+        working-directory: ./build
+        run: mv ../GLSMAC_data bin/
+      - name: pack
+        working-directory: ./build/bin
+        run: Compress-Archive -Path GLSMAC.exe,GLSMAC_data -Destination ../GLSMAC.zip
+      - name: publish
+        uses: actions/upload-artifact@v3
+        with:
+          name: GLSMAC-windows64-bin
+          path: |
+            ./build/GLSMAC.zip
+      - name: upload
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.prepare.outputs.upload_url }}
+          asset_path: ./build/GLSMAC.zip
+          asset_name: GLSMAC-${{ needs.prepare.outputs.ver }}-win64-${{ needs.prepare.outputs.sha }}.zip
+          asset_content_type: application/gzip

CMakeLists.txt

@@ -67,6 +67,11 @@ INCLUDE_DIRECTORIES( "src" )
 IF ( VISUAL_STUDIO ) # (Provided in CMakePresets)
 	ADD_COMPILE_DEFINITIONS( _ITERATOR_DEBUG_LEVEL=0 )
 	ADD_COMPILE_DEFINITIONS( VISUAL_STUDIO )
+ELSEIF ( WIN32 ) # probably mingw or github runner
+	TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PRIVATE wsock32 )
+	TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PRIVATE ws2_32 )
+#	TARGET_LINK_OPTIONS( ${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -static-winpthread )
+	TARGET_LINK_OPTIONS( ${PROJECT_NAME} PRIVATE -static )
 ENDIF ()
 
 # needed for some uncommon IDE and OS combinations

GLSMAC_data/default/factions.gls.js

@@ -1,40 +1,24 @@
-const faction = (id, name, text_color, border_color, pcx, extra) => {
-	return [id, {
-		name: name,
-		colors: {
-			text: text_color,
-			border: border_color,
-		},
-		bases: {
-			render: {
-				type: 'sprite_grid',
-				file: pcx,
-				grid_x: 1, grid_y: 1,
-				cell_width: 100, cell_height: 75,
-				//cell_cx: 50, cell_cy: 38,
-				cell_padding: 1,
-				/*scale_x: 0.7,
-				scale_y: 0.7,*/
-			}
-		},
-	} + extra];
-};
+return {
 
-const factions = [
-	faction('GAIANS', 'Gaians', #to_color(16, 228, 0), #to_color(0, 252, 0), 'gaians.pcx', {}),
-	faction('HIVE', 'Hive', #to_color(0, 97, 255), #to_color(0, 0, 255), 'hive.pcx', {}),
-	faction('UNIVERSITY', 'University', #to_color(216, 224, 244), #to_color(255, 255, 255), 'univ.pcx', {}),
-	faction('MORGANITES', 'Morganites', #to_color(255, 255, 0), #to_color(255, 255, 0), 'morgan.pcx', {}),
-	faction('SPARTANS', 'Spartans', #to_color(136, 166, 166), #to_color(0, 0, 0), 'spartans.pcx', {}),
-	faction('BELIEVERS', 'Believers', #to_color(224, 156, 28), #to_color(236, 92, 0), 'believe.pcx', {}),
-	faction('PEACEKEEPERS', 'Peacekeepers', #to_color(164, 176, 232), #to_color(164, 176, 232), 'peace.pcx', {}),
-	faction('CONSCIOUSNESS', 'Consciousness', #to_color(44, 128, 104), #to_color(44, 128, 104), 'cyborg.pcx', {}),
-	faction('PIRATES', 'Pirates', #to_color(0, 255, 255), #to_color(0, 255, 255), 'pirates.pcx', {}),
-	faction('DRONES', 'Drones', #to_color(173, 196, 192), #to_color(136, 12, 12), 'drone.pcx', {}),
-	faction('ANGELS', 'Angels', #to_color(103, 91, 181), #to_color(103, 91, 181), 'angels.pcx', {}),
-	faction('PLANETCULT', 'Planet Cult', #to_color(232, 84, 84), #to_color(232, 84, 84), 'fungboy.pcx', {}),
-	faction('CARETAKERS', 'Caretakers', #to_color(116, 156, 56), #to_color(116, 156, 56), 'caretake.pcx', {is_progenitor: true}),
-	faction('USURPERS', 'Usurpers', #to_color(212, 208, 116), #to_color(212, 208, 116), 'usurper.pcx', {is_progenitor: true}),
-];
+	define: () => {
+		for (faction of [
+			'gaians',
+			'hive',
+			'university',
+			'morganites',
+			'spartans',
+			'believers',
+			'peacekeepers',
+			'consciousness',
+			'pirates',
+			'drones',
+			'angels',
+			'planetcult',
+			'caretakers',
+			'usurpers'
+		]) {
+			#game.factions.define(#to_uppercase(faction), #include('./factions/' + faction));
+		}
+	},
 
-return factions;
+};

GLSMAC_data/default/factions/angels.gls.js

@@ -0,0 +1,14 @@
+return {
+	name: 'Angels',
+	colors: #game.factions.import_colors('angels.pcx'),
+	bases: {
+		render: {
+			type: 'sprite_grid',
+			file: 'angels.pcx',
+			grid_x: 1, grid_y: 1,
+			cell_width: 100, cell_height: 75,
+			cell_padding: 1,
+		},
+		names: #game.factions.import_base_names('angels.txt'),
+	},
+};

GLSMAC_data/default/factions/believers.gls.js

@@ -0,0 +1,14 @@
+return {
+	name: 'Believers',
+	colors: #game.factions.import_colors('believe.pcx'),
+	bases: {
+		render: {
+			type: 'sprite_grid',
+			file: 'believe.pcx',
+			grid_x: 1, grid_y: 1,
+			cell_width: 100, cell_height: 75,
+			cell_padding: 1,
+		},
+		names: #game.factions.import_base_names('believe.txt'),
+	},
+};

GLSMAC_data/default/factions/caretakers.gls.js

@@ -0,0 +1,15 @@
+return {
+	name: 'Caretakers',
+	colors: #game.factions.import_colors('caretake.pcx'),
+	bases: {
+		render: {
+			type: 'sprite_grid',
+			file: 'caretake.pcx',
+			grid_x: 1, grid_y: 1,
+			cell_width: 100, cell_height: 75,
+			cell_padding: 1,
+		},
+		names: #game.factions.import_base_names('caretake.txt'),
+	},
+	is_progenitor: true,
+};

GLSMAC_data/default/factions/consciousness.gls.js

@@ -0,0 +1,14 @@
+return {
+	name: 'Consciousness',
+	colors: #game.factions.import_colors('cyborg.pcx'),
+	bases: {
+		render: {
+			type: 'sprite_grid',
+			file: 'cyborg.pcx',
+			grid_x: 1, grid_y: 1,
+			cell_width: 100, cell_height: 75,
+			cell_padding: 1,
+		},
+		names: #game.factions.import_base_names('cyborg.txt'),
+	},
+};

GLSMAC_data/default/factions/drones.gls.js

@@ -0,0 +1,14 @@
+return {
+	name: 'Drones',
+	colors: #game.factions.import_colors('drone.pcx'),
+	bases: {
+		render: {
+			type: 'sprite_grid',
+			file: 'drone.pcx',
+			grid_x: 1, grid_y: 1,
+			cell_width: 100, cell_height: 75,
+			cell_padding: 1,
+		},
+		names: #game.factions.import_base_names('drone.txt'),
+	},
+};

GLSMAC_data/default/factions/gaians.gls.js

@@ -0,0 +1,16 @@
+const faction = {
+	name: 'Gaians',
+	colors: #game.factions.import_colors('gaians.pcx'),
+	bases: {
+		render: {
+			type: 'sprite_grid',
+			file: 'gaians.pcx',
+			grid_x: 1, grid_y: 1,
+			cell_width: 100, cell_height: 75,
+			cell_padding: 1,
+		},
+		names: #game.factions.import_base_names('gaians.txt'),
+	},
+};
+
+return faction;

GLSMAC_data/default/factions/hive.gls.js

@@ -0,0 +1,14 @@
+return {
+	name: 'Hive',
+	colors: #game.factions.import_colors('hive.pcx'),
+	bases: {
+		render: {
+			type: 'sprite_grid',
+			file: 'hive.pcx',
+			grid_x: 1, grid_y: 1,
+			cell_width: 100, cell_height: 75,
+			cell_padding: 1,
+		},
+		names: #game.factions.import_base_names('hive.txt'),
+	},
+};

GLSMAC_data/default/factions/morganites.gls.js

@@ -0,0 +1,14 @@
+return {
+	name: 'Morganites',
+	colors: #game.factions.import_colors('morgan.pcx'),
+	bases: {
+		render: {
+			type: 'sprite_grid',
+			file: 'morgan.pcx',
+			grid_x: 1, grid_y: 1,
+			cell_width: 100, cell_height: 75,
+			cell_padding: 1,
+		},
+		names: #game.factions.import_base_names('morgan.txt'),
+	},
+};