From 25d0a5cf0848091074f22ecf0d281a12d39c8536 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Fri, 29 May 2020 16:08:12 -0700
Subject: [PATCH] Kill off another hardcoded list of FSes.
---
src/neighbor/neighborDisplay.js | 1 -
src/uncategorized/neighborInteract.tw | 102 +-------------------------
2 files changed, 2 insertions(+), 101 deletions(-)
diff --git a/src/neighbor/neighborDisplay.js b/src/neighbor/neighborDisplay.js
index a4ada374db6..5d54ad6e260 100644
--- a/src/neighbor/neighborDisplay.js
+++ b/src/neighbor/neighborDisplay.js
@@ -58,7 +58,6 @@ App.Neighbor.Display = class {
* @returns {Element}
*/
_renderListName() {
- debugger;
const container = App.UI.DOM.makeElement("div", null, ["neighbor-container", "neighbor-container-list"]);
const arcologyNames = V.arcologies.map((a) => a.name).sort((a, b) => a.localeCompare(b));
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 58d6e683868..1a927112f3e 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -77,115 +77,17 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
<</if>>
<</if>>
-<<set $desc = []>>
-<<if $arcologies[0].FSSubjugationist > 60>>
- <<set $desc.push("Racial Subjugation")>>
-<</if>>
-<<if $arcologies[0].FSSupremacist > 60>>
- <<set $desc.push("Racial Supremacy")>>
-<</if>>
-<<if $arcologies[0].FSRepopulationFocus > 60>>
- <<set $desc.push("Repopulation Focus")>>
-<</if>>
-<<if $arcologies[0].FSRestart > 60>>
- <<set $desc.push("Eugenics")>>
-<</if>>
-<<if $arcologies[0].FSGenderRadicalist > 60>>
- <<set $desc.push("Gender Radicalism")>>
-<</if>>
-<<if $arcologies[0].FSGenderFundamentalist > 60>>
- <<set $desc.push("Gender Fundamentalism")>>
-<</if>>
-<<if $arcologies[0].FSPaternalist > 60>>
- <<set $desc.push("Paternalism")>>
-<</if>>
-<<if $arcologies[0].FSDegradationist > 60>>
- <<set $desc.push("Degradationism")>>
-<</if>>
-<<if $arcologies[0].FSBodyPurist > 60>>
- <<set $desc.push("Body Purism")>>
-<</if>>
-<<if $arcologies[0].FSTransformationFetishist > 60>>
- <<set $desc.push("Transformation Fetishism")>>
-<</if>>
-<<if $arcologies[0].FSYouthPreferentialist > 60>>
- <<set $desc.push("Youth Preferentialism")>>
-<</if>>
-<<if $arcologies[0].FSMaturityPreferentialist > 60>>
- <<set $desc.push("Maturity Preferentialism")>>
-<</if>>
-<<if $arcologies[0].FSSlimnessEnthusiast > 60>>
- <<set $desc.push("Slimness Enthusiasm")>>
-<</if>>
-<<if $arcologies[0].FSAssetExpansionist > 60>>
- <<set $desc.push("Asset Expansionism")>>
-<</if>>
-<<if $arcologies[0].FSPastoralist > 60>>
- <<set $desc.push("Pastoralism")>>
-<</if>>
-<<if $arcologies[0].FSCummunism > 60>>
- <<set $desc.push("Cummunism")>>
-<</if>>
-<<if $arcologies[0].FSPhysicalIdealist > 60>>
- <<set $desc.push("Physical Idealism")>>
-<</if>>
-<<if $arcologies[0].FSHedonisticDecadence > 60>>
- <<set $desc.push("Hedonistic Decadence")>>
-<</if>>
-<<if $arcologies[0].FSIncestFetishist > 60>>
- <<set $desc.push("Incest Fetishism")>>
-<</if>>
-<<if $arcologies[0].FSIntellectualDependency > 60>>
- <<set $desc.push("Intellectual Dependency")>>
-<</if>>
-<<if $arcologies[0].FSSlaveProfessionalism > 60>>
- <<set $desc.push("Slave Professionalism")>>
-<</if>>
-<<if $arcologies[0].FSPetiteAdmiration > 60>>
- <<set $desc.push("Petite Admiration")>>
-<</if>>
-<<if $arcologies[0].FSStatuesqueGlorification > 60>>
- <<set $desc.push("Statuesque Glorification")>>
-<</if>>
-<<if $arcologies[0].FSChattelReligionist > 60>>
- <<set $desc.push("Chattel Religionism")>>
-<</if>>
-<<if $arcologies[0].FSRomanRevivalist > 60>>
- <<set $desc.push("Roman Revivalism")>>
-<</if>>
-<<if $arcologies[0].FSAztecRevivalist > 60>>
- <<set $desc.push("Aztec Revivalism")>>
-<</if>>
-<<if $arcologies[0].FSEgyptianRevivalist > 60>>
- <<set $desc.push("Egyptian Revivalism")>>
-<</if>>
-<<if $arcologies[0].FSEdoRevivalist > 60>>
- <<set $desc.push("Edo Revivalism")>>
-<</if>>
-<<if $arcologies[0].FSArabianRevivalist > 60>>
- <<set $desc.push("Arabian Revivalism")>>
-<</if>>
-<<if $arcologies[0].FSChineseRevivalist > 60>>
- <<set $desc.push("Chinese Revivalism")>>
-<</if>>
-
<<set _selFunc = (f) => {}>>
<<set _nd = new App.Neighbor.Display(_selFunc)>>
<<includeDOM _nd.render()>>
<<run _nd.select(0)>>
<span id="Security">
+<<set $desc = FutureSocieties.activeFSes(0).map((f) => FutureSocieties.displayName(f))>>
<<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>>
- Your arcology's mature culture is capable of exerting great cultural sway over other arcologies. It can readily project $desc[0],
- <<for $i = 1; $i < $desc.length; $i++>>
- <<if $i < $desc.length-1>>
- $desc[$i],
- <<else>>
- and $desc[$i].
- <</if>>
- <</for>>
+ Your arcology's mature culture is capable of exerting great cultural sway over other arcologies. It can readily project <<= $desc.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch)>>.
<<elseif $desc.length == 2>>
Your arcology's culture is capable of exerting some cultural sway over other arcologies. It can effectively project $desc[0] and $desc[1].
<<else>>
--
GitLab