diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index acef3c5e7096396b0dbb83dccacc424be580277e..57a78fd95acd336b011d65ae777ad85403400d4d 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -1,6 +1,16 @@
Pregmod
-0.10.7.1-1.1.x
+0.10.7.1-1.2.x
+
+12/02/2018
+
+ 0
+ -added universal rule to send children to the repop breeder school if available
+ -added universal rule to automatically decide the fate of born children
+ -hormone balance now displayed in slave summary + other QoL changes
+ -fixes
+
+0.10.7.1-1.1.x
12/01/2018
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 3b1020843f7105dc5bcf8aff9b53901247153e96..3c539dbe44b666a9d8609affb02dc07446444c42 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1039,6 +1039,10 @@ window.removeFS = function(FS) {
arcology.FSChattelReligionistSMR = 0;
arcology.FSChattelReligionistCreed = 0;
break;
+ case "FSRepopulationFocus":
+ arcology[FSLaw] = 0;
+ arcology[FSSMR] = 0;
+ V.universalRulesChildrenBecomeBreeders = 0;
case "FSNull":
break;
default: /* all others have one law and one SMR */
@@ -15383,7 +15387,7 @@ window.DefaultRules = (function() {
} else if ((rule.growth_boobs == "no default setting" && rule.growth_butt == "no default setting" && rule.growth_lips == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_balls == "no default setting")) {
return;
}
- if (slave.assignmentVisible) { // More resource intensive version with prioritizing. Possible to give this a toggle rather than basing it on visibility.
+ if (!rule.hyper_drugs) { // More resource intensive version with prioritizing.
let _priorities = [];
if (rule.growth_boobs != "no default setting") {
let _priority;
@@ -15480,15 +15484,10 @@ window.DefaultRules = (function() {
return;
}
} else {
- let _hyper;
- if (V.arcologies[0].FSAssetExpansionistResearch == 1)
- _hyper = "hyper ";
- else
- _hyper = "";
if (rule.growth_boobs != "no default setting") {
if (slave.boobs < rule.growth_boobs) {
- if (slave.drugs != _hyper + "breast injections") {
- slave.drugs = _hyper + "breast injections";
+ if (slave.drugs != "hyper breast injections") {
+ slave.drugs = "hyper breast injections";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -15496,8 +15495,8 @@ window.DefaultRules = (function() {
}
if (rule.growth_butt != "no default setting") {
if (slave.butt < rule.growth_butt) {
- if (slave.drugs != _hyper + "butt injections") {
- slave.drugs = _hyper + "butt injections";
+ if (slave.drugs != "hyper butt injections") {
+ slave.drugs = "hyper butt injections";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -15514,8 +15513,8 @@ window.DefaultRules = (function() {
}
if (rule.growth_dick != "no default setting" && slave.dick) {
if (slave.dick < rule.growth_dick) {
- if (slave.drugs != _hyper + "penis enhancement") {
- slave.drugs = _hyper + "penis enhancement";
+ if (slave.drugs != "hyper penis enhancement") {
+ slave.drugs = "hyper penis enhancement";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -15523,8 +15522,8 @@ window.DefaultRules = (function() {
}
if (rule.growth_balls != "no default setting" && slave.balls) {
if (slave.balls < rule.growth_balls) {
- if (slave.drugs != _hyper + "testicle enhancement") {
- slave.drugs = _hyper + "testicle enhancement";
+ if (slave.drugs != "hyper testicle enhancement") {
+ slave.drugs = "hyper testicle enhancement";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -16054,7 +16053,7 @@ window.DefaultRules = (function() {
slave.labor = 1;
slave.induce = 1;
V.birthee = 1;
- r += `<br>slave.slaveName is ready to birth, so her labor has been stimulated.`;
+ r += `<br>${slave.slaveName} is ready to birth, so her labor has been stimulated.`;
} else if (rule.pregSpeed == "fast" && slave.pregControl == "speed up" && slave.health <= -50) {
slave.pregControl = "none";
r += `<br>${slave.slaveName} is on rapid gestation agents and dangerously unhealthy, so her agent regimen has been stopped.`;
@@ -17790,6 +17789,8 @@ window.rulesAssistantOptions = (function() {
class RegimenSection extends Section {
constructor() {
super("Physical Regimen Settings");
+ if (V.arcologies[0].FSAssetExpansionistResearch === 1)
+ this.appendChild(new HyperGrowthSwitch());
this.appendChild(new GrowthList());
this.appendChild(new CurrativesList());
this.appendChild(new AphrodisiacList());
@@ -18284,6 +18285,18 @@ window.rulesAssistantOptions = (function() {
}
}
+ class HyperGrowthSwitch extends List {
+ constructor() {
+ const pairs = [
+ ["No", 0],
+ ["Yes", 1],
+ ];
+ super("Use hyper growth drugs", pairs, true);
+ this.setValue(current_rule.set.hyper_drugs);
+ this.onchange = (value) => current_rule.set.hyper_drugs = value;
+ }
+ }
+
class GrowthList extends Options {
constructor() {
super();
@@ -21588,6 +21601,51 @@ window.SlaveSummaryUncached = (function(){
r += `Branded.`;
r += `</span>`;
}
+ if (V.abbreviateHormoneBalance === 1) {
+ if (slave.hormoneBalance <= -21) {
+ r += `<span class="deepskyblue">`;
+ r += ` <strong>HB:M</strong>`;
+ } else if (slave.hormoneBalance <= 20) {
+ r += `<span class="pink">`;
+ r += ` <strong>HB:N</strong>`;
+ } else if (slave.hormoneBalance <= 500) {
+ r += `<span class="pink">`;
+ r += ` <strong>HB:F</strong>`;
+ }
+ r += `</span>`;
+ } else if (V.abbreviateHormoneBalance === 2) {
+ r += `<span class="`;
+ if (slave.hormoneBalance <= -21) {
+ r += `deepskyblue`;
+ } else {
+ r += `pink`;
+ }
+ r += `">`;
+ if (slave.hormoneBalance < -400) {
+ r += `Overwhelmingly masculine`;
+ } else if (slave.hormoneBalance <= -300) {
+ r += `Extremely masculine`;
+ } else if (slave.hormoneBalance <= -200) {
+ r += `Heavily masculine`;
+ } else if (slave.hormoneBalance <= -100) {
+ r += `Very masculine`;
+ } else if (slave.hormoneBalance <= -21) {
+ r += `Masculine`;
+ } else if (slave.hormoneBalance <= 20) {
+ r += `Neutral`;
+ } else if (slave.hormoneBalance <= 99) {
+ r += `Feminine`;
+ } else if (slave.hormoneBalance <= 199) {
+ r += `Very feminine`;
+ } else if (slave.hormoneBalance <= 299) {
+ r += `Heavily feminine`;
+ } else if (slave.hormoneBalance <= 399) {
+ r += `Extremely feminine`;
+ } else if (slave.hormoneBalance <= 500) {
+ r += `Overwhelmingly feminine`;
+ }
+ r += ` hormone balance.</span>`;
+ }
r += `<br>`;
if (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1)
r += ` `;
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 496a76ecfa86de992a454eb511a7d0fa4e375c4c..195acf495bd5a5b25ca3d6ae21f6b4e2665bfd28 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -130,7 +130,7 @@
<hr>
<<if $attackType == "raiders">>
- Today, the _day of _month _year, our arcology was attacked by a band of wild raiders, $attackTroops men strong.
+ Today, the _day of _month _year, our arcology was attacked by a band of wild raiders, <<print commaNum($attackTroops)>> men strong.
<<if $battleResult != 1 && $battleResult != 0 && $battleResult != -1>>
Our defense forces, <<print commaNum(Math.trunc($troopCount))>> strong, clashed with them
<<if $battleTerrain == "urban">>
@@ -192,7 +192,7 @@
You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls.
<</if>>
<<elseif $attackType == "free city">>
- Today, the _day of _month _year, our arcology was attacked by a contingent of mercenaries hired by a competing free city, $attackTroops men strong.
+ Today, the _day of _month _year, our arcology was attacked by a contingent of mercenaries hired by a competing free city, <<print commaNum($attackTroops)>> men strong.
<<if $battleResult != 1 && $battleResult != 0 && $battleResult != -1>>
Our defense forces, $troopCount strong, clashed with them
<<if $battleTerrain == "urban">>
@@ -254,7 +254,7 @@
You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls.
<</if>>
<<elseif $attackType == "freedom fighters">>
- Today, the _day of _month _year, our arcology was attacked by a group of freedom fighters bent on the destruction of the institution of slavery, $attackTroops men strong.
+ Today, the _day of _month _year, our arcology was attacked by a group of freedom fighters bent on the destruction of the institution of slavery, <<print commaNum($attackTroops)>> men strong.
<<if $battleResult != 1 && $battleResult != 0 && $battleResult != -1>>
Our defense forces, $troopCount strong, clashed with them
<<if $battleTerrain == "urban">>
@@ -316,7 +316,7 @@
You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls.
<</if>>
<<elseif $attackType == "old world">>
- Today, the _day of _month _year, our arcology was attacked by an old world nation boasting a misplaced sense of superiority, $attackTroops men strong.
+ Today, the _day of _month _year, our arcology was attacked by an old world nation boasting a misplaced sense of superiority, <<print commaNum($attackTroops)>> men strong.
<<if $battleResult != 1 && $battleResult != 0 && $battleResult != -1>>
Our defense forces, $troopCount strong, clashed with them
<<if $battleTerrain == "urban">>
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index 05b27294b6997bc1234b6e963e8e470e49b77ac6..29da0b465f1a8de9118513e799cb1e6e3135a400 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -300,11 +300,8 @@
<br>
<br>
<<set _loss = _lossesList.pluck()>>
- <<if _loss < $ACitizens + 100>>
- <<set $ACitizens -= _loss>>
- <<else>>
- <<set $ACitizens = 100>>
- <</if>>
+ <<if _loss > $ACitizens * 0.95>>
+ <<set _loss = Math.trunc($ACitizens * 0.95>> /* this is unlikely to happen, but might as well be safe*/
The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology:
<<if _loss <= 0>>
no casualties
@@ -318,6 +315,29 @@
catastrophic casualties
<</if>>
suffered.
+ <<if _loss > $lowerClass * 0.95>> /*I suspect only lower class ever get to fight/die, but being safe*/
+ <<set $lowerClass = Math.trunc($lowerClass * 0.05),
+ _loss -= $lowerClass * 0.95>>
+ <<if _loss > $middleClass * 0.95>>
+ <<set $middleClass = Math.trunc($middleClass * 0.05),
+ _loss -= $middleClass *0.95>>
+ <<if _loss > $upperClass * 0.95>>
+ <<set $upperClass = Math.trunc($upperClass * 0.05),
+ _loss -= $upperClass * 0.95>>
+ <<if _loss > $topClass * 0.95>>
+ <<set $topClass = Math.trunc($topClass * 0.05)>>
+ <<else>>
+ <<set $topClass -= _loss>>
+ <</if>>
+ <<else>>
+ <<set $upperClass -= _loss>>
+ <</if>>
+ <<else>>
+ <<set $middleClass -= _loss>>
+ <</if>>
+ <<else>>
+ <<set $lowerClass -= _loss>>
+ <</if>>
<</if>>
<<if $secBots.active == 1>>
<br>
diff --git a/src/art/assistantArt.tw b/src/art/assistantArt.tw
index 511da7a1d5aa2fe1ee03d4b0018a416d90118220..9cf48c515a66be3361f92a3e59068d1060b53e63 100644
--- a/src/art/assistantArt.tw
+++ b/src/art/assistantArt.tw
@@ -68,65 +68,63 @@ window.assistantArt = function assistantArt(sizePlacement) {
}
} else /* V.imageChoice === 0*/ {
fileName += "'resources/renders/assistant ";
- switch (V.assistantAppearance) {
- case "monstergirl":
- fileName += "monstergirl.png'";
- break;
- case "shemale":
- fileName += "shemale.png'";
- break;
- case "amazon":
- fileName += "amazon.png'";
- break;
- case "businesswoman":
- fileName += "businesswoman.png'";
- break;
- case "goddess":
- fileName += "goddess.png'";
- break;
- case "schoolgirl":
- fileName += "schoolgirl.png'";
- break;
- case "angel":
- fileName += "angel.png'";
- break;
- case "cherub":
- fileName += "cherub.png'";
- break;
- case "ERROR_1606_APPEARANCE_FILE_CORRUPT":
- fileName += "corrupt.png'";
- break;
- case "fairy":
- fileName += "fairy.png'";
- break;
- case "imp":
- fileName += "imp.png'";
- break;
- case "incubus":
- fileName += "incubus.png'";
- break;
- case "pregnant fairy":
- fileName += "pfairy.png'";
- break;
- case "succubus":
- fileName += "succubus.png'";
- break;
- case "witch":
- fileName += "witch.png'";
- break;
- default:
- fileName += "default.png'";
- }
+ switch (V.assistantAppearance) {
+ case "monstergirl":
+ fileName += "monstergirl.png'";
+ break;
+ case "shemale":
+ fileName += "shemale.png'";
+ break;
+ case "amazon":
+ fileName += "amazon.png'";
+ break;
+ case "businesswoman":
+ fileName += "businesswoman.png'";
+ break;
+ case "goddess":
+ fileName += "goddess.png'";
+ break;
+ case "schoolgirl":
+ fileName += "schoolgirl.png'";
+ break;
+ case "angel":
+ fileName += "angel.png'";
+ break;
+ case "cherub":
+ fileName += "cherub.png'";
+ break;
+ case "ERROR_1606_APPEARANCE_FILE_CORRUPT":
+ fileName += "corrupt.png'";
+ break;
+ case "fairy":
+ fileName += "fairy.png'";
+ break;
+ case "imp":
+ fileName += "imp.png'";
+ break;
+ case "incubus":
+ fileName += "incubus.png'";
+ break;
+ case "pregnant fairy":
+ fileName += "pfairy.png'";
+ break;
+ case "succubus":
+ fileName += "succubus.png'";
+ break;
+ case "witch":
+ fileName += "witch.png'";
+ break;
+ default:
+ fileName += "default.png'";
+ }
}
- if (filename !== "") {
- if (sizePlacement === 3) {
- fileName = `<img src=${fileName} style='float:right; border:3px hidden'/>`;
- } else if (V.imageChoice === 1) {
- fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='282' height='602'/>`;
- } else /* V.imageChoice === 0 */ {
- fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='300' height='300'/>`;
- }
+ if (sizePlacement === 3) {
+ fileName = `<img src=${fileName} style='float:right; border:3px hidden'/>`;
+ } else if (V.imageChoice === 1) {
+ fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='282' height='602'/>`;
+ } else /* V.imageChoice === 0 */ {
+ fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='300' height='300'/>`;
}
}
return fileName;
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index c4db02dbe760fa7cbf1ecbef0cb02910aadaa819..4816f14ef8921aa981936e9d7df57606ed2f9da0 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2628,7 +2628,7 @@ LORE: INTERVIEWS
<br>''Editoranon and Milkanon?'' for prison markets and the nursing handjob scene.
<br>''DCoded'' for creating the favicon and adding animals to the Pit, as well as nursery and bestiality content, scenes, facilities and fixes. Also added a pussy licking scene and created and fixed a number of bugs.
<br>''HiveBro'' for giving hyperpregnant slaves some serious loving.
- <br>''Quin2k'' for overwriting save function via Degrees of Lewdity.
+ <br>''Quin2k'' for overwriting save function and expired tweak via Vrelnir & co.
<br>''git contributors lost to time'' for their submissions and work through pregmod's git.
<br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index b2194b2d4ebd9480cc56562d6e9cf9a9fd79c839..c22bfac2e8b768263447750deed0327af7b24d92 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with thi
<<set $returnTo = "init", $nextButton = "Continue", $nextLink = "Alpha disclaimer">>
<<unset $releaseID>>
-<<set $ver = "0.10.7", $pmodVer = "1.1.X", $releaseID = 1033>>
-<<if ndef $pmodVer>><<set $pmodVer = "1.1.X">><</if>>
+<<set $ver = "0.10.7", $pmodVer = "1.2.X", $releaseID = 1034>>
+<<if ndef $pmodVer>><<set $pmodVer = "1.2.X">><</if>>
/* This needs to be broken down into individual files that can be added to StoryInit instead. */
@@ -254,6 +254,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $universalRulesNewSlavesRA = 1>>
<<set $universalRulesAssignsSelfFacility = 0>>
<<set $universalRulesImmobileSlavesMaintainMuscles = 0>>
+ <<set $universalRulesChildrenBecomeBreeders = 0>>
<<set $slaveDead = 0>>
<<set $rulesAssistantMain = 1>>
<<set $rulesAssistantAuto = 0>>
@@ -1419,4 +1420,7 @@ erectileImplant: 0
<<set $postSexCleanUp = 1>>
+<<set $DefaultBirthDestination = "anywhere">>
+<<set $abbreviateHormoneBalance = 2>>
+
<<goto "Alpha disclaimer">>
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index c33e6bb3e46b863bda3db02e98463e009fe551f5..d9bc69af428db1d5e4a9eac96255e04ec002eabc 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -1007,7 +1007,7 @@ window.DefaultRules = (function() {
} else if ((rule.growth_boobs == "no default setting" && rule.growth_butt == "no default setting" && rule.growth_lips == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_balls == "no default setting")) {
return;
}
- if (slave.assignmentVisible) { // More resource intensive version with prioritizing. Possible to give this a toggle rather than basing it on visibility.
+ if (!rule.hyper_drugs) { // More resource intensive version with prioritizing.
let _priorities = [];
if (rule.growth_boobs != "no default setting") {
let _priority;
@@ -1104,15 +1104,10 @@ window.DefaultRules = (function() {
return;
}
} else {
- let _hyper;
- if (V.arcologies[0].FSAssetExpansionistResearch == 1)
- _hyper = "hyper ";
- else
- _hyper = "";
if (rule.growth_boobs != "no default setting") {
if (slave.boobs < rule.growth_boobs) {
- if (slave.drugs != _hyper + "breast injections") {
- slave.drugs = _hyper + "breast injections";
+ if (slave.drugs != "hyper breast injections") {
+ slave.drugs = "hyper breast injections";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -1120,8 +1115,8 @@ window.DefaultRules = (function() {
}
if (rule.growth_butt != "no default setting") {
if (slave.butt < rule.growth_butt) {
- if (slave.drugs != _hyper + "butt injections") {
- slave.drugs = _hyper + "butt injections";
+ if (slave.drugs != "hyper butt injections") {
+ slave.drugs = "hyper butt injections";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -1138,8 +1133,8 @@ window.DefaultRules = (function() {
}
if (rule.growth_dick != "no default setting" && slave.dick) {
if (slave.dick < rule.growth_dick) {
- if (slave.drugs != _hyper + "penis enhancement") {
- slave.drugs = _hyper + "penis enhancement";
+ if (slave.drugs != "hyper penis enhancement") {
+ slave.drugs = "hyper penis enhancement";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -1147,8 +1142,8 @@ window.DefaultRules = (function() {
}
if (rule.growth_balls != "no default setting" && slave.balls) {
if (slave.balls < rule.growth_balls) {
- if (slave.drugs != _hyper + "testicle enhancement") {
- slave.drugs = _hyper + "testicle enhancement";
+ if (slave.drugs != "hyper testicle enhancement") {
+ slave.drugs = "hyper testicle enhancement";
r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
}
return;
@@ -1678,7 +1673,7 @@ window.DefaultRules = (function() {
slave.labor = 1;
slave.induce = 1;
V.birthee = 1;
- r += `<br>slave.slaveName is ready to birth, so her labor has been stimulated.`;
+ r += `<br>${slave.slaveName} is ready to birth, so her labor has been stimulated.`;
} else if (rule.pregSpeed == "fast" && slave.pregControl == "speed up" && slave.health <= -50) {
slave.pregControl = "none";
r += `<br>${slave.slaveName} is on rapid gestation agents and dangerously unhealthy, so her agent regimen has been stopped.`;
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 2e8f49cbe35dac54a05f4bbacf34589668e23771..1c09c07fcac69e692e6d6b104cacc515346a97b6 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -933,6 +933,8 @@ window.rulesAssistantOptions = (function() {
class RegimenSection extends Section {
constructor() {
super("Physical Regimen Settings");
+ if (V.arcologies[0].FSAssetExpansionistResearch === 1)
+ this.appendChild(new HyperGrowthSwitch());
this.appendChild(new GrowthList());
this.appendChild(new CurrativesList());
this.appendChild(new AphrodisiacList());
@@ -1427,6 +1429,18 @@ window.rulesAssistantOptions = (function() {
}
}
+ class HyperGrowthSwitch extends List {
+ constructor() {
+ const pairs = [
+ ["No", 0],
+ ["Yes", 1],
+ ];
+ super("Use hyper growth drugs", pairs, true);
+ this.setValue(current_rule.set.hyper_drugs);
+ this.onchange = (value) => current_rule.set.hyper_drugs = value;
+ }
+ }
+
class GrowthList extends Options {
constructor() {
super();
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index 58a2abe9d3680047dca7294028cb0d8d78ab87dd..f398a396163687384745ed188a484b960056c56f 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -122,6 +122,51 @@ window.SlaveSummaryUncached = (function(){
r += `Branded.`;
r += `</span>`;
}
+ if (V.abbreviateHormoneBalance === 1) {
+ if (slave.hormoneBalance <= -21) {
+ r += `<span class="deepskyblue">`;
+ r += ` <strong>HB:M</strong>`;
+ } else if (slave.hormoneBalance <= 20) {
+ r += `<span class="pink">`;
+ r += ` <strong>HB:N</strong>`;
+ } else if (slave.hormoneBalance <= 500) {
+ r += `<span class="pink">`;
+ r += ` <strong>HB:F</strong>`;
+ }
+ r += `</span>`;
+ } else if (V.abbreviateHormoneBalance === 2) {
+ r += `<span class="`;
+ if (slave.hormoneBalance <= -21) {
+ r += `deepskyblue`;
+ } else {
+ r += `pink`;
+ }
+ r += `">`;
+ if (slave.hormoneBalance < -400) {
+ r += `Overwhelmingly masculine`;
+ } else if (slave.hormoneBalance <= -300) {
+ r += `Extremely masculine`;
+ } else if (slave.hormoneBalance <= -200) {
+ r += `Heavily masculine`;
+ } else if (slave.hormoneBalance <= -100) {
+ r += `Very masculine`;
+ } else if (slave.hormoneBalance <= -21) {
+ r += `Masculine`;
+ } else if (slave.hormoneBalance <= 20) {
+ r += `Neutral`;
+ } else if (slave.hormoneBalance <= 99) {
+ r += `Feminine`;
+ } else if (slave.hormoneBalance <= 199) {
+ r += `Very feminine`;
+ } else if (slave.hormoneBalance <= 299) {
+ r += `Heavily feminine`;
+ } else if (slave.hormoneBalance <= 399) {
+ r += `Extremely feminine`;
+ } else if (slave.hormoneBalance <= 500) {
+ r += `Overwhelmingly feminine`;
+ }
+ r += ` hormone balance.</span>`;
+ }
r += `<br>`;
if (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1)
r += ` `;
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 99cb7b1aad6e85eb481564bc27a1cda3bab1c29b..f5840354fcc03ffeaee3a552e376d2e6db4730e2 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -1037,6 +1037,10 @@ window.removeFS = function(FS) {
arcology.FSChattelReligionistSMR = 0;
arcology.FSChattelReligionistCreed = 0;
break;
+ case "FSRepopulationFocus":
+ arcology[FSLaw] = 0;
+ arcology[FSSMR] = 0;
+ V.universalRulesChildrenBecomeBreeders = 0;
case "FSNull":
break;
default: /* all others have one law and one SMR */
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index a51f5d76ba6b411b10c24dbab00d7a8077daae65..a9d70e6aae18964d29d1f7ca8b5592fea582962a 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -213,8 +213,26 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<<set _lostBabies = 1, _babyCost = random(-12,12)>>
sold for a total of @@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@
<<set $cash += _curBabies*(50+_babyCost)>>
+ <<elseif $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "anywhere">>
+ <<set _lostBabies = 1>>
+ sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $activeSlave.slaveName
+ <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>>
+ has few thoughts about the matter.
+ <<elseif $activeSlave.devotion > 95>>
+ loves you already, but $he'll @@.hotpink;love you even more@@ for this. $He can't wait to see $his child<<if _curBabies > 1>>ren<</if>> proudly furthering your cause.
+ <<set $activeSlave.devotion += 4>>
+ <<elseif $activeSlave.devotion > 50>>
+ heard about these and will be @@.hotpink;happy that $his child<<if $activeSlave.pregType > 1>>ren<</if>> will have a purpose in your society other than slavery.@@ $He will miss $his child<<if $activeSlave.pregType > 1>>ren<</if>>, but $he expected that.
+ <<set $activeSlave.devotion += 4>>
+ <<elseif $activeSlave.devotion > 20>>
+ will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will is broken enough to hope that $his offspring will have a better life, or at least an enjoyable one.
+ <<else>>
+ will of course @@.mediumorchid;hate you for this.@@ The mere thought of $his $fertilityAge year old daughter<<if _curBabies > 1>>s<</if>> swollen with life, and proud of it, fills $him with @@.gold;disdain.@@
+ <<set $activeSlave.devotion -= 4, $activeSlave.trust -= 4>>
+ <</if>>
+ <<set $breederOrphanageTotal += _curBabies>>
<</if>>
- <<if _lostBabies != 1>>
+ <<if _lostBabies != 1 && $DefaultBirthDestination === "anywhere">>
<br><br>
<<link '...sent to a slave orphanage.'>>
<<replace #_disposition>>
@@ -300,6 +318,69 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */
<</link>>
//Will cost <<print cashFormat(500)>> weekly//
+ <<elseif _lostBabies != 1 && $DefaultBirthDestination != "anywhere">>
+ $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sent to $DefaultBirthDestination. $slaves[$i].slaveName
+ <<switch $DefaultBirthDestination>>
+ <<case "an orphanage">>
+ <<if $slaves[$i].devotion > 95>>
+ worships you so completely that $he will not resent this.
+ <<elseif $slaves[$i].devotion > 50>>
+ is devoted to you, but $he will @@.mediumorchid;struggle to accept this.@@
+ <<set $slaves[$i].devotion -= 2>>
+ <<elseif $slaves[$i].devotion > 20>>
+ has accepted being a sex slave, but $he will @@.mediumorchid;resent this intensely.@@
+ <<set $slaves[$i].devotion -= 3>>
+ <<else>>
+ will of course @@.mediumorchid;hate you for this.@@
+ <<set $slaves[$i].devotion -= 4>>
+ <</if>>
+ <<set $slaveOrphanageTotal += _curBabies>>
+ <<case "a citizen school">>
+ <<if $slaves[$i].devotion > 95>>
+ loves you already, but <<print $he>>'ll @@.hotpink;love you even more@@ for this.
+ <<elseif $slaves[$i].devotion > 50>>
+ knows about these and will be @@.hotpink;overjoyed.@@ $He will miss $his child<<if _curBabies > 1>>ren<</if>>, but $he expected that.
+ <<elseif $slaves[$i].devotion > 20>>
+ will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will @@.hotpink;take comfort@@ in the hope that $his offspring will have a better life.
+ <<else>>
+ will naturally retain some resentment over being separated from $his child<<if _curBabies > 1>>ren<</if>>, but this should be balanced by hope that $his offspring will have a better life.
+ <</if>>
+ <<set $slaves[$i].devotion += 4, $citizenOrphanageTotal += _curBabies>>
+ <<case "a private school">>
+ <<if $slaves[$i].devotion > 95>>
+ will @@.hotpink;worship you utterly@@ for this.
+ <<elseif $slaves[$i].devotion > 50>>
+ understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@
+ <<elseif $slaves[$i].devotion > 20>>
+ will miss $his child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print $he>>'ll understand this is the best possible outcome for a slave mother.
+ <<else>>
+ will resent being separated from $his child<<if _curBabies > 1>>ren<</if>>, but @@.hotpink;should understand and be grateful@@ that this is the best possible outcome here.
+ <</if>>
+ The child<<if _curBabies > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
+ <<set $slaves[$i].devotion += 6, $privateOrphanageTotal += _curBabies>>
+ <<case "the market">>
+ <<if $slaves[$i].prestige > 1 || $slaves[$i].pornPrestige > 2>>
+ <<set _babyCost = random(-12,100)>>
+ <<if $slaves[$i].prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
+ <<else>>
+ <<set _babyCost = random(-12,12)>>
+ <<if $slaves[$i].prematureBirth > 0>><<set _babyCost = -45>><</if>>
+ <</if>>
+ $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
+ <<if $slaves[$i].devotion > 95>>
+ $He adheres to your thoughts so strongly that even though you backed out of caring for $his child<<if _curBabies > 1>>ren<</if>>, $he still truly believes you are doing $him an honor.
+ <<elseif $slaves[$i].devotion > 50>>
+ $He is @@.mediumorchid;deeply hurt@@ by your sudden decision to sell $his child<<if _curBabies > 1>>ren<</if>> instead of having <<if _curBabies > 1>>them<<else>>it<</if>> cared for. $His trust in your words @@.gold;wavers@@ as $he thinks of $his child<<if _curBabies > 1>>ren<</if>>'s future.
+ <<set $slaves[$i].trust -= 5, $slaves[$i].devotion -= 5>>
+ <<elseif $slaves[$i].devotion > 20>>
+ $He is @@.mediumorchid;devastated@@ by your sudden decision to sell $his child<<if _curBabies > 1>>ren<</if>> instead of having <<if _curBabies > 1>>them<<else>>it<</if>> cared for. $His mind struggles to comprehend @@.gold;such betrayal.@@
+ <<set $slaves[$i].trust -= 10, $slaves[$i].devotion -= 10>>
+ <<else>>
+ For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even thing of trusting such a person.@@
+ <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>>
+ <</if>>
+ <<set $cash += _curBabies*(50+_babyCost)>>
+ <</switch>>
<<else>>
<<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */
<</if>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index abacfbfe92e9beac87df175a741aa00c5773645e..e5e4928fdf4f72eda6f3874cf6aff4287edec401 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -444,7 +444,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
Reproduction management systems are offline; $he will undergo normal puberty.
<</if>>
<</if>>
- <br>Rename $him: <<textbox "_tempName" _tempName >> [[Apply | incubator][$tanks[$i].slaveName = _tempName]] // Given name only //
+ <br>Rename $him: <<textbox "_tempName" _tempName >> [[Apply |incubator][$tanks[$i].slaveName = _tempName]] // Given name only //
<<if $cheatMode == 1>>
<br>''Cheatmode:''
<<link "Retrieve immediately">>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 7ccb9ce4dc2d4811a003e3ed4e778794a426d31d..12ca2a19ec169d94694fc8f74e07cc78d88789fe 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -918,7 +918,23 @@ All in all,
<<set $cash += _curBabies*(50+_babyCost)>>
<</if>>
<</if>>
- <<if _lostBabies != 1>>
+ <<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "anywhere">>
+ <<set _lostBabies = 1>>
+ $His child<<if _count > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $slaves[$i].slaveName
+ <<if $slaves[$i].devotion > 95>>
+ loves you already, but <<print $he>>'ll @@.hotpink;love you even more@@ for this. $He can't wait to see $his child<<if _count > 1>>ren<</if>> proudly furthering your cause.
+ <<set $slaves[$i].devotion += 4>>
+ <<elseif $slaves[$i].devotion > 50>>
+ heard about these and will be @@.hotpink;happy that $his child<<if _count > 1>>ren<</if>> will have a purpose in your society other than slavery.@@ $He will miss $his child<<if _count > 1>>ren<</if>>, but $he expected that.
+ <<set $slaves[$i].devotion += 4>>
+ <<elseif $slaves[$i].devotion > 20>>
+ will naturally miss $his child<<if _count > 1>>ren<</if>>, but will is broken enough to hope that $his offspring will have a better life, or at least an enjoyable one.
+ <<else>>
+ will of course @@.mediumorchid;hate you for this.@@ The mere thought of $his $fertilityAge year old daughter<<if _count > 1>>s<</if>> swollen with life, and proud of it, fills $him with @@.gold;disdain.@@
+ <<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
+ <</if>>
+ <<set $breederOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
+ <<elseif _lostBabies != 1 && $DefaultBirthDestination === "anywhere" && $universalRulesChildrenBecomeBreeders < 1>>
<<set $slaveOrphanageTotal += _curBabies>>
Unless you provide otherwise, the child<<if _curBabies > 1>>ren<</if>> will be remanded to one of $arcologies[0].name's slave orphanages. $slaves[$i].slaveName
<<if $slaves[$i].devotion > 95>>
@@ -995,7 +1011,7 @@ All in all,
<<replace `"#" + $dispositionId`>>
<<set _babyCost = random(-12,100)>>
<<if $slaves[$i].prematureBirth == 1>><<set _babyCost = random(-32,40)>><</if>>
- $His <<if _count > 1>>babies<<else>>baby<</if>> went for a <<if _curBabies > 1>>total <</if>>bid of @@.yellowgreen;<<print cashFormat(_count*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
+ $His <<if _count > 1>>babies<<else>>baby<</if>> went for a <<if _curBabies > 1>>total <</if>>bid of @@.yellowgreen;<<print cashFormat(_count*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
<<if $slaves[$i].devotion > 95>>
$He adheres to your thoughts so strongly that even though you backed out of caring for $his child<<if _count > 1>>ren<</if>>, $he still truly believes you are doing $him an honor.
<<elseif $slaves[$i].devotion > 50>>
@@ -1005,7 +1021,7 @@ All in all,
$He is @@.mediumorchid;devastated@@ by your sudden decision to sell $his child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $His mind struggles to comprehend @@.gold;such betrayal.@@
<<set $slaves[$i].trust -= 10, $slaves[$i].devotion -= 10>>
<<else>>
- For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even thing of trusting such a person.@@
+ For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even think of trusting such a person.@@
<<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>>
<</if>>
<<set $cash += _curBabies*(50+_babyCost)>>
@@ -1026,7 +1042,7 @@ All in all,
$He is @@.mediumorchid;devastated@@ by your sudden decision to sell $his child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $His mind struggles to comprehend @@.gold;such betrayal.@@
<<set $slaves[$i].trust -= 10, $slaves[$i].devotion -= 10>>
<<else>>
- For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even thing of trusting such a person.@@
+ For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even think of trusting such a person.@@
<<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>>
<</if>>
<<set $cash += _curBabies*(50+_babyCost)>>
@@ -1037,11 +1053,11 @@ All in all,
<</capture>>
<</if>>
<</span>>
-<<elseif $Cash4Babies == 1 && _curBabies > 0>>
+<<elseif $Cash4Babies == 1 && _curBabies > 0 && $DefaultBirthDestination === "anywhere" && $universalRulesChildrenBecomeBreeders < 1>>
<br><br>
<<set _babyCost = random(-12,12)>>
<<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>>
- $His <<if _curBabies > 1>>babies<<else>>baby<</if>> sold <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
+ $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
<<set $cash += _curBabies*(50+_babyCost)>>
<</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 5cd80db33b93d779485d9f1d82a31261dbdeeab4..f8f1a1d64e6e9887c2224890b87351e7adbb869e 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -388,6 +388,9 @@
<<if ndef $universalRulesImmobileSlavesMaintainMuscles>>
<<set $universalRulesImmobileSlavesMaintainMuscles = 0>>
<</if>>
+<<if ndef $universalRulesChildrenBecomeBreeders>>
+ <<set $universalRulesChildrenBecomeBreeders = 0>>
+<</if>>
<<if ndef $surnamesForbidden>>
<<set $surnamesForbidden = 0>>
<</if>>
@@ -3686,6 +3689,9 @@ Done!
<<if ndef _rule.legAccessory>>
<<set _rule.legAccessory = "no default setting">>
<</if>>
+ <<if ndef _rule.hyper_drugs>>
+ <<set _rule.hyper_drugs = 0>>
+ <</if>>
<</for>>
<<if $releaseID < 1032>>
@@ -3699,3 +3705,13 @@ Done!
<<if def $individualCosts>>
<<unset $individualCosts>>
<</if>>
+
+<<if $DefaultBirthDestination === "">>
+ <<set $DefaultBirthDestination = "anywhere">>
+<</if>>
+<<if ndef $DefaultBirthDestination>>
+ <<set $DefaultBirthDestination = "anywhere">>
+<</if>>
+<<if ndef $abbreviateHormoneBalance>>
+ <<set $abbreviateHormoneBalance = 2>>
+<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 596f9594d949542c49384a911d601594f45d9e5e..31c0c50723332b4ac755fa8c7e6fb1480fea49e4 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -198,7 +198,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br><br>
<<set $arcologies[0].prosperity -= 15>>
<<set $rep -= 18000>>
- <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave = _princess>>
<<include "New Slave Intro">>
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
@@ -223,8 +223,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds to enslave a crown prince.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire the crown prince.">>
+<<if $SF.Toggle && $SF.Active >= 1>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire the crown prince.">>
<<replace "#result">>
Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. They take off again with the crown prince aboard and in chains, where he rails against the uncaring metal walls of the VTOL for the breadth of his journey to your penthouse.
<br><br>
@@ -232,7 +232,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br><br>
<<set $arcologies[0].prosperity -= 15>>
<<set $rep -= 18000>>
- <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave = _prince>>
<<include "New Slave Intro">>
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
@@ -278,8 +278,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds and reputation to enslave both the crown prince and princess.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire both the prince and princess.">>
+<<if $SF.Toggle && $SF.Active >= 1>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire both the prince and princess.">>
<<replace "#result">>
Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the prince and princess aboard, clad in chains and bound face to face in a forced embrace, and make a direct course towards your waiting penthouse.
<br><br>
@@ -288,7 +288,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $arcologies[0].prosperity -= 15>>
<<set $rep -= 18000>>
/* princess */
- <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _princess.recruiter = 0>>
<<if $familyTesting == 1>>
<<set _princess.mother = $missingParentID>>
@@ -301,7 +301,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</if>>
<<run newSlave(_princess)>> /* skip New Slave Intro */
/* prince */
- <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _prince.recruiter = 0>>
<<if $familyTesting == 1>>
<<set _prince.mother = _princess.mother>>
@@ -364,10 +364,10 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds to enslave a handful of court ladies.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire a handful of court ladies.">>
+<<if $SF.Toggle && $SF.Active >= 1>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire a handful of court ladies.">>
<<replace "#result">>
- You take a tablet and peruse the various court ladies on offer by the fledgling arcology. You single out a few interesting individuals for acquisition that might suit your tastes, but the slapdash descriptions provided for each by $securityForceName Intelligence make it likely that any similarities to your aesthetic leanings will be coincidental. Once you are satisfied with your selection, you electronically transfer the order to The Colonel and soon receive a mission success notice along with an estimated delivery schedule.
+ You take a tablet and peruse the various court ladies on offer by the fledgling arcology. You single out a few interesting individuals for acquisition that might suit your tastes, but the slapdash descriptions provided for each by $SF.Lower Intelligence make it likely that any similarities to your aesthetic leanings will be coincidental. Once you are satisfied with your selection, you electronically transfer the order to The Colonel and soon receive a mission success notice along with an estimated delivery schedule.
<br><br>
When the ladies arrive at your penthouse, they seem almost relieved at the opulence of their new surroundings. Though they still retain much of their aristocratic arrogance, they each submit to biometric scanning with relative obedience. It seems likely that their obedience is borne out of a delusional rationalization that enslavement by one wealthy master is better than enslavement by the unwashed masses they once lorded over.
<br><br>
@@ -378,7 +378,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
<<include "Generate XX Slave">>
- <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
<<set $activeSlave.prestige = 1>>
@@ -442,8 +442,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds to enslave a Queen.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire the Queen herself.">>
+<<if $SF.Toggle && $SF.Active >= 1>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire the Queen herself.">>
<<replace "#result">>
Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the Queen aboard and make a direct course towards your waiting penthouse.
<br><br>
@@ -461,7 +461,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _queen.visualAge = _queen.actualAge>>
<<set _queen.physicalAge = _queen.actualAge>>
<<set _queen.ovaryAge = _queen.actualAge>>
- <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave = _queen>>
<<include "New Slave Intro">>
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
@@ -504,8 +504,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds and reputation to enslave both the Queen and princess.//
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire both the Princess and Queen.">>
+<<if $SF.Toggle && $SF.Active >= 1>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire both the Princess and Queen.">>
<<replace "#result">>
Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the princess and Queen aboard, making a direct course towards your waiting penthouse.
<br><br>
@@ -595,8 +595,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</link>> // It will cost about <<print cashFormat(500000)>> to enslave the Queen and her court ladies.//
<<else>>
<</if>>
-<<if $securityForceActive == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to acquire the Queen and her court ladies.">>
+<<if $SF.Toggle && $SF.Active >= 1>>
+<br><<link "Dispatch $SF.Lower on a night time raid to acquire the Queen and her court ladies.">>
<<replace "#result">>
Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the Queen, who is resigned to her fate, and a gaggle of terrified court ladies chained together.
<br><br>
@@ -609,7 +609,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
<<include "Generate XX Slave">>
- <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
<<set $activeSlave.prestige = 1>>
@@ -641,7 +641,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
/*Queen*/
- <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _queen.recruiter = 0>>
<<set _queen.mother = $missingParentID>>
<<set $missingParentID-->>
@@ -724,8 +724,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br>//You lack the necessary funds to enslave the entire court.//
<</if>>
-<<if $securityForceActive == 1 && $familyTesting == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to take everything of value.">>
+<<if $SF.Toggle && $SF.Active >= 1 && $familyTesting == 1>>
+<br><<link "Dispatch $SF.Lower on a night time raid to take everything of value.">>
<<replace "#result">>
<<set _loot = random(10,300)*100>>
Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the prince and princess, clad in chains and bound face to face in a forced embrace, the Queen, who is resigned to her fate, a gaggle of terrified court ladies and as much loot as they could carry.
@@ -739,7 +739,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
<<include "Generate XX Slave">>
- <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
<<set $activeSlave.prestige = 1>>
@@ -771,20 +771,20 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
/* princess */
- <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _princess.origin = "She was a princess of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _princess.recruiter = 0>>
<<set _princess.mother = _queen.ID>>
<<set _princess.father = $missingParentID>>
<<set $missingParentID-->>
<<run newSlave(_princess)>> /* skip New Slave Intro */
/* prince */
- <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _prince.recruiter = 0>>
<<set _prince.mother = _princess.mother>>
<<set _prince.father = _princess.father>>
<<run newSlave(_prince)>> /* skip New Slave Intro */
/*Queen*/
- <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$securityForceName+".">>
+ <<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$SF.Lower+".">>
<<set _queen.recruiter = 0>>
<<set _queen.mother = $missingParentID>>
<<set $missingParentID-->>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 6d4993bf5a7713b5a02c0ceb944b4a8ee7c6bc53..9c81a4714a1b59e3551e0a03be4ee5ec1b976faa 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -493,9 +493,9 @@ _topClassP = 1>>
_middleClass += $nicaeaPower * 20,
_middleClassP *= 1 + $nicaeaPower * 0.005>>
<<else>>
- <<set _expirationFS *= 1 + $nicaeaPower 0.25,
+ <<set _expirationFS *= 1 + $nicaeaPower * 0.25,
_lowerClass += $nicaeaPower * 100,
- _lowerClassP *= 1 + $nicaeaPower *0.01,
+ _lowerClassP *= 1 + $nicaeaPower * 0.01,
_middleClass += $nicaeaPower * 20,
_middleClassP *= 1 + $nicaeaPower * 0.005,
_upperClass += $nicaeaPower * -6.75,
@@ -845,9 +845,14 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
/*Top Class Citizens*/
/*Setting GDP depending on population*/
-<<set $GDP = Math.trunc((($NPCSlaves + $helots) * 0.35 * $slaveProductivity) + ($lowerClass * 0.35) + ($middleClass * 0.75) + ($upperClass * 2) + ($topClass * 10)) / 10,
+<<set $GDP = Math.trunc((($NPCSlaves + $helots) * 0.35 * $slaveProductivity) + ($lowerClass * 0.35) + ($middleClass * 0.75) + ($upperClass * 2) + ($topClass * 10)) / 10>>
/*Top Class Interest in living in your arcology*/
-_TCD = Math.trunc(($GDP / 15 + _topClass) * $rentEffectT * _topClassP + $TCBase)>>
+<<if $eliteFailTimer > 0>> /*when you fail the eugenics elite and they leave this triggers*/
+ <<set _TCD = Math.trunc(($GDP / 15 + _topClass) * $rentEffectT * _topClassP + $TCBase - ($eliteFail / 15 * $eliteFailTimer)),
+ $eliteFailTimer -= 1>>
+<<else>>
+ <<set _TCD = Math.trunc(($GDP / 15 + _topClass) * $rentEffectT * _topClassP + $TCBase)>>
+<</if>>
/*Top Class Citizens immigrating*/
<<if $topClass < _TCD>>
<<set _TCImmigration = Math.trunc((_TCD - $topClass) * (0.3 * _terrain)) + 1,
@@ -957,7 +962,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<if $alternativeRents == 1>> /*A silly policy*/
Your citizens are allowed to pay their rents in slaves rather than cash and a few financially challenged individuals make use of this.
<<set _rentMultiplier *= 0.95>>
- <<set _movement = random(0,3), $helots += _movement, $ASlaves -= _movement>>
+ <<set _movement = random(0,3), $helots += _movement, $NPCSlaves -= _movement>>
<</if>>
<<if $discountMercenaries == 1>>
Mercenaries willing to come to your arcology are given a discount on rent.
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index ddb6b32412de469d7e763a90b2720b092f28277c..ae380c1d8cd23a0cf17df06d69f3a3b725b31a53 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -369,7 +369,7 @@
/% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/
/% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/
-<<set $averageProsperity = 0, $beauty = 0, $beautyMultiplier = 0, $boobsID = -1, $boobsInterestTargetID = -1, $brideSlave = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $FResult = 0, $groomSlave = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $i = 0, $individualCosts = 0, $influenceBonus = 0, $j = 0, $masochistID = -1, $masochistInterestTargetID = -1, $opinion = 0, $r = 0, $subID = -1, $submissiveInterestTargetID = -1, $weddingSlaveID = -1, $x = 0, $mother = -1, $daughter = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>>
+<<set $averageProsperity = 0, $beauty = 0, $beautyMultiplier = 0, $boobsID = -1, $boobsInterestTargetID = -1, $brideSlave = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $FResult = 0, $groomSlave = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $i = 0, $influenceBonus = 0, $j = 0, $masochistID = -1, $masochistInterestTargetID = -1, $opinion = 0, $r = 0, $subID = -1, $submissiveInterestTargetID = -1, $weddingSlaveID = -1, $x = 0, $mother = -1, $daughter = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>>
/% Other arrays %/
<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $qualifiedNicknames = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $devotedSlaves = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RESimpleAssaultIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $qualifiedFS = [], $eligibleSlaves = [], $slavesInLine = []>>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 4ed933854939160cdb8e1bfcde19f80d41c61bd8..be8d81bed9ad75212e77c0d63154373704d3fe55 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -323,6 +323,10 @@
<<if $CoursingAssociation == 1>>
<br>''Coursing Association:'' you are sponsoring a [[Coursing Association]] that will hold monthly races.
[[Repeal|Policies][$CoursingAssociation = 0]]
+ <<if $Lurcher != 0>> <<set _slaveName = SlaveFullName($Lurcher);>>
+ <br> Your current lurcher is
+ <<link "<<= SlaveFullName($Lurcher)>>""Slave Interact">> <<set $activeSlave = getSlave($Lurcher.ID);>> <</link>>.
+ <</if>>
<</if>>
<<if $RaidingMercenaries == 1>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index e6e5add1a05c70adf5330db9b0f30bab8a0e2672..431814431e04030f3a5f65a80ae3c06ef6b921d9 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -521,7 +521,6 @@ She is easily taken into custody and her contraband confiscated once the jeering
You help the exhausted mother to her feet and hand her her second newborn. She watches you, uncertain of your motives, until you have her escorted to the proper welcoming facility and put in a good word for having her added to your arcology's free population. You announce to the public that such a fertile <<if $activeSlave.physicalAge > 30>>milf<<elseif $activeSlave.physicalAge > 19>>woman<<elseif $activeSlave.physicalAge > 12>>teen<<else>>youth<</if>> will be a boon to Repopulationism, and that the contract she is signing mandates she be on powerful fertility agents whenever she isn't pregnant. During her residency, free or not, she will provide society with dozens of future children. The public @@.green;approves of breeders, free or not,@@ and word spreads that any and all mothers are welcome into your arcology @@.green;adding to its prosperity.@@
<<set $rep += 10>>
<<set $arcologies[0].prosperity += 1>>
- <<set $ACitizens++>>
<</replace>>
<</link>>
<</if>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index a1e639a1416eecf17204bf9300ccb3bd33588cb6..40f14cf06797a6d472fe03becdecbe105f55e6be 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -767,7 +767,11 @@ On formal occasions, you are announced as $PCTitle.
The Societal Elite @@.red;have departed from your arcology in disgust@@.
<<run removeFS("FSRestart")>>
<<set $rep -= 10000>>
- <<set $ACitizens = Math.max($ACitizens - random(30,100), 0)>>
+ <<set $eliteFail = random(30,100),
+ $eliteFailTimer = 15>>
+ <<if $eliteFail > $topClass - 20>>
+ <<set $eliteFail = $topClass - 20>>
+ <</if>>
<<if $arcologies[0].prosperity > 50>>
<<set $arcologies[0].prosperity -= random(20,40)>>
<</if>>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index d36100fc090a3ceae9423b0fde8cb912892d6e6b..b4cbc1a04835efd4ccf2e8e14ad29d96e84d604a 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -44,6 +44,71 @@ I need to break single passage to several widgets, as it's been overcomplicated
<<seBirthBabies>>
+ <<if $DefaultBirthDestination != "anywhere" && $universalRulesChildrenBecomeBreeders < 1>>
+ $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sent to $DefaultBirthDestination. $slaves[$i].slaveName
+ <<switch $DefaultBirthDestination>>
+ <<case "an orphanage">>
+ <<if $slaves[$i].devotion > 95>>
+ worships you so completely that $he will not resent this.
+ <<elseif $slaves[$i].devotion > 50>>
+ is devoted to you, but $he will @@.mediumorchid;struggle to accept this.@@
+ <<set $slaves[$i].devotion -= 2>>
+ <<elseif $slaves[$i].devotion > 20>>
+ has accepted being a sex slave, but $he will @@.mediumorchid;resent this intensely.@@
+ <<set $slaves[$i].devotion -= 3>>
+ <<else>>
+ will of course @@.mediumorchid;hate you for this.@@
+ <<set $slaves[$i].devotion -= 4>>
+ <</if>>
+ <<set $slaveOrphanageTotal += _curBabies>>
+ <<case "a citizen school">>
+ <<if $slaves[$i].devotion > 95>>
+ loves you already, but <<print $he>>'ll @@.hotpink;love you even more@@ for this.
+ <<elseif $slaves[$i].devotion > 50>>
+ knows about these and will be @@.hotpink;overjoyed.@@ $He will miss $his child<<if _curBabies > 1>>ren<</if>>, but $he expected that.
+ <<elseif $slaves[$i].devotion > 20>>
+ will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will @@.hotpink;take comfort@@ in the hope that $his offspring will have a better life.
+ <<else>>
+ will naturally retain some resentment over being separated from $his child<<if _curBabies > 1>>ren<</if>>, but this should be balanced by hope that $his offspring will have a better life.
+ <</if>>
+ <<set $slaves[$i].devotion += 4, $citizenOrphanageTotal += _curBabies>>
+ <<case "a private school">>
+ <<if $slaves[$i].devotion > 95>>
+ will @@.hotpink;worship you utterly@@ for this.
+ <<elseif $slaves[$i].devotion > 50>>
+ understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@
+ <<elseif $slaves[$i].devotion > 20>>
+ will miss $his child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print $he>>'ll understand this is the best possible outcome for a slave mother.
+ <<else>>
+ will resent being separated from $his child<<if _curBabies > 1>>ren<</if>>, but @@.hotpink;should understand and be grateful@@ that this is the best possible outcome here.
+ <</if>>
+ The child<<if _curBabies > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
+ <<set $slaves[$i].devotion += 6, $privateOrphanageTotal += _curBabies>>
+ <<case "the market">>
+ <<if $slaves[$i].prestige > 1 || $slaves[$i].pornPrestige > 2>>
+ <<set _babyCost = random(-12,100)>>
+ <<if $slaves[$i].prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
+ <<else>>
+ <<set _babyCost = random(-12,12)>>
+ <<if $slaves[$i].prematureBirth > 0>><<set _babyCost = -45>><</if>>
+ <</if>>
+ $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
+ <<if $slaves[$i].devotion > 95>>
+ $He adheres to your thoughts so strongly that even though you backed out of caring for $his child<<if _curBabies > 1>>ren<</if>>, $he still truly believes you are doing $him an honor.
+ <<elseif $slaves[$i].devotion > 50>>
+ $He is @@.mediumorchid;deeply hurt@@ by your sudden decision to sell $his child<<if _curBabies > 1>>ren<</if>> instead of having <<if _curBabies > 1>>them<<else>>it<</if>> cared for. $His trust in your words @@.gold;wavers@@ as $he thinks of $his child<<if _curBabies > 1>>ren<</if>>'s future.
+ <<set $slaves[$i].trust -= 5, $slaves[$i].devotion -= 5>>
+ <<elseif $slaves[$i].devotion > 20>>
+ $He is @@.mediumorchid;devastated@@ by your sudden decision to sell $his child<<if _curBabies > 1>>ren<</if>> instead of having <<if _curBabies > 1>>them<<else>>it<</if>> cared for. $His mind struggles to comprehend @@.gold;such betrayal.@@
+ <<set $slaves[$i].trust -= 10, $slaves[$i].devotion -= 10>>
+ <<else>>
+ For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even thing of trusting such a person.@@
+ <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>>
+ <</if>>
+ <<set $cash += _curBabies*(50+_babyCost)>>
+ <</switch>>
+ <</if>>
+
<<seBirthPostpartum>>
<<seBirthCritical>>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index a237728edd511bd55fbbfdcbacea482ccf4bfeb9..f09e3817ecffbba1c8dac8413efa276994da2c22 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -9,7 +9,7 @@
<<run Enunciate($activeSlave)>>
$activeSlave.slaveName's indentured servitude is ending this week, meaning that your arcology is gaining a citizen.
-<<set $ACitizens += 1>>
+<<set $lowerClass += 1>>
<<set _seed = 0>>
<<for _seexp = 0; _seexp < $slaves.length; _seexp++>>
@@ -36,7 +36,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<replace "#result">>
You plead necessity and place $him under another indenture, paying the trivial fees left over once $he has been charged for $his own forecasted upkeep. Naturally, $he offers no response at all to any of this.
<<set $cash -= 1000>>
- <<set $ACitizens -= 1>>
+ <<set $lowerClass -= 1>>
<<set $expired = 0, $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
@@ -72,7 +72,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
$He's beside $himself with joy when you accept $his plea and enslave $him. $He's given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt. $His $activeSlave.eyeColor eyes <<if canSee($activeSlave)>>watch you<<else>>are wide<</if>> with eager anticipation, radiating gladness that the prospect of separation from you has gone.
<<set $activeSlave.indenture = -1, $activeSlave.indentureRestrictions = 0>>
<<set $cash -= 1000>>
- <<set $ACitizens -= 1>>
+ <<set $lowerClass -= 1>>
<<set $expired = 0, $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
@@ -111,7 +111,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<replace "#result">>
$He smiles almost shyly when you offer $him a one year supplementary indenture. The price is reasonable, but definitely favorable to you. $He accepts it anyway, and you transfer the money into an escrow account to be held for $him until $his new indenture is done. Your sex slave once again, $he awaits your pleasure without a hint of fear.
<<set $cash -= $slaveCost>>
- <<set $ACitizens -= 1>>
+ <<set $lowerClass -= 1>>
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
@@ -142,7 +142,7 @@ at the moment of $his scheduled emancipation, $he seems willing to consider a sh
<<replace "#result">>
$He looks pensive when you offer $him a one year supplementary indenture. The price reflects the market, and is a reasonable compensation for a year of sexual slavery. $He accepts it after some consideration, and you transfer the money into an escrow account to be held for $him until $his new indenture is done. Your sex slave once again, $he awaits orders with complacency.
<<set $cash -= $slaveCost>>
- <<set $ACitizens -= 1>>
+ <<set $lowerClass -= 1>>
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 8cad7e4ec01e2da4e16c4ad5cca467dba199521a..2bfbac40dabaab717d89eef4af597690db755c60 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -46,6 +46,9 @@
<br>
<span id="OptionAbbreviateDrugs"><<OptionAbbreviateDrugs>></span>
+<br>
+<span id="OptionAbbreviateHormoneBalance"><<OptionAbbreviateHormoneBalance>></span>
+
<br>
<span id="OptionAbbreviateRace"><<OptionAbbreviateRace>></span>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index e1bc04e4bb661d758d4f46269bd0a037029cd24f..88a74ef1d20a1320697394d0f992dc110315cfe8 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -100,7 +100,7 @@ Future society names for new slaves are currently @@.cyan;APPLIED@@. [[Stop appl
The Rules Assistant ''will apply'' automatically to newly acquired slaves [[Stop applying to new slaves|Universal Rules][$universalRulesNewSlavesRA = 0]]
<</if>>
-<<if $seeDicks != 100>>
+<<if $seePreg != 0>>
<br><br>
<<if $universalRulesImpregnation == "HG">>
@@ -127,7 +127,6 @@ Future society names for new slaves are currently @@.cyan;APPLIED@@. [[Stop appl
//This will increase upkeep costs for these slaves//
<</if>>
-<<if $universalRulesBirthing == 1>>
<br><br>
<<if $universalRulesCSec == 1>>
Pregnant slaves will be ''given Caesarean sections'' rather than allowed to give birth naturally in order to minimize health issues and to preserve their vaginas.
@@ -138,6 +137,40 @@ Future society names for new slaves are currently @@.cyan;APPLIED@@. [[Stop appl
//Will lessen medical costs, at the expense of scarring//
<</if>>
+
+<br><br>
+<<if $DefaultBirthDestination !== "anywhere">>
+ <<if $arcologies[0].FSRepopulationFocus > 40>>
+ <<if $universalRulesChildrenBecomeBreeders == 1>>
+ Unreserved children ''will be auto-enrolled'' in breeder schools to be raised into fine mothers and fathers.
+ [[Decide children's fate on an individual level|Universal Rules][$universalRulesChildrenBecomeBreeders = 0]]
+ <<else>>
+ Unreserved children ''will not be auto-enrolled'' in breeder schools. Their fate will be decided at birth.
+ [[All children with undecided fates will be given to breeder schools|Universal Rules][$universalRulesChildrenBecomeBreeders = 1]]
+
+ //Will require a <<print cashFormat(50)>> donation per week once enrollment begins//
+ <</if>>
+ <</if>>
+<<else>>
+ //Option disabled as upon birth slave babies will be sent to $DefaultBirthDestination.//
+<</if>>
+
+<br><br>
+<<if $universalRulesChildrenBecomeBreeders < 1>>
+ Upon birth slave babies
+ <<if $DefaultBirthDestination === "anywhere">>
+ can be sent anywhere. Pre-select their destination a:
+ [[slave orphanage|Universal Rules][$DefaultBirthDestination = "an orphanage"]]
+ [[citizen school|Universal Rules][$DefaultBirthDestination = "a citizen school"]]
+ [[private school|Universal Rules][$DefaultBirthDestination = "a private school"]]
+ <<if $Cash4Babies > 0>>
+ [[market|Universal Rules][$DefaultBirthDestination = "the market"]]
+ <</if>>
+ <<else>>
+ will be sent to $DefaultBirthDestination. [[Change your mind.|Universal Rules][$DefaultBirthDestination = "anywhere"]]
+ <</if>>
+<<else>>
+ //Option disabled as unreserved children ''will be auto-enrolled'' in breeder schools.//
<</if>>
<</if>>
diff --git a/src/utility/optionsWidgets.tw b/src/utility/optionsWidgets.tw
index c19abdd471ad11fdf41ad32f9d7b27271b4af086..19255fab93aadbe2d68add45bfa7e38f76dab3c1 100644
--- a/src/utility/optionsWidgets.tw
+++ b/src/utility/optionsWidgets.tw
@@ -445,6 +445,57 @@ Drugs and addiction are
<</if>>
<</widget>>
+/%
+ Call as <<OptionAbbreviateHormoneBalance>>
+ Should be placed in a <span> with id = "OptionAbbreviateHormoneBalance"
+%/
+<<widget "OptionAbbreviateHormoneBalance">>
+Hormone balance is
+<<if $abbreviateHormoneBalance == 1>>
+ @@.yellow;ABBREVIATED.@@
+ <<link 'Hide'>>
+ <<set $abbreviateHormoneBalance = 0>>
+ <<replace '#OptionAbbreviateHormoneBalance'>>
+ <<OptionAbbreviateHormoneBalance>>
+ <</replace>>
+ <</link>>
+ | <<link 'Summarize'>>
+ <<set $abbreviateHormoneBalance = 2>>
+ <<replace '#OptionAbbreviateHormoneBalance'>>
+ <<OptionAbbreviateHormoneBalance>>
+ <</replace>>
+ <</link>>
+<<elseif $abbreviateHormoneBalance == 2>>
+ @@.cyan;SUMMARIZED.@@
+ <<link 'Hide'>>
+ <<set $abbreviateHormoneBalance = 0>>
+ <<replace '#OptionAbbreviateHormoneBalance'>>
+ <<OptionAbbreviateHormoneBalance>>
+ <</replace>>
+ <</link>>
+ | <<link 'Abbreviate'>>
+ <<set $abbreviateHormoneBalance = 1>>
+ <<replace '#OptionAbbreviateHormoneBalance'>>
+ <<OptionAbbreviateHormoneBalance>>
+ <</replace>>
+ <</link>>
+<<else>>
+ @@.red;HIDDEN.@@
+ <<link 'Abbreviate'>>
+ <<set $abbreviateHormoneBalance = 1>>
+ <<replace '#OptionAbbreviateHormoneBalance'>>
+ <<OptionAbbreviateHormoneBalance>>
+ <</replace>>
+ <</link>>
+ | <<link 'Summarize'>>
+ <<set $abbreviateHormoneBalance = 2>>
+ <<replace '#OptionAbbreviateHormoneBalance'>>
+ <<OptionAbbreviateHormoneBalance>>
+ <</replace>>
+ <</link>>
+<</if>>
+<</widget>>
+
/%
Call as <<OptionAbbreviateGenitalia>>
Should be placed in a <span> with id = "OptionAbbreviateGenitalia"