From 3c84e6b6810b35368e7234bd91df0c88d21074d9 Mon Sep 17 00:00:00 2001
From: Blank <okp57855@psoxs.com>
Date: Sun, 2 Dec 2018 15:17:08 -0800
Subject: [PATCH] hormoneBalance-display
---
devNotes/twine JS.txt | 45 ++++++++++++++++++
src/init/storyInit.tw | 1 +
src/js/slaveSummaryWidgets.tw | 45 ++++++++++++++++++
src/pregmod/incubator.tw | 2 +-
src/pregmod/widgets/seBirthWidgets.tw | 3 +-
src/uncategorized/BackwardsCompatibility.tw | 3 ++
src/uncategorized/policies.tw | 4 ++
src/uncategorized/summaryOptions.tw | 3 ++
src/uncategorized/universalRules.tw | 5 +-
src/utility/optionsWidgets.tw | 51 +++++++++++++++++++++
10 files changed, 156 insertions(+), 6 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 458bfa3dd53..ae302be6290 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -21651,6 +21651,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/init/storyInit.tw b/src/init/storyInit.tw
index 5d61bf66b81..c100c04dd35 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1421,5 +1421,6 @@ erectileImplant: 0
<<set $postSexCleanUp = 1>>
<<set $DefaultBirthDestination = "">>
+<<set $abbreviateHormoneBalance = 2>>
<<goto "Alpha disclaimer">>
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index 58a2abe9d36..f398a396163 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/incubator.tw b/src/pregmod/incubator.tw
index abacfbfe92e..e5e4928fdf4 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 8ba6fc25608..1ee6f7c9c19 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 === "">>
<<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,7 +934,6 @@ 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>>
<<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
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index f0bdc96ae63..569718416fe 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3705,4 +3705,7 @@ Done!
<<if ndef $DefaultBirthDestination>>
<<set $DefaultBirthDestination = "">>
+<</if>>
+<<if ndef $abbreviateHormoneBalance>>
+ <<set $abbreviateHormoneBalance = 2>>
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 4ed93385493..be8d81bed9a 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/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 8cad7e4ec01..2bfbac40dab 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 384a71d28ee..199c5dc70b4 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -155,8 +155,7 @@ Future society names for new slaves are currently @@.cyan;APPLIED@@. [[Stop appl
<</if>>
<<if $universalRulesChildrenBecomeBreeders < 1>>
- Upon birth slave babies
- <br><br> <<if $DefaultBirthDestination === "">>
+ <br><br> Upon birth slave babies <<if $DefaultBirthDestination === "">>
can be sent anywhere. Pre-select their destination a:
[[slave orphanage|Universal Rules][$DefaultBirthDestination = "a orphanage"]]
[[citizen school|Universal Rules][$DefaultBirthDestination = "a citizen school"]]
@@ -168,7 +167,7 @@ Future society names for new slaves are currently @@.cyan;APPLIED@@. [[Stop appl
will be sent to $DefaultBirthDestination. [[Change your mind.|Universal Rules][$DefaultBirthDestination = ""]]
<</if>>
<<else>>
- //Option disabled as unreserved children ''will be auto-enrolled'' in breeder schools.//
+ <br><br>//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 c19abdd471a..19255fab93a 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"
--
GitLab