From 3a7e624b1e6852aef626ebc022eec7841da52b5b Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 31 May 2018 02:24:53 -0400
Subject: [PATCH] fixes and mass slave removal
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 +++
src/pregmod/newChildIntro.tw | 2 +-
src/pregmod/widgets/pregmodWidgets.tw | 54 ++++++++++++++++++++
src/uncategorized/arcade.tw | 20 ++++++--
src/uncategorized/brothel.tw | 24 +++++++--
src/uncategorized/cellblock.tw | 16 ++++++
src/uncategorized/clinic.tw | 16 ++++++
src/uncategorized/club.tw | 24 +++++++--
src/uncategorized/dairy.tw | 24 +++++++--
src/uncategorized/masterSuite.tw | 16 ++++++
src/uncategorized/pit.tw | 7 ++-
src/uncategorized/schoolroom.tw | 17 ++++++
src/uncategorized/servantsQuarters.tw | 16 ++++++
src/uncategorized/spa.tw | 16 ++++++
14 files changed, 233 insertions(+), 25 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 956fc2dca40..a81b9a78062 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.1-0.3.x
+5/31/2018
+
+ 3
+ -remove all slaves facility option
+ -BC now properly applies pronouns to hero slaves
+
5/30/2018
2
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index c7c5453917a..653ec887603 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -244,7 +244,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<else>>
alone, having no family<<if $activeSlave.mother == -1 || $activeSlave.father == -1>>, other than you,<</if>> in your stock.
<</if>>
-<<if $arcologies[0].FSRestartDecoration == 100>>
+<<if $arcologies[0].FSRestartDecoration == 100 && def _tempMom>>
<<if _tempMom.breedingMark == 1>>
The Societal Elite are waiting to inspect the child of their eugenics programs.
<<if $arcologies[0].FSSupremacist > 20 && $activeSlave.race != $arcologies[0].FSSupremacistRace>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 9179d7cd030..a7fca1dc21a 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1326,5 +1326,59 @@ extremely pale -5
|| setup.surnamePoolSelector[s.nationality]
|| setup.whiteAmericanSlaveSurnames).random();
}
+ if(!s.pronoun) {
+ if(s.fuckdoll) {
+ s.pronoun = "it";
+ } else if(s.dick && s.vagina == -1 && State.variables.diversePronouns == 1) {
+ s.pronoun = "he";
+ } else {
+ s.pronoun = "she";
+ }
+ }
+ if(!s.possessivePronoun) {
+ if(s.fuckdoll) {
+ s.possessivePronoun = "its";
+ } else if(s.dick && s.vagina == -1 && State.variables.diversePronouns == 1) {
+ s.possessivePronoun = "his";
+ } else {
+ s.possessivePronoun = "hers";
+ }
+ }
+ if(!s.possessive) {
+ if(s.fuckdoll) {
+ s.possessive = "its";
+ } else if(s.dick && s.vagina == -1 && State.variables.diversePronouns == 1) {
+ s.possessive = "his";
+ } else {
+ s.possessive = "her";
+ }
+ }
+ if(!s.object) {
+ if(s.fuckdoll) {
+ s.object = "it";
+ } else if(s.dick && s.vagina == -1 && State.variables.diversePronouns == 1) {
+ s.object = "him";
+ } else {
+ s.object = "her";
+ }
+ }
+ if(!s.objectReflexive) {
+ if(s.fuckdoll) {
+ s.objectReflexive = "itself";
+ } else if(s.dick && s.vagina == -1 && State.variables.diversePronouns == 1) {
+ s.objectReflexive = "himself";
+ } else {
+ s.objectReflexive = "herself";
+ }
+ }
+ if(!s.noun) {
+ if(s.fuckdoll) {
+ s.noun = "toy";
+ } else if(s.dick && s.vagina == -1 && State.variables.diversePronouns == 1) {
+ s.noun = "boy";
+ } else {
+ s.noun = "girl";
+ }
+ }
})>>
<</widget>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 2d754758b96..8ff694c94ba 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -66,15 +66,25 @@ $arcadeNameCaps
It's understaffed; there are lines here and there for the few holes available.
<<else>>
It's empty and quiet.
- <<link "Decommission the arcade">>
+ <<link "Decommission the arcade" "Main">>
<<set $arcade = 0, $arcadeUpgradeInjectors = 0, $arcadeUpgradeFuckdolls = 0, $arcadeUpgradeCollectors = 0>>
- <<for _i = 0; _i < $sectors.length; _i++>>
- <<if $sectors[_i].type == "Arcade">>
- <<set $sectors[_i].type = "Markets">><<break>>
+ <<set _arc = $sectors.findIndex(function(s) { return s.type == "Arcade"; })>>
+ <<if _arc != -1>>
+ <<set $sectors[_arc].type = "Markets">>
<</if>>
+ <</link>>
+<</if>>
+
+<<if $arcadeSlaves > 0>>
+ <<set _NewPop = $arcadeSlaves+$dormitoryPopulation>>
+ <<link "Remove all slaves" "Arcade">>
+ <<for $arcadeSlaves > 0>>
+ <<assignJob $slaves[$slaveIndices[$ArcadeiIDs[0]]] "work a glory hole">>
<</for>>
- <<goto "Main">>
<</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red;Dormitory capacity will be exceeded.@@
+ <</if>>
<</if>>
<br>It can support $arcade inmates. Currently $arcadeSlaves <<if $arcadeSlaves == 1>>slave is<<else>>slaves are<</if>> incarcerated.
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index d5e89c1fcbf..ba713647ab0 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -134,15 +134,29 @@ $brothelNameCaps
$Madam.slaveName is alone in $brothelName, and has nothing to do but keep the place clean and plan future sales efforts.
<<else>>
$brothelNameCaps is empty and desolate.
- <<link "Decommission the brothel">>
+ <<link "Decommission the brothel" "Main">>
<<set $brothel = 0, $brothelUpgradeDrugs = 0, $brothelDecoration = "standard">>
- <<for _i = 0; _i < $sectors.length; _i++>>
- <<if $sectors[_i].type == "Brothel">>
- <<set $sectors[_i].type = "Shops">><<break>>
+ <<set _broth = $sectors.findIndex(function(s) { return s.type == "Brothel"; })>>
+ <<if _broth != -1>>
+ <<set $sectors[_broth].type = "Shops">>
<</if>>
+ <</link>>
+<</if>>
+
+<<if $brothelSlaves > 0>>
+ <<if $Madam != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
+ <<set _NewPop = $brothelSlaves+$dormitoryPopulation+_X>>
+ <<link "Remove all slaves" "Brothel">>
+ <<if $Madam != 0>>
+ <<assignJob $Madam "rest">>
+ <</if>>
+ <<for $brothelSlaves > 0>>
+ <<assignJob $slaves[$slaveIndices[$BrothiIDs[0]]] "whore">>
<</for>>
- <<goto "Main">>
<</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red;Dormitory capacity will be exceeded.@@
+ <</if>>
<</if>>
<<set _Tmult0 = Math.trunc($brothel*1000*$upgradeMultiplierArcology)>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index a9a92d60336..bfc18c7395a 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -70,6 +70,22 @@ $cellblockNameCaps
None of your slaves are confined in the cellblock. [[Decommission the cellblock|Main][$cellblock = 0, $cellblockDecoration = "standard", $cellblockUpgrade = 0]]
<</if>>
+<<if $cellblockSlaves > 0>>
+ <<if $Wardeness != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
+ <<set _NewPop = $cellblockSlaves+$dormitoryPopulation+_X>>
+ <<link "Remove all slaves" "Cellblock">>
+ <<if $Wardeness != 0>>
+ <<assignJob $Wardeness "rest">>
+ <</if>>
+ <<for $cellblockSlaves > 0>>
+ <<assignJob $slaves[$slaveIndices[$CellBiIDs[0]]] "stay confined">>
+ <</for>>
+ <</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red;Dormitory capacity will be exceeded.@@
+ <</if>>
+<</if>>
+
<<set _Tmult0 = Math.trunc($cellblock*1000*$upgradeMultiplierArcology)>>
<br>$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement. Currently $cellblockSlaves <<if $cellblockSlaves == 1>>is<<else>>are<</if>> kept in close confinement.
[[Expand the cellblock|Cellblock][$cash -= _Tmult0, $cellblock += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 3f38e1aa299..86f76f53f56 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -70,6 +70,22 @@ $clinicNameCaps
$clinicNameCaps is empty and quiet. [[Decommission the Clinic|Main][$clinic = 0, $clinicDecoration = "standard", $clinicUpgradeScanner = 0, $clinicUpgradeFilters = 0, $clinicUpgradePurge = 0, $clinicInflateBelly = 0, $clinicSpeedGestation = 0]]
<</if>>
+<<if $clinicSlaves > 0>>
+ <<if $Nurse != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
+ <<set _NewPop = $clinicSlaves+$dormitoryPopulation+_X>>
+ <<link "Remove all slaves" "Clinic">>
+ <<if $Nurse != 0>>
+ <<assignJob $Nurse "rest">>
+ <</if>>
+ <<for $clinicSlaves > 0>>
+ <<assignJob $slaves[$slaveIndices[$CliniciIDs[0]]] "rest">>
+ <</for>>
+ <</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red;Dormitory capacity will be exceeded.@@
+ <</if>>
+<</if>>
+
<<set _Tmult0 = Math.trunc($clinic*1000*$upgradeMultiplierArcology)>>
<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment. Currently $clinicSlaves slave<<if $clinicSlaves == 1>> is<<else>>s are<</if>> receiving treatment.
[[Expand the clinic|Clinic][$cash -= _Tmult0, $clinic += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 3ad8e202203..59e3a8b4d92 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -134,15 +134,29 @@ $clubNameCaps
$clubNameCaps is doing business normally, without a complement of sex slaves to spice things up. $DJ.slaveName is alone in $clubName, and can accomplish little by herself.
<<else>>
$clubNameCaps is doing business normally, without a complement of sex slaves to spice things up.
- <<link "Decommission the club">>
+ <<link "Decommission the club" "Main">>
<<set $club = 0, $clubDecoration = "standard", $clubUpgradePDAs = 0>>
- <<for _i = 0; _i < $sectors.length; _i++>>
- <<if $sectors[_i].type == "Club">>
- <<set $sectors[_i].type = "Shops">><<break>>
+ <<set _club = $sectors.findIndex(function(s) { return s.type == "Club"; })>>
+ <<if _club != -1>>
+ <<set $sectors[_club].type = "Shops">>
<</if>>
+ <</link>>
+<</if>>
+
+<<if $clubSlaves > 0>>
+ <<if $DJ != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
+ <<set _NewPop = $clubSlaves+$dormitoryPopulation+_X>>
+ <<link "Remove all slaves" "Club">>
+ <<if $DJ != 0>>
+ <<assignJob $DJ "rest">>
+ <</if>>
+ <<for $clubSlaves > 0>>
+ <<assignJob $slaves[$slaveIndices[$ClubiIDs[0]]] "serve the public">>
<</for>>
- <<goto "Main">>
<</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red;Dormitory capacity will be exceeded.@@
+ <</if>>
<</if>>
<<if $clubSlaves > 2>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index e87656ad13f..89ed7378d28 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -295,15 +295,29 @@ $dairyNameCaps
$Milkmaid.slaveName is alone in $dairyName, and has nothing to do but clean and maintain the equipment.
<<else>>
$dairyNameCaps is empty and desolate.
- <<link "Decommission the dairy">>
+ <<link "Decommission the dairy" "Main">>
<<set $dairy = 0, $dairyFeedersUpgrade = 0, $dairyPregUpgrade = 0, $dairyStimulatorsUpgrade = 0, $dairyDecoration = "standard", $dairyFeedersSetting = 0, $dairyPregSetting = 0, $dairyStimulatorsSetting = 0, $dairyHyperPregRemodel = 0, $cumPipeline = 0, $milkPipeline = 0>>
- <<for _i = 0; _i < $sectors.length; _i++>>
- <<if $sectors[_i].type == "Dairy">>
- <<set $sectors[_i].type = "Manufacturing">><<break>>
+ <<set _dai = $sectors.findIndex(function(s) { return s.type == "Dairy"; })>>
+ <<if _dai != -1>>
+ <<set $sectors[_dai].type = "Manufacturing">>
<</if>>
+ <</link>>
+<</if>>
+
+<<if $dairySlaves > 0>>
+ <<if $Milkmaid != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
+ <<set _NewPop = $dairySlaves+$dormitoryPopulation+_X>>
+ <<link "Remove all slaves" "Dairy">>
+ <<if $Milkmaid != 0>>
+ <<assignJob $Milkmaid "rest">>
+ <</if>>
+ <<for $dairySlaves > 0>>
+ <<assignJob $slaves[$slaveIndices[$DairyiIDs[0]]] "get milked">>
<</for>>
- <<goto "Main">>
<</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red/Dormitory capacity will be exceeded.@@
+ <</if>>
<</if>>
<<set _Tmult0 = Math.trunc($dairy*1000*$upgradeMultiplierArcology)>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 269403b8577..4e257d325d9 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -301,6 +301,22 @@ $masterSuiteNameCaps is furnished
|[[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]]
<</if>>
+<<if $masterSuiteSlaves > 0>>
+ <<if $Concubine != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
+ <<set _NewPop = $masterSuiteSlaves+$dormitoryPopulation+_X>>
+ <<link "Remove all slaves" "Master Suite">>
+ <<if $Concubine != 0>>
+ <<assignJob $Concubine "rest">>
+ <</if>>
+ <<for $masterSuiteSlaves > 0>>
+ <<assignJob $slaves[$slaveIndices[$MastSiIDs[0]]] "please you">>
+ <</for>>
+ <</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red;Dormitory capacity will be exceeded.@@
+ <</if>>
+<</if>>
+
<<if $seePreg != 0>>
<br>
<<if $masterSuiteUpgradePregnancy == 1>>
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index a7ed7075f8c..f80f632db38 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -20,11 +20,10 @@ $pitNameCaps is clean and ready,
but no slaves are assigned to fight.
<<link "Decommission the pit" "Main">>
<<set $pit = 0>>
- <<for _i = 0; _i < $sectors.length; _i++>>
- <<if $sectors[_i].type == "Pit">>
- <<set $sectors[_i].type = "Markets">><<break>>
+ <<set _pit = $sectors.findIndex(function(s) { return s.type == "Pit"; })>>
+ <<if _pit != -1>>
+ <<set $sectors[_pit].type = "Markets">>
<</if>>
- <</for>>
<</link>>
<</if>>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index f059045f2a8..9cbed24404a 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -70,6 +70,23 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
None of your slaves are learning in $schoolroomName.
[[Decommission the schoolroom|Main][$schoolroom = 0, $schoolroomUpgradeSkills = 0, $schoolroomUpgradeLanguage = 0, $schoolroomUpgradeRemedial = 0, $schoolroomDecoration = "standard"]]
<</if>>
+
+<<if $schoolroomSlaves > 0>>
+ <<if $Schoolteacher != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
+ <<set _NewPop = $schoolroomSlaves+$dormitoryPopulation+_X>>
+ <<link "Remove all slaves" "Schoolroom">>
+ <<if $Schoolteacher != 0>>
+ <<assignJob $Schoolteacher "rest">>
+ <</if>>
+ <<for $schoolroomSlaves > 0>>
+ <<assignJob $slaves[$slaveIndices[$SchlRiIDs[0]]] "take classes">>
+ <</for>>
+ <</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red;Dormitory capacity will be exceeded.@@
+ <</if>>
+<</if>>
+
<<set _Tmult0 = Math.trunc($schoolroom*1000*$upgradeMultiplierArcology)>>
<br>$schoolroomNameCaps has room to house $schoolroom slaves while they learn. Currently $schoolroomSlaves <<if $schoolroomSlaves == 1>>is<<else>>are<</if>> learning.
[[Expand the schoolroom|Schoolroom][$cash -= _Tmult0, $schoolroom += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 94ffaaf0900..8a4a600f89d 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -70,6 +70,22 @@ $servantsQuartersNameCaps
None of your slaves are working out of the servants' quarters. [[Decommission the quarters|Main][$servantsQuarters = 0, $servantsQuartersUpgradeMonitoring = 0, $servantsQuartersDecoration = "standard"]]
<</if>>
+<<if $servantsQuartersSlaves > 0>>
+ <<if $Stewardess != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
+ <<set _NewPop = $servantsQuartersSlaves+$dormitoryPopulation+_X>>
+ <<link "Remove all slaves" "Servants' Quarters">>
+ <<if $Schoolteacher != 0>>
+ <<assignJob $Stewardess "rest">>
+ <</if>>
+ <<for $servantsQuartersSlaves > 0>>
+ <<assignJob $slaves[$slaveIndices[$ServQiIDs[0]]] "be a servant">>
+ <</for>>
+ <</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red;Dormitory capacity will be exceeded.@@
+ <</if>>
+<</if>>
+
<<set _Tmult0 = Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology)>>
<br>$servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve. Currently $servantsQuartersSlaves <<if $servantsQuartersSlaves == 1>>is<<else>>are<</if>> serving.
[[Expand the Servants' Quarters|Servants' Quarters][$cash -= _Tmult0, $servantsQuarters += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index a1e9050838d..f88279d6ef7 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -70,6 +70,22 @@ $spaNameCaps
It's empty and quiet. [[Decommission the Spa|Main][$spa = 0, $spaDecoration = "standard", $spaUpgrade = 0, $spaFix = 0]]
<</if>>
+<<if $spaSlaves > 0>>
+ <<if $Attendant != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
+ <<set _NewPop = $spaSlaves+$dormitoryPopulation+_X>>
+ <<link "Remove all slaves" "Spa">>
+ <<if $Attendant != 0>>
+ <<assignJob $Attendant "rest">>
+ <</if>>
+ <<for $spaSlaves > 0>>
+ <assignJob $slaves[$slaveIndices[$SpaiIDs[0]]] "rest">>
+ <</for>>
+ <</link>>
+ <<if _NewPop > $dormitory>>
+ @@.red;Dormitory capacity will be exceeded.@@
+ <</if>>
+<</if>>
+
<<set _Tmult0 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
<br>$spaNameCaps can house $spa slaves while they recuperate here. Currently $spaSlaves <<if $spaSlaves == 1>>is<<else>>are<</if>> recuperating.
[[Expand the spa|Spa][$cash -= _Tmult0, $spa += 5]] //Costs <<print cashFormat(_Tmult0)>>//
--
GitLab