Merge branch 'pregmod-dev' into 'pregmod-master'

Pregmod dev

See merge request pregmodfan/fc-pregmod!3272

devNotes/twine JS.txt

@@ -1650,7 +1650,22 @@ window.setPregType = function(actor) {
 			}
 			ovum = Math.clamp(ovum, 0, 8);
 		} else if(actor.pregType == 0) {
-			ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
+			if(actor.geneticQuirks.fertility == 2 && actor.geneticQuirks.hyperFertility == 2) { // Do not mix with sperm
+				ovum += jsEither([1, 2, 2, 3]);
+				fertilityStack++;
+				fertilityStack++;
+				fertilityStack++;
+				fertilityStack++;
+			} else if(actor.geneticQuirks.hyperFertility == 2) { // Predisposed to multiples
+				ovum += jsEither([0, 1, 1, 2]);
+				fertilityStack++;
+				fertilityStack++;
+			} else if(actor.geneticQuirks.fertility == 2) { // Predisposed to twins
+				ovum += jsEither([0, 0, 0, 0, 1]);
+				fertilityStack++;
+			} else {
+				ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
+			}
 			if(actor.ovaImplant == "fertility") {
 				ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
 				fertilityStack++;
@@ -2502,6 +2517,9 @@ window.getSlaveCost = function(s) {
 			cost -= foodCost;
 			break;
 	}
+	if(s.geneticQuirks.fertility == 2 && s.geneticQuirks.hyperFertility == 2) {
+		cost += foodCost * .5;
+	}
 	if(s.weight > 130) {
 		cost += foodCost * 2;
 	} else if(s.weight > 50) {
@@ -39213,13 +39231,15 @@ window.Beauty = (function() {
 		if (arcology.FSPhysicalIdealist === "unset" && arcology.FSHedonisticDecadenceStrongFat === 0 && slave.muscles > 30) { /*muscle check*/
 			V.genderLawPass = 0;
-		} else if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /*weight check*/
+		}
+		if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /*weight check*/
 			if (slave.weight > 130 || slave.weight <= -30) {
 				V.genderLawPass = 0;
 			}
 		} else if (Math.abs(slave.weight) > 30) {
 			V.genderLawPass = 0;
-		} else if (arcology.FSAssetExpansionist !== "unset") {
+		}
+		if (arcology.FSAssetExpansionist !== "unset") {
 			if (slave.boobs < 500 || slave.boobs > 1600 || slave.butt < 3 || slave.butt > 6) {
 				V.genderLawPass = 0;
 			}

src/js/economyJS.tw

@@ -452,6 +452,9 @@ window.getSlaveCost = function(s) {
 			cost -= foodCost;
 			break;
 	}
+	if(s.geneticQuirks.fertility == 2 && s.geneticQuirks.hyperFertility == 2) {
+		cost += foodCost * .5;
+	}
 	if(s.weight > 130) {
 		cost += foodCost * 2;
 	} else if(s.weight > 50) {

src/js/pregJS.tw

@@ -122,7 +122,22 @@ window.setPregType = function(actor) {
 			}
 			ovum = Math.clamp(ovum, 0, 8);
 		} else if(actor.pregType == 0) {
-			ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
+			if(actor.geneticQuirks.fertility == 2 && actor.geneticQuirks.hyperFertility == 2) { // Do not mix with sperm
+				ovum += jsEither([1, 2, 2, 3]);
+				fertilityStack++;
+				fertilityStack++;
+				fertilityStack++;
+				fertilityStack++;
+			} else if(actor.geneticQuirks.hyperFertility == 2) { // Predisposed to multiples
+				ovum += jsEither([0, 1, 1, 2]);
+				fertilityStack++;
+				fertilityStack++;
+			} else if(actor.geneticQuirks.fertility == 2) { // Predisposed to twins
+				ovum += jsEither([0, 0, 0, 0, 1]);
+				fertilityStack++;
+			} else {
+				ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
+			}
 			if(actor.ovaImplant == "fertility") {
 				ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); 
 				fertilityStack++;

src/js/slaveCostJS.tw

@@ -1119,13 +1119,15 @@ window.Beauty = (function() {
 
 		if (arcology.FSPhysicalIdealist === "unset" && arcology.FSHedonisticDecadenceStrongFat === 0 && slave.muscles > 30) { /*muscle check*/
 			V.genderLawPass = 0;
-		} else if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /*weight check*/
+		}
+		if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /*weight check*/
 			if (slave.weight > 130 || slave.weight <= -30) {
 				V.genderLawPass = 0;
 			}
 		} else if (Math.abs(slave.weight) > 30) {
 			V.genderLawPass = 0;
-		} else if (arcology.FSAssetExpansionist !== "unset") {
+		}
+		if (arcology.FSAssetExpansionist !== "unset") {
 			if (slave.boobs < 500 || slave.boobs > 1600 || slave.butt < 3 || slave.butt > 6) {
 				V.genderLawPass = 0;
 			}

src/uncategorized/RESS.tw

@@ -5840,7 +5840,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
 <br><<link "Spend the day in bed">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	What's the point of becoming a wealthy tycoon in an anarcho-libertarian paradise if you have to obey the rules all the time? You tell $assistantName to cancel the appointment. Then, you wake your bedmate, and <<if $PC.dick == 1>>get a blowjob<<if $PC.vagina == 1>> and some attention for your pussy<</if>><<else>>have $him eat you out<</if>> under the sheet while you enjoy the lurid sunrise through the glass wall of your bedroom. When the sun is up and you've <<if $PC.dick == 1>>shot your load down $his throat<<else>>climaxed twice<</if>>, you pull the bemused $girl up alongside you again, bring the sheets up over you both, switch on a wallscreen, and ask $him if there's anything $he'd like to <<if canSee($activeSlave)>>watch<<elseif canHear($activeSlave)>>listen to<<else>>put on<</if>>. $He smiles incredulously, but after you encourage $him $he @@.mediumaquamarine;finds $his confidence@@ and admits that there's a Free Cities serial drama about slave life that $he enjoys. You put it on and watch three episodes with $him. It's terribly insipid, but there's a lot of explicit sex to liven things up, and all the actresses are nice enough to look at. $activeSlave.slaveName cuddles comfortably with you the entire time, <<if canSee($activeSlave)>>watching raptly<<else>>listening intently<<else>>staying as silent as possible<</if>> and doing $his best to explain the wretchedly trite plot you've missed.
+	What's the point of becoming a wealthy tycoon in an anarcho-libertarian paradise if you have to obey the rules all the time? You tell $assistantName to cancel the appointment. Then, you wake your bedmate, and <<if $PC.dick == 1>>get a blowjob<<if $PC.vagina == 1>> and some attention for your pussy<</if>><<else>>have $him eat you out<</if>> under the sheet while you enjoy the lurid sunrise through the glass wall of your bedroom. When the sun is up and you've <<if $PC.dick == 1>>shot your load down $his throat<<else>>climaxed twice<</if>>, you pull the bemused $girl up alongside you again, bring the sheets up over you both, switch on a wallscreen, and ask $him if there's anything $he'd like to <<if canSee($activeSlave)>>watch<<elseif canHear($activeSlave)>>listen to<<else>>put on<</if>>. $He smiles incredulously, but after you encourage $him $he @@.mediumaquamarine;finds $his confidence@@ and admits that there's a Free Cities serial drama about slave life that $he enjoys. You put it on and watch three episodes with $him. It's terribly insipid, but there's a lot of explicit sex to liven things up, and all the actresses are nice enough to look at. $activeSlave.slaveName cuddles comfortably with you the entire time, <<if canSee($activeSlave)>>watching raptly<<elseif canHear($activeSlave)>>listening intently<<else>>staying as silent as possible<</if>> and doing $his best to explain the wretchedly trite plot you've missed.
 	<<set $activeSlave.oralCount++, $oralTotal++>>
 	You have a meal delivered,
 	<<if $activeSlave.vagina > 0 && canDoVaginal($activeSlave)>>

src/uncategorized/peHeadgirlConcubine.tw

@@ -8,7 +8,15 @@
 <<setLocalPronouns $Concubine 2>>
 <<setAssistantPronouns>>
 
-You wake up one morning to find $HeadGirl.slaveName and $Concubine.slaveName waiting next to your bed. It's immediately obvious that they both have a minor item of business for you, since nothing was urgent enough to wake you early, and they evidently both came in to catch you at your normal hour of rising. They're kneeling side by side next to the bed<<if $HeadGirl.boobs + $Concubine.boobs > 10000>> (a position that smashes their massive breasts together on one side)<<elseif $HeadGirl.butt + $Concubine.butt > 10>> (a position that smashes their massive asses together on one side)<</if>>, and it's also obvious that they've been filling the few minutes they've been waiting for you to wake up by making out. Their lips are moist, $Concubine.slaveName's $Concubine.skin cheeks are a little flushed, and there's even a little unnoticed strand of saliva running from _his2 mouth to $HeadGirl.slaveName's. They both look at you expectantly, wondering whether to speak up or save their questions for after you take a moment to get ready for your day.
+You wake up one morning to find $HeadGirl.slaveName and $Concubine.slaveName waiting next to your bed. It's immediately obvious that they both have a minor item of business for you, since nothing was urgent enough to wake you early, and they evidently both came in to catch you at your normal hour of rising. They're kneeling side by side next to the
+<<if $HeadGirl.boobs + $Concubine.boobs > 10000>>
+	bed (a position that smashes their massive breasts together on one side),
+<<elseif $HeadGirl.butt + $Concubine.butt > 10>>
+	bed (a position that smashes their massive asses together on one side),
+<<else>>
+	bed,
+<</if>>
+and it's also obvious that they've been filling the few minutes they've been waiting for you to wake up by making out. Their lips are moist, $Concubine.slaveName's $Concubine.skin cheeks are a little flushed, and there's even a little unnoticed strand of saliva running from _his2 mouth to $HeadGirl.slaveName's. They both look at you expectantly, wondering whether to speak up or save their questions for after you take a moment to get ready for your day.
 
 <br><br>