From 46e1b73c8cd4860d0f2e58d03345f1365d90ad57 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 17 Oct 2018 22:20:48 -0400 Subject: [PATCH] fixes and beta belly band --- devNotes/twine JS.txt | 6 +++++- src/endWeek/saChoosesOwnClothes.tw | 6 +++++- src/init/setupVars.tw | 1 + src/uncategorized/reRecruit.tw | 11 +++++++---- src/uncategorized/saLongTermEffects.tw | 12 ++++++------ src/uncategorized/slaveInteract.tw | 3 +++ src/uncategorized/wardrobeUse.tw | 7 +++++++ src/utility/descriptionWidgetsFlesh.tw | 1 + 8 files changed, 35 insertions(+), 12 deletions(-) diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 0f93daccc7c..359676f2967 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -10887,7 +10887,9 @@ window.saChoosesOwnClothes = (function() { belly.push({text: "", bellyAccessory: slave.bellyAccessory}); /*compatibility for no output, will likely get deprecated in the future as content is added*/ } } else if(slave.devotion <= 20) { - + if(slave.belly > 10000 && (slave.pregAdaptation*800 <= slave.belly)){ + belly.push({text: `slips a pregnancy support band around ${his} middle to help alleviate some of the discomfort,`, bellyAccessory: "a support band"}); + } } else { if(V.arcologies[0].FSRepopulationFocus > 0 && slave.belly < 1500 && slave.sexualFlaw != "breeder") { if(slave.weight > 130) { @@ -10905,6 +10907,8 @@ window.saChoosesOwnClothes = (function() { } else if(slave.fetishStrength > 95) { belly.push({text: `straps on the largest belly ${he} can find to satisfy ${his} pregnancy fetish,`, bellyAccessory: "a huge empathy belly"}); } + } else if(slave.belly > 10000 && (slave.pregAdaptation*1200 <= slave.belly)){ + belly.push({text: `slips a pregnancy support band around ${his} middle to better handle ${his} fecund mound,`, bellyAccessory: "a support band"}); } else if(empathyBellies.includes(slave.bellyAccessory) && slave.fetish != "pregnancy") { belly.push({text: `removes ${his} fake belly, since ${he} dislikes it,`, bellyAccessory: "none"}); } else if(empathyBellies.includes(slave.bellyAccessory) && slave.sexualFlaw == "breeder") { diff --git a/src/endWeek/saChoosesOwnClothes.tw b/src/endWeek/saChoosesOwnClothes.tw index 5dbd62aee5b..8d5e12e75db 100644 --- a/src/endWeek/saChoosesOwnClothes.tw +++ b/src/endWeek/saChoosesOwnClothes.tw @@ -895,7 +895,9 @@ window.saChoosesOwnClothes = (function() { belly.push({text: "", bellyAccessory: slave.bellyAccessory}); /*compatibility for no output, will likely get deprecated in the future as content is added*/ } } else if(slave.devotion <= 20) { - + if(slave.belly > 10000 && (slave.pregAdaptation*800 <= slave.belly)){ + belly.push({text: `slips a pregnancy support band around ${his} middle to help alleviate some of the discomfort,`, bellyAccessory: "a support band"}); + } } else { if(V.arcologies[0].FSRepopulationFocus > 0 && slave.belly < 1500 && slave.sexualFlaw != "breeder") { if(slave.weight > 130) { @@ -913,6 +915,8 @@ window.saChoosesOwnClothes = (function() { } else if(slave.fetishStrength > 95) { belly.push({text: `straps on the largest belly ${he} can find to satisfy ${his} pregnancy fetish,`, bellyAccessory: "a huge empathy belly"}); } + } else if(slave.belly > 10000 && (slave.pregAdaptation*1200 <= slave.belly)){ + belly.push({text: `slips a pregnancy support band around ${his} middle to better handle ${his} fecund mound,`, bellyAccessory: "a support band"}); } else if(empathyBellies.includes(slave.bellyAccessory) && slave.fetish != "pregnancy") { belly.push({text: `removes ${his} fake belly, since ${he} dislikes it,`, bellyAccessory: "none"}); } else if(empathyBellies.includes(slave.bellyAccessory) && slave.sexualFlaw == "breeder") { diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw index 6ed2c731f7d..c3de2c1f883 100644 --- a/src/init/setupVars.tw +++ b/src/init/setupVars.tw @@ -1992,6 +1992,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do {name: "None", value: "none"}, {name: "Tight corset", value: "a corset"}, {name: "Extreme corset", value: "an extreme corset"}, + {name: "Supportive band", value: "a support band"}, {name: "1st Trimester belly", value: "a small empathy belly", fs: "repopulation", rs: "boughtBelly"}, {name: "2nd Trimester belly", value: "a medium empathy belly", fs: "repopulation", rs: "boughtBelly"}, {name: "3rd Trimester belly", value: "a large empathy belly", fs: "repopulation", rs: "boughtBelly"}, diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw index f39a11771e2..133862abcef 100644 --- a/src/uncategorized/reRecruit.tw +++ b/src/uncategorized/reRecruit.tw @@ -303,6 +303,7 @@ <<set $activeSlave.hStyle = "long and in twin schoolgirl tails">> <<set $activeSlave.pubicHStyle = "waxed">> <<set $activeSlave.underArmHStyle = "waxed">> +<<set $activeSlave.birthWeek = 0>> <<case "school trap">> @@ -335,6 +336,7 @@ <<set $activeSlave.underArmHStyle = "waxed">> <<set $activeSlave.pubertyXY = 0>> <<set $activeSlave.pubertyAgeXY = 50>> +<<set $activeSlave.birthWeek = 0>> <<case "handsome PC">> @@ -354,6 +356,7 @@ <<set $activeSlave.vagina = 1>> <<set $activeSlave.vaginalSkill = 15>> <</if>> +<<set $activeSlave.birthWeek = random(0,2)>> <<set $activeSlave.earPiercing = random(0,1)>> <<case "womanly PC">> @@ -1854,7 +1857,7 @@ One of your tenants asks for an interview. He's an effeminate young man; it seem A young slave is going door to door offering $himself for sale on behalf of $his owner. It's rare to see a slave obedient enough to be entrusted with $his own sale, and $he's interesting, so you let $him up. $He stands in front of your desk and waits for instructions. $He's wearing a very skimpy schoolgirl skirt and a white blouse so tight and brief that the tops of $his areolae are visible. The badge on $his blouse identifies $him as a product of one of the Free Cities' legal slave orphanages. You instruct $him to tell you about $himself. <br><br> -"I was raised and trained by a slave orphanage, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. It is not legal to own underage girls, but it is legal to charge an orphan for the costs of raising $him when $he reaches $minimumSlaveAge, and those debts are always high enough to enslave $him. My <<print $activeSlave.actualAge>>th birthday was yesterday, <<if $activeSlave.actualAge == $minimumSlaveAge>>so I am a slave and for sale now<<else>>so I'm too old to stay at the orphanage any longer<</if>>." +"I was raised and trained by a slave orphanage, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. It is not legal to own underage <<= $girl>>s, but it is legal to charge an orphan for the costs of raising $him when $he reaches $minimumSlaveAge, and those debts are always high enough to enslave $him. My <<print $activeSlave.actualAge>>th birthday was yesterday, <<if $activeSlave.actualAge == $minimumSlaveAge>>so I am a slave and for sale now<<else>>so I'm too old to stay at the orphanage any longer<</if>>." <br><br> "I have been trained for obedience since I came to the orphanage. At <<print Math.min(14, $activeSlave.actualAge - 4)>> they put me on drugs to make sure I'd grow nice T&A. On my <<print Math.min(16, $activeSlave.actualAge - 2)>>th birthday I got my first set of implants. Every time my boobs got used to the implants, I got sent in for a bigger set. I'm on my second set." $He unbuttons $his blouse and displays a pair of big fake tits. "I've also had my lips done." $He blows you a wet kiss. <br><br> @@ -1868,7 +1871,7 @@ $He hikes up $his skirt and spins around slowly. "The drugs also made my butt bi A young slave is going door to door offering $himself for sale on behalf of $his owner. It's rare to see a slave obedient enough to be entrusted with $his own sale, and $he's interesting, so you let $him up. $He stands in front of your desk and waits for instructions. $He's wearing a very skimpy schoolgirl skirt and a white blouse so tight and brief that the tops of $his areolae are visible. Something is tenting the front of $his skirt slightly. The badge on $his blouse identifies $him as a product of one of the Free Cities' legal slave orphanages. You instruct $him to tell you about $himself. <br><br> -"I was raised and trained by a slave orphanage, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. It is not legal to own underage girls, but it is legal to charge an orphan for the costs of raising $him when $he reaches $minimumSlaveAge, and those debts are always high enough to enslave $him. My <<print $activeSlave.actualAge>>th birthday was yesterday, <<if $activeSlave.actualAge == $minimumSlaveAge>>so I am a slave and for sale now<<else>>so I'm too old to stay at the orphanage any longer<</if>>." +"I was raised and trained by a slave orphanage, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>. It is not legal to own underage <<= $girl>>s, but it is legal to charge an orphan for the costs of raising $him when $he reaches $minimumSlaveAge, and those debts are always high enough to enslave $him. My <<print $activeSlave.actualAge>>th birthday was yesterday, <<if $activeSlave.actualAge == $minimumSlaveAge>>so I am a slave and for sale now<<else>>so I'm too old to stay at the orphanage any longer<</if>>." <br><br> "I have been trained for obedience since I came to the orphanage. I came as a male, but they reassigned me to female right away. At <<print Math.min(14, $activeSlave.actualAge - 4)>> they put me on drugs to make sure I'd grow nice T&A and look more feminine. Those drugs also stopped my penis from growing much, so it's small, <<= properTitle()>>. On my <<print Math.min(16, $activeSlave.actualAge - 2)>>th birthday I got my first set of implants. Every time my chest got used to the implants, I got sent in for a bigger set. I'm on my third set." $He unbuttons $his blouse and displays a pair of fake tits. <br><br> @@ -1878,11 +1881,11 @@ $He hikes up $his skirt and spins around slowly, displaying a petite, half-hard <<case "handsome PC">> -<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistantName makes herself invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; this is just such a girl. +<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistantName makes herself invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; this is just such a $girl. <br><br> The young girl who is admitted to your office quails a bit at the sight of you, and you believe you can detect a bit of infatuation there, too. You wordlessly query $assistantName, and she turns to the massive task of sorting through arcology records to come up with a possible explanation. Meanwhile, you start interviewing the potential slave. It appears that $he left home, in a settlement near the arcology, right after $his <<print $activeSlave.actualAge>>th birthday and came straight here. $He's no innocent, and not destitute, and you're surprised $he's done something this foolish. <br><br> -After a short while, your assistant whispers in your earpiece, <<if $assistant == 0>><<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>"Sir<<else>>"Ma'am<</if>>,<<else>>"Sweetheart,<</if>> $he doesn't live here. Look at this." $He pulls up footage of a public event several weeks ago, and the girl is in the crowd, staring at you with limpid eyes. Rather than confronting $him directly, you probe the subject, and after some evasion $he admits that yes, $he did come here out of infatuation with you. "Pretty fuckin' stupid," $he admits. "But I've come too far now. I just really want to live here. With you, I guess. If that means being your slave, that's okay. Can I be your house servant, maybe?" +After a short while, your assistant whispers in your earpiece, <<if $assistant == 0>><<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>"Sir<<else>>"Ma'am<</if>>,<<else>>"Sweetheart,<</if>> $he doesn't live here. Look at this." $He pulls up footage of a public event several weeks ago, and the $girl is in the crowd, staring at you with limpid eyes. Rather than confronting $him directly, you probe the subject, and after some evasion $he admits that yes, $he did come here out of infatuation with you. "Pretty fuckin' stupid," $he admits. "But I've come too far now. I just really want to live here. With you, I guess. If that means being your slave, that's okay. Can I be your house servant, maybe?" <<case "womanly PC">> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index f02ebcdcb90..5df6957ec7d 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -1,4 +1,4 @@ -/*:: SA long term effects [nobr]*/ +:: SA long term effects [nobr] <<set _fetishChangeChance = fetishChangeChance($slaves[$i])>> <<set $bellyAccessory = $slaves[$i].bellyAccessory>> @@ -7167,10 +7167,10 @@ <<set $slaves[$i].pregAdaptation += .1>> <</if>> - <<if seeExtreme == 1 && $dangerousPregnancy == 1 && (($slaves[$i].belly > ($slaves[$i].pregAdaptation*3200)) || $slaves[$i].bellyPreg > 600000)>> + <<if $seeExtreme == 1 && $dangerousPregnancy == 1 && (($slaves[$i].belly > ($slaves[$i].pregAdaptation*3200)) || $slaves[$i].bellyPreg > 600000) && $slaves[$i].bellyPreg >= 100000>> <<if $slaves[$i].assignment == "get treatment in the clinic">> <<if $Nurse.ID > 0>> - The fast actions of $clinicName's nurse, $Nurse.slaveName, saved $his life few times. @@.red;$His womb is breaking!@@ + The fast actions of $clinicName's nurse, $Nurse.slaveName, saved $his life a few times. @@.red;$His womb is breaking!@@ <<else>> Automatic monitors in $clinicName detected critical pressure and called junior medical staff. They managed to hold $him together, for now; @@.red;$his womb is breaking!@@ <</if>> @@ -8161,7 +8161,7 @@ <<set _miscarriageChance -= 150>> <</if>> <</if>> - <<if $slaves[$i].bellyAccessory == "support band">> + <<if $slaves[$i].bellyAccessory == "a support band">> <<set _miscarriageChance -= 30>> <</if>> <<if $slaves[$i].pregControl == "slow gestation">> @@ -8238,7 +8238,7 @@ <</if>> <</if>> <<if $seeExtreme == 1>> - <<if _miscarriage != 1 && (($slaves[$i].belly > ($slaves[$i].pregAdaptation*3200)) || $slaves[$i].bellyPreg > 600000)>> /* If she can't relieve the pressure that way, will she hold? */ + <<if _miscarriage != 1 && (($slaves[$i].belly > ($slaves[$i].pregAdaptation*3200)) || $slaves[$i].bellyPreg >= 600000) && $slaves[$i].bellyPreg >= 100000>> /* If she can't relieve the pressure that way, will she hold? */ <<set _burstChance = -80>> <<set _burstChance += (($slaves[$i].belly/1000)-$slaves[$i].pregAdaptation)>> /* this could use to not be linear */ <<if $slaves[$i].health < -20>> @@ -8251,7 +8251,7 @@ <</if>> <<set _burstChance -= $slaves[$i].bellySag>> <<set _burstChance -= $slaves[$i].muscles>> - <<if $slaves[$i].bellyAccessory == "support band">> + <<if $slaves[$i].bellyAccessory == "a support band">> <<set _burstChance -= 10>> <</if>> <<if $slaves[$i].pregControl == "slow down">> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index aa717e41f09..2298cf969a9 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -860,6 +860,9 @@ <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> | <<link "Extreme corset">><<set $activeSlave.bellyAccessory = "an extreme corset">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>> <</if>> + <<if ($activeSlave.belly > 10000)>> + | <<link "Supportive band">><<set $activeSlave.bellyAccessory = "a support band">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>> + <</if>> <<if isItemAccessible("a small empathy belly")>> /* works for all of them */ <<if $activeSlave.belly < 1500 && $activeSlave.weight < 130>> | <<link "1st Trimester belly">><<set $activeSlave.bellyAccessory = "a small empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>> diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw index 355beaf2628..d5dedca1bc4 100644 --- a/src/uncategorized/wardrobeUse.tw +++ b/src/uncategorized/wardrobeUse.tw @@ -888,6 +888,13 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.'' <<replace "#bellyAccessoryDescription">><br>//<<clothingCorsetDescription>><<CorsetPiercingDescription>>//<</replace>> <</link>> <</if>> +<<if ($activeSlave.belly > 10000)>> +| <<link "Supportive band">> + <<set $activeSlave.bellyAccessory = "a support band">> + <<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>> + <<replace "#bellyAccessoryDescription">><br>//<<clothingCorsetDescription>><<CorsetPiercingDescription>>//<</replace>> +<</link>> +<</if>> <<if isItemAccessible("a small empathy belly")>> /* works for all of them */ <<if $activeSlave.belly < 1500 && $activeSlave.weight < 130>> | <<link "1st Trimester belly">> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 1e7967874ec..bd87740e311 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -7159,6 +7159,7 @@ $He has <<elseif $activeSlave.weight > 95>> $activeSlave.slaveName's small empathy belly is barely noticeable over $his large gut. <</if>> + <<case "a support band">> <</switch>> <<switch $activeSlave.clothes>> -- GitLab