From b577b8628e672d195f7b01b7a5b57a25b6df95d5 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 16 Feb 2018 11:18:14 -0500 Subject: [PATCH] fixes and tweaks to the preg biometrics collar --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +++++++ src/uncategorized/arcologyDescription.tw | 2 +- src/uncategorized/saLongTermEffects.tw | 3 +++ src/utility/assayWidgets.tw | 2 ++ src/utility/descriptionWidgetsStyle.tw | 12 +++++++++--- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 301a308bf76..e75450e0de1 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,13 @@ 0.10.7.0/1 +2/16/18 + + 354 + -preg biometrics collar now reports new mother status + -preg biometrics collar reporting early pregnancy now pleases repopulationists + -submited text improvements + 2/15/18 353 diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw index d0f231ebe6a..5aaaef06498 100644 --- a/src/uncategorized/arcologyDescription.tw +++ b/src/uncategorized/arcologyDescription.tw @@ -384,7 +384,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el Near the penthouse the riot control centre can be found. Here dissidents and dangerous political forces of $arcologies[0].name are carefully monitored and managed. <</if>> <<if $transportHub == 1>> - The transport hub, in the commercial section of the arcology, deals with new arrivals to $arcologies[0].name via <<if $railway == 1>>land<<elseif $docks == 1>>sea <</if>> <<if $airport == 1>>in addition to air<</if>>. + The transport hub, in the commercial section of the arcology, deals with new arrivals to $arcologies[0].name via <<if $terrain != "oceanic" && $terrain != "marine">>land<<else>>sea<</if>> in addition to air. <</if>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index b7fccf097a6..f0d600c790c 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -5047,6 +5047,9 @@ <<elseif $slaves[$i].pregWeek < 0>> Society is @@.green;pleased@@ by $slaves[$i].slaveName's recent birth. <<FSChangePorn "Repopulationist" 2>> + <<elseif $slaves[$i].collar == "preg biometrics" && $slaves[$i].preg > 0>> + Society is @@.green;pleased@@ by $slaves[$i].slaveName's collar revealing her womb's secret<<if $slaves[$i].pregType > 1>>s<</if>> even when $possessive body is trying its best to keep <<if $slaves[$i].pregType > 1>>them<<else>>it<</if>> hidden. + <<FSChangePorn "Repopulationist" 1>> <<elseif ($slaves[$i].ovaries == 0 && $slaves[$i].mpreg == 0) || ($slaves[$i].preg < -1) || ($slaves[$i].pubertyXX == 0)>> Society is @@.red;mildly disappointed@@ that $slaves[$i].slaveName is unable to become pregnant. <<FSChangePorn "Repopulationist" -1>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 2144a93719c..04ba3c9019d 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -761,6 +761,8 @@ <</if>> <<elseif $args[0].pregWeek < 0>> <<set $beauty += $arcologies[0].FSRepopulationFocus/10>> /*10*/ +<<elseif $args[0].preg > 0 && $args[0].collar == "preg biometrics">> + <<set $beauty += $arcologies[0].FSRepopulationFocus/12>> /*8.33*/ <<else>> <<set $beauty -= 2*($arcologies[0].FSRepopulationFocus/5)>> /*-40*/ <</if>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index 9ff64efc312..51bf9c1b397 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -2326,7 +2326,9 @@ $possessiveCap "I might be preggers! Rub my belly for luck!" <<else>> <<if _pregCollar == 1>> - <<if $activeSlave.pregKnown == 0>> + <<if $activeSlave.pregWeek < 0>> + "I'm a mommy now!" + <<elseif $activeSlave.pregKnown == 0>> "Knock me up!" <<elseif $activeSlave.pregKnown == 1>> "<<if $activeSlave.pregType == 0>>1<<else>>$activeSlave.pregType<</if>> bab<<if $activeSlave.pregType > 1>>ies<<else>>y<</if>> on board!" @@ -2334,7 +2336,9 @@ $possessiveCap "I'm infertile!" <</if>> <<elseif _pregCollar == 2>> - <<if $activeSlave.pregKnown == 1>> + <<if $activeSlave.pregWeek < 0>> + "<<print $activeSlave.pregWeek*-1>> week<<if $activeSlave.pregWeek != -1>>s<</if>> until I can get preggers again!" + <<elseif $activeSlave.pregKnown == 1>> <<if $activeSlave.broodmother == 2>> <<if $activeSlave.preg > 37>> "I'm crowning as you read this!" @@ -2350,7 +2354,9 @@ $possessiveCap "My womb needs filling!" <</if>> <<else>> - <<if $activeSlave.pregKnown == 0>> + <<if $activeSlave.pregWeek < 0>> + "I can't wait for my belly to swell with life again!" + <<elseif $activeSlave.pregKnown == 0>> "Put a baby in me today!" <<elseif $activeSlave.pregSource == -1>> "Womb claimed by my <<WrittenMaster>>!" -- GitLab