From eac1fb0e38e475fc26ce974784949e5518765928 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 4 Jan 2019 11:43:51 -0500
Subject: [PATCH] fixes
---
devNotes/twine JS.txt | 12 ++++++------
src/js/generateGenetics.tw | 10 +++++-----
src/uncategorized/saLongTermEffects.tw | 6 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index a3edb5091a5..77bbf385158 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -10782,17 +10782,17 @@ window.generateChild = function(mother, ova, destination) {
if (childName.indexOf("ovum") == 0) {
if (genes.mother == -1) {
if (genes.father <= 0) {
- child.slaveName = "Your son";
+ child.slaveName = "Your daughter";
} else {
- child.slaveName = `Your and ${genes.fatherName}'s son`;
+ child.slaveName = `Your and ${genes.fatherName}'s daughter`;
}
} else {
if (genes.father == -1) {
- child.slaveName = `${genes.motherName} and your son`;
+ child.slaveName = `${genes.motherName} and your daughter`;
} else if (genes.father > 0) {
- child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
+ child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
} else {
- child.slaveName = `${genes.motherName}'s bastard son`;
+ child.slaveName = `${genes.motherName}'s bastard daughter`;
}
}
} else {
@@ -13371,7 +13371,7 @@ window.saServant = function saServant(slave) {
if (slave.relationship == -2) {
t += ` ${He} does ${his} best to perfect your domesticity due to ${his} emotional bond to you.`;
} else if (slave.relationship == -3 && slave.devotion > 50) {
- t += ` ${He} does ${his}very best to be the perfect housewife, making ${him} an outstanding servant.`;
+ t += ` ${He} does ${his} very best to be the perfect housewife, making ${him} an outstanding servant.`;
}
if (setup.servantCareers.includes(slave.career)) {
diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index 854d626824b..411d867dc78 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -825,17 +825,17 @@ window.generateChild = function(mother, ova, destination) {
if (childName.indexOf("ovum") == 0) {
if (genes.mother == -1) {
if (genes.father <= 0) {
- child.slaveName = "Your son";
+ child.slaveName = "Your daughter";
} else {
- child.slaveName = `Your and ${genes.fatherName}'s son`;
+ child.slaveName = `Your and ${genes.fatherName}'s daughter`;
}
} else {
if (genes.father == -1) {
- child.slaveName = `${genes.motherName} and your son`;
+ child.slaveName = `${genes.motherName} and your daughter`;
} else if (genes.father > 0) {
- child.slaveName = `${genes.motherName} and ${genes.fatherName}'s son`;
+ child.slaveName = `${genes.motherName} and ${genes.fatherName}'s daughter`;
} else {
- child.slaveName = `${genes.motherName}'s bastard son`;
+ child.slaveName = `${genes.motherName}'s bastard daughter`;
}
}
} else {
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 63c67a22512..8de9d0d3fae 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3558,7 +3558,7 @@
<</if>>
<<default>> /* random impregnation chance on other assignments - consider relationships first */
- <<if ["masturbation", "chastity"].includes($slaves[$i].releaseRules) && $slaves[$i].devotion <= 50>>
+ <<if !["masturbation", "chastity"].includes($slaves[$i].releaseRules) || $slaves[$i].devotion <= 50>>
<<if (_conceptionSeed > 80) && (($slaves[$i].vaginalCount > 0) || ($slaves[$i].analCount > 0 && $slaves[$i].mpreg > 0))>> /* TODO: compare to previous week totals? */
<<if $slaves[$i].relationshipTarget > 0>>
<<set _tempLover = getSlave($slaves[$i].relationshipTarget)>>
@@ -3570,14 +3570,14 @@
<<set _tempSub = getSlave($slaves[$i].subTarget)>>
<<if ndef _tempSub>>@@.red;Error, subTarget not found.@@<</if>>
<</if>>
- <<if (($slaves[$i].relationship == -3) || ($slaves[$i].relationship == -2)) && canImpreg($slaves[$i], $PC)>>
+ <<if (($slaves[$i].relationship == -3) || ($slaves[$i].relationship == -2)) && canImpreg($slaves[$i], $PC) && !["masturbation", "chastity"].includes($slaves[$i].releaseRules)>>
<<set $slaves[$i].pregSource = -1>>
<<elseif ($slaves[$i].relationship > 2) && canImpreg($slaves[$i], _tempLover)>> /* erection not needed for impregnation via consensual sex play (FWB or better) */
<<set $slaves[$i].pregSource = _tempLover.ID>>
<<elseif ($slaves[$i].subTarget != 0) && ($slaves[$i].assignment == "be a subordinate slave") && canAchieveErection(_tempSub) && canImpreg($slaves[$i], _tempSub)>> /* subordinate must have erection to impregnate target */
<<set $slaves[$i].pregSource = _tempSub.ID>>
<<elseif (random(1,100) > 95) && ($slaves[$i].rivalry > 2) && canAchieveErection(_tempRival) && canImpreg($slaves[$i], _tempRival)>> /* 5% chance to be raped and knocked up by bitter rival - erection needed */
- Driven by the bitter rivalry between them, _tempRival.slaveName successfully overpowers $slaves[$i].slaveName and rapes $him, cumming deep in $his fertile <<if $slaves[$i].mpreg == 1>>asshole<<else>>pussy<</if>> whenever $he chooses. By the end of the week, $slaves[$i].slaveName is vowing revenge as $he regains confidence.
+ Driven by the bitter rivalry between them, _tempRival.slaveName successfully manages to overpower $slaves[$i].slaveName and rape $him, cumming deep in $his fertile <<if $slaves[$i].mpreg == 1>>asshole<<else>>pussy<</if>>. By the end of the week, $slaves[$i].slaveName is vowing revenge as $he regains confidence.
<<set $slaves[$i].pregSource = _tempRival.ID>>
<<elseif (random(1,100) > 60) && canImpreg($slaves[$i], $PC) && !["masturbation", "chastity"].includes($slaves[$i].releaseRules)>> /* still 40% chance of impregnation by PC */
<<set $slaves[$i].pregSource = -1>>
--
GitLab