From 93c65c9966fd133c94b28910edd8d07a1ca4bbef Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 3 Jun 2018 20:14:59 -0400
Subject: [PATCH] tweaks to .weekAcquired
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +
devNotes/twine JS | 12 +-
slave variables documentation - Pregmod.txt | 1 +
src/init/storyInit.tw | 2 +-
src/js/eventSelectionJS.tw | 12 +-
src/npc/fFeelings.tw | 14 +-
src/npc/startingGirls/commitStartingGirl.tw | 1 +
src/pregmod/csec.tw | 2 +-
src/pregmod/organFarmOptions.tw | 2 +-
src/pregmod/widgets/seBirthWidgets.tw | 22 +-
src/uncategorized/longSlaveDescription.tw | 289 +++++++++++--------
src/uncategorized/nextWeek.tw | 4 +-
src/uncategorized/options.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 19 +-
src/uncategorized/saLongTermEffects.tw | 4 +-
src/utility/descriptionWidgetsTattoos.tw | 14 +-
16 files changed, 226 insertions(+), 181 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index da3de7c788b..f1ebc55e48b 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-0.3.x
+6/03/2018
+
+ 7
+ -tweaks to .weekAcquired
+ -fixes
+ -adjusted did x every y hours text to not be so analcentric
+
6/01/2018
6
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 33fabbb2b65..6ecf983c998 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -3967,11 +3967,13 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.devotion <= 50) {
if(eventSlave.devotion >= -20) {
- if(State.variables.week-eventSlave.weekAcquired < 10) {
- if(eventSlave.energy > 20) {
- if(eventSlave.anus != 0) {
- if(eventSlave.vagina != 0) {
- State.variables.RESSevent.push("ignorant horny");
+ if(eventSlave.weekAcquired > 0) {
+ if(State.variables.week-eventSlave.weekAcquired < 10) {
+ if(eventSlave.energy > 20) {
+ if(eventSlave.anus != 0) {
+ if(eventSlave.vagina != 0) {
+ State.variables.RESSevent.push("ignorant horny");
+ }
}
}
}
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 10283d4ebd9..745229c9b9a 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -31,6 +31,7 @@ weekAcquired:
game week slave was acquired
accepts int
+0 - Obtained prior to game start/at game start
origin:
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index aa54eb4dfa1..cda90c92dc3 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -27,7 +27,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $slaves[_i].ID += 1200000>>
<<set $slaves[_i].assignment = "rest">>
<<set $slaves[_i].assignmentVisible = 1>>
- <<set $slaves[_i].weekAcquired = 1>>
+ <<set $slaves[_i].weekAcquired = 0>>
<<set $slaves[_i].newGamePlus = 1>>
<<PMODinit $slaves[_i]>>
<<if $slaves[_i].mother > 0>>
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index 78002eb1475..6d6516b53cf 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -162,11 +162,13 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.devotion <= 50) {
if(eventSlave.devotion >= -20) {
- if(State.variables.week-eventSlave.weekAcquired < 10) {
- if(eventSlave.energy > 20) {
- if(eventSlave.anus != 0) {
- if(eventSlave.vagina != 0) {
- State.variables.RESSevent.push("ignorant horny");
+ if(eventSlave.weekAcquired > 0) {
+ if(State.variables.week-eventSlave.weekAcquired < 10) {
+ if(eventSlave.energy > 20) {
+ if(eventSlave.anus != 0) {
+ if(eventSlave.vagina != 0) {
+ State.variables.RESSevent.push("ignorant horny");
+ }
}
}
}
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 26f3d7c1b7e..6b040fcc2d9 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -1230,11 +1230,15 @@ My favorite part of my body i<<s>>
<</if>> /* closes FS */
<<if ($activeSlave.devotion > 75)>>
-<<if ($activeSlave.weekAcquired == 1) && ($week > 104)>>
- I feel like I've known you my whole life, <<Master>>, and I would follow you to the end of the earth.
-<<elseif ($week - $activeSlave.weekAcquired) > 104>>
- I feel like I know you pretty well, <<Master>>.
-<</if>>
+ <<if $activeSlave.tankBaby > 0 || $activeSlave.mother == -1 || (areSisters($activeSlave, $PC) && $activeSlave.actualAge <= $PC.actualAge)>>
+ I've known you my whole life, <<Master>>, I can't really think of any time<<s>> you weren't there for me.
+ <<elseif (areSisters($activeSlave, $PC) && $activeSlave.actualAge > $PC.actualAge) || $PC.mother == $activeSlave.ID || $PC.father == $activeSlave.ID>>
+ You're my dear <<Master>>. I've known you <<s>>in<<c>>e you were born, and I will alway<<s>> be watching out for you, no matter what.
+ <<elseif ($activeSlave.weekAcquired == 0) && ($week > 104)>>
+ I feel like I've known you my whole life, <<Master>>, and I would follow you to the end of the earth.
+ <<elseif ($week - $activeSlave.weekAcquired) > 104>>
+ I feel like I know you pretty well, <<Master>>.
+ <</if>>
<</if>>
<<S>>o,
diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw
index 397639917f8..597f6cf3556 100644
--- a/src/npc/startingGirls/commitStartingGirl.tw
+++ b/src/npc/startingGirls/commitStartingGirl.tw
@@ -12,6 +12,7 @@
<<set $activeSlave.height = Math.clamp($activeSlave.height, 85, 274) || 140>>
<<set $activeSlave.boobs = Math.clamp(Math.trunc($activeSlave.boobs/50)*50, 0, 50000) || 200>>
<<set $activeSlave.origSkin = $activeSlave.skin>>
+<<set $activeSlave.weekAcquired = 0>>
<<set $careerBonusApplied = 0>>
<<set $originOveride = 0>>
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index 38d3cb77905..a6910bbb582 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -259,7 +259,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<<elseif $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
<br><br>
<<if $activeSlave.pregSource == -1>>
- <<if $activeSlave.devotion < 20 && ($week-$activeSlave.weekAcquired >= $activeSlave.weekAcquired)>>
+ <<if $activeSlave.devotion < 20 && $activeSlave.weekAcquired > 0)>>
She @@.mediumorchid;despises@@ you for using her body to bear your children.
<<set $activeSlave.devotion -= 10>>
<<elseif $activeSlave.devotion > 50>>
diff --git a/src/pregmod/organFarmOptions.tw b/src/pregmod/organFarmOptions.tw
index 14a288b8666..509aa6644a3 100644
--- a/src/pregmod/organFarmOptions.tw
+++ b/src/pregmod/organFarmOptions.tw
@@ -170,7 +170,7 @@ The fabricator is ready to grow an organ for $object. Extract tissue to begin gr
<<if $youngerOvaries == 1>>
<<if $slaveOrgans.freshOvaries != 1>>
<br>
- <<link "Fertile Ovaries">>
+ <<link "Younger Ovaries">>
<<set $cash -= 10000>>
<<set _newOrgan = {type: "freshOvaries", weeksToCompletion: "10", ID: 0}>>
<<set _newOrgan.ID = $activeSlave.ID>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index f7e5ca71f25..c70ff4ad56b 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -689,7 +689,7 @@ All in all,
/* ----- Postbirth reactions, mind ------------------------------------------------------------------------------------------- */
-<<if $slaves[$i].fetish != "mindbroken">>
+<<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].curStillBirth > 0>>
<br><br>
/*Here should be descriptions of reactions from losing some of babies.*/
@@ -699,17 +699,15 @@ All in all,
$pronounCap @@.mediumorchid;despises@@ you for using $object as a breeder.
<<set $slaves[$i].devotion -= 10>>
<</if>>
- <<if $slaves[$i].fuckdoll == 0>>
- <<if $slaves[$i].pregSource == -1 >>
- <<if $slaves[$i].devotion < 20 && ($week-$slaves[$i].weekAcquired >= $slaves[$i].weekAcquired)>>
- <br>
- $pronounCap @@.mediumorchid;hates@@ you for using $possessive body to bear your children.
- <<set $slaves[$i].devotion -= 10>>
- <<elseif $slaves[$i].devotion > 50>>
- <br>
- <<print $pronounCap>>'s @@.hotpink;so proud@@ to have successfully carried children for you.
- <<set $slaves[$i].devotion += 3>>
- <</if>>
+ <<if $slaves[$i].pregSource == -1>>
+ <<if $slaves[$i].devotion < 20 && $slaves[$i].weekAcquired > 0>>
+ <br>
+ $pronounCap @@.mediumorchid;hates@@ you for using $possessive body to bear your children.
+ <<set $slaves[$i].devotion -= 10>>
+ <<elseif $slaves[$i].devotion > 50>>
+ <br>
+ <<print $pronounCap>>'s @@.hotpink;so proud@@ to have successfully carried children for you.
+ <<set $slaves[$i].devotion += 3>>
<</if>>
<</if>>
<<if $humiliation == 1>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index e9516d101f6..45d17f22d48 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -370,137 +370,170 @@ $He comes to you for an inspection
<<ageAndHealthDescription>>
-<<if $clinic != 0>>
-<<if $clinicUpgradeScanner == 1>>
-<<if $activeSlave.chem > 15>>
- $clinicNameCaps's scanners score long term carcinogenic buildup in $his body at @@.cyan;<<print Math.ceil($activeSlave.chem/10)>>@@.
-<<else>>
- $clinicNameCaps's scanners confirm that $he has good prospects for long term health.
-<</if>>
-<</if>>
-<</if>>
-
-<<if $showSexualHistory == 1>>
-<<if $ui != "start">>
-<<if $week-$activeSlave.weekAcquired > 0>>
-
-<<set _weeksOwned = $week-$activeSlave.weekAcquired>>
-$He has been with you
-<<if $activeSlave.weekAcquired == 1>>
- since before you owned the arcology,
-<<elseif _weeksOwned > 1>>
- <<print $week-$activeSlave.weekAcquired>> weeks,
-<<else>>
- one week,
-<</if>>
-
-<<if ($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount) > 0>>
- and has been fucked about <<print ($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount)>> times, including
- <<if $activeSlave.mammaryCount > 0>>
- $activeSlave.mammaryCount mammary,
- <</if>>
- <<if $activeSlave.vaginalCount > 0>>
- $activeSlave.vaginalCount vanilla,
- <</if>>
- <<if $activeSlave.analCount > 0>>
- $activeSlave.analCount anal,
- <</if>>
- <<if $activeSlave.penetrativeCount > 0>>
- $activeSlave.penetrativeCount penetrating,
- <</if>>
- <<if ($activeSlave.penetrativeCount+$activeSlave.mammaryCount+$activeSlave.vaginalCount+$activeSlave.analCount) > 0>>
- and
- <</if>>
- $activeSlave.oralCount oral sexual encounters.
-<<else>>
- <<if $week-$activeSlave.weekAcquired >= 1>>
- and
+<<if $clinic != 0 && $clinicUpgradeScanner == 1>>
+ <<if $activeSlave.chem > 15>>
+ $clinicNameCaps's scanners score long term carcinogenic buildup in $his body at @@.cyan;<<print Math.ceil($activeSlave.chem/10)>>@@.
<<else>>
- $He
+ $clinicNameCaps's scanners confirm that $he has good prospects for long term health.
<</if>>
- has had little or no sexual experience as your slave yet.
<</if>>
-<<if (_weeksOwned*112)/$activeSlave.analCount < 4>>
- Remarkably, this means that $he's been buttfucked
- <<if (_weeksOwned*112)/$activeSlave.analCount < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.analCount < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.analCount < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.analCount < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
- <</if>>
- $he's spent awake.
-<<elseif (_weeksOwned*112)/$activeSlave.oralCount < 4>>
- Remarkably, this means that $he's sucked something off
- <<if (_weeksOwned*112)/$activeSlave.oralCount < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
- <</if>>
- $he's spent awake.
-<<elseif (_weeksOwned*112)/$activeSlave.vaginalCount < 4>>
- Remarkably, this means that $his pussy has been fucked
- <<if (_weeksOwned*112)/$activeSlave.vaginalCount < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.vaginalCount < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.vaginalCount < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.vaginalCount < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
- <</if>>
- $he's spent awake.
-<</if>>
-
-<<if ($activeSlave.lactation > 0) && ($activeSlave.milk < 20)>>
- $He has given a small quantity of milk<<if ($activeSlave.cum > 0)>> and about $activeSlave.cum deciliters of cum<</if>>.
-<<elseif ($activeSlave.milk > 1)>>
- $He has given about $activeSlave.milk liters of milk<<if ($activeSlave.cum > 0)>> and about $activeSlave.cum deciliters of cum<</if>>.
-<</if>>
+<<if $showSexualHistory == 1 && $ui != "start">>
+ <<set _weeksOwned = $week-$activeSlave.weekAcquired>>
+ $He has been with you
+ <<if $activeSlave.weekAcquired == 0>>
+ since before you owned the arcology,
+ <<elseif _weeksOwned > 1>>
+ <<print $week-$activeSlave.weekAcquired>> weeks,
+ <<else>>
+ one week,
+ <</if>>
-<<if ($activeSlave.birthsTotal != 0)>>
- $He has given birth a total of <<print $activeSlave.birthsTotal>> time<<if $activeSlave.birthsTotal != 1>>s<</if>>;
-<<if ($activeSlave.births == $activeSlave.birthsTotal)>>
- <<if ($activeSlave.births == 1)>>
- it happened within the walls of $arcologies[0].name.
+ <<if ($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount) > 0>>
+ and has been fucked about <<print ($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount)>> times, including
+ <<if $activeSlave.mammaryCount > 0>>
+ $activeSlave.mammaryCount mammary,
+ <</if>>
+ <<if $activeSlave.vaginalCount > 0>>
+ $activeSlave.vaginalCount vanilla,
+ <</if>>
+ <<if $activeSlave.analCount > 0>>
+ $activeSlave.analCount anal,
+ <</if>>
+ <<if $activeSlave.penetrativeCount > 0>>
+ $activeSlave.penetrativeCount penetrating,
+ <</if>>
+ <<if ($activeSlave.penetrativeCount+$activeSlave.mammaryCount+$activeSlave.vaginalCount+$activeSlave.analCount) > 0>>
+ and
+ <</if>>
+ $activeSlave.oralCount oral sexual encounters.
<<else>>
- all of them happened within the walls of $arcologies[0].name.
+ <<if $week-$activeSlave.weekAcquired >= 1>>
+ and
+ <<else>>
+ $He
+ <</if>>
+ has had little or no sexual experience <<if $activeSlave.weekAcquired != 0>>as your slave<<else>>in your new arcology<</if>> yet.
+ <</if>>
+
+ <<set _sortedCounts = []>>
+ <<set _sortedCounts.push({type: "anal", value: $activeSlave.analCount}), _sortedCounts.push({type: "vaginal", value: $activeSlave.vaginalCount}), _sortedCounts.push({type: "oral", value: $activeSlave.oralCount/2}), _sortedCounts.push({type: "mammary", value: $activeSlave.mammaryCount}), _sortedCounts.push({type: "penetrative", value: $activeSlave.penetrativeCount})>>
+ <<set _sortedCounts = _sortedCounts.sort(function(a, b){return b.value-a.value})>>
+ <<if _sortedCounts[0].type == "anal">>
+ <<if (_weeksOwned*112)/$activeSlave.analCount < 4>>
+ Remarkably, this means that $he's been buttfucked
+ <<if (_weeksOwned*112)/$activeSlave.analCount < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.analCount < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.analCount < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.analCount < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
+ <</if>>
+ <<elseif _sortedCounts[0].type == "vaginal">>
+ <<if (_weeksOwned*112)/$activeSlave.vaginalCount < 4>>
+ Remarkably, this means that $his pussy has been fucked
+ <<if (_weeksOwned*112)/$activeSlave.vaginalCount < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.vaginalCount < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.vaginalCount < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.vaginalCount < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
+ <</if>>
+ <<elseif _sortedCounts[0].type == "oral">>
+ <<if (_weeksOwned*112)/$activeSlave.oralCount < 4>>
+ Remarkably, this means that $he's sucked something off
+ <<if (_weeksOwned*112)/$activeSlave.oralCount < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
+ <</if>>
+ <<elseif _sortedCounts[0].type == "mammary">>
+ <<if (_weeksOwned*112)/$activeSlave.oralCount < 4>>
+ Remarkably, this means that $he's put $his tits to work
+ <<if (_weeksOwned*112)/$activeSlave.oralCount < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
+ <</if>>
+ <<elseif _sortedCounts[0].type == "penetrative">>
+ <<if (_weeksOwned*112)/$activeSlave.oralCount < 4>>
+ Remarkably, this means that $he's pounded a hole
+ <<if (_weeksOwned*112)/$activeSlave.oralCount < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
+ <</if>>
<</if>>
-<<elseif $activeSlave.births == 1>>
- one of them happened within the walls of $arcologies[0].name.
-<<elseif ($activeSlave.births > 1)>>
- $activeSlave.births of them happened within the walls of $arcologies[0].name.
-<<else>>
- none of them happening within $arcologies[0].name.
-<</if>>
-<</if>>
-<<if $activeSlave.slavesKnockedUp > 0>>
- $He's knocked up $activeSlave.slavesKnockedUp other slave girl<<if $activeSlave.slavesKnockedUp > 1>>s<</if>><<if $activeSlave.slavesFathered > 0>> and fathered $activeSlave.slavesFathered new slave<<if $activeSlave.slavesFathered > 1>>s<</if>> for you<</if>>.
-<<elseif $activeSlave.slavesFathered > 0>>
- $He's fathered $activeSlave.slavesFathered new slave<<if $activeSlave.slavesFathered > 1>>s<</if>> for you.
-<</if>>
-<<if $activeSlave.PCKnockedUp > 0>>
- $He's managed to knock you up $activeSlave.PCKnockedUp time<<if $activeSlave.PCKnockedUp > 1>>s<</if>><<if $activeSlave.slavesFathered > 0>> and is the father of $activeSlave.PCChildrenFathered of your children<</if>>.
-<<elseif $activeSlave.slavesFathered > 0>>
- $He's the father of $activeSlave.PCChildrenFathered of your children.
-<</if>>
+ <<if ($activeSlave.lactation > 0) && ($activeSlave.milk < 20)>>
+ $He has given a small quantity of milk<<if ($activeSlave.cum > 0)>> and about $activeSlave.cum deciliters of cum<</if>>.
+ <<elseif ($activeSlave.milk > 1)>>
+ $He has given about $activeSlave.milk liters of milk<<if ($activeSlave.cum > 0)>> and about $activeSlave.cum deciliters of cum<</if>>.
+ <</if>>
-<</if>>
-<</if>>
+ <<if ($activeSlave.birthsTotal != 0)>>
+ $He has given birth a total of <<print $activeSlave.birthsTotal>> time<<if $activeSlave.birthsTotal != 1>>s<</if>>;
+ <<if ($activeSlave.births == $activeSlave.birthsTotal)>>
+ <<if ($activeSlave.births == 1)>>
+ it happened within the walls of $arcologies[0].name.
+ <<else>>
+ all of them happened within the walls of $arcologies[0].name.
+ <</if>>
+ <<elseif $activeSlave.births == 1>>
+ one of them happened within the walls of $arcologies[0].name.
+ <<elseif ($activeSlave.births > 1)>>
+ $activeSlave.births of them happened within the walls of $arcologies[0].name.
+ <<else>>
+ none of them happening within $arcologies[0].name.
+ <</if>>
+ <</if>>
+
+ <<if $activeSlave.slavesKnockedUp > 0>>
+ $He's knocked up $activeSlave.slavesKnockedUp other slave girl<<if $activeSlave.slavesKnockedUp > 1>>s<</if>><<if $activeSlave.slavesFathered > 0>> and fathered $activeSlave.slavesFathered new slave<<if $activeSlave.slavesFathered > 1>>s<</if>> for you<</if>>.
+ <<elseif $activeSlave.slavesFathered > 0>>
+ $He's fathered $activeSlave.slavesFathered new slave<<if $activeSlave.slavesFathered > 1>>s<</if>> for you.
+ <</if>>
+ <<if $activeSlave.PCKnockedUp > 0>>
+ $He's managed to knock you up $activeSlave.PCKnockedUp time<<if $activeSlave.PCKnockedUp > 1>>s<</if>><<if $activeSlave.slavesFathered > 0>> and is the father of $activeSlave.PCChildrenFathered of your children<</if>>.
+ <<elseif $activeSlave.slavesFathered > 0>>
+ $He's the father of $activeSlave.PCChildrenFathered of your children.
+ <</if>>
<</if>>
<<if $activeSlave.fuckdoll == 0>> /* NORMAL NON-FUCKDOLL MENTAL REPORT */
@@ -1254,13 +1287,13 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<</if>>
<</if>>
<<if ($week-$activeSlave.weekAcquired >= 20) && ($activeSlave.entertainSkill >= 100)>>
- <<if setup.entertainmentCareers.includes($activeSlave.career)>><<else>>
- $He has gotten enough experience to be as charismatic as any professional entertainer<<if ($activeSlave.oralCount + $activeSlave.analCount + $activeSlave.vaginalCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount > 1000)>>, and has been fucked so many times that a free sex worker could teach $him nothing<</if>>.
- <</if>>
+ <<if setup.entertainmentCareers.includes($activeSlave.career)>><<else>>
+ $He has gotten enough experience to be as charismatic as any professional entertainer<<if ($activeSlave.oralCount + $activeSlave.analCount + $activeSlave.vaginalCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount > 1000)>>, and has been fucked so many times that a free sex worker could teach $him nothing<</if>>.
+ <</if>>
<<elseif ($activeSlave.oralCount + $activeSlave.analCount + $activeSlave.vaginalCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount > 1000)>>
- <<if setup.whoreCareers.includes($activeSlave.career)>><<else>>
- $He has been fucked so many times that a free sex worker could teach $him nothing.
- <</if>>
+ <<if setup.whoreCareers.includes($activeSlave.career)>><<else>>
+ $He has been fucked so many times that a free sex worker could teach $him nothing.
+ <</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index d5b4d0143b9..77c45990fc0 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -63,8 +63,8 @@
<<elseif $slaves[_i].sentence == 1>>
<<removeJob $slaves[_i] $slaves[_i].assignment>>
<</if>>
- <<if $slaves[_i].weekAcquired == 0>>
- <<set $slaves[_i].weekAcquired = $week>>
+ <<if $slaves[_i].weekAcquired < 0>>
+ <<set $slaves[_i].weekAcquired = 0>>
<</if>>
<<if $slaves[_i].relation == 0>>
<<set $slaves[_i].relationTarget = 0>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 72d830a3615..7b08c4b6fbe 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -21,7 +21,7 @@ End of week autosaving is currently @@.cyan;ENABLED@@. [[Disable|Options][$autos
<br><br>
''NEW GAME PLUS''
<br>
- //You can begin a new game with up to five of your current slaves, although starting resources other than these five slaves will be reduced. New Game Plus @@.yellow;MAY@@ work across versions. To attempt to migrate a save across versions://
+ //You can begin a new game with up to five (or more) of your current slaves, although starting resources other than these slaves will be reduced. New Game Plus @@.yellow;MAY@@ work across versions. To attempt to migrate a save across versions://
<br> //1) Save on this screen//
<br> //2) Use your browser to open the new .html file in this tab//
<br> //3) [[Activate New Game Plus.|New Game Plus][$ui = "start"]]
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index b3bb5da0801..2bb3b8f6fdb 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -769,16 +769,19 @@ Work on her sex:
<</if>>
<<if $seeExtreme == 1 && $seeHyperPreg == 1 && $seePreg != 0 && $permaPregImplant == 1>>
+ <br>
<<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>>
- <br>
$possessiveCap womb is already rented out for the production of calves.
<<else>>
<<if isFertile($activeSlave) && $activeSlave.ovaryAge <= 46>>
- <br>
$pronounCap could be made into a broodmother.
<<elseif $activeSlave.broodmother > 0>>
- <br>
$pronounCap has been made into a <<if $activeSlave.broodmother > 1>>hyper-<</if>>broodmother.
+ <<if $activeSlave.womb.length == 0 >>
+ [[Remove a pregnancy generator|Surgery Degradation][$activeSlave.preg = 0,$activeSlave.pregWeek = -2,$activeSlave.pregSource = 0,$activeSlave.pregWeek = 0,$activeSlave.pregKnown = 0,$activeSlave.pregType = 0,$activeSlave.broodmother = 0,$activeSlave.broodmotherFetuses = 0,$activeSlave.broodmotherOnHold = 0,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "pregRemove"]]
+ <<else>>
+ $pronounCap is pregnant right now, so $possessive broodmother implant can't be safely extracted.
+ <</if>>
<<else>>
$possessiveCap body cannot support being a broodmother.
<</if>>
@@ -790,16 +793,6 @@ Work on her sex:
<</if>>
<</if>>
-<<if $permaPregImplant == 1>>
- <<if $activeSlave.broodmother >= 1 >>
- <<if $activeSlave.womb.length == 0 >>
- [[Remove a pregnancy generator|Surgery Degradation][$activeSlave.preg = 0,$activeSlave.pregWeek = -2,$activeSlave.pregSource = 0,$activeSlave.pregWeek = 0,$activeSlave.pregKnown = 0,$activeSlave.pregType = 0,$activeSlave.broodmother = 0,$activeSlave.broodmotherFetuses = 0,$activeSlave.broodmotherOnHold = 0,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "pregRemove"]]
- <<else>>
- $pronounCap is pregnant right now, so $possessive broodmother implant can't be safely extracted.
- <</if>>
- <</if>>
-<</if>>
-
<<if $activeSlave.mpreg == 1>>
<<if $activeSlave.preg > 0>>
<br>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 4e7168ac8f0..712360f78e0 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -7757,9 +7757,9 @@
<<if $slaves[$i].fuckdoll > 0>>
It did not know.
<<elseif $slaves[$i].devotion > 50>>
- $pronounCap did not notice.
+ $pronounCap did not notice.
<<elseif $week-$slaves[$i].weekAcquired > 10>>
- $pronounCap remembered it only dimly.
+ $pronounCap remembered it only dimly.
<<else>>
$pronounCap remembered it, but no one cared.
<</if>>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 61b249b3a2b..cbcf9468cd0 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -226,12 +226,16 @@
<<case "flowers">>
$His back is covered in hundreds of beautiful flower tattoos; one could spend half an hour examining them all.
<<case "counting">>
- $His back is tattooed with tick marks to count the days of $his sexual slavery
- <<set $seed = (($week-$activeSlave.weekAcquired)*7)+random(-3,3)>>
- <<if $seed < 10>>
- here. There are only a few.
+ $His back is tattooed with tick marks to count the days of $his sexual
+ <<if $activeSlave.weekAcquired == 0>>
+ enlsavement to you. There are a lot of them.
<<else>>
- here: $seed of them.
+ <<set $seed = (($week-$activeSlave.weekAcquired)*7)+random(-3,3)>>
+ <<if $seed < 10>>
+ slavery here. There are only a few.
+ <<else>>
+ slavery here: $seed of them.
+ <</if>>
<</if>>
<<case "advertisements">>
$He has an ad for the arcology itself tattooed across $his back.
--
GitLab