diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 8b89eddc9cbc477d849803c59a97e13f9ae2dc62..0e38f46d0e29530b8e130db1b91d16faedc34d22 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,13 +2,20 @@
0.10.7.0/1
+2/21/18
+
+ 363
+ -added labor suppressant feedback to BellyDescription
+ -tweaked Mercenary Romeo to avoid mastersuite slaves and your wives if given the option.
+ -further tweaked Mercenary Romeo to only fire off if you have a public slave or a slave that has seen lots of public duty. MB, FD and NG+ exclusions.
+
2/20/18
362
-added .pregWeek to the advanced cheat edit slave
-added slow gestation feedback to PregnancyDescription
-added labor suppressant feedback to PregnancyDescription
- -added speed gestation feedback to PregnancyDescription.
+ -added speed gestation feedback to PregnancyDescription
BellyDescription may need additions as well for the trio.
2/19/18
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 11399d69a2434902ebafba7aaba109e729cd6d12..c1feb313ce7f995e496360397ebb310f83fb0b33 100755
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -49,9 +49,15 @@
<<goto "P snatch and grab">>
<<elseif (_effectiveWeek == 43)>>
<<goto "P invasion">>
-<<elseif (_effectiveWeek == 44) && ($mercenaries > 0)>>
- <<set $activeSlave = 0>>
+<<elseif (_effectiveWeek == 44) && ($mercenaries > 0) && $mercRomeo != 1>>
+ <<set _valid = $slaves.find(function(s) { return (["serve the public", "serve in the club", "whore", "work in the brothel"].includes(s.assignment) || s.publicCount >= 50) && s.fetish != "mindbroken" && s.fuckdoll == 0; })>>
+ <<if def _valid>>
+ <<set $mercRomeo = 1, $activeSlave = 0>>
<<goto "P mercenary romeo">>
+ <<else>>
+ <<set $mercRomeo = 1>>
+ <<goto "Nonrandom Event">>
+ <</if>>
<<elseif (_effectiveWeek == 46) && ($mercenaries > 0)>>
<<goto "P raid invitation">>
<<elseif (_effectiveWeek == 52) && ($seeHyperPreg == 1) && $seePreg != 0 && $badB != 1>>
diff --git a/src/uncategorized/pMercenaryRomeo.tw b/src/uncategorized/pMercenaryRomeo.tw
index cffccf4b33a7a5aeafa825da96749779cb7fdb96..9e2eb3863f20e092d24807dd8e409920df64452a 100644
--- a/src/uncategorized/pMercenaryRomeo.tw
+++ b/src/uncategorized/pMercenaryRomeo.tw
@@ -13,10 +13,12 @@
<</for>>
<<if $activeSlave == 0>>
<<for _pmr = $slaves.length - 1; _pmr >= 0; _pmr-->>
- <<if ($slaves[_pmr].publicCount > 0) && (($activeSlave == 0) || (random(1,100) > 50))>>
- <<set $activeSlave = $slaves[_pmr]>>
- <<break>>
- <</if>>
+ <<if ($slaves[_pmr].publicCount > 0) && ($slaves[_pmr].newGamePlus == 0) && ($slaves[_pmr].relationship > -3) && (($activeSlave == 0) || (random(1,100) > 50))>>
+ <<if !["be your Concubine", "serve in the master suite"].includes($slaves[_pmr].assignment)>>
+ <<set $activeSlave = $slaves[_pmr]>>
+ <<break>>
+ <</if>>
+ <</if>>
<</for>>
<</if>>
<<if $activeSlave == 0>>
@@ -49,7 +51,13 @@ proffered by an attentive slave girl, he seems almost bashful.
<br><br>
-"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'll say this straight. I'd like to buy one of your slaves. I've been seeing <<EventNameLink $activeSlave>> a lot, and she makes the years sit a little lighter on me. I've scraped together what I can, and I can pay <<print cashFormat($slaveCost)>>." It's a decent price, probably a little less than you could get at auction. It's a huge sum for a mercenary; it's probably his entire savings. You ask what he would do with her. "Well," he says, actually blushing, "I'd free her. And marry her, if she'd have me."
+"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'll say this straight. I'd like to buy one of your slaves.
+<<if ["serve the public", "serve in the club", "whore", "work in the brothel"].includes($activeSlave.assignment)>>
+ I've been seeing <<EventNameLink $activeSlave>> a lot, and she makes the years sit a little lighter on me.
+<<else>>
+ I've seen <<EventNameLink $activeSlave>> here and there and I can't stop thinking about her. I feel she'd make the years sit a little lighter on me.
+<</if>>
+I've scraped together what I can, and I can pay <<print cashFormat($slaveCost)>>." It's a decent price, probably a little less than you could get at auction. It's a huge sum for a mercenary; it's probably his entire savings. You ask what he would do with her. "Well," he says, actually blushing, "I'd free her. And marry her, if she'd have me."
<br><br>
@@ -57,32 +65,64 @@ proffered by an attentive slave girl, he seems almost bashful.
<<link "Decline, and tell her not to see him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- $activeSlave.slaveName obeys your orders not to see the old mercenary. Though neither he or $activeSlave.slaveName says a word about it, his squadmates are not so closemouthed. Soon the tragic story of The Mercenary and the Slave Girl is being told in bars and brothels across the Free City, with you naturally playing @@.red;the role of the villain.@@
- <<set $rep -= 1000>>
+ $activeSlave.slaveName obeys your orders not to see the old mercenary. Though neither he or $activeSlave.slaveName says a word about it, his squadmates are not so closemouthed. Soon the tragic story of The Mercenary and the Slave Girl is being told in bars and brothels across the Free City, with you naturally playing @@.red;the role of the villain.@@
+ <<set $rep -= 1000>>
<</replace>>
<</link>>
<br><<link "Politely decline">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- "Ah well," he says, "didn't think you would, but I had to ask. If you'd be so kind as to keep her assigned so's I can see her, I would be grateful. That was a fine victory, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to."
+ "Ah well," he says, "didn't think you would, but I had to ask. If you'd be so kind as to keep her assigned so's I can see her, I would be grateful. That was a fine victory, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to."
+ <<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>$activeSlave.slaveName politely thanks you for not letting him take her away.<</if>>
<</replace>>
<</link>>
<br><<link "Accept">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- The mercenary leaves to collect his purchase. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's happened. <<if $activeSlave.amp != 1>>She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,<<else>>As he picks up her limbless form to give her a hug,<</if>> she gives the nearest camera a little nod and silently mouths the words 'thank you, <<WrittenMaster $activeSlave>>.' Soon the romantic story of The Mercenary and the Slave Girl is being told in bars and brothels across the Free City, with you naturally playing @@.green;a supporting role.@@
- <<set $rep += 500, $cash += $slaveCost>>
- <<include "Remove activeSlave">>
+ The mercenary leaves to collect his purchase. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's
+ <<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>
+ happening. You can't hear what he says as he takes out a ring, but her reaction speaks clearly. She says "No."
+ <<if $activeSlave.amp != 1>>
+ She points back into your penthouse and returns to her home.
+ <<else>>
+ She gestures towards the nearest camera and he helps her back into your penthouse.
+ <</if>>
+ The only thing she wants after being freed is to return to your side.
+ "I thought I was giving her a better life... But she already had everything she wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
+ Since she returned to slavery, it's only fair to return the credits he paid for her. He thanks you hollowly before heading on his way.
+ <<else>>
+ happened.
+ <<if $activeSlave.amp != 1>>
+ She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
+ <<else>>
+ As he picks up her limbless form to give her a hug,
+ <</if>>
+ she gives the nearest camera a little nod and silently mouths the words 'thank you, <<WrittenMaster $activeSlave>>.' Soon the romantic story of The Mercenary and the Slave Girl is being told in bars and brothels across the Free City, with you naturally playing @@.green;a supporting role.@@
+ <<set $rep += 500, $cash += $slaveCost>>
+ <<include "Remove activeSlave">>
+ <</if>>
<</replace>>
<</link>>
<br><<link "Give her to him as a gift">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- The mercenary cannot believe his ears. After you repeat yourself twice, he leaves to collect your gift, thanking you clumsily. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's happened. <<if $activeSlave.amp != 1>>She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,<<else>>As he picks up her limbless form to give her a hug,<</if>> she gives the nearest camera a little nod and silently mouths the words 'thank you, <<WrittenMaster $activeSlave>>.' You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing $activeSlave.slaveName, and a noted character actor playing you.
- <<set $rep += 3000>>
- <<set _poster = "a poster for the movie that was made about the love between one of your mercenaries and " + $activeSlave.slaveName>>
- <<set $trinkets.push(_poster)>>
- <<include "Remove activeSlave">>
+ The mercenary cannot believe his ears. After you repeat yourself twice, he leaves to collect your gift, thanking you clumsily.
+ <<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>
+ happening. You can't hear what he says as he takes out a ring, but her reaction speaks clearly. She says "No."
+ <<if $activeSlave.amp != 1>>
+ She points back into your penthouse and returns to her home.
+ <<else>>
+ She gestures towards the nearest camera and he helps her back into your penthouse.
+ <</if>>
+ The only thing she wants after being freed is to return to your side.
+ "I thought I was giving her a better life... But she already had everything she wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
+ <<else>>
+ On the video feeds, you see that $activeSlave.slaveName can hardly believe what's happened. <<if $activeSlave.amp != 1>>She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,<<else>>As he picks up her limbless form to give her a hug,<</if>> she gives the nearest camera a little nod and silently mouths the words 'thank you, <<WrittenMaster $activeSlave>>.' You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing $activeSlave.slaveName, and a noted character actor playing you.
+ <<set $rep += 3000>>
+ <<set _poster = "a poster for the movie that was made about the love between one of your mercenaries and " + $activeSlave.slaveName>>
+ <<set $trinkets.push(_poster)>>
+ <<include "Remove activeSlave">>
+ <</if>>
<</replace>>
<</link>>
</span>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index ee4e530b1de15b404eeb1c27fdbfb1b559b18b59..904a4109aa25e6e2ecaafbec23ad0465f2b1f011 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -4414,6 +4414,24 @@ $pronounCap has
<</if>>
<<if $activeSlave.preg < 30>>
Given how far along $pronoun is, $pronoun is clearly having an obscene number of children.
+ <<elseif $activeSlave.preg > 42>>
+ <<if $activeSlave.pregType == 1>>
+ $possessiveCap womb contains one single, massive unborn child. It has grown so large that $pronoun will never be able to birth it.
+ <<elseif $activeSlave.pregType == 2>>
+ $possessiveCap womb contains a pair of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 3>>
+ $possessiveCap womb contains a trio of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 4>>
+ $possessiveCap womb contains a quartet of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 5>>
+ $possessiveCap womb contains a quintet of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 6>>
+ $possessiveCap womb contains a sextet of oversized babies. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 7>>
+ $possessiveCap womb contains a septet of oversized babies. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 8>>
+ $possessiveCap womb contains a octet of oversized babies. There is little chance of $object giving birth to them.
+ <</if>>
<</if>>
<<if $activeSlave.bellyFluid >= 1500>>
<<if $activeSlave.inflationMethod == 2>>
@@ -4469,8 +4487,22 @@ $pronounCap has
<</if>>
<<if $activeSlave.preg < 40>>
Given how far along $pronoun is, $pronoun is clearly having an obscene number of children.
- <<else>>
+ <<elseif $activeSlave.preg < 42>>
$pronounCap is clearly full-term with octuplets.
+ <<elseif $activeSlave.pregType == 1>>
+ $possessiveCap womb contains one single, massive unborn child. It has grown so large that $pronoun will never be able to birth it.
+ <<elseif $activeSlave.pregType == 2>>
+ $possessiveCap womb contains a pair of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 3>>
+ $possessiveCap womb contains a trio of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 4>>
+ $possessiveCap womb contains a quartet of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 5>>
+ $possessiveCap womb contains a quintet of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 6>>
+ $possessiveCap womb contains a sextet of oversized babies. There is little chance of $object giving birth to them.
+ <<elseif $activeSlave.pregType == 7>>
+ $possessiveCap womb contains a septet of oversized babies. There is little to no chance of $object giving birth to them.
<</if>>
<<if $activeSlave.bellyFluid >= 1500>>
<<if $activeSlave.inflationMethod == 2>>
@@ -4525,8 +4557,20 @@ $pronounCap has
<</if>>
<<if $activeSlave.preg < 40>>
Given how far along $pronoun is, $pronoun is clearly having more than seven.
- <<else>>
+ <<elseif $activeSlave.preg < 42>>
$pronounCap is clearly full-term with septuplets.
+ <<elseif $activeSlave.pregType == 1>>
+ $possessiveCap womb contains one single, massive unborn child. It has grown so large that $pronoun will never be able to birth it.
+ <<elseif $activeSlave.pregType == 2>>
+ $possessiveCap womb contains a pair of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 3>>
+ $possessiveCap womb contains a trio of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 4>>
+ $possessiveCap womb contains a quartet of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 5>>
+ $possessiveCap womb contains a quintet of massive unborn children. There is little chance of $object giving birth to them.
+ <<elseif $activeSlave.pregType == 6>>
+ $possessiveCap womb contains a sextet of oversized babies. There is little to no chance of $object giving birth to them.
<</if>>
<<if $activeSlave.bellyFluid >= 1500>>
<<if $activeSlave.inflationMethod == 2>>
@@ -4581,8 +4625,18 @@ $pronounCap has
<</if>>
<<if $activeSlave.preg < 40>>
Given how far along $pronoun is, $pronoun is clearly having more than six.
- <<else>>
+ <<elseif $activeSlave.preg < 42>>
$pronounCap is clearly full-term with sextuplets.
+ <<elseif $activeSlave.pregType == 1>>
+ $possessiveCap womb contains one single, massive unborn child. It has grown so large that $pronoun will never be able to birth it.
+ <<elseif $activeSlave.pregType == 2>>
+ $possessiveCap womb contains a pair of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 3>>
+ $possessiveCap womb contains a trio of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 4>>
+ $possessiveCap womb contains a quartet of massive unborn children. There is little chance of $object giving birth to them.
+ <<elseif $activeSlave.pregType == 5>>
+ $possessiveCap womb contains a quintet of oversized babies. There is little to no chance of $object giving birth to them.
<</if>>
<<if $activeSlave.bellyFluid >= 1500>>
<<if $activeSlave.inflationMethod == 2>>
@@ -4637,8 +4691,16 @@ $pronounCap has
<</if>>
<<if $activeSlave.preg < 40>>
Given how far along $pronoun is, $pronoun is clearly having more than five.
- <<else>>
+ <<else$activeSlave.preg < 42>>
$pronounCap is clearly full-term with quintuplets.
+ <<elseif $activeSlave.pregType == 1>>
+ $possessiveCap womb contains one single, massive unborn child. It has grown so large that $pronoun will never be able to birth it.
+ <<elseif $activeSlave.pregType == 2>>
+ $possessiveCap womb contains a pair of massive unborn children. They have grown so large that $pronoun will never be able to birth them.
+ <<elseif $activeSlave.pregType == 3>>
+ $possessiveCap womb contains a trio of massive unborn children. There is little chance of $object giving birth to them.
+ <<elseif $activeSlave.pregType == 4>>
+ $possessiveCap womb contains a quartet of oversized babies. There is little to no chance of $object giving birth to them.
<</if>>
<<if $activeSlave.bellyFluid >= 1500>>
<<if $activeSlave.inflationMethod == 2>>
@@ -4693,8 +4755,15 @@ $pronounCap has
<</if>>
<<if $activeSlave.preg < 36>>
Given how far along $pronoun is, $pronoun is clearly having more than four.
- <<else>>
+ <<elseif $activeSlave.preg < 42>>
$pronounCap is clearly full-term with quadruplets.
+ <<elseif $activeSlave.pregType == 1>>
+ $possessiveCap womb contains one single, massive unborn child. It has grown so large that $pronoun will never be able to birth it.
+ <<elseif $activeSlave.pregType == 2>>
+ $possessiveCap womb contains a pair of massive unborn children. There is little to no chance of $object giving birth to them.
+ <<elseif $activeSlave.pregType == 3>>
+ $possessiveCap womb contains a trio of oversized babies. There is little chance of $object giving birth to them.
+ <</if>>
<</if>>
<<if $activeSlave.bellyFluid >= 1500>>
<<if $activeSlave.inflationMethod == 2>>
@@ -4749,8 +4818,12 @@ $pronounCap has
<</if>>
<<if $activeSlave.preg < 35>>
Given how far along $pronoun is, $pronoun is clearly having more than three.
- <<else>>
+ <<elseif $activeSlave.preg < 42>>
$pronounCap is clearly full-term with triplets.
+ <<elseif $activeSlave.pregType == 1>>
+ $possessiveCap womb contains one single, massive unborn child. There is little to no chance of $object giving birth to it.
+ <<elseif $activeSlave.pregType == 2>>
+ $possessiveCap womb contains a pair of oversized babies. There is little chance of $object giving birth to them.
<</if>>
<<if $activeSlave.bellyFluid >= 1500>>
<<if $activeSlave.inflationMethod == 2>>
@@ -4805,8 +4878,10 @@ $pronounCap has
<</if>>
<<if $activeSlave.preg < 33>>
Given how far along $pronoun is, $pronoun is clearly having more than two.
- <<else>>
+ <<elseif $activeSlave.preg < 42>>
$pronounCap is clearly full-term with twins.
+ <<elseif $activeSlave.pregType == 1>>
+ $possessiveCap womb contains one single, massive child. There is little chance of $object giving birth to it.
<</if>>
<<if $activeSlave.bellyFluid >= 1500>>
<<if $activeSlave.inflationMethod == 2>>