diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 419284878d70ba628235d22ffbdb5559b649b8c9..09ab6c1564a75a1033097e892e32d7c951d0cffa 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -1352,6 +1352,12 @@ window.FacilityDatatypeCleanup = (function() {
ClubDatatypeCleanup();
ServantsQuartersDatatypeCleanup();
SchoolroomDatatypeCleanup();
+ SpaDatatypeCleanup();
+ ClinicDatatypeCleanup();
+ ArcadeDatatypeCleanup();
+ CellblockDatatypeCleanup();
+ MasterSuiteDatatypeCleanup();
+ HeadGirlSuiteDatatypeCleanup();
}
function FacilityIDArrayCleanup() {
@@ -1401,8 +1407,6 @@ window.FacilityDatatypeCleanup = (function() {
V.nurseryDecoration = "standard";
if (typeof V.farmyardDecoration !== "string")
V.farmyardDecoration = "standard";
- if (typeof V.brothelDecoration !== "string")
- V.brothelDecoration = "standard";
}
function FacilityNameCleanup() {
@@ -1518,7 +1522,71 @@ window.FacilityDatatypeCleanup = (function() {
V.schoolroomUpgradeSkills = Math.clamp(+V.schoolroomUpgradeSkills, 0, 1) || 0;
V.schoolroomUpgradeLanguage = Math.clamp(+V.schoolroomUpgradeLanguage, 0, 1) || 0;
V.schoolroomUpgradeRemedial = Math.clamp(+V.schoolroomUpgradeRemedial, 0, 1) || 0;
- /* stewardess */
+ /* schoolteacher */
V.Schoolteacher = V.slaves.find(function(s) { return s.assignment === "be the Schoolteacher"; }) || 0;
}
+
+ function SpaDatatypeCleanup() {
+ /* upgrades */
+ V.spa = Math.max(+V.spa, 0) || 0;
+ V.spaUpgrade = Math.clamp(+V.spaUpgrade, 0, 1) || 0;
+ /* attendant */
+ V.Attendant = V.slaves.find(function(s) { return s.assignment === "be the Attendant"; }) || 0;
+ V.spaFix = Math.clamp(+V.spaFix, 0, 2) || 0;
+ }
+
+ function ClinicDatatypeCleanup() {
+ /* upgrades */
+ V.clinic = Math.max(+V.clinic, 0) || 0;
+ V.clinicUpgradeScanner = Math.clamp(+V.clinicUpgradeScanner, 0, 1) || 0;
+ V.clinicUpgradeFilters = Math.clamp(+V.clinicUpgradeFilters, 0, 1) || 0;
+ V.clinicUpgradePurge = Math.clamp(+V.clinicUpgradePurge, 0, 1) || 0;
+ V.clinicInflateBelly = Math.clamp(+V.clinicInflateBelly, 0, 1) || 0;
+ V.clinicSpeedGestation = Math.clamp(+V.clinicSpeedGestation, 0, 1) || 0;
+ /* nurse */
+ V.Nurse = V.slaves.find(function(s) { return s.assignment === "be the Nurse"; }) || 0;
+ }
+
+ function ArcadeDatatypeCleanup() {
+ /* upgrades */
+ V.arcade = Math.max(+V.arcade, 0) || 0;
+ V.arcadeUpgradeInjectors = Math.clamp(+V.arcadeUpgradeInjectors, 0, 1) || 0;
+ V.arcadeUpgradeCollectors = Math.clamp(+V.arcadeUpgradeCollectors, 0, 1) || 0;
+ V.arcadeUpgradeMenials = Math.clamp(+V.arcadeUpgradeMenials, 0, 1) || 0;
+ V.arcadeUpgradeFuckdolls = Math.clamp(+V.arcadeUpgradeFuckdolls, 0, 1) || 0;
+ }
+
+ function CellblockDatatypeCleanup() {
+ /* upgrades */
+ V.cellblock = Math.max(+V.cellblock, 0) || 0;
+ V.cellblockUpgrade = Math.clamp(+V.cellblockUpgrade, 0, 1) || 0;
+ /* wardeness */
+ V.Wardeness = V.slaves.find(function(s) { return s.assignment === "be the Wardeness"; }) || 0;
+ V.cellblockWardenCumsInside = Math.clamp(+V.cellblockWardenCumsInside, 0, 1) || 0;
+ }
+
+ function MasterSuiteDatatypeCleanup() {
+ /* upgrades */
+ V.masterSuite = Math.max(+V.masterSuite, 0) || 0;
+ V.masterSuiteUpgradeLuxury = Math.clamp(+V.masterSuiteUpgradeLuxury, 0, 2) || 0;
+ V.masterSuiteUpgradePregnancy = Math.clamp(+V.masterSuiteUpgradePregnancy, 0, 1) || 0;
+ V.masterSuitePregnancyFertilitySupplements = Math.clamp(+V.masterSuitePregnancyFertilitySupplements, 0, 1) || 0;
+ V.masterSuitePregnancySlaveLuxuries = Math.clamp(+V.masterSuitePregnancySlaveLuxuries, 0, 1) || 0;
+ V.masterSuitePregnancyFertilityDrugs = Math.clamp(+V.masterSuitePregnancyFertilityDrugs, 0, 1) || 0;
+ V.masterSuiteHyperPregnancy = Math.clamp(+V.masterSuiteHyperPregnancy, 0, 1) || 0;
+ /* concubine */
+ V.Concubine = V.slaves.find(function(s) { return s.assignment === "be your Concubine"; }) || 0;
+ }
+
+ function HeadGirlSuiteDatatypeCleanup(){
+ /* headgirl */
+ V.HeadGirl = V.slaves.find(function(s) { return s.assignment === "be your Head Girl"; }) || 0;
+ V.HGSuiteEquality = Math.clamp(+V.HGSuiteEquality, 0, 1) || 0;
+ if (V.HGSuiteSurgery !== 0)
+ V.HGSuiteSurgery = 1;
+ if (V.HGSuiteDrugs !== 0)
+ V.HGSuiteDrugs = 1;
+ if (V.HGSuiteHormones !== 0)
+ V.HGSuiteHormones = 1;
+ }
})();
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index fb4fbecc0b55c04621e5a24acd67a310a94b6e02..263690b8900362f859e5d75e56539a3098775389 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -533,9 +533,6 @@
<<if ndef $slaveDeath>>
<<set $slaveDeath = 0>>
<</if>>
-<<if ndef $clinicInflateBelly>>
- <<set $clinicInflateBelly = 0>>
-<</if>>
<<if ndef $playerBred>>
<<set $playerBred = 0>>
<</if>>
@@ -590,9 +587,6 @@
<<if ndef $pregSpeedControl>>
<<set $pregSpeedControl = 0>>
<</if>>
-<<if ndef $clinicSpeedGestation>>
- <<set $clinicSpeedGestation = 0>>
-<</if>>
<<if ndef $playerSurgery>>
<<set $playerSurgery = 0>>
<</if>>
@@ -641,18 +635,6 @@
<<if ndef $freshPC>>
<<set $freshPC = 0>>
<</if>>
-<<if ndef $dairyHyperPregRemodel>>
- <<set $dairyHyperPregRemodel = 0>>
-<</if>>
-<<if ndef $dairyWeightSetting>>
- <<set $dairyWeightSetting = 0>>
-<</if>>
-<<if ndef $dairyImplantsSetting>>
- <<set $dairyImplantsSetting = 1>>
-<</if>>
-<<if ndef $spaFix>>
- <<set $spaFix = 0>>
-<</if>>
<<if ndef $incubator>>
<<set $incubator = 0>>
<</if>>
@@ -890,12 +872,6 @@
<<unset $boughtTigers>>
<</if>>
-<<if ndef $clinicUpgradePurge>>
- <<set $clinicUpgradePurge = 0>>
-<</if>>
-<<if ndef $masterSuiteHyperPregnancy>>
- <<set $masterSuiteHyperPregnancy = 0>>
-<</if>>
<<if ndef $legendaryWombID>>
<<set $legendaryWombID = 0>>
<</if>>
@@ -1720,7 +1696,7 @@ Setting missing global variables:
<<set $terrain = "rural">>
<</if>>
-<<if ndef nicaeaAnnounceable>>
+<<if ndef $nicaeaAnnounceable>>
<<set $nicaeaAnnounceable = 0>>
<</if>>
<<if ndef $nicaeaAnnounced>>
@@ -1779,49 +1755,11 @@ Setting missing global variables:
<<if ndef $clinicSlaves>>
<<set $clinicSlaves = 0>>
<</if>>
-<<if ndef $clinic>>
- <<set $clinic = 0>>
-<</if>>
-<<if ndef $clinicUpgradeFilters>>
- <<set $clinicUpgradeFilters = 0>>
-<</if>>
-<<if ndef $clinicUpgradeScanner>>
- <<set $clinicUpgradeScanner = 0>>
-<</if>>
-<<if ndef $cellblockWardenCumsInside>>
- <<set $cellblockWardenCumsInside = 0>>
-<</if>>
-
-<<if ndef $masterSuiteUpgradePregnancy>>
- <<set $masterSuiteUpgradePregnancy = 0>>
-<</if>>
-<<if ndef $masterSuitePregnancyFertilityDrugs>>
- <<set $masterSuitePregnancyFertilityDrugs = 0>>
-<</if>>
-<<if ndef $masterSuitePregnancyFertilitySupplements>>
- <<set $masterSuitePregnancyFertilitySupplements = 0>>
-<</if>>
-<<if ndef $masterSuitePregnancySlaveLuxuries>>
- <<set $masterSuitePregnancySlaveLuxuries = 0>>
-<</if>>
<<if ndef $universalHGImpregnateMasterSuiteToggle>>
<<set $universalHGImpregnateMasterSuiteToggle = 0>>
<</if>>
-<<if ndef $HGSuiteSurgery>>
- <<set $HGSuiteSurgery = 1>>
-<</if>>
-<<if ndef $HGSuiteDrugs>>
- <<set $HGSuiteDrugs = 1>>
-<</if>>
-<<if ndef $HGSuiteHormones>>
- <<set $HGSuiteHormones = 1>>
-<</if>>
-<<if ndef $HGSuiteEquality>>
- <<set $HGSuiteEquality = 0>>
-<</if>>
-
<<run FacilityDatatypeCleanup()>>
<<if ndef $fighterIDs>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index d9e8b8334493485f29d53c8f1fd053b07ae57df6..08548d45513f8c0af160151ef6c17c10c63dc0ff 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -67,7 +67,7 @@ $arcadeNameCaps
<<else>>
It's empty and quiet.
<<link "Decommission the arcade" "Main">>
- <<set $arcade = 0, $arcadeUpgradeInjectors = 0, $arcadeUpgradeFuckdolls = 0, $arcadeUpgradeCollectors = 0>>
+ <<set $arcade = 0, $arcadeUpgradeInjectors = 0, $arcadeUpgradeFuckdolls = 0, $arcadeUpgradeMenials = 0, $arcadeUpgradeCollectors = 0>>
<<set _arc = $sectors.findIndex(function(s) { return s.type == "Arcade"; })>>
<<if _arc != -1>>
<<set $sectors[_arc].type = "Markets">>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index f772a4ddeab0fe4caa634f93420b270bea538f7c..886f5c8886d5ffc4deea3332adf6611619d41608 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -104,7 +104,7 @@ $clinicNameCaps
The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. The blood is intensely cleaned to greatly decrease the presence of impurities at the cost of compatibility. Patients will likely be ill for the duration of the treatment.
<<else>>
<<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology)>>
- The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3), "capEx"), $clinicUpgradePurge to 1]] //Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves//
+ The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3), "capEx"), $clinicUpgradePurge = 1]] //Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves//
<</if>>
<<if $Nurse == 0>>
<br>However, without a nurse in attendance, the @@.yellow;blood treatment equipment remains idle.@@