diff --git a/devTools/FC.d.ts b/devTools/FC.d.ts
index bbaee44babb1af4a845284118b9112eaf7a0a492..e3e9a5ef4190bf9e15bc27882b2b5abf89c863d8 100644
--- a/devTools/FC.d.ts
+++ b/devTools/FC.d.ts
@@ -277,7 +277,7 @@ declare namespace App {
namespace DOM {
namespace Widgets { }
- function makeElement<K extends keyof HTMLElementTagNameMap>(tag: K, content: string | Node, classNames: string | string[]): HTMLElementTagNameMap[K];
+ function makeElement<K extends keyof HTMLElementTagNameMap>(tag: K, content: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
function appendNewElement<K extends keyof HTMLElementTagNameMap>(tag: K, parent: ParentNode, content?: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
}
namespace View { }
diff --git a/js/002-config/fc-js-init.js b/js/002-config/fc-js-init.js
index f0f4a2670cc5bd8f4dee378273743a86e4e14c58..550ee01672b9960ed4cbf4b99e439ee30785b1ff 100644
--- a/js/002-config/fc-js-init.js
+++ b/js/002-config/fc-js-init.js
@@ -43,6 +43,7 @@ App.Facilities.ServantsQuarters = {};
App.Facilities.Spa = {};
App.Interact = {};
App.Intro = {};
+App.Neighbor = {};
App.MainView = {};
App.Medicine = {};
App.Medicine.Modification = {};
diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js
index d0f12b4330a61b4ab894c712a0fc33057445d4bf..cfba77e9bdf49917629d0406c1d60cd714e0ce15 100644
--- a/src/js/futureSocietyJS.js
+++ b/src/js/futureSocietyJS.js
@@ -89,6 +89,7 @@ globalThis.FutureSocieties = (function() {
};
return {
+ activeFSes: activeFSes,
activeCount: activeCount,
applyBroadProgress: applyBroadProgress,
influenceSources: influenceSources,
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index 8d025903825d3d9d7f6a741d0f5b6a743464d02b..1088be2f554d0a8959f61628fa5d9273b9566c30 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -470,7 +470,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
} else {
market = 1;
}
- opinion = ArcologyDiplomacy.opinion(0, market);
+ opinion = App.Neighbor.opinion(0, market);
opinion = Math.trunc(opinion/20);
opinion = Math.clamp(opinion, -10, 10);
diff --git a/src/neighbor/arcologyDiplomacy.js b/src/neighbor/arcologyDiplomacy.js
index 9283acf2496456789cd073622f8130437668d837..1df56958aefbae6d09ccb4983468eba2eb3560f8 100644
--- a/src/neighbor/arcologyDiplomacy.js
+++ b/src/neighbor/arcologyDiplomacy.js
@@ -1,78 +1,71 @@
-globalThis.ArcologyDiplomacy = (function() {
- return {
- opinion: opinion,
- selectInfluenceTarget: selectInfluenceTarget
- };
-
- /** get one arcology's opinion of another
- * @param {number} activeID index
- * @param {number} targetID index
- * @returns {number} opinion
- */
- function opinion(activeID, targetID) {
- const activeArcology = V.arcologies[activeID];
- const targetArcology = V.arcologies[targetID];
- if (typeof activeArcology.FSNull === "undefined") { activeArcology.FSNull = "unset"; }
- if (typeof targetArcology.FSNull === "undefined") { targetArcology.FSNull = "unset"; }
-
- let opinion = 0;
-
- const {shared, conflicting} = FutureSocieties.diplomaticFSes(activeID, targetID);
-
- for (const fs of shared) {
- opinion += activeArcology[fs];
- opinion += targetArcology[fs];
- }
+/** get one arcology's opinion of another
+ * @param {number} activeID index
+ * @param {number} targetID index
+ * @returns {number} opinion
+ */
+App.Neighbor.opinion = function(activeID, targetID) {
+ const activeArcology = V.arcologies[activeID];
+ const targetArcology = V.arcologies[targetID];
+ if (typeof activeArcology.FSNull === "undefined") { activeArcology.FSNull = "unset"; }
+ if (typeof targetArcology.FSNull === "undefined") { targetArcology.FSNull = "unset"; }
+
+ let opinion = 0;
+
+ const {shared, conflicting} = FutureSocieties.diplomaticFSes(activeID, targetID);
+
+ for (const fs of shared) {
+ opinion += activeArcology[fs];
+ opinion += targetArcology[fs];
+ }
- for (const [activeFS, targetFS] of conflicting) {
- opinion -= activeArcology[activeFS];
- opinion -= targetArcology[targetFS];
- }
+ for (const [activeFS, targetFS] of conflicting) {
+ opinion -= activeArcology[activeFS];
+ opinion -= targetArcology[targetFS];
+ }
- // unshared but uncontested multiculturalism gets a relationship bonus
- if (!shared.includes("FSNull") && !conflicting.some((pair) => pair.includes("FSNull"))) {
- if (activeArcology.FSNull !== "unset") {
- opinion += activeArcology.FSNull;
- } else if (targetArcology.FSNull !== "unset") {
- opinion += targetArcology.FSNull;
- }
+ // unshared but uncontested multiculturalism gets a relationship bonus
+ if (!shared.includes("FSNull") && !conflicting.some((pair) => pair.includes("FSNull"))) {
+ if (activeArcology.FSNull !== "unset") {
+ opinion += activeArcology.FSNull;
+ } else if (targetArcology.FSNull !== "unset") {
+ opinion += targetArcology.FSNull;
}
-
- return opinion = Number(opinion) || 0;
}
- /** set a new influence target for a given arcology
- * @param {number} arcID
- */
- function selectInfluenceTarget(arcID) {
- const notMulticulturalism = (f) => f !== "FSNull"; // multiculturalism can neither influence nor be influenced
- const influenceSources = FutureSocieties.influenceSources(arcID);
- const arcology = V.arcologies[arcID];
- if (influenceSources.length > 0) {
- let eligibleTargets = [];
- const obdedient = (arcology.government === "your trustees" || arcology.government === "your agent");
-
- for (let targetID = 0; targetID < V.arcologies.length; ++targetID) {
- const target = V.arcologies[targetID];
- if (arcology.direction !== target.direction) {
- if (!obdedient || target.direction !== 0) {
- const {shared, conflicting} = FutureSocieties.diplomaticFSes(arcID, targetID);
- let count = 0;
- count += shared.filter(notMulticulturalism).length;
- count += conflicting.filter((pair) => pair.every(notMulticulturalism)).length;
- eligibleTargets.push(...Array(count).fill(target.direction));
- }
+ return opinion = Number(opinion) || 0;
+};
+
+/** set a new influence target for a given arcology
+ * @param {number} arcID
+ */
+App.Neighbor.selectInfluenceTarget = function(arcID) {
+ const notMulticulturalism = (f) => f !== "FSNull"; // multiculturalism can neither influence nor be influenced
+ const influenceSources = FutureSocieties.influenceSources(arcID);
+ const arcology = V.arcologies[arcID];
+ if (influenceSources.length > 0) {
+ let eligibleTargets = [];
+ const obdedient = (arcology.government === "your trustees" || arcology.government === "your agent");
+
+ for (let targetID = 0; targetID < V.arcologies.length; ++targetID) {
+ const target = V.arcologies[targetID];
+ if (arcology.direction !== target.direction) {
+ if (!obdedient || target.direction !== 0) {
+ const {shared, conflicting} = FutureSocieties.diplomaticFSes(arcID, targetID);
+ let count = 0;
+ count += shared.filter(notMulticulturalism).length;
+ count += conflicting.filter((pair) => pair.every(notMulticulturalism)).length;
+ eligibleTargets.push(...Array(count).fill(target.direction));
}
}
+ }
- if (eligibleTargets.length > 0) {
- arcology.influenceTarget = eligibleTargets.random();
- }
+ if (eligibleTargets.length > 0) {
+ arcology.influenceTarget = eligibleTargets.random();
}
}
-})();
+};
-globalThis.ArcologyFSPassiveInfluence = class {
+App.Neighbor.PassiveFSInfluence = class {
/** pick up social hints from an arcology's neighbors
* @param {number} arcID
*/
@@ -106,7 +99,6 @@ globalThis.ArcologyFSPassiveInfluence = class {
let conflicting = new Map();
const arcology = V.arcologies[this._arcID];
- debugger;
for (const [i, rel] of this._relationships) {
if (rel.shared.some((s) => s === fs)) {
if (V.arcologies[i][fs] > arcology[fs] + this._thresh) {
diff --git a/src/neighbor/neighborGrid.css b/src/neighbor/neighborGrid.css
new file mode 100644
index 0000000000000000000000000000000000000000..dc20b25dbf10e2750d32b46bd72d5007a069f338
--- /dev/null
+++ b/src/neighbor/neighborGrid.css
@@ -0,0 +1,35 @@
+.neighborgrid-container {
+ display: grid;
+ grid-template-columns: auto auto auto;
+ background-color: rgba(17,17,17,1);
+ padding: 5px;
+ max-width: fit-content;
+ margin: 0 auto;
+}
+
+.neighborgrid-item {
+ margin: 3px;
+ border: 5px solid;
+ padding: 10px;
+ text-align: center;
+}
+
+.neighborgrid-item-selected {
+ background-color: rgba(255, 255, 255, 0.2);
+}
+
+.neighborgrid-item-empty {
+ border-color: rgba(17,17,17,1);
+}
+
+.neighborgrid-item-self {
+ border-color: white;
+}
+
+.neighborgrid-item-owned {
+ border-color: steelblue;
+}
+
+.neighborgrid-item-unowned {
+ border-color: red;
+}
diff --git a/src/neighbor/neighborGrid.js b/src/neighbor/neighborGrid.js
new file mode 100644
index 0000000000000000000000000000000000000000..04582e12aeba86edcc6fe0ca05b3f2000f972404
--- /dev/null
+++ b/src/neighbor/neighborGrid.js
@@ -0,0 +1,146 @@
+App.Neighbor.Grid = class {
+ /** Create a neighbor grid controller
+ * @param {function(number):void} onSelection function to be called when selection changes
+ */
+ constructor(onSelection) {
+ this._onSelection = onSelection;
+ }
+
+ /** Render the neighbor grid to DOM
+ * @returns {Element}
+ */
+ render() {
+ const container = App.UI.DOM.makeElement("div", null, "neighborgrid-container");
+
+ this._renderCell(container, "northwest");
+ this._renderCell(container, "north");
+ this._renderCell(container, "northeast");
+ this._renderCell(container, "west");
+ this._renderCell(container, "self");
+ this._renderCell(container, "east");
+ this._renderCell(container, "southwest");
+ this._renderCell(container, "south");
+ this._renderCell(container, "southeast");
+
+ return container;
+ }
+
+ /** Render a single cell to the grid
+ * @param {Element} container
+ * @param {string} direction
+ */
+ _renderCell(container, direction) {
+ const arcID = direction === "self" ? 0 : V.arcologies.findIndex((a) => a.direction === direction);
+ const arcology = V.arcologies[arcID];
+
+ /** render styled text with a tooltip
+ * @param {string} text
+ * @param {string} tooltipText
+ * @param {string} className
+ * @returns {HTMLSpanElement}
+ */
+ function withTooltip(text, tooltipText, className) {
+ let tooltip = App.UI.DOM.makeElement("span", tooltipText, "tooltip");
+ let res = App.UI.DOM.makeElement("span", text, ["textWithTooltip", className]);
+ res.appendChild(tooltip);
+ return res;
+ }
+
+ function nameFrag() {
+ return App.UI.DOM.makeElement("div", App.UI.DOM.link(arcology.name, () => this.select(arcID)), "name");
+ }
+
+ function govGSPFrag() {
+ let frag = document.createDocumentFragment();
+ let gov;
+ if (arcID === 0) {
+ gov = App.UI.DOM.appendNewElement("div", frag, "Your arcology; ");
+ } else {
+ gov = App.UI.DOM.appendNewElement("div", frag, capFirstChar(arcology.government) + '; ');
+ }
+ const estimatedGSP = Math.trunc((0.1 * arcology.prosperity * random(100 - V.economicUncertainty, 100 + V.economicUncertainty))/100);
+ App.UI.DOM.appendNewElement("span", gov, cashFormat(estimatedGSP) + "m GSP", "cash");
+ return frag;
+ }
+
+ function fsFrag() {
+ let frag = document.createDocumentFragment();
+ frag.appendChild(document.createTextNode("FS: "));
+ if (arcID === 0) {
+ const fses = FutureSocieties.activeFSes(0);
+ for (const fs of fses) {
+ frag.appendChild(withTooltip("â¯", FutureSocieties.displayName(fs), "steelblue"));
+ }
+ } else {
+ const fses = FutureSocieties.activeFSes(arcID);
+ const diplo = FutureSocieties.diplomaticFSes(arcID, 0);
+ let style = "white";
+ for (const fs of fses) {
+ if (diplo.shared.includes(fs)) {
+ style = "steelblue";
+ } else {
+ const conflict = diplo.conflicting.find((f) => f[0] === fs);
+ if (conflict) {
+ style = "red";
+ }
+ }
+ frag.appendChild(withTooltip("â¯", FutureSocieties.displayName(fs), style));
+ }
+ }
+ return App.UI.DOM.makeElement("div", frag);
+ }
+
+ function ownershipFrag() {
+ let frag = document.createDocumentFragment();
+ const owned = arcID === 0 || arcology.government === "your trustees" || arcology.government === "your agent";
+ const yourPercent = owned ? `${arcology.ownership}%` : `${arcology.PCminority}%`;
+ const hostilePercent = owned ? `${arcology.minority}%` : `${arcology.ownership}%`;
+ const challengerPercent = owned ? null : `${arcology.minority}%`;
+ const publicPercent = `${100 - (arcology.ownership + arcology.minority + arcology.PCminority)}%`;
+ App.UI.DOM.appendNewElement("li", frag, withTooltip(yourPercent, "Your ownership", "steelblue"));
+ if (arcID !== 0) {
+ App.UI.DOM.appendNewElement("li", frag, withTooltip(publicPercent, "Public ownership", "yellow"));
+ }
+ if (challengerPercent) {
+ App.UI.DOM.appendNewElement("li", frag, withTooltip(challengerPercent, "Minority challenger ownership", "orange"));
+ }
+ App.UI.DOM.appendNewElement("li", frag, withTooltip(hostilePercent, "Hostile ownership", "red"));
+ return App.UI.DOM.makeElement("ul", frag, "choicesStrip");
+ }
+
+ let frag = document.createDocumentFragment();
+ let classNames = ["neighborgrid-item"];
+ if (!arcology) {
+ // empty block
+ classNames.push("neighborgrid-item-empty");
+ } else {
+ frag.appendChild(nameFrag());
+ frag.appendChild(govGSPFrag());
+ frag.appendChild(fsFrag());
+ frag.appendChild(ownershipFrag());
+ if (arcID === 0) {
+ classNames.push("neighborgrid-item-self");
+ } else if (arcology.government === "your trustees" || arcology.government === "your agent") {
+ classNames.push("neighborgrid-item-owned");
+ } else {
+ classNames.push("neighborgrid-item-unowned");
+ }
+ }
+
+ const element = App.UI.DOM.appendNewElement("div", container, frag, classNames);
+ element.id = `neighborgrid-cell-${direction}`;
+ }
+
+ /** Set the selection to a particular arcology
+ * @param {number} arcID
+ */
+ select(arcID) {
+ const direction = arcID === 0 ? "self" : V.arcologies[arcID].direction;
+ const elementID = `#neighborgrid-cell-${direction}`;
+
+ $("div[id^='neighborgrid-cell']").each((i, e) => { $(e).removeClass("neighborgrid-item-selected"); });
+ $(elementID).addClass("neighborgrid-item-selected");
+
+ this._onSelection(arcID);
+ }
+};
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 95d9db643b04013c722a4955dc2aa24065daf650..6210c09c70d1be8ae36286540c86633283df19dd 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1501,7 +1501,7 @@ You own
<<set _desc = []>>
<<set _descNeg = []>>
<<for $i = 1; $i < $arcologies.length; $i++>>
- <<set _opinion = ArcologyDiplomacy.opinion(0, $i)>>
+ <<set _opinion = App.Neighbor.opinion(0, $i)>>
<<if _opinion >= 100>>
<<set _desc.push($arcologies[$i].name)>>
<<elseif _opinion <= -100>>
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index c7f3d0b90a52cf310d757cab9f145ddec3263cb2..eb87587f3c2dbd68742c0321995bab72f9c8cacb 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -65,7 +65,7 @@
<<if $numArcology >= $arcologies.length>>
<<set $numArcology = 1>>
<</if>>
- <<set _opinion = ArcologyDiplomacy.opinion(0, $numArcology)>>
+ <<set _opinion = App.Neighbor.opinion(0, $numArcology)>>
<<set _opinion = Math.clamp(Math.trunc(_opinion/20), -10, 10)>>
<<set $discount -= (_opinion * 25)>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 97c8bba3c3bfdc2a219b6b7d6a0cc76d4eb46a7f..52cad24e8d65493be51808bfbc13476b1fe2b30c 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -169,7 +169,12 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
<<set $desc.push("Chinese Revivalism")>>
<</if>>
-<br> <span id="Security"> <br>
+<<set _selFunc = (f) => {}>>
+<<set _grid = new App.Neighbor.Grid(_selFunc)>>
+<<includeDOM _grid.render()>>
+<<run _grid.select(0)>>
+
+<span id="Security">
<<if $desc.length == 0>>
Your arcology's culture has not developed to the point where it can meaningfully influence other arcologies.
<<elseif $desc.length > 2>>
@@ -190,12 +195,12 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
<<for _currentNeighbor = 1; _currentNeighbor < $arcologies.length; _currentNeighbor++>>
<<set _Agent = App.currentAgent(_currentNeighbor)>>
-<<capture _currentNeighbor, _Agent>>
+<<capture _currentNeighbor, _Agent, _grid>>
<<set $arcologies[_currentNeighbor].prosperity = Math.clamp($arcologies[_currentNeighbor].prosperity, 1, 300)>>
<br>You own $arcologies[_currentNeighbor].PCminority% of
<<link "$arcologies[_currentNeighbor].name">>
<<replace "#Security">> <<set $activeArcologyIdx = _currentNeighbor>>
- <br>[[Back to the main diplomacy page|Neighbor Interact]]
+ [[Back to the main diplomacy page|Neighbor Interact]]
<<set $i = _currentNeighbor>> <<include "Neighbor Description">> <br>
<<set _ownershipCost = 500*Math.trunc($arcologies[_currentNeighbor].prosperity*(1+($arcologies[_currentNeighbor].demandFactor/100)))>>
@@ -402,7 +407,7 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
<<elseif $arcologies[_currentNeighbor].direction === $arcologies[0].embargoTarget>>
Due to your active embargo, trade with $arcologies[_currentNeighbor].name is not possible.
<<else>>
- <<set _opinion = ArcologyDiplomacy.opinion(_currentNeighbor, 0)>>
+ <<set _opinion = App.Neighbor.opinion(_currentNeighbor, 0)>>
<<set _prices = _opinion*10>>
<</if>>
<<if $arcologies[_currentNeighbor].FSRomanRevivalist > 95>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 266655e7b0318633d9df4b046d44f3e34125f816..2d7dd91affb1419de1dbddb58b861885418fe3a0 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -426,7 +426,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<<if $arcologies[$i].direction != 0>>
<<run FutureSocieties.applyBroadProgress($i, _efficiency)>>
<</if>>
-<<set _passive = new ArcologyFSPassiveInfluence($i)>>
+<<set _passive = new App.Neighbor.PassiveFSInfluence($i)>>
<<if $arcologies[$i].FSSupremacist != "unset">>
<<= _passive.output("FSSupremacist")>>
<<if $arcologies[$i].direction != 0>>
@@ -1780,7 +1780,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<<if $arcologies[$i].direction != 0>>
<<if $arcologies[$i].influenceTarget == -1>>
- <<run ArcologyDiplomacy.selectInfluenceTarget($i)>>
+ <<run App.Neighbor.selectInfluenceTarget($i)>>
<</if>>
<</if>>
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index b044c7c478eac4cdf90486a6556225abfe662720..69cf45e9b1ea942ca78a741aed904a6aae5c5fea 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -871,7 +871,7 @@ societal development.
<<set _influenceBonus = 20>>
<</if>>
- <<set _opinion = ArcologyDiplomacy.opinion($i, $j)>>
+ <<set _opinion = App.Neighbor.opinion($i, $j)>>
<<if _opinion >= 50>>
$arcologies[$i].name is aligned with $arcologies[$j].name socially, encouraging it to consider adopting all its cultural values.
<<set _influenceBonus += _opinion-50>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 070a4756e2f9d0c05ab9e7c037e7528d400f61ad..afa58266093315505f82989dc9f89f1a8981c3c5 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -139,7 +139,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<case "neighbor">>
You're in the area of the slave market that specializes in slaves from within the Free City, viewing slaves from ''<<print "$arcologies[$numArcology].name">>''. Some were trained there, specifically for sale, while others are simply being sold.
- <<set _opinion = ArcologyDiplomacy.opinion(0, $numArcology)>>
+ <<set _opinion = App.Neighbor.opinion(0, $numArcology)>>
<<if _opinion != 0>>
<<set _slaveCost -= Math.trunc(_slaveCost*_opinion*0.05)>>
<<if _opinion > 2>>