diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw index 434a64cf002347a1cacf655a8d7c414c462e2fee..83b314e537f52114d245c4e1ccd6ee43957519db 100644 --- a/src/cheats/mod_EditFSCheat.tw +++ b/src/cheats/mod_EditFSCheat.tw @@ -35,7 +35,7 @@ <<radiobutton "$arcologies[0].FSSupremacistRace" "semitic">> Semitic | <<radiobutton "$arcologies[0].FSSupremacistRace" "mixed race">> Mixed Race - <br>[[Apply and reset Racial Subjugationism|MOD_Edit FS Cheat][removeFS("FSSubjugationist")]] + <br>[[Apply and reset Racial Subjugationism|MOD_Edit FS Cheat][FutureSocieties.remove("FSSubjugationist")]] <br><br> @@ -71,7 +71,7 @@ <<radiobutton "$arcologies[0].FSSubjugationistRace" "semitic">> Semitic | <<radiobutton "$arcologies[0].FSSubjugationistRace" "mixed race">> Mixed Race - <br>[[Apply and reset Racial Supremacy|MOD_Edit FS Cheat][removeFS("FSSupremacist")]] + <br>[[Apply and reset Racial Supremacy|MOD_Edit FS Cheat][FutureSocieties.remove("FSSupremacist")]] <br><br> @@ -101,7 +101,7 @@ | <<radiobutton "$arcologies[0].FSGenderRadicalistLawFuta" 3>> 3 (Big butts and skilled buttholes pref.) | <<radiobutton "$arcologies[0].FSGenderRadicalistLawFuta" 4>> 4 (Trap pref.) - <br>[[Apply and reset Gender Traditionalism|MOD_Edit FS Cheat][removeFS("FSGenderFundamentalist")]] + <br>[[Apply and reset Gender Traditionalism|MOD_Edit FS Cheat][FutureSocieties.remove("FSGenderFundamentalist")]] <br><br> @@ -124,7 +124,7 @@ <<radiobutton "$arcologies[0].FSGenderFundamentalistSMR" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSGenderFundamentalistSMR" 1>> 1 (Passed.) - <br>[[Apply and reset Gender Radicalism|MOD_Edit FS Cheat][removeFS("FSGenderRadicalist")]] + <br>[[Apply and reset Gender Radicalism|MOD_Edit FS Cheat][FutureSocieties.remove("FSGenderRadicalist")]] <<if $seePreg != 0>> <br><br> @@ -152,7 +152,7 @@ <<radiobutton "$arcologies[0].FSRepopulationFocusLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSRepopulationFocusLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Eugenics|MOD_Edit FS Cheat][removeFS("FSRestart")]] + <br>[[Apply and reset Eugenics|MOD_Edit FS Cheat][FutureSocieties.remove("FSRestart")]] <br><br> @@ -175,7 +175,7 @@ <<radiobutton "$arcologies[0].FSRestartSMR" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSRestartSMR" 1>> 1 (Passed.) - <br>[[Apply and reset Repopulation Efforts|MOD_Edit FS Cheat][removeFS("FSRepopulationFocus")]] + <br>[[Apply and reset Repopulation Efforts|MOD_Edit FS Cheat][FutureSocieties.remove("FSRepopulationFocus")]] <</if>> <br><br> @@ -199,7 +199,7 @@ <<radiobutton "$arcologies[0].FSPaternalistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSPaternalistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Degradationism|MOD_Edit FS Cheat][removeFS("FSDegradationist")]] + <br>[[Apply and reset Degradationism|MOD_Edit FS Cheat][FutureSocieties.remove("FSDegradationist")]] <br><br> @@ -222,7 +222,7 @@ <<radiobutton "$arcologies[0].FSDegradationistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSDegradationistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Paternalism|MOD_Edit FS Cheat][removeFS("FSPaternalist")]] + <br>[[Apply and reset Paternalism|MOD_Edit FS Cheat][FutureSocieties.remove("FSPaternalist")]] <br><br> @@ -245,7 +245,7 @@ <<radiobutton "$arcologies[0].FSBodyPuristLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSBodyPuristLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Body Transformationism|MOD_Edit FS Cheat][removeFS("FSTransformationFetishist")]] + <br>[[Apply and reset Body Transformationism|MOD_Edit FS Cheat][FutureSocieties.remove("FSTransformationFetishist")]] <br><br> @@ -268,7 +268,7 @@ <<radiobutton "$arcologies[0].FSTransformationFetishistSMR" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSTransformationFetishistSMR" 1>> 1 (Passed.) - <br>[[Apply and reset Body Purism|MOD_Edit FS Cheat][removeFS("FSBodyPurist")]] + <br>[[Apply and reset Body Purism|MOD_Edit FS Cheat][FutureSocieties.remove("FSBodyPurist")]] <br><br> @@ -292,7 +292,7 @@ <<radiobutton "$arcologies[0].FSYouthPreferentialistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSYouthPreferentialistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Maturity Preferentialism|MOD_Edit FS Cheat][removeFS("FSMaturityPreferentialist")]] + <br>[[Apply and reset Maturity Preferentialism|MOD_Edit FS Cheat][FutureSocieties.remove("FSMaturityPreferentialist")]] <br><br> @@ -316,7 +316,7 @@ <<radiobutton "$arcologies[0].FSMaturityPreferentialistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSMaturityPreferentialistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset Youth Preferentialism|MOD_Edit FS Cheat][removeFS("FSYouthPreferentialist")]] + <br>[[Apply and reset Youth Preferentialism|MOD_Edit FS Cheat][FutureSocieties.remove("FSYouthPreferentialist")]] <br><br> @@ -339,7 +339,7 @@ <<radiobutton "$arcologies[0].FSSlimnessEnthusiastSMR" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSSlimnessEnthusiastSMR" 1>> 1 (Passed.) - <br>[[Apply and reset Asset Expansionism|MOD_Edit FS Cheat][removeFS("FSAssetExpansionist")]] + <br>[[Apply and reset Asset Expansionism|MOD_Edit FS Cheat][FutureSocieties.remove("FSAssetExpansionist")]] <br><br> @@ -363,7 +363,7 @@ <<radiobutton "$arcologies[0].FSAssetExpansionistSMR" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSAssetExpansionistSMR" 1>> 1 (Passed.) - <br>[[Apply and reset Slimness Enthusiasm|MOD_Edit FS Cheat][removeFS("FSSlimnessEnthusiast")]] + <br>[[Apply and reset Slimness Enthusiasm|MOD_Edit FS Cheat][FutureSocieties.remove("FSSlimnessEnthusiast")]] <br><br> @@ -409,7 +409,7 @@ <<radiobutton "$arcologies[0].FSPhysicalIdealistSMR" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSPhysicalIdealistSMR" 1>> 1 (Passed.) - <br>[[Apply and reset Hedonistic Decadence|MOD_Edit FS Cheat][removeFS("FSHedonisticDecadence")]] + <br>[[Apply and reset Hedonistic Decadence|MOD_Edit FS Cheat][FutureSocieties.remove("FSHedonisticDecadence")]] <br><br> @@ -440,7 +440,7 @@ <<radiobutton "$arcologies[0].FSHedonisticDecadenceLaw2" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSHedonisticDecadenceLaw2" 1>> 1 (Passed.) - <br>[[Apply and reset Physical Idealist|MOD_Edit FS Cheat][removeFS("FSPhysicalIdealist")]] + <br>[[Apply and reset Physical Idealist|MOD_Edit FS Cheat][FutureSocieties.remove("FSPhysicalIdealist")]] <br><br> @@ -486,7 +486,7 @@ <<radiobutton "$arcologies[0].FSRomanRevivalistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSRomanRevivalistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][removeFS("FSAztecRevivalist"), removeFS("FSEgyptianRevivalist"), removeFS("FSEdoRevivalist"), removeFS("FSArabianRevivalist"), removeFS("FSChineseRevivalist")]] + <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][FutureSocieties.remove("FSAztecRevivalist"), FutureSocieties.remove("FSEgyptianRevivalist"), FutureSocieties.remove("FSEdoRevivalist"), FutureSocieties.remove("FSArabianRevivalist"), FutureSocieties.remove("FSChineseRevivalist")]] <br><br> @@ -509,7 +509,7 @@ <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][removeFS("FSRomanRevivalist"), removeFS("FSEgyptianRevivalist"), removeFS("FSEdoRevivalist"), removeFS("FSArabianRevivalist"), removeFS("FSChineseRevivalist")]] + <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][FutureSocieties.remove("FSRomanRevivalist"), FutureSocieties.remove("FSEgyptianRevivalist"), FutureSocieties.remove("FSEdoRevivalist"), FutureSocieties.remove("FSArabianRevivalist"), FutureSocieties.remove("FSChineseRevivalist")]] <br><br> @@ -532,7 +532,7 @@ <<radiobutton "$arcologies[0].FSEgyptianRevivalistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSEgyptianRevivalistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][removeFS("FSRomanRevivalist"), removeFS("FSAztecRevivalist"), removeFS("FSEdoRevivalist"), removeFS("FSArabianRevivalist"), removeFS("FSChineseRevivalist")]] + <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][FutureSocieties.remove("FSRomanRevivalist"), FutureSocieties.remove("FSAztecRevivalist"), FutureSocieties.remove("FSEdoRevivalist"), FutureSocieties.remove("FSArabianRevivalist"), FutureSocieties.remove("FSChineseRevivalist")]] <br><br> @@ -555,7 +555,7 @@ <<radiobutton "$arcologies[0].FSEdoRevivalistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSEdoRevivalistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][removeFS("FSRomanRevivalist"), removeFS("FSAztecRevivalist"), removeFS("FSEgyptianRevivalist"), removeFS("FSArabianRevivalist"), removeFS("FSChineseRevivalist")]] + <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][FutureSocieties.remove("FSRomanRevivalist"), FutureSocieties.remove("FSAztecRevivalist"), FutureSocieties.remove("FSEgyptianRevivalist"), FutureSocieties.remove("FSArabianRevivalist"), FutureSocieties.remove("FSChineseRevivalist")]] <br><br> @@ -578,7 +578,7 @@ <<radiobutton "$arcologies[0].FSArabianRevivalistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSArabianRevivalistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][removeFS("FSRomanRevivalist"), removeFS("FSAztecRevivalist"), removeFS("FSEgyptianRevivalist"), removeFS("FSEdoRevivalist"), removeFS("FSChineseRevivalist")]] + <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][FutureSocieties.remove("FSRomanRevivalist"), FutureSocieties.remove("FSAztecRevivalist"), FutureSocieties.remove("FSEgyptianRevivalist"), FutureSocieties.remove("FSEdoRevivalist"), FutureSocieties.remove("FSChineseRevivalist")]] <br><br> @@ -601,4 +601,4 @@ <<radiobutton "$arcologies[0].FSChineseRevivalistLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSChineseRevivalistLaw" 1>> 1 (Passed.) - <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][removeFS("FSRomanRevivalist"), removeFS("FSAztecRevivalist"), removeFS("FSEgyptianRevivalist"), removeFS("FSEdoRevivalist"), removeFS("FSArabianRevivalist")]] + <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][FutureSocieties.remove("FSRomanRevivalist"), FutureSocieties.remove("FSAztecRevivalist"), FutureSocieties.remove("FSEgyptianRevivalist"), FutureSocieties.remove("FSEdoRevivalist"), FutureSocieties.remove("FSArabianRevivalist")]] diff --git a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw index 460a79ba8d52f964b4d619b9359b8b8c59e4b866..f0dc1eabfd1d3b10eb3c864d0c1c40eb882af4fb 100644 --- a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw @@ -141,7 +141,7 @@ <</if>> <<for _fscdc = 0; _fscdc < setup.FutureSocieties.length; _fscdc++>> <<if !($arcologies[0][setup.FutureSocieties[_fscdc]] > 0)>> - <<run removeFS(setup.FutureSocieties[_fscdc])>> + <<run FutureSocieties.remove(setup.FutureSocieties[_fscdc])>> <</if>> <</for>> diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js new file mode 100644 index 0000000000000000000000000000000000000000..bacc24c4d70e8fe9a665c065fc6c038f5fb570c5 --- /dev/null +++ b/src/js/futureSocietyJS.js @@ -0,0 +1,112 @@ +window.FutureSocieties = (function() { + return { + remove: removeFS + resetCredits: resetFSCredits, + } + + // call as FutureSocieties.remove(FS) + // FS must be a string (e.g. "FSPaternalist" or "FSDegradationist"). + function removeFS(FS) { + const V = State.variables; + const arcology = V.arcologies[0]; + const FSDecoration = FS + "Decoration"; + const FSSMR = FS + "SMR"; + let FSLaw = FS + "Law"; + if (arcology[FS] === undefined) { + console.log(`ERROR: bad FS reference, $arcologies[0].${FS} not defined`) + return; + } + + if (FS === "FSSupremacist" || FS === "FSSubjugationist") + FSLaw += "ME"; + if (FS !== "FSNull") + arcology[FSDecoration] = 20; + arcology[FS] = "unset"; + switch (FS) { + case "FSPaternalist": + arcology[FSLaw] = 0; + arcology[FSSMR] = 0; + V.slaveWatch = 0; + break; + case "FSDegradationist": + arcology[FSLaw] = 0; + arcology[FSSMR] = 0; + V.liveTargets = 0; + break; + case "FSGenderRadicalist": + arcology.FSGenderRadicalistLawBeauty = 0; + arcology.FSGenderRadicalistLawFuta = 0; + break; + case "FSGenderFundamentalist": + arcology.FSGenderFundamentalistLawBeauty = 0; + arcology.FSGenderFundamentalistLawBimbo = 0; + arcology.FSGenderFundamentalistSMR = 0; + break; + case "FSTransformationFetishist": + case "FSAssetExpansionist": + arcology[FSSMR] = 0; + break; + case "FSPhysicalIdealist": + arcology.FSPhysicalIdealistLaw = 0; + arcology.FSPhysicalIdealistSMR = 0; + arcology.FSPhysicalIdealistStrongFat = 0; + V.martialSchool = 0; + break; + case "FSHedonisticDecadence": + arcology.FSHedonisticDecadenceLaw = 0; + arcology.FSHedonisticDecadenceLaw2 = 0; + arcology.FSHedonisticDecadenceSMR = 0; + arcology.FSHedonisticDecadenceStrongFat = 0; + break; + case "FSChattelReligionist": + arcology.FSChattelReligionistLaw = 0; + arcology.FSChattelReligionistSMR = 0; + arcology.FSChattelReligionistCreed = 0; + V.subsidyChurch = 0; + break; + case "FSRepopulationFocus": + arcology[FSLaw] = 0; + arcology[FSSMR] = 0; + V.universalRulesChildrenBecomeBreeders = 0; + break; + case "FSRestart": + arcology[FSLaw] = 0; + arcology[FSSMR] = 0; + V.eliteOfficers = 0; + V.propOutcome = 0; + V.failedElite = 0; + break; + case "FSNull": + break; + default: // all others have one law and one SMR + arcology[FSLaw] = 0; + arcology[FSSMR] = 0; + break; + } + + FacilityDecorationCleanup(); + resetFSCredits(); + } + + function resetFSCredits() { + const V = State.variables; + let activeFS = 0; + for (let i = 0; i < setup.FutureSocieties.length; i++) { + if (V.arcologies[0][setup.FutureSocieties[i]] > 0) { + activeFS++; + } + } + if (V.arcologies[0].FSNull > 0) { // possibly recalculate for multiculturalism + activeFS--; + if (V.FSCreditCount === 4) + activeFS += V.arcologies[0].FSNull/25; + else if (V.FSCreditCount === 6) + activeFS += V.arcologies[0].FSNull/17; + else if (V.FSCreditCount === 7) + activeFS += V.arcologies[0].FSNull/15; + else + activeFS += V.arcologies[0].FSNull/20; + } + V.FSCredits = Math.max(Math.trunc(V.FSGotRepCredits - activeFS), 0); + } +})(); diff --git a/src/js/storyJS.js b/src/js/storyJS.js index eb172c1209d03e14dd89b6d7b3286db066625e0b..67101c00926a46acb0769f864892593c465c45ff 100644 --- a/src/js/storyJS.js +++ b/src/js/storyJS.js @@ -808,109 +808,6 @@ window.SoftenSexualFlaw = /** @param {App.Entity.SlaveState} slave */ function S slave.sexualFlaw = "none"; }; -window.removeFS = function(FS) { - const V = State.variables; - const arcology = V.arcologies[0]; - let FSDecoration = FS + "Decoration"; - let FSSMR = FS + "SMR"; - let FSLaw = FS + "Law"; - if (FS === "FSSupremacist" || FS === "FSSubjugationist") { - FSLaw += "ME"; - } - switch (FS) { - case "FSPaternalist": - arcology[FSLaw] = 0; - arcology[FSSMR] = 0; - V.slaveWatch = 0; - break; - case "FSDegradationist": - arcology[FSLaw] = 0; - arcology[FSSMR] = 0; - V.liveTargets = 0; - break; - case "FSGenderRadicalist": - arcology.FSGenderRadicalistLawBeauty = 0; - arcology.FSGenderRadicalistLawFuta = 0; - break; - case "FSGenderFundamentalist": - arcology.FSGenderFundamentalistLawBeauty = 0; - arcology.FSGenderFundamentalistLawBimbo = 0; - arcology.FSGenderFundamentalistSMR = 0; - break; - case "FSTransformationFetishist": - case "FSAssetExpansionist": - arcology[FSSMR] = 0; - break; - case "FSPhysicalIdealist": - arcology.FSPhysicalIdealistLaw = 0; - arcology.FSPhysicalIdealistSMR = 0; - arcology.FSPhysicalIdealistStrongFat = 0; - V.martialSchool = 0; - break; - case "FSHedonisticDecadence": - arcology.FSHedonisticDecadenceLaw = 0; - arcology.FSHedonisticDecadenceLaw2 = 0; - arcology.FSHedonisticDecadenceSMR = 0; - arcology.FSHedonisticDecadenceStrongFat = 0; - break; - case "FSChattelReligionist": - arcology.FSChattelReligionistLaw = 0; - arcology.FSChattelReligionistSMR = 0; - arcology.FSChattelReligionistCreed = 0; - V.subsidyChurch = 0; - break; - case "FSRepopulationFocus": - arcology[FSLaw] = 0; - arcology[FSSMR] = 0; - V.universalRulesChildrenBecomeBreeders = 0; - break; - case "FSRestart": - arcology[FSLaw] = 0; - arcology[FSSMR] = 0; - V.eliteOfficers = 0; - break; - case "FSNull": - break; - default: /* all others have one law and one SMR */ - arcology[FSLaw] = 0; - arcology[FSSMR] = 0; - break; - } - if (FS !== "FSNull") { - arcology[FSDecoration] = 20; - if (FS === "FSRestart") { - V.propOutcome = 0; - V.failedElite = 0; - } - } - arcology[FS] = "unset"; - FacilityDecorationCleanup(); - resetFSCredits(); -}; - -window.resetFSCredits = function() { - const V = State.variables; - let activeFS = 0; - for (let i = 0; i < setup.FutureSocieties.length; i++) { - if (V.arcologies[0][setup.FutureSocieties[i]] > 0) { - activeFS++; - } - } - if (V.arcologies[0].FSNull > 0) { /* possibly recalculate for multiculturalism */ - activeFS--; - if (V.FSCreditCount === 4) { - activeFS += V.arcologies[0].FSNull/25; - } else if (V.FSCreditCount === 6) { - activeFS += V.arcologies[0].FSNull/17; - } else if (V.FSCreditCount === 7) { - activeFS += V.arcologies[0].FSNull/15; - } else { - activeFS += V.arcologies[0].FSNull/20; - } - } - V.FSCredits = Math.max(Math.trunc(V.FSGotRepCredits - activeFS), 0); -}; - window.generatePlayerPronouns = function(PC) { if (PC.title === 0) { PC.pronoun = "she"; diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw index 60e018b48d914a42b862f4814831669101c99a3d..a36258e4325634e3327dc3365155b4aa62d8a03a 100644 --- a/src/uncategorized/fsDevelopments.tw +++ b/src/uncategorized/fsDevelopments.tw @@ -695,7 +695,7 @@ $arcologies[0].name is unconvinced of $arcologies[0].FSSupremacistRace superiority. <</if>> <<if $arcologies[0].FSSupremacist < 0>> - <<run removeFS("FSSupremacist")>> + <<run FutureSocieties.remove("FSSupremacist")>> <<if $assistantFSAppearance == "supremacist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -725,7 +725,7 @@ $arcologies[0].name is unconvinced of the inferiority of $arcologies[0].FSSubjugationistRace people. <</if>> <<if $arcologies[0].FSSubjugationist < 0>> - <<run removeFS("FSSubjugationist")>> + <<run FutureSocieties.remove("FSSubjugationist")>> <<if $assistantFSAppearance == "subjugationist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -755,7 +755,7 @@ $arcologies[0].name is unconvinced that all women should be pregnant. <</if>> <<if $arcologies[0].FSRepopulationFocus < 0>> - <<run removeFS("FSRepopulationFocus")>> + <<run FutureSocieties.remove("FSRepopulationFocus")>> <<if $assistantFSAppearance == "repopulation focus">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -785,7 +785,7 @@ $arcologies[0].name is unconvinced that only the elite should reproduce. <</if>> <<if $arcologies[0].FSRestart < 0 && $arcologies[0].FSRestartDecoration != 100>> - <<run removeFS("FSRestart")>> + <<run FutureSocieties.remove("FSRestart")>> <<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -815,7 +815,7 @@ $arcologies[0].name is unconvinced of the need to redefine gender around power. <</if>> <<if $arcologies[0].FSGenderRadicalist < 0>> - <<run removeFS("FSGenderRadicalist")>> + <<run FutureSocieties.remove("FSGenderRadicalist")>> <<if $assistantFSAppearance == "gender radicalist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -845,7 +845,7 @@ $arcologies[0].name is unconvinced of the need to preserve traditional gender roles. <</if>> <<if $arcologies[0].FSGenderFundamentalist < 0>> - <<run removeFS("FSGenderFundamentalist")>> + <<run FutureSocieties.remove("FSGenderFundamentalist")>> <<if $assistantFSAppearance == "gender fundamentalist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -875,7 +875,7 @@ $arcologies[0].name is unconvinced of the vision of a well-bred race of slaves. <</if>> <<if $arcologies[0].FSPaternalist < 0>> - <<run removeFS("FSPaternalist")>> + <<run FutureSocieties.remove("FSPaternalist")>> <<if $assistantFSAppearance == "paternalist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -905,7 +905,7 @@ $arcologies[0].name is unconvinced that slaves are not human and should be thoroughly degraded. <</if>> <<if $arcologies[0].FSDegradationist < 0>> - <<run removeFS("FSDegradationist")>> + <<run FutureSocieties.remove("FSDegradationist")>> <<if $assistantFSAppearance == "degradationist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -935,7 +935,7 @@ $arcologies[0].name is unconvinced of the unattractive nature of implants. <</if>> <<if $arcologies[0].FSBodyPurist < 0>> - <<run removeFS("FSBodyPurist")>> + <<run FutureSocieties.remove("FSBodyPurist")>> <<if $assistantFSAppearance == "body purist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -963,7 +963,7 @@ $arcologies[0].name is unconvinced about the attractiveness of implants. <</if>> <<if $arcologies[0].FSTransformationFetishist < 0>> - <<run removeFS("FSTransformationFetishist")>> + <<run FutureSocieties.remove("FSTransformationFetishist")>> <<if $assistantFSAppearance == "transformation fetishist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -991,7 +991,7 @@ $arcologies[0].name is unconvinced about your preference for older ladies. <</if>> <<if $arcologies[0].FSMaturityPreferentialist < 0>> - <<run removeFS("FSMaturityPreferentialist")>> + <<run FutureSocieties.remove("FSMaturityPreferentialist")>> <<if $assistantFSAppearance == "maturity preferentialist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1019,7 +1019,7 @@ $arcologies[0].name is unconvinced about your preference for young women. <</if>> <<if $arcologies[0].FSYouthPreferentialist < 0>> - <<run removeFS("FSYouthPreferentialist")>> + <<run FutureSocieties.remove("FSYouthPreferentialist")>> <<if $assistantFSAppearance == "youth preferentialist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1047,7 +1047,7 @@ $arcologies[0].name is unconvinced about your preference for slim slaves with girlish figures. <</if>> <<if $arcologies[0].FSSlimnessEnthusiast < 0>> - <<run removeFS("FSSlimnessEnthusiast")>> + <<run FutureSocieties.remove("FSSlimnessEnthusiast")>> <<if $assistantFSAppearance == "slimness enthusiast">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1077,7 +1077,7 @@ $arcologies[0].name is unconvinced that all tits and asses should be bigger. <</if>> <<if $arcologies[0].FSAssetExpansionist < 0>> - <<run removeFS("FSAssetExpansionist")>> + <<run FutureSocieties.remove("FSAssetExpansionist")>> <<if $assistantFSAppearance == "asset expansionist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1107,7 +1107,7 @@ $arcologies[0].name is unconvinced that slaves should be milked. <</if>> <<if $arcologies[0].FSPastoralist < 0>> - <<run removeFS("FSPastoralist")>> + <<run FutureSocieties.remove("FSPastoralist")>> <<if $assistantFSAppearance == "pastoralist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1137,7 +1137,7 @@ $arcologies[0].name is unconvinced that all slaves should be tall and strong. <</if>> <<if $arcologies[0].FSPhysicalIdealist < 0>> - <<run removeFS("FSPhysicalIdealist")>> + <<run FutureSocieties.remove("FSPhysicalIdealist")>> <<if $assistantFSAppearance == "physical idealist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1167,7 +1167,7 @@ $arcologies[0].name is unconvinced that all slaves should be soft and laid-back. <</if>> <<if $arcologies[0].FSHedonisticDecadence < 0>> - <<run removeFS("FSHedonisticDecadence")>> + <<run FutureSocieties.remove("FSHedonisticDecadence")>> <<if $assistantFSAppearance == "hedonistic decadence">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1197,7 +1197,7 @@ $arcologies[0].name is unconvinced of a version of religion that emphasizes slaveholding traditions. <</if>> <<if $arcologies[0].FSChattelReligionist < 0>> - <<run removeFS("FSChattelReligionist")>> + <<run FutureSocieties.remove("FSChattelReligionist")>> <<if $assistantFSAppearance == "chattel religionist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1227,7 +1227,7 @@ $arcologies[0].name is unconvinced of the wisdom of your project to build a new Rome. <</if>> <<if $arcologies[0].FSRomanRevivalist < 0>> - <<run removeFS("FSRomanRevivalist")>> + <<run FutureSocieties.remove("FSRomanRevivalist")>> <<if $assistantFSAppearance == "roman revivalist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1257,7 +1257,7 @@ $arcologies[0].name is unconvinced of the wisdom of your project to build a new Aztec Empire. <</if>> <<if $arcologies[0].FSAztecRevivalist < 0>> - <<run removeFS("FSAztecRevivalist")>> + <<run FutureSocieties.remove("FSAztecRevivalist")>> <<if $assistantFSAppearance == "aztec revivalist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1287,7 +1287,7 @@ $arcologies[0].name is unconvinced of the wisdom of your project to build a new land of the Pharaohs. <</if>> <<if $arcologies[0].FSEgyptianRevivalist < 0>> - <<run removeFS("FSEgyptianRevivalist")>> + <<run FutureSocieties.remove("FSEgyptianRevivalist")>> <<if $assistantFSAppearance == "egyptian revivalist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1317,7 +1317,7 @@ $arcologies[0].name is unconvinced of the wisdom of your project to build a new Edo Japan. <</if>> <<if $arcologies[0].FSEdoRevivalist < 0>> - <<run removeFS("FSEdoRevivalist")>> + <<run FutureSocieties.remove("FSEdoRevivalist")>> <<if $assistantFSAppearance == "edo revivalist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1347,7 +1347,7 @@ $arcologies[0].name is unconvinced of the wisdom of your project to build a new Sultanate. <</if>> <<if $arcologies[0].FSArabianRevivalist < 0>> - <<run removeFS("FSArabianRevivalist")>> + <<run FutureSocieties.remove("FSArabianRevivalist")>> <<if $assistantFSAppearance == "arabian revivalist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ @@ -1377,7 +1377,7 @@ $arcologies[0].name is unconvinced of the wisdom of your pursuit of the Mandate of Heaven. <</if>> <<if $arcologies[0].FSChineseRevivalist < 0>> - <<run removeFS("FSChineseRevivalist")>> + <<run FutureSocieties.remove("FSChineseRevivalist")>> <<if $assistantFSAppearance == "chinese revivalist">><<set $assistantFSAppearance = "default">><</if>> <<ClearFacilityDecorations>> @@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@ diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw index d253264c5153ab60250308b5bcc9bab3d0f2921b..5df1ca07eb6cb70511e37f45024cc4346dbbfc67 100644 --- a/src/uncategorized/futureSociety.tw +++ b/src/uncategorized/futureSociety.tw @@ -593,7 +593,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc </span> <<if $arcologies[0].FSSupremacist != "unset">> - <br>''You are pursuing'' $arcologies[0].FSSupremacistRace superiority. //<<link "Abandon" "Future Society">><<run removeFS("FSSupremacist")>><<if $assistantFSAppearance == "supremacist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + <br>''You are pursuing'' $arcologies[0].FSSupremacistRace superiority. //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSSupremacist")>><<if $assistantFSAppearance == "supremacist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSSupremacist">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "succubus")>> @@ -622,7 +622,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <</if>> <<if $arcologies[0].FSSubjugationist != "unset">> - <br>''You are pursuing'' $arcologies[0].FSSubjugationistRace inferiority. //<<link "Abandon" "Future Society">><<run removeFS("FSSubjugationist")>><<if $assistantFSAppearance == "subjugationist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + <br>''You are pursuing'' $arcologies[0].FSSubjugationistRace inferiority. //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSSubjugationist")>><<if $assistantFSAppearance == "subjugationist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSSubjugationist">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "imp")>> @@ -654,7 +654,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSRestart == "unset">> <<if $arcologies[0].FSRepopulationFocus != "unset">> <br>''You are pursuing'' the belief that mass breeding will save humanity. - //<<link "Abandon" "Future Society">><<run removeFS("FSRepopulationFocus")>><<if $assistantFSAppearance == "repopulation focus">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSRepopulationFocus")>><<if $assistantFSAppearance == "repopulation focus">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSRepopulationFocus" "clothesBoughtMaternityLingerie" "clothesBoughtMaternityDress" "clothesBoughtBelly">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>> @@ -674,14 +674,14 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSRestart != "unset">> <<if $arcologies[0].FSRestartDecoration != 100>> <br>''You are pursuing'' Eugenics. - //<<link "Abandon" "Future Society">><<run removeFS("FSRestart")>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSRestart")>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSRestart">> <<else>> <br>''You have established'' Eugenics. <<if $eugenicsFullControl != 1>> The Societal Elite will not permit you to abandon Eugenics. <<else>> - //<<link "Abandon" "Future Society">><<run removeFS("FSRestart")>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>// + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSRestart")>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>// <</if>> <br> <<FSChangeDecoration "FSRestart">> @@ -706,7 +706,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSGenderFundamentalist == "unset">> <<if $arcologies[0].FSGenderRadicalist != "unset">> <br>''You are pursuing'' a radical redefinition of gender that identifies powerful people as male, and everyone else as female. - //<<link "Abandon" "Future Society">><<run removeFS("FSGenderRadicalist")>><<if $assistantFSAppearance == "gender radicalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSGenderRadicalist")>><<if $assistantFSAppearance == "gender radicalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSGenderRadicalist">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "shemale") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>> @@ -726,7 +726,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSGenderRadicalist == "unset">> <<if $arcologies[0].FSGenderFundamentalist != "unset">> <br>''You are pursuing'' gender traditionalism, including a societal preference for feminine slaves and support for slave pregnancy. - //<<link "Abandon" "Future Society">><<run removeFS("FSGenderFundamentalist")>><<if $assistantFSAppearance == "gender fundamentalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSGenderFundamentalist")>><<if $assistantFSAppearance == "gender fundamentalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSGenderFundamentalist" "clothesBoughtBunny">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>> @@ -745,7 +745,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSDegradationist == "unset">> <<if $arcologies[0].FSPaternalist != "unset">> <br>''You are pursuing'' a vision of slave improvement, including slaves' health, mental well-being, and education. - //<<link "Abandon" "Future Society">><<run removeFS("FSPaternalist")>><<if $assistantFSAppearance == "paternalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSPaternalist")>><<if $assistantFSAppearance == "paternalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSPaternalist" "clothesBoughtConservative">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub")>> @@ -764,7 +764,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSPaternalist == "unset">> <<if $arcologies[0].FSDegradationist != "unset">> <br>''You are pursuing'' slave degradation, a belief that slaves are not human and should not be treated decently. - //<<link "Abandon" "Future Society">><<run removeFS("FSDegradationist")>><<if $assistantFSAppearance == "degradationist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSDegradationist")>><<if $assistantFSAppearance == "degradationist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSDegradationist" "clothesBoughtChains">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "monstergirl") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "imp")>> @@ -783,7 +783,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSTransformationFetishist == "unset">> <<if $arcologies[0].FSBodyPurist != "unset">> <br>''You are pursuing'' societal disapproval of implant surgery. - //<<link "Abandon" "Future Society">><<run removeFS("FSBodyPurist")>><<if $assistantFSAppearance == "body purist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSBodyPurist")>><<if $assistantFSAppearance == "body purist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSBodyPurist">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "amazon") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>> @@ -802,7 +802,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSBodyPurist == "unset">> <<if $arcologies[0].FSTransformationFetishist != "unset">> <br>''You are pursuing'' societal fetishization of implant surgery. - //<<link "Abandon" "Future Society">><<run removeFS("FSTransformationFetishist")>><<if $assistantFSAppearance == "transformation fetishist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSTransformationFetishist")>><<if $assistantFSAppearance == "transformation fetishist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSTransformationFetishist">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT")>> @@ -821,7 +821,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSMaturityPreferentialist == "unset">> <<if $arcologies[0].FSYouthPreferentialist != "unset">> <br>''You are pursuing'' an accentuated societal preference for younger slaves. - //<<link "Abandon" "Future Society">><<run removeFS("FSYouthPreferentialist")>><<if $assistantFSAppearance == "youth preferentialist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSYouthPreferentialist")>><<if $assistantFSAppearance == "youth preferentialist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSYouthPreferentialist">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "witch")>> @@ -840,7 +840,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSYouthPreferentialist == "unset">> <<if $arcologies[0].FSMaturityPreferentialist != "unset">> <br>''You are pursuing'' a societal preference for older women. - //<<link "Abandon" "Future Society">><<run removeFS("FSMaturityPreferentialist")>><<if $assistantFSAppearance == "maturity preferentialist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSMaturityPreferentialist")>><<if $assistantFSAppearance == "maturity preferentialist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSMaturityPreferentialist">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "goddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel")>> @@ -859,7 +859,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSAssetExpansionist == "unset">> <<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <br>''You are supporting'' enthusiasm for slaves with girlish figures. - //<<link "Abandon" "Future Society">><<run removeFS("FSSlimnessEnthusiast")>><<if $assistantFSAppearance == "slimness enthusiast">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSSlimnessEnthusiast")>><<if $assistantFSAppearance == "slimness enthusiast">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSSlimnessEnthusiast">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "loli") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>> @@ -878,7 +878,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSSlimnessEnthusiast == "unset">> <<if $arcologies[0].FSAssetExpansionist != "unset">> <br>''You are pursuing'' societal hunger for huge assets. - //<<link "Abandon" "Future Society">><<run removeFS("FSAssetExpansionist")>><<if $assistantFSAppearance == "asset expansionist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSAssetExpansionist")>><<if $assistantFSAppearance == "asset expansionist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSAssetExpansionist">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>> @@ -896,7 +896,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSPastoralist != "unset">> <br>''You are pursuing'' societal normalization of slave milking. - //<<link "Abandon" "Future Society">><<run removeFS("FSPastoralist")>><<if $assistantFSAppearance == "pastoralist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSPastoralist")>><<if $assistantFSAppearance == "pastoralist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSPastoralist" "clothesBoughtWestern">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "goddess") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>> @@ -914,7 +914,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSHedonisticDecadence == "unset">> <<if $arcologies[0].FSPhysicalIdealist != "unset">> <br>''You are pursuing'' societal reverence for the idealized human form, including height, health and muscle. - //<<link "Abandon" "Future Society">><<run removeFS("FSPhysicalIdealist")>><<if $assistantFSAppearance == "physical idealist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSPhysicalIdealist")>><<if $assistantFSAppearance == "physical idealist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSPhysicalIdealist" "clothesBoughtOil">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "amazon") || ($assistantAppearance == "shemale") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>> @@ -933,7 +933,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSPhysicalIdealist == "unset">> <<if $arcologies[0].FSHedonisticDecadence != "unset">> <br>''You are pursuing'' societal normalization of overindulgence and immediate gratification. Be it food, drink, sex, drugs or whatever one's desire may be. - //<<link "Abandon" "Future Society">><<run removeFS("FSHedonisticDecadence")>><<if $assistantFSAppearance == "hedonistic decadence">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSHedonisticDecadence")>><<if $assistantFSAppearance == "hedonistic decadence">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSHedonisticDecadence">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "imp") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>> @@ -952,7 +952,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSNull == "unset">> <<if $arcologies[0].FSChattelReligionist != "unset">> <br>''You are pursuing'' a new strain of religion that emphasizes the slaveholding portions of religious history. - //<<link "Abandon" "Future Society">><<run removeFS("FSChattelReligionist")>><<if $assistantFSAppearance == "chattel religionist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSChattelReligionist")>><<if $assistantFSAppearance == "chattel religionist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSChattelReligionist" "clothesBoughtHabit">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp")>> @@ -971,7 +971,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>> <<if $arcologies[0].FSRomanRevivalist != "unset">> <br>''You are pursuing'' a vision of a new Rome. - //<<link "Abandon" "Future Society">><<run removeFS("FSRomanRevivalist")>><<if $assistantFSAppearance == "roman revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSRomanRevivalist")>><<if $assistantFSAppearance == "roman revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSRomanRevivalist" "clothesBoughtToga">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>> @@ -990,7 +990,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>> <<if $arcologies[0].FSAztecRevivalist != "unset">> <br>''You are pursuing'' a vision of a new Aztec Empire. - //<<link "Abandon" "Future Society">><<run removeFS("FSAztecRevivalist")>><<if $assistantFSAppearance == "aztec revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSAztecRevivalist")>><<if $assistantFSAppearance == "aztec revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSAztecRevivalist" "clothesBoughtHuipil">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "goddess") || ($assistantAppearance == "amazon") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>> @@ -1009,7 +1009,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>> <<if $arcologies[0].FSEgyptianRevivalist != "unset">> <br>''You are pursuing'' a vision of Pharaoh's Egypt. - //<<link "Abandon" "Future Society">><<run removeFS("FSEgyptianRevivalist")>><<if $assistantFSAppearance == "egyptian revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSEgyptianRevivalist")>><<if $assistantFSAppearance == "egyptian revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSEgyptianRevivalist" "clothesBoughtEgypt">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>> @@ -1028,7 +1028,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>> <<if $arcologies[0].FSEdoRevivalist != "unset">> <br>''You are pursuing'' a vision of Edo Japan. - //<<link "Abandon" "Future Society">><<run removeFS("FSEdoRevivalist")>><<if $assistantFSAppearance == "edo revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSEdoRevivalist")>><<if $assistantFSAppearance == "edo revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSEdoRevivalist" "clothesBoughtKimono">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "loli") || ($assistantAppearance == "kitsune") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>> @@ -1047,7 +1047,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>> <<if $arcologies[0].FSArabianRevivalist != "unset">> <br>''You are pursuing'' a vision of the Sultanate of old. - //<<link "Abandon" "Future Society">><<run removeFS("FSArabianRevivalist")>><<if $assistantFSAppearance == "arabian revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSArabianRevivalist")>><<if $assistantFSAppearance == "arabian revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSArabianRevivalist" "clothesBoughtHarem">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>> @@ -1066,7 +1066,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset")>> <<if $arcologies[0].FSChineseRevivalist != "unset">> <br>''You are pursuing'' a vision of ancient China. - //<<link "Abandon" "Future Society">><<run removeFS("FSChineseRevivalist")>><<if $assistantFSAppearance == "chinese revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + //<<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSChineseRevivalist")>><<if $assistantFSAppearance == "chinese revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> <<FSChangeDecoration "FSChineseRevivalist" "clothesBoughtQipao">> <<if $PAPublic == 1>> <<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>> @@ -1087,7 +1087,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSNull != "unset">> <br>''You are permitting <<if $arcologies[0].FSNull <= 25>>basic<<elseif $arcologies[0].FSNull <= 50>>considerable<<elseif $arcologies[0].FSNull <= 75>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology. <<if $arcologies[0].FSNull <= 25>> - //[[Abandon|Future Society][removeFS("FSNull")]]// + //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]// <<else>> //[[Withdraw|Future Society][$arcologies[0].FSNull -= 25, $FSCredits += 1]]// <</if>> @@ -1106,7 +1106,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSNull != "unset">> <br>''You are permitting <<if $arcologies[0].FSNull <= 17>>basic<<elseif $arcologies[0].FSNull <= 34>>some<<elseif $arcologies[0].FSNull <= 51>>considerable<<elseif $arcologies[0].FSNull <= 68>>great<<elseif $arcologies[0].FSNull <= 85>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology. <<if $arcologies[0].FSNull <= 20>> - //[[Abandon|Future Society][removeFS("FSNull")]]// + //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]// <<else>> //[[Withdraw|Future Society][$arcologies[0].FSNull -= 17, $FSCredits += 1]]// <</if>> @@ -1125,7 +1125,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSNull != "unset">> <br>''You are permitting <<if $arcologies[0].FSNull <= 15>>basic<<elseif $arcologies[0].FSNull <= 30>>some<<elseif $arcologies[0].FSNull <= 45>>notable<<elseif $arcologies[0].FSNull <= 60>>considerable<<elseif $arcologies[0].FSNull <= 75>>great<<elseif $arcologies[0].FSNull <= 90>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology. <<if $arcologies[0].FSNull <= 20>> - //[[Abandon|Future Society][removeFS("FSNull")]]// + //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]// <<else>> //[[Withdraw|Future Society][$arcologies[0].FSNull -= 15, $FSCredits += 1]]// <</if>> @@ -1144,7 +1144,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSNull != "unset">> <br>''You are permitting <<if $arcologies[0].FSNull <= 20>>basic<<elseif $arcologies[0].FSNull <= 40>>considerable<<elseif $arcologies[0].FSNull <= 60>>great<<elseif $arcologies[0].FSNull <= 80>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology. <<if $arcologies[0].FSNull <= 20>> - //[[Abandon|Future Society][removeFS("FSNull")]]// + //[[Abandon|Future Society][FutureSocieties.remove("FSNull")]]// <<else>> //[[Withdraw|Future Society][$arcologies[0].FSNull -= 20, $FSCredits += 1]]// <</if>> diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index 6aabb016be8fec2a20487c172c056891f3ead47f..cc6aad833f56b3774849a3092e0b98d505d63d56 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -782,7 +782,7 @@ On formal occasions, you are announced as $PCTitle. <<if $eugenicsFullControl != 1>> <<if $failedElite > 300>> The Societal Elite @@.red;have departed from your arcology in disgust@@. - <<run removeFS("FSRestart")>> + <<run FutureSocieties.remove("FSRestart")>> <<run repX(-10000, "event")>> <<set $eliteFail = random(30,100), $eliteFailTimer = 15>>