diff --git a/src/facilities/fsPassage.js b/src/facilities/fsPassage.js index 147ca0616dcfd113f319cb0469339152d1b108b5..1c3d0cd124034173a48d7929fd6d8c16e30aa037 100644 --- a/src/facilities/fsPassage.js +++ b/src/facilities/fsPassage.js @@ -656,35 +656,35 @@ App.UI.FSPassage = function() { const assistantMatching = new Map([ ["FSSupremacist", ["amazon", "monstergirl", "succubus"]], - ["FSSubjugationist", [""]], - ["FSGenderRadicalist", [""]], - ["FSGenderFundamentalist", [""]], - ["FSDegradationist", [""]], - ["FSPaternalist", [""]], - ["FSBodyPurist", [""]], - ["FSTransformationFetishist", [""]], - ["FSYouthPreferentialist", [""]], - ["FSMaturityPreferentialist", [""]], - ["FSSlimnessEnthusiast", [""]], - ["FSAssetExpansionist", [""]], - ["FSPastoralist", [""]], - ["FSPhysicalIdealist", [""]], - ["FSHedonisticDecadence", [""]], - ["FSChattelReligionist", [""]], - ["FSNull", [""]], - ["FSRomanRevivalist", [""]], - ["FSNeoImperialist", [""]], - ["FSEgyptianRevivalist", [""]], - ["FSEdoRevivalist", [""]], - ["FSArabianRevivalist", [""]], - ["FSChineseRevivalist", [""]], - ["FSAztecRevivalist", [""]], - ["FSRepopulationFocus", [""]], - ["FSRestart", [""]], - ["FSIntellectualDependency", [""]], - ["FSSlaveProfessionalism", [""]], - ["FSPetiteAdmiration", [""]], - ["FSStatuesqueGlorification", [""]] + ["FSSubjugationist", ["amazon", "businesswoman", "imp"]], + ["FSGenderRadicalist", ["incubus", "monstergirl", "shemale", "succubus", "witch"]], + ["FSGenderFundamentalist", ["angel", "cherub", "fairy", "goddess", "hypergoddess", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"]], + ["FSDegradationist", ["businesswoman", "imp", "incubus", "monstergirl", "preggololi", "succubus"]], + ["FSPaternalist", ["angel", "cherub", "fairy", "goddess", "hypergoddess", "loli", "preggololi", "pregnant fairy", "schoolgirl"]], + ["FSBodyPurist", ["amazon", "angel", "fairy", "goddess", "incubus", "loli", "pregnant fairy", "succubus", "witch"]], + ["FSTransformationFetishist", ["businesswoman", "ERROR_1606_APPEARANCE_FILE_CORRUPT", "incubus", "shemale", "succubus", "witch"]], + ["FSYouthPreferentialist", ["angel", "cherub", "imp", "loli", "preggololi", "schoolgirl", "shemale", "succubus", "witch"]], + ["FSMaturityPreferentialist", ["angel", "businesswoman", "goddess", "incubus", "succubus", "witch"]], + ["FSSlimnessEnthusiast", ["cherub", "imp", "loli", "schoolgirl", "shemale", "succubus", "witch"]], + ["FSAssetExpansionist", ["businesswoman", "hypergoddess", "incubus", "shemale", "succubus", "witch"]], + ["FSPastoralist", ["goddess", "hypergoddess", "incubus", "shemale", "succubus", "witch"]], + ["FSPhysicalIdealist", ["amazon", "incubus", "shemale", "succubus", "witch"]], + ["FSHedonisticDecadence", ["goddess", "hypergoddess", "imp", "incubus", "preggololi", "succubus", "witch"]], + ["FSChattelReligionist", ["angel", "cherub", "goddess", "imp", "incubus", "monstergirl", "succubus", "witch"]], + ["FSNull", []], + ["FSRomanRevivalist", ["amazon", "businesswoman", "incubus", "succubus"]], + ["FSNeoImperialist", ["amazon", "businesswoman", "incubus", "shemale", "angel"]], + ["FSEgyptianRevivalist", ["goddess", "incubus", "monstergirl", "succubus"]], + ["FSEdoRevivalist", ["amazon", "incubus", "kitsune", "loli", "monstergirl", "succubus"]], + ["FSArabianRevivalist", ["businesswoman", "incubus", "schoolgirl", "succubus"]], + ["FSChineseRevivalist", ["incubus", "monstergirl", "schoolgirl", "succubus"]], + ["FSAztecRevivalist", ["amazon", "businesswoman", "incubus", "succubus"]], + ["FSRepopulationFocus", ["goddess", "hypergoddess", "preggololi", "pregnant fairy", "succubus", "witch"]], + ["FSRestart", ["angel", "businesswoman", "goddess", "incubus", "loli", "schoolgirl", "succubus", "witch"]], + ["FSIntellectualDependency", ["shemale", "succubus", "witch"]], + ["FSSlaveProfessionalism", ["angel", "businesswoman", "incubus", "goddess", "schoolgirl", "succubus"]], + ["FSPetiteAdmiration", ["cherub", "fairy", "imp", "incubus", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"]], + ["FSStatuesqueGlorification", ["amazon", "goddess", "incubus", "succubus", "witch"]] ]); function pursuit() { return App.UI.DOM.makeElement("span", "You are pursuing", "bold"); @@ -713,14 +713,12 @@ App.UI.FSPassage = function() { ); } r.push(App.UI.FSChangeDecoration(FS, itemArray)); - // TODO: build out map for this - /* if (V.policies.publicPA === 1) { if (assistantMatching.get(FS).includes(V.assistant.appearance)) { const {hisA} = getPronouns(assistant.pronouns().main).appendSuffix('A'); r.push(App.UI.DOM.makeElement("div", `With ${hisA} ${V.assistant.appearance} appearance, ${V.assistant.name} is a good public mascot for this goal.`, "note")); } - }*/ + } App.Events.addNode(el, r); return el; @@ -753,8 +751,7 @@ App.UI.FSPassage = function() { r.push(`Select race:`); const select = document.createElement("select"); r.push(select); - const races = App.Data.misc.filterRacesLowercase.filter(race => race !== arc.FSSubjugationistRace); // Subjugation race cannot be superior, so remove - for (const race of races) { + 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) { @@ -792,14 +789,13 @@ App.UI.FSPassage = function() { if (arc.FSSubjugationistRace === 0) { r.push(`the inferiority of a chosen race.`); } else { - r.push(`${arc.FSSubjugationistRace} superiority.`); + r.push(`${arc.FSSubjugationistRace} inferiority.`); } r.push(`Select race:`); const select = document.createElement("select"); r.push(select); - const races = App.Data.misc.filterRacesLowercase.filter(race => race !== arc.FSSupremacistRace); // Superior race cannot be subj, so remove - for (const race of races) { + for (const race of App.Data.misc.filterRacesLowercase.filter(race => race !== arc.FSSupremacistRace)) { // Superior race cannot be subj, so remove const choice = App.UI.DOM.appendNewElement("option", select, capFirstChar(race)); choice.value = race; if (race === arc.FSSubjugationistRace) { @@ -1450,7 +1446,7 @@ App.UI.FSPassage = function() { function withdrawRel(num) { return App.UI.DOM.link( - "Windraw", + "Withdraw", () => { if (arc.FSNull !== "unset") { arc.FSNull -= num;