Merge branch 'main' into stable

.gitignore

@@ -27,3 +27,4 @@ _deps
 /.cmake
 /cmake-build-debug
 /GLSMAC.cbp
+/GLSMAC_data/mods

GLSMAC_data/default/bases.gls.js

@@ -6,8 +6,8 @@ const result = {
 		//pops.init();
 	},
 
-	define: () => {
-		pops.define();
+	define: (bm) => {
+		pops.define(bm);
 	},
 
 };

GLSMAC_data/default/bases/pops.gls.js

@@ -1,4 +1,4 @@
-const define = (id, name, renders_human_x, renders_progenitor_x, properties) => {
+const define = (bm, id, name, renders_human_x, renders_progenitor_x, properties) => {
 	// TODO: if (!properties) { ... }
 	let rh = [];
 	for ( x of renders_human_x ) {
@@ -18,27 +18,27 @@ const define = (id, name, renders_human_x, renders_progenitor_x, properties) =>
 			w: 38, h: 48,
 		};
 	}
-	#game.bases.define_pop(id, {
+	bm.define_pop(id, {
 		name: name,
 		renders_human: rh,
 		renders_progenitor: rp,
 	} + properties);
 };
 
 const result = {
-	define: () => {
+	define: (bm) => {
 
-		define('Worker', 'Worker', [79, 118], [40], {tile_worker: true});
-		define('Talent', 'Talent', [1, 40], [1], {tile_worker: true});
-		define('Doctor', 'Doctor', [352], [196], {});
-		define('Technician', 'Technician', [313], [157], {});
-		define('Librarian', 'Librarian', [391], [235], {});
-		define('Engineer', 'Engineer', [430], [274], {});
-		define('Empath', 'Empath', [469], [313], {});
-		define('Thinker', 'Thinker', [508], [352], {});
-		define('Transcend', 'Transcend', [547], [391], {});
-		define('Drone', 'Drone', [157, 196], [79], {});
-		define('DronePlus', 'Drone', [235, 274], [118], {});
+		define(bm, 'Worker', 'Worker', [79, 118], [40], {tile_worker: true});
+		define(bm, 'Talent', 'Talent', [1, 40], [1], {tile_worker: true});
+		define(bm, 'Doctor', 'Doctor', [352], [196], {});
+		define(bm, 'Technician', 'Technician', [313], [157], {});
+		define(bm, 'Librarian', 'Librarian', [391], [235], {});
+		define(bm, 'Engineer', 'Engineer', [430], [274], {});
+		define(bm, 'Empath', 'Empath', [469], [313], {});
+		define(bm, 'Thinker', 'Thinker', [508], [352], {});
+		define(bm, 'Transcend', 'Transcend', [547], [391], {});
+		define(bm, 'Drone', 'Drone', [157, 196], [79], {});
+		define(bm, 'DronePlus', 'Drone', [235, 274], [118], {});
 
 	},
 };

GLSMAC_data/default/factions.gls.js

@@ -1,23 +1,38 @@
+const factions = [
+	['Gaians', 'gaians', {}],
+	['Hive', 'hive', {}],
+	['University', 'univ', {}],
+	['Morganites', 'morgan', {}],
+	['Spartans', 'spartans', {}],
+	['Believers', 'believe', {}],
+	['Peacekeepers', 'peace', {}],
+	['Consciousness', 'cyborg', {}],
+	['Pirates', 'pirates', {is_naval: true}],
+	['Drones', 'drone', {}],
+	['Angels', 'angels', {}],
+	['Planetcult', 'fungboy', {}],
+	['Caretakers', 'caretake', {is_progenitor: true}],
+	['Usurpers', 'usurper', {is_progenitor: true}],
+];
+
 return {
 
-	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));
+	configure: (fm) => {
+		for (f of factions) {
+			fm.add(#uppercase(f[0]), {
+				name: f[0],
+				colors: fm.import_colors(f[1] + '.pcx'),
+				bases: {
+					render: {
+						type: 'sprite_grid',
+						file: f[1] + '.pcx',
+						grid_x: 1, grid_y: 1,
+						cell_width: 100, cell_height: 75,
+						cell_padding: 1,
+					},
+					names: fm.import_base_names(f[1] + '.txt'),
+				},
+			} + f[2]);
 		}
 	},