From 8220c4e21b59808c0b863f53e67a9445ee15351d Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 10 Jan 2019 18:19:40 -0500
Subject: [PATCH] whiny merger
---
src/js/economyJS.tw | 3 +++
src/js/pregJS.tw | 17 ++++++++++++++++-
src/uncategorized/peHeadgirlConcubine.tw | 10 +++++++++-
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index e7aebe72ff1..f3b56f444f5 100644
--- a/src/js/economyJS.tw
+++ b/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) {
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index d379a138601..ba5050d5b37 100644
--- a/src/js/pregJS.tw
+++ b/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++;
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index 4cb01df4ae0..28a839e8819 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/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>
--
GitLab