Merge branch 'pregmod-master' into 'pregmod-master'

NPC arcologies shouldn't choose names that are already in use within the Free City

Closes #2077

See merge request pregmodfan/fc-pregmod!7449

src/neighbor/arcologyDiplomacy.js

@@ -158,3 +158,12 @@ App.Neighbor.PassiveFSInfluence = class {
 		return t.join(" ");
 	}
 };
+
+/** Get an arcology name from a given set, preferring unused ones.
+ * @param {string[]} nameSet
+ * @returns {string}
+ */
+App.Neighbor.getUnusedName = function(nameSet) {
+	const filteredSet = nameSet.filter(n => !V.arcologies.some(a => a.name === n));
+	return filteredSet.length > 0 ? filteredSet.random() : nameSet.random();
+};