From 59dcab51b5c17ba5134b7258761ca284972c4a5e Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 8 Nov 2018 19:23:41 -0500
Subject: [PATCH] $seeDicks separation from child gender option
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 +++++
devNotes/twine JS.txt | 2 +-
src/events/intro/introSummary.tw | 6 +++++
src/init/storyInit.tw | 1 +
src/js/itemAvailability.tw | 2 +-
src/pregmod/generateChild.tw | 14 +++++++++---
src/pregmod/pAssociatesPublicSlut.tw | 4 ++--
src/pregmod/sePlayerBirth.tw | 24 ++++++++++++++++----
src/uncategorized/BackwardsCompatibility.tw | 3 +++
src/uncategorized/options.tw | 7 ++++++
src/uncategorized/seCoursing.tw | 1 +
11 files changed, 59 insertions(+), 11 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index cda8deae3b4..48fbedbf721 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.1-0.10.x
+11/08/2018
+
+ 48
+ -added an option to permit and deny $seeDicks control over child gender
+ -minor fixes
+
11/06/2018
47
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index a994aa4a5db..56ca8f5d89a 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1165,7 +1165,7 @@ window.isItemAccessible = function(string) {
case 'a gothic lolita dress':
//case 'a halter top dress':
//case 'a mini dress':
- case 'a slave gown':
+ //case 'a slave gown':
if (V.clothesBoughtDresses === 1) {
return true;
} else {
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 296218fa4ae..a00a0fc1fc5 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -405,6 +405,12 @@ Should you be able to surgically attach a penis to your female slaves and starti
[[Enable|Intro Summary][$seePreg = 1]]
<</if>>
+<br>
+Should children born in game strictly adhere to dick content settings?
+<<if $seeDicksAffectsPregnancy != 0>>[[No|Intro Summary][$seeDicksAffectsPregnancy = 0]]<<else>>No<</if>>
+| <<if $seeDicksAffectsPregnancy != 1>>[[Yes|Intro Summary][$seeDicksAffectsPregnancy = 1]]<<else>>Yes<</if>>
+<</if>>
+
<br>
<<if $seeHyperPreg == 1>>
Extreme pregnancy content like broodmothers is ''enabled''.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 4a08a1aa388..bf4afe9557e 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -279,6 +279,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $seeCircumcision = 1>>
<<set $seeAge = 1>>
<<set $seeDicks = 25>>
+ <<set $seeDicksAffectsPregnancy = 1>>
<<set $seeRace = 1>>
<<set $seeNationality = 1>>
<<set $seeImages = 0>>
diff --git a/src/js/itemAvailability.tw b/src/js/itemAvailability.tw
index 64c9d36521e..8cf51a08b04 100644
--- a/src/js/itemAvailability.tw
+++ b/src/js/itemAvailability.tw
@@ -182,7 +182,7 @@ window.isItemAccessible = function(string) {
case 'a gothic lolita dress':
//case 'a halter top dress':
//case 'a mini dress':
- case 'a slave gown':
+ //case 'a slave gown':
if (V.clothesBoughtDresses === 1) {
return true;
} else {
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index 06dca38b0d5..83bd70891e3 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -296,10 +296,18 @@
<</if>>
<<set $activeSlave.slaveSurname = $PC.surname>>
<<else>>
- <<if random(0,100) >= $seeDicks>>
- <<include "Generate XX Slave">>
+ <<if $seeDicksAffectsPregnancy == 1>>
+ <<if random(0,100) >= $seeDicks>>
+ <<include "Generate XX Slave">>
+ <<else>>
+ <<include "Generate XY Slave">>
+ <</if>>
<<else>>
- <<include "Generate XY Slave">>
+ <<if random(0,100) > 50>>
+ <<include "Generate XY Slave">>
+ <<else>>
+ <<include "Generate XX Slave">>
+ <</if>>
<</if>>
<<set $activeSlave.mother = $mergeMom.ID>>
<<if $mom.pregSource > 0>>
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
index 2751543f33f..7db54415209 100644
--- a/src/pregmod/pAssociatesPublicSlut.tw
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -32,9 +32,9 @@ You take a detour down one of the minor byways that feed into the Promenade prop
<<link "Give <<if _num < $seeDicks>>him his<<else>>her the<</if>> first taste of slave life">>
<<replace "#result">>
<<if _num < $seeDicks>>
- Taking a slaves anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $PC.dick == 0>>. You also reach for one of the brand new strapons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $PC.dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $PC.dick == 0>>The slave climaxes, and while you dont quite join him, watching him squirm helplessly underneath you as you used his ass has left you instensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's faced is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very very fashionable.
+ Taking a slaves anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $PC.dick == 0>>. You also reach for one of the brand new strapons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $PC.dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $PC.dick == 0>>The slave climaxes, and while you dont quite join him, watching him squirm helplessly underneath you as you used his ass has left you instensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's faced is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very fashionable.
<<else>>
- Taking a slaves virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet.<<if $PC.dick == 0>>. You do however reach for one of the brand new strapons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<<else>>.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $PC.dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering hes new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very very fashionable.
+ Taking a slaves virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet.<<if $PC.dick == 0>>. You do however reach for one of the brand new strapons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<<else>>.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $PC.dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering hes new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very fashionable.
<</if>>
Your citizens @@.green;appreciated@@ the vigorous show you put on, and the fact that you are @@.green;not too snobby@@ to enjoy the simple pleasure of availing of a public whore once in a while.
<<set $rep += 100>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 3702ab80a06..cd5d5b5fa27 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -56,7 +56,11 @@ PC.pregSource documentation
<</if>>
<<if $PC.pregSource == -1>>
- <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <<if $seeDicksAffectsPregnancy == 1>>
+ <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <<else>>
+ <<set $babyGender = random(1,2)>>
+ <</if>>
Since you are heavily pregnant with a child of the Societal Elite, you are quickly taken to the finest clinic the arcology has to offer. After a quick sedation, you awake to find your belly no longer round with child; that and a note stating your next breeding partner and a notice that <<print cashFormat(50000)>> has been added to your account. The Societal Elite are @@.green;very pleased@@ at their new addition to the ranks. You just wish you could have seen your <<if _curBabies == 1>>little <<if $babyGender == 1>>girl<<else>>boy<</if>> before they took <<if $babyGender == 1>>her<<else>>him<</if>><<else>>babies before they took them<</if>> away to be raised into a proper member of the future world.
<<if $PC.ovaryAge >= 55 && $playerAging != 0>>
You are getting too old to have children; you feel like <<if _curBabies > 1>>they<<else>>this<</if>> may be your last.
@@ -112,7 +116,11 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro
<br><br>
You arrange yourself to give birth, relaxing until your body urges you to begin bearing down and pushing your child into the world.<<if _concubinePresent == 1>>$Concubine.slaveName settles in beside you, one hand soothing your contraction wracked middle and the other <<if $PC.dick == 1>>stroking your hardening dick<<else>>teasing your stiffening clit<</if>>.<</if>>
<<if $badBirth > random(1,100)>> /* shits going wrong */
- <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <<if $seeDicksAffectsPregnancy == 1>>
+ <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <<else>>
+ <<set $babyGender = random(1,2)>>
+ <</if>>
<<if $Nurse != 0>>
<<setLocalPronouns $Nurse>>
You keep pushing and pushing, but your child is not coming out.<<if _concubinePresent == 1>> $Concubine.slaveName shifts to massaging your gravid middle<<if canTalk($Concubine)>>, while whispering words of encouragement into your ear<</if>>. Until $Nurse.slaveName shoos _him2 away so $he can take over and get this baby out of you.<</if>> $Nurse.slaveName was prepared for this possibility, adjusts your position and timings, and before long is holding your @@.lime;new baby <<if $babyGender == 1>>girl<<else>>boy<</if>>@@ in $his arms.
@@ -228,7 +236,11 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<set $gameover = "birth complications", $nextButton = "Have to keep trying!", $nextLink = "Gameover">>
<</if>>
<<else>>
- <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <<if $seeDicksAffectsPregnancy == 1>>
+ <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <<else>>
+ <<set $babyGender = random(1,2)>>
+ <</if>>
<<if $Nurse != 0>>
<<setLocalPronouns $Nurse>>
Under $Nurse.slaveName's guidance, childbirth is a breeze for you.
@@ -521,7 +533,11 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<set _identicalChildGen = 1>>
<<else>>
<<set _identicalChildGen = 0>>
- <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <<if $seeDicksAffectsPregnancy == 1>>
+ <<set $babyGender = Math.floor(Math.random()*100) < $seeDicks ? 2 : 1>>
+ <<else>>
+ <<set $babyGender = random(1,2)>>
+ <</if>>
<</if>>
<</for>>
<<if _shiftDegree > 0>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index d32646be83a..f6ea32ebd7d 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -579,6 +579,9 @@
<<if ndef $seePreg>>
<<set $seePreg = 1>>
<</if>>
+<<if ndef $seeDicksAffectsPregnancy>>
+ <<set $seeDicksAffectsPregnancy = 1>>
+<</if>>
<<if ndef $dangerousPregnancy>>
<<set $dangerousPregnancy = 1>>
<</if>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 640c2419f2f..c557c684bf1 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -365,6 +365,13 @@ Pregnancy related content is currently @@.red;DISABLED@@. [[Enable|Options][$see
Pregnancy related content is currently @@.cyan;ENABLED@@. [[Disable|Options][$seePreg = 0]]
<</if>> //Will not affect existing pregnancies already in-game.//
+<br>
+<<if ($seeDicksAffectsPregnancy == 1)>>
+At birth, children ''will'' be generated based off dick content settings. Currently <<print $seeDicks>>% of children will be born male. [[Disable|Options][$seeDicksAffectsPregnancy = 0]]
+<<else>>
+At birth, children ''will not'' be generated based off dick content settings. [[Enable|Options][$seeDicksAffectsPregnancy = 1]]
+<</if>>
+
<br>
<<if ($seeHyperPreg == 0)>>
Extreme pregnancy content like broodmothers is currently @@.red;DISABLED@@. [[Enable|Options][$seeHyperPreg = 1]]
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index 81e3e555d3a..16f9fb60390 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -141,6 +141,7 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<set $activeSlave.anus = 1>>
<<set $activeSlave.analCount += 1, $analTotal += 1>>
<<set $activeSlave.balls = 5>>
+ <<set $activeSlave.scrotum = 5>>
<<set $activeSlave.dick = random(3,5)>>
<<set $activeSlave.oralSkill = 0>>
<<set $activeSlave.analSkill = 0>>
--
GitLab