From 8d2048eea6e15b12bb7968fdba383a7880ad2754 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 7 Dec 2020 00:58:51 -0500
Subject: [PATCH] review and cleanup
---
src/facilities/fsPassage.js | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/facilities/fsPassage.js b/src/facilities/fsPassage.js
index a42fe5c864e..2c78a2cf363 100644
--- a/src/facilities/fsPassage.js
+++ b/src/facilities/fsPassage.js
@@ -698,6 +698,8 @@ App.UI.FSPassage = function() {
function FSIsChosen(FS, itemArray) {
const el = new DocumentFragment();
const r = [];
+
+ // Abandon
if (FS === "FSRestart" && V.eugenicsFullControl !== 1) {
r.push(`The Societal Elite will not permit you to abandon Eugenics.`);
} else {
@@ -706,13 +708,16 @@ App.UI.FSPassage = function() {
"Abandon",
() => {
FutureSocieties.remove(FS);
- },
- [],
- "Future Society"
+ App.UI.reload();
+ }
)
);
}
+
+ // Decoration
r.push(App.UI.FSChangeDecoration(FS, itemArray));
+
+ // Assistant
if (V.policies.publicPA === 1) {
if (assistantMatching.get(FS).includes(V.assistant.appearance)) {
const {hisA} = getPronouns(assistant.pronouns().main).appendSuffix('A');
@@ -751,7 +756,7 @@ App.UI.FSPassage = function() {
r.push(`Select race:`);
const select = document.createElement("select");
r.push(select);
- for (const race of App.Data.misc.filterRacesLowercase.filter(race => race !== arc.FSSubjugationistRace)) {// Subjugation race cannot be superior, so remove
+ for (const race of App.Data.misc.filterRacesLowercase.filter(race => race !== arc.FSSubjugationistRace)) { // Subjugation race cannot be superior, so remove
const choice = App.UI.DOM.appendNewElement("option", select, capFirstChar(race));
choice.value = race;
if (race === arc.FSSupremacistRace) {
@@ -772,7 +777,7 @@ App.UI.FSPassage = function() {
r = [];
if (arc.FSSubjugationist !== "unset") {
r.push(pursuit());
- r.push(`${arc.FSSupremacistRace} inferiority.`);
+ r.push(`${arc.FSSubjugationistRace} inferiority.`);
r.push(FSIsChosen("FSSubjugationist"));
} else {
if (_FSCredits > 0) {
@@ -965,7 +970,7 @@ App.UI.FSPassage = function() {
if (arc.FSGenderFundamentalist !== "unset") {
r.push(pursuit());
r.push(`gender traditionalism, including a societal preference for feminine slaves ${(V.seePreg !== 0) ? ` and support for slave pregnancy` : ``}.`);
- r.push(FSIsChosen("FSGenderRadicalist", ["boughtItem.clothing.bunny"]));
+ r.push(FSIsChosen("FSGenderFundamentalist", ["boughtItem.clothing.bunny"]));
} else {
if (_FSCredits > 0) {
r.push(
@@ -1177,7 +1182,7 @@ App.UI.FSPassage = function() {
if (arc.FSStatuesqueGlorification !== "unset") {
r.push(pursuit());
r.push(`a societal fixation on tallness.`);
- r.push(FSIsChosen("FSPetiteAdmiration"));
+ r.push(FSIsChosen("FSStatuesqueGlorification"));
} else {
if (_FSCredits > 0) {
r.push(
@@ -1256,7 +1261,7 @@ App.UI.FSPassage = function() {
if (arc.FSPastoralist !== "unset") {
r.push(pursuit());
r.push(`societal normalization of slave milking.`);
- r.push(FSIsChosen("FSAssetExpansionist", ["boughtItem.clothing.western"]));
+ r.push(FSIsChosen("FSPastoralist", ["boughtItem.clothing.western"]));
} else {
if (_FSCredits > 0) {
r.push(
@@ -1283,7 +1288,7 @@ App.UI.FSPassage = function() {
if (arc.FSPhysicalIdealist !== "unset") {
r.push(pursuit());
r.push(`societal reverence for the idealized human form, including height, health and muscle.`);
- r.push(FSIsChosen("FSAssetExpansionist", ["boughtItem.clothing.oil"]));
+ r.push(FSIsChosen("FSPhysicalIdealist", ["boughtItem.clothing.oil"]));
} else {
if (_FSCredits > 0) {
r.push(
@@ -1307,7 +1312,7 @@ App.UI.FSPassage = function() {
if (arc.FSHedonisticDecadence !== "unset") {
r.push(pursuit());
r.push(`societal normalization of overindulgence and immediate gratification.Be it food, drink, sex, drugs or whatever one's desire may be.`);
- r.push(FSIsChosen("FSAssetExpansionist"));
+ r.push(FSIsChosen("FSHedonisticDecadence"));
} else {
if (_FSCredits > 0) {
r.push(
@@ -1554,7 +1559,7 @@ App.UI.FSPassage = function() {
if (arc.FSAztecRevivalist !== "unset") {
r.push(pursuit());
r.push(`a vision of a new Aztec Empire.`);
- r.push(FSIsChosen("FSNeoImperialist", ["boughtItem.clothing.huipil"]));
+ r.push(FSIsChosen("FSAztecRevivalist", ["boughtItem.clothing.huipil"]));
} else {
if (_FSCredits > 0) {
r.push(
--
GitLab