From daa2eaba6ce02515e222cda550cf45f148ebde88 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 6 Jun 2021 00:52:53 -0400
Subject: [PATCH] remove old
---
devTools/types/FC/gameState.d.ts | 2 -
src/endWeek/nextWeek/resetGlobals.js | 1 -
src/uncategorized/randomNonindividualEvent.tw | 179 ------------------
src/uncategorized/reFSAcquisition.tw | 74 --------
4 files changed, 256 deletions(-)
delete mode 100644 src/uncategorized/reFSAcquisition.tw
diff --git a/devTools/types/FC/gameState.d.ts b/devTools/types/FC/gameState.d.ts
index 7a58b556a3b..e0521754444 100644
--- a/devTools/types/FC/gameState.d.ts
+++ b/devTools/types/FC/gameState.d.ts
@@ -65,8 +65,6 @@ declare namespace FC {
/** @deprecated */
PETSevent: string[];
/** @deprecated */
- FSAcquisitionEvents: string[];
- /** @deprecated */
FSNonconformistEvents: string[];
/** @deprecated */
rebelSlaves: string[];
diff --git a/src/endWeek/nextWeek/resetGlobals.js b/src/endWeek/nextWeek/resetGlobals.js
index 8f37de1191f..4fe6e819515 100644
--- a/src/endWeek/nextWeek/resetGlobals.js
+++ b/src/endWeek/nextWeek/resetGlobals.js
@@ -24,7 +24,6 @@ App.EndWeek.resetGlobals = function() {
V.REFSevent = [];
V.PESSevent = [];
V.PETSevent = [];
- V.FSAcquisitionEvents = [];
V.FSNonconformistEvents = [];
V.REButtholeCheckinIDs = [];
V.recruit = [];
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 246dd0b9ab7..c9b7e68c674 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -383,185 +383,6 @@
<<set $RecETSevent.push("addict mother daughter")>>
<</if>>
- <<if $FSAnnounced == 1>>
- <<set $FSAcquisitionEvents = []>>
- <<if $arcologies[0].FSGenderRadicalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Gender Radicalist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSRestart > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Eugenics")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $seePreg != 0>>
- <<if $arcologies[0].FSGenderFundamentalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Gender Fundamentalist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <</if>>
- <<if $arcologies[0].FSPaternalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Paternalist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSDegradationist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Degradationist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSIntellectualDependency > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Intellectual Dependency")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSSlaveProfessionalism > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Slave Professionalism")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSBodyPurist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Body Purist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSTransformationFetishist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Transformation Fetishist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSPetiteAdmiration > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Petite Admiration")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSStatuesqueGlorification > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Statuesque Glorification")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSYouthPreferentialist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Youth Preferentialist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSMaturityPreferentialist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Maturity Preferentialist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSSlimnessEnthusiast > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Slimness Enthusiast")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSAssetExpansionist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Asset Expansionist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSPhysicalIdealist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Physical Idealist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSHedonisticDecadence > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Hedonistic Decadence")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSChattelReligionist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Chattel Religionist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSGenderRadicalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Gender Radicalist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $seePreg != 0>>
- <<if $arcologies[0].FSGenderFundamentalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Gender Fundamentalist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <</if>>
- <<if $arcologies[0].FSPaternalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Paternalist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSDegradationist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Degradationist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSIntellectualDependency > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Intellectual Dependency Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSSlaveProfessionalism > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Slave Professionalism Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSBodyPurist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Body Purist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSTransformationFetishist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Transformation Fetishist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSPetiteAdmiration > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Petite Admiration Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSStatuesqueGlorification > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Statuesque Glorification Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSYouthPreferentialist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Youth Preferentialist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSMaturityPreferentialist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Maturity Preferentialist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSSlimnessEnthusiast > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Slimness Enthusiast Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSAssetExpansionist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Asset Expansionist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSPhysicalIdealist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Physical Idealist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSHedonisticDecadence > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Hedonistic Decadence Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSChattelReligionist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Chattel Religionist Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSRestart > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Eugenics Two")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSRomanRevivalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Roman Revivalist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSNeoImperialist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Neo Imperialist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSAztecRevivalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Aztec Revivalist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSEdoRevivalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Edo Revivalist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSArabianRevivalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Arabian Revivalist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSChineseRevivalist > (random(1,100) || _oneIfDebug)>>
- <<set $FSAcquisitionEvents.push("Chinese Revivalist")>>
- <<set _recruitEvents.push("RE FS acquisition")>>
- <</if>>
- <<if $arcologies[0].FSEgyptianRevivalist > (random(1,100) || _oneIfDebug)>>
- <<set _recruitEvents.push("RE FSEgyptianRevivalist acquisition")>>
- <</if>>
- <</if>>
-
<<if $justiceEvents.length > 0>>
<<if ($seeExtreme == 0) || ($seeDicks == 0)>>
<<set $justiceEvents.delete("slave training")>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
deleted file mode 100644
index f539d8c19d8..00000000000
--- a/src/uncategorized/reFSAcquisition.tw
+++ /dev/null
@@ -1,74 +0,0 @@
-:: RE FS acquisition [nobr]
-
-<<if Array.isArray($FSAcquisitionEvents)>>
- <<if $debugMode > 0 && $debugModeEventSelection > 0>>
- <<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
- ''A random FS acquisition event would have been selected from the following:''
- <br>
- <<for _i = 0; _i < $FSAcquisitionEvents.length; _i++>>
- <<print "[[$FSAcquisitionEvents[_i]|RE FS acquisition][$FSAcquisitionEvents = $FSAcquisitionEvents[" + _i + "]]]">>
- <br>
- <</for>>
- <br><br>[[Go Back to Random Nonindividual Event|Random Nonindividual Event][$eventSlave = 0]]
- <<else>>
- <<set $FSAcquisitionEvents = $FSAcquisitionEvents.random()>>
- <<goto "RE FS acquisition">>
- <</if>>
-<<else>>
-
-<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check", $encyclopedia = "Enslaving People">>
-
-<<switch $FSAcquisitionEvents>>
-
-<<case "Chinese Revivalist">>
- <<set _ContractCost = 1000>>
-
- <<set _slaveCost = slaveCost(_slave)>>
- <<set _slaveCost -= 1000>>
-<</switch>>
-
-<<run App.Utils.setLocalPronouns(_slave)>>
-<<run Enunciate(_slave)>>
-<<setPlayerPronouns>>
-<<setAssistantPronouns>>
-
-<<switch $FSAcquisitionEvents>>
-<<case "Chinese Revivalist">>
-<</switch>>
-
-<br><br>
-
-<<includeDOM App.Desc.longSlave(_slave, {market: "generic"})>>
-
-<br><br>
-
-<span id="result">
-<<if $cash >= _ContractCost>>
-<<link "Enslave $him">>
- <<run cashX(forceNeg(_ContractCost), "slaveTransfer", _slave)>>
- <<replace "#result">>
- <<switch $FSAcquisitionEvents>>
- <<case "Chinese Revivalist">>
- <</switch>>
- <<includeDOM App.UI.newSlaveIntro(_slave)>>
- <</replace>>
-<</link>> //This will cost <<print cashFormat(_ContractCost)>>//
-<br><<link "Sell $him immediately">>
- <<run cashX(_slaveCost, "slaveTransfer")>>
- <<replace "#result">>
- <<switch $FSAcquisitionEvents>>
- <<case "Chinese Revivalist">>
- <</switch>>
- <</replace>>
-<</link>> //This will bring in <<print cashFormat(_slaveCost)>>//
-<<else>>
- //You lack the necessary funds to enslave $him.//
-<</if>>
-
-<<if $debugMode > 0 && $debugModeEventSelection > 0>>
- <br><br>DEBUG: [[Go back to Nonrandom Event|Nonrandom Event][_slave = 0, $eventSlave = 0]]
-<</if>>
-
-</span>
-
-<</if>>
--
GitLab