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 458bfa3dd53256ebe76d2e273bdab9eafbecb620..214f9cd9a7933d41d478fd84b3ead68446e5f3fc 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -15387,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;
@@ -15484,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;
@@ -15500,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;
@@ -15518,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;
@@ -15527,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;
@@ -17794,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());
@@ -18288,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();
@@ -21651,6 +21660,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/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/init/storyInit.tw b/src/init/storyInit.tw
index 5d61bf66b8126ad6b1fd34d9db2e5ed433719e82..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. */
@@ -1420,6 +1420,7 @@ erectileImplant: 0
<<set $postSexCleanUp = 1>>
-<<set $DefaultBirthDestination = "">>
+<<set $DefaultBirthDestination = "anywhere">>
+<<set $abbreviateHormoneBalance = 2>>
<<goto "Alpha disclaimer">>
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 2f60d4ab562a07b290d344bc05ae9826d67e7546..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;
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/pregmod/csec.tw b/src/pregmod/csec.tw
index 4703d1ba09532c9fb4614d09a5d19740dbc2f1d6..a9d70e6aae18964d29d1f7ca8b5592fea582962a 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -213,7 +213,7 @@ 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 === "">>
+ <<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>>
@@ -232,7 +232,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<</if>>
<<set $breederOrphanageTotal += _curBabies>>
<</if>>
- <<if _lostBabies != 1 && $DefaultBirthDestination === "">>
+ <<if _lostBabies != 1 && $DefaultBirthDestination === "anywhere">>
<br><br>
<<link '...sent to a slave orphanage.'>>
<<replace #_disposition>>
@@ -318,10 +318,10 @@ 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 != "">>
+ <<elseif _lostBabies != 1 && $DefaultBirthDestination != "anywhere">>
$His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sent to $DefaultBirthDestination. $slaves[$i].slaveName
<<switch $DefaultBirthDestination>>
- <<case "a orphanage">>
+ <<case "an orphanage">>
<<if $slaves[$i].devotion > 95>>
worships you so completely that $he will not resent this.
<<elseif $slaves[$i].devotion > 50>>
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 8ba6fc25608a4c85deb4fa7b2f0fb16d8ccdebde..12ca2a19ec169d94694fc8f74e07cc78d88789fe 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -918,7 +918,7 @@ All in all,
<<set $cash += _curBabies*(50+_babyCost)>>
<</if>>
<</if>>
- <<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && && $DefaultBirthDestination === "">>
+ <<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>>
@@ -934,8 +934,7 @@ All in all,
<<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
<</if>>
<<set $breederOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
- <</if>>
- <<elseif _lostBabies != 1 && $DefaultBirthDestination === "" && $universalRulesChildrenBecomeBreeders < 1>>
+ <<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>>
@@ -1054,7 +1053,7 @@ All in all,
<</capture>>
<</if>>
<</span>>
-<<elseif $Cash4Babies == 1 && _curBabies > 0 && $DefaultBirthDestination === "" && $universalRulesChildrenBecomeBreeders < 1>>
+<<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>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 241682c070c6977b441ea488c6bc82fbe79e9fb6..cc0ee65d6f4d41feccf95515336fd61899d0df0c 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3689,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>>
@@ -3702,11 +3705,15 @@ Done!
<<if def $individualCosts>>
<<unset $individualCosts>>
<</if>>
-
-<<if ndef $DefaultBirthDestination>>
- <<set $DefaultBirthDestination = "">>
-<</if>>
-
<<if def $sissy>>
<<unset $sissy>>
+<</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/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/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 90e671b819c3ae0daa2a697c68f6b29cc2021e59..b4cbc1a04835efd4ccf2e8e14ad29d96e84d604a 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -44,10 +44,10 @@ I need to break single passage to several widgets, as it's been overcomplicated
<<seBirthBabies>>
- <<if $DefaultBirthDestination != "" && $universalRulesChildrenBecomeBreeders < 1>>
+ <<if $DefaultBirthDestination != "anywhere" && $universalRulesChildrenBecomeBreeders < 1>>
$His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sent to $DefaultBirthDestination. $slaves[$i].slaveName
<<switch $DefaultBirthDestination>>
- <<case "a orphanage">>
+ <<case "an orphanage">>
<<if $slaves[$i].devotion > 95>>
worships you so completely that $he will not resent this.
<<elseif $slaves[$i].devotion > 50>>
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 384a71d28ee9b1e29071b50f903e2548f4aec15f..88a74ef1d20a1320697394d0f992dc110315cfe8 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -137,9 +137,10 @@ Future society names for new slaves are currently @@.cyan;APPLIED@@. [[Stop appl
//Will lessen medical costs, at the expense of scarring//
<</if>>
-<<if $DefaultBirthDestination !== "">>
+
+<br><br>
+<<if $DefaultBirthDestination !== "anywhere">>
<<if $arcologies[0].FSRepopulationFocus > 40>>
- <br><br>
<<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]]
@@ -154,18 +155,19 @@ Future society names for new slaves are currently @@.cyan;APPLIED@@. [[Stop appl
//Option disabled as upon birth slave babies will be sent to $DefaultBirthDestination.//
<</if>>
+<br><br>
<<if $universalRulesChildrenBecomeBreeders < 1>>
- Upon birth slave babies
- <br><br> <<if $DefaultBirthDestination === "">>
+ Upon birth slave babies
+ <<if $DefaultBirthDestination === "anywhere">>
can be sent anywhere. Pre-select their destination a:
- [[slave orphanage|Universal Rules][$DefaultBirthDestination = "a orphanage"]]
+ [[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 = ""]]
+ 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.//
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"