Skip to content
Snippets Groups Projects
Commit 6df619f5 authored by svornost's avatar svornost
Browse files

actually commit the last bit (for loose grouping of the same effect from different causes).

parent 8d00ea41
No related branches found
No related tags found
1 merge request!6882Neighbor FS development improvements
...@@ -143,8 +143,8 @@ globalThis.ArcologyFSPassiveInfluence = class { ...@@ -143,8 +143,8 @@ globalThis.ArcologyFSPassiveInfluence = class {
} }
t.push(`in ${arcology.name} is influenced by`); t.push(`in ${arcology.name} is influenced by`);
const sharedNames = shared.map((i) => V.arcologies[i].name + "'s"); const sharedNames = shared.map((i) => V.arcologies[i].name + "'s");
t.push(sharedNames.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch)); t.push(sharedNames.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch) +
t.push(`more advanced ${shared.length === 1 ? "society" : "societies"}.`); ` more advanced ${shared.length === 1 ? "society" : "societies"}.`);
} }
// passive slowing influence // passive slowing influence
...@@ -156,12 +156,14 @@ globalThis.ArcologyFSPassiveInfluence = class { ...@@ -156,12 +156,14 @@ globalThis.ArcologyFSPassiveInfluence = class {
} else if (fs === "FSSupremacy") { } else if (fs === "FSSupremacy") {
actualDisplayName = `${arcology.FSSupremacistRace} Supremacy`; actualDisplayName = `${arcology.FSSupremacistRace} Supremacy`;
} }
t.push(`Development of ${actualDisplayName} in ${arcology.name} is slowed by contact with`);
let conflictOutput = [];
for (const [conflictFS, arcs] of conflicting) { for (const [conflictFS, arcs] of conflicting) {
t.push(`Development of ${actualDisplayName} in ${arcology.name} is slowed by contact with`);
const conflictNames = arcs.map((i) => V.arcologies[i].name + "'s"); const conflictNames = arcs.map((i) => V.arcologies[i].name + "'s");
t.push(conflictNames.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch)); conflictOutput.push(conflictNames.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch) +
t.push(`more advanced ${FutureSocieties.displayAdj(conflictFS)} ${arcs.length === 1 ? "society" : "societies"}.`); ` more advanced ${FutureSocieties.displayAdj(conflictFS)} ${arcs.length === 1 ? "society" : "societies"}`);
} }
t.push(conflictOutput.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch) + '.');
} }
return t.join(" "); return t.join(" ");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment