From 0e3adf5eb7a1d66838814b93cfb40ba6482174b0 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 14 Nov 2018 03:12:32 -0500
Subject: [PATCH] more normalization
---
devNotes/twine JS.txt | 13 ++++++-------
src/js/generateGenetics.tw | 13 ++++++-------
src/pregmod/MpregSelf.tw | 4 ++--
src/pregmod/reMaleCitizenHookup.tw | 8 ++++----
src/uncategorized/persBusiness.tw | 2 +-
5 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 2d87af9abab..24940631d44 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -9976,8 +9976,7 @@ window.generateGenetics = (function() {
mother = (actor1 > 0) ? V.genePool.findIndex(function(s) { return s.ID == actor1; }) : V.PC;
activeMother = (actor1 > 0) ? V.slaves[actor1] : V.PC;
father = (actor2 > 0) ? V.genePool.findIndex(function(s) { return s.ID == actor2; })
- : (actor2 == -1 && actor1 > 0) ? mother
- : (actor2 == -6 && actor1 == -1) ? V.PC
+ : (actor2 == -1) ? V.PC
: 0;
activeFather = (father !== 0 && father.ID > 0) ? V.slaves[actor2]
: (father !== 0 && father.ID == -1) ? V.PC
@@ -10082,7 +10081,7 @@ window.generateGenetics = (function() {
race = (mother.origRace == father.origRace) ? mother.origRace
: (jsRandom(1,4)) == 4 ? jsEither([father.origRace, mother.origRace])
: "mixed race";
- } else if (actor2 == -2) {
+ } else if (actor2 == -2 || actor2 == -5) {
if (V.arcologies[0].FSSupremacist != "unset") {
race = jsEither([mother.origRace, V.arcologies[0].FSSupremacistRace, V.arcologies[0].FSSupremacistRace]);
if (mother.origRace != V.arcologies[0].FSSupremacistRace) {
@@ -10179,7 +10178,7 @@ window.generateGenetics = (function() {
} else {
eyeColor = jsEither([mother.origEye, father.origEye]);
}
- } else if (actor2 === -2 || actor2 === 0) {
+ } else if (actor2 === -2 || actor2 === 0 || actor2 === -5) {
eyeColor = jsEither([mother.origEye, "brown", "blue", "brown", "green", "hazel", "green"]);
} else {
eyeColor = mother.origEye;
@@ -10208,7 +10207,7 @@ window.generateGenetics = (function() {
} else {
hairColor = jsEither([mother.origHColor, father.origHColor]);
}
- } else if (actor2 === -2 || actor2 === 0) {
+ } else if (actor2 === -2 || actor2 === 0 || actor2 === -5) {
hairColor = jsEither([mother.origHColor, "brown", "blonde", "black", "brown", "black", "brown", "black"]);
} else {
hairColor = mother.origHColor;
@@ -10310,7 +10309,7 @@ window.generateGenetics = (function() {
function setIntelligence(father, mother, activeMother, actor2) {
let smarts;
if (mother.ID == -1) {
- if (actor2 == -1) {
+ if (actor2 == -6) {
smarts = jsRandom(90,100);
} else if (father) {
if (father.intelligence < mother.intelligence) {
@@ -10362,7 +10361,7 @@ window.generateGenetics = (function() {
function setFace(father, mother, activeMother, actor2) {
let face;
if (mother.ID == -1) {
- if (actor2 == -1) {
+ if (actor2 == -6) {
face = jsRandom(90,100);
} else if (father) {
if (father.face < mother.face) {
diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index b0d6cb311f0..50d6be2670f 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -16,8 +16,7 @@ window.generateGenetics = (function() {
mother = (actor1 > 0) ? V.genePool.findIndex(function(s) { return s.ID == actor1; }) : V.PC;
activeMother = (actor1 > 0) ? V.slaves[actor1] : V.PC;
father = (actor2 > 0) ? V.genePool.findIndex(function(s) { return s.ID == actor2; })
- : (actor2 == -1 && actor1 > 0) ? mother
- : (actor2 == -6 && actor1 == -1) ? V.PC
+ : (actor2 == -1) ? V.PC
: 0;
activeFather = (father !== 0 && father.ID > 0) ? V.slaves[actor2]
: (father !== 0 && father.ID == -1) ? V.PC
@@ -122,7 +121,7 @@ window.generateGenetics = (function() {
race = (mother.origRace == father.origRace) ? mother.origRace
: (jsRandom(1,4)) == 4 ? jsEither([father.origRace, mother.origRace])
: "mixed race";
- } else if (actor2 == -2) {
+ } else if (actor2 == -2 || actor2 == -5) {
if (V.arcologies[0].FSSupremacist != "unset") {
race = jsEither([mother.origRace, V.arcologies[0].FSSupremacistRace, V.arcologies[0].FSSupremacistRace]);
if (mother.origRace != V.arcologies[0].FSSupremacistRace) {
@@ -219,7 +218,7 @@ window.generateGenetics = (function() {
} else {
eyeColor = jsEither([mother.origEye, father.origEye]);
}
- } else if (actor2 === -2 || actor2 === 0) {
+ } else if (actor2 === -2 || actor2 === 0 || actor2 === -5) {
eyeColor = jsEither([mother.origEye, "brown", "blue", "brown", "green", "hazel", "green"]);
} else {
eyeColor = mother.origEye;
@@ -248,7 +247,7 @@ window.generateGenetics = (function() {
} else {
hairColor = jsEither([mother.origHColor, father.origHColor]);
}
- } else if (actor2 === -2 || actor2 === 0) {
+ } else if (actor2 === -2 || actor2 === 0 || actor2 === -5) {
hairColor = jsEither([mother.origHColor, "brown", "blonde", "black", "brown", "black", "brown", "black"]);
} else {
hairColor = mother.origHColor;
@@ -350,7 +349,7 @@ window.generateGenetics = (function() {
function setIntelligence(father, mother, activeMother, actor2) {
let smarts;
if (mother.ID == -1) {
- if (actor2 == -1) {
+ if (actor2 == -6) {
smarts = jsRandom(90,100);
} else if (father) {
if (father.intelligence < mother.intelligence) {
@@ -402,7 +401,7 @@ window.generateGenetics = (function() {
function setFace(father, mother, activeMother, actor2) {
let face;
if (mother.ID == -1) {
- if (actor2 == -1) {
+ if (actor2 == -6) {
face = jsRandom(90,100);
} else if (father) {
if (father.face < mother.face) {
diff --git a/src/pregmod/MpregSelf.tw b/src/pregmod/MpregSelf.tw
index 5f17ca1f347..87c3251ec36 100644
--- a/src/pregmod/MpregSelf.tw
+++ b/src/pregmod/MpregSelf.tw
@@ -49,7 +49,7 @@
<</if>>
<<set _selfPreg = 30+($PC.balls*20)>>
- <<= knockMeUp($PC, _selfPreg, 0, -6)>>
+ <<= knockMeUp($PC, _selfPreg, 0, -1)>>
<<else>>
<<if $PC.balls > 2>>
Calling over your closest slave, you order her to bring you one of the high-volume enema syringes from the slave quarters. She rushes off, and you set about getting naked before lying down on your luxurious bed. Your cock is already rock-hard, sending rivulets of precum running down to pool on your massive balls. Your pussy is similarly soaked, imagining your belly swelling after your knock yourself up has it practically puddling. Just as you start to think about punishing your slave for taking too long, you hear a knock before she enters carrying the extra-long enema syringe. Impatient, you give her your instructions: "pull out the plunger and keep the syringe handy. You're going to suck me off, but I want every drop of my cum to go into that syringe. No spilling. Now get started."
@@ -96,5 +96,5 @@
You feel her soft lips pressed to your vulva as she works to retrieve her treat. You hear some soft slurping noises and feel a warm tongue worming its way inside you to retrieve any lingering cum. You relax and enjoy the afterglow of your orgasms while she works, proud of your ingenious idea to take advantage of your own balls for a satisfying creampie. There's always a slave to do that, of course, but why use slave cum when you have such obviously superior material available?
<</if>>
- <<= knockMeUp($PC, 100, 0, -6)>>
+ <<= knockMeUp($PC, 100, 0, -1)>>
<</if>>
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index eacb77d3be6..35becd0e649 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -304,11 +304,11 @@ He's clearly attracted to you; even the most consummate actor would have difficu
<<if isPlayerFertile($PC)>>
<<switch _FS>>
<<case "Asset Expansionist" "Repopulationist">>
- <<= knockMeUp($PC, 100, 0, -5)>>
+ <<= knockMeUp($PC, 100, 0, -2)>>
<<case "Gender Fundamentalist" "Eugenics" "Paternalist" "Maturity Preferentialist" "Physical Idealist">>
- <<= knockMeUp($PC, 60, 0, -5)>>
+ <<= knockMeUp($PC, 60, 0, -2)>>
<<default>>
- <<= knockMeUp($PC, 40, 0, -5)>>
+ <<= knockMeUp($PC, 40, 0, -2)>>
<</switch>>
<</if>>
<<if _FS != "none">>
@@ -409,7 +409,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
<</switch>>
is obvious to everyone. The message is clear, and your guest of honor is the center of attention as you take him there in view of the arcology's leading citizens. Naturally, the story percolates, making it clear that there's nothing you won't do to @@.green;further acceptance of _FS principles.@@
<<if isPlayerFertile($PC)>>
- <<= knockMeUp($PC, 40, 0, -5)>>
+ <<= knockMeUp($PC, 40, 0, -2)>>
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 77ff2a25621..d9c83eed445 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -84,7 +84,7 @@
Your client this week offered you some free pills to make sex more fun. He was right; it made bareback sex feel amazing.
<<set $PC.forcedFertDrugs += 2>>
<</if>>
- <<= knockMeUp($PC, 20, 0, -2)>>
+ <<= knockMeUp($PC, 20, 0, -5)>>
<</if>>
<</if>>
<<set $enduringRep *= .5>>
--
GitLab