diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 09ddb4f4241e9e076f5e5a79b19cb56834ea2bf6..7ec986c43918a789d0cccad67c27227322b84f61 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1876,25 +1876,36 @@ window.findFather = function(fatherID) {
return father;
}
+window.adjustFatherProperty = function(actor, property, newValue) {
+ let father = findFather(actor.ID);
+ if (father)
+ father[property] = newValue;
+}
+
+/* OLD
window.adjustFatherProperty = function(actor, property, newValue) {
let V = State.variables;
- let fatherID;
+ let fatherIndex;
- fatherID = V.slaves.findIndex(function(s) { return s.ID == actor.ID; });
- if (fatherID > 0) {
- V.slaves[fatherID][property] = newValue;
+ fatherIndex = V.slaves.findIndex(function(s) { return s.ID == actor.ID; });
+ if (fatherIndex > 0) {
+ V.slaves[fatherIndex][property] = newValue;
} else if (V.incubator > 0) {
- fatherID = V.tanks.findIndex(function(s) { return s.ID == actor.ID; });
- if (fatherID > 0) {
- V.tanks[fatherID][property] = newValue;
- } else if (V.nursery > 0) {
- father = V.cribs.findIndex(function(s) { return s.ID == actor.ID; });
- if (fatherID !== -1) {
- V.cribs[fatherID][property] = newValue;
+ fatherIndex = V.tanks.findIndex(function(s) { return s.ID == actor.ID; });
+ if (fatherIndex > 0) {
+ V.tanks[fatherIndex][property] = newValue;
+ }
+ }
+ if (fatherIndex === -1) {
+ if (V.nursery > 0) {
+ fatherIndex = V.cribs.findIndex(function(s) { return s.ID == actor.ID; });
+ if (fatherIndex !== -1) {
+ V.cribs[fatherIndex][property] = newValue;
}
}
}
}
+*/
/* not to be used until that last part is defined. It may become slave.boobWomb.volume or some shit */
window.getBaseBoobs = function(slave) {
@@ -11087,7 +11098,7 @@ window.WombInit = function(actor) {
}
//backward compatibility setup. Fully accurate for normal pregnancy only.
- if (actor.womb.length > 0 && actor.broodmother == 0 && actor.womb[0].genetics == undefined) {
+ if (actor.womb.length > 0 && actor.womb[0].genetics == undefined) {
var i=0
actor.womb.forEach(function(ft){
ft.genetics = generateGenetics(actor.ID, actor.pregSource, i);
diff --git a/src/js/generateNewSlaveJS.tw b/src/js/generateNewSlaveJS.tw
index df902983bc928aa3c9837b45f13c3c5dc603eeb0..554fa42f449715da965a66529db29b2d6af6d825 100644
--- a/src/js/generateNewSlaveJS.tw
+++ b/src/js/generateNewSlaveJS.tw
@@ -925,7 +925,7 @@ window.GenerateNewSlave = (function(){
}
if (jsRandom(0, femaleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
- slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]);
+ slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked"]); // , "gapped"
}
if (slave.physicalAge < 6) {
@@ -946,7 +946,7 @@ window.GenerateNewSlave = (function(){
}
if (jsRandom(0, maleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
- slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]);
+ slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked"]); // , "gapped"
}
if (slave.physicalAge < 6) {
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index d63cce3ce6ec7c82f56f9b24ea632f81ee76e451..3d6942d6787aada24670cdc9362e0d8dcf476475 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -46,7 +46,7 @@ window.WombInit = function(actor) {
}
//backward compatibility setup. Fully accurate for normal pregnancy only.
- if (actor.womb.length > 0 && actor.broodmother == 0 && actor.womb[0].genetics == undefined) {
+ if (actor.womb.length > 0 && actor.womb[0].genetics == undefined) {
var i=0
actor.womb.forEach(function(ft){
ft.genetics = generateGenetics(actor.ID, actor.pregSource, i);
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
index 9d237f84b461c07bf7e60ebc4828a691e6c3edc5..462790b2f725543d70f7f79988b19822fd73d385 100644
--- a/src/pregmod/pAssociatesPublicSlut.tw
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", _num = random(1,99)>>
-The Promenade is especially vibrant today, humming with activity as the wealthier of ''$arcologies[0].name''s citizens go about their business and pleasure. You are a regular sight here, leisurely strolling amidst the bustle of the many shops, boutiques and eateries that line the wide thoroughfare. These regular strolls are, of course, timed in order to allow the citizenry, particularly high society, to feel your presence. Its not all about optics though, there are frequent opportunities for pleasure during these outings, be it shopping, dining or more unique kinds of distraction. One such opportunity presents itself today.
+The Promenade is especially vibrant today, humming with activity as the wealthier of ''$arcologies[0].name'''s citizens go about their business and pleasure. You are a regular sight here, leisurely strolling amidst the bustle of the many shops, boutiques and eateries that line the wide thoroughfare. These regular strolls are, of course, timed in order to allow the citizenry, particularly high society, to feel your presence. Its not all about optics though, there are frequent opportunities for pleasure during these outings, be it shopping, dining or more unique kinds of distraction. One such opportunity presents itself today.
<br><br>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 0dc906bf42845f3557aabf076b4798f759f66e12..1fcf66389fc21ab32deb37f4be0f93fd0ab68fe4 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1742,7 +1742,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<</if>>
$activeSlave.slaveName pulls out, sits $his bare butt down on the floor, and hauls a struggling $subSlave.slaveName onto $his lap, shoving $his stiff prick back where it belongs. Then $activeSlave.slaveName hauls $subSlave.slaveName's legs back, offering you _his2 already-occupied hole.
<<if $subSlave.vagina != 0 && _vaginal == 0>>$subSlave.slaveName has another hole, and _he2 tearfully begs you to use it, but in vain.<</if>>
- You jam yourself inside, enjoying $subSlave.slaveName's wriggling<<if !_fit>> and the extreme tightness of _his2 overfilled insides. _He2 spasms with pain as you force your way inside _him2<</if>>. $activeSlave.slaveName can't thrust much from where $he is, and serves mostly to tighten $subSlave.slaveName for you, but $he <<if canSee($activeSlave)>>stares into your eyes lovingly<<else>>lovingly smiles at you<</if>>. Playing such an equal sexual role with you definitely @@.mediumaquamarine;builds $his trust@@ in #his role. For _his2 part, $subSlave.slaveName is @@.gold;thoroughly degraded,@@ <<if _fit>>but physically unhurt.<<else>>and @@.orange;stretched out.@@<</if>>
+ You jam yourself inside, enjoying $subSlave.slaveName's wriggling<<if !_fit>> and the extreme tightness of _his2 overfilled insides. _He2 spasms with pain as you force your way inside _him2<</if>>. $activeSlave.slaveName can't thrust much from where $he is, and serves mostly to tighten $subSlave.slaveName for you, but $he <<if canSee($activeSlave)>>stares into your eyes lovingly<<else>>lovingly smiles at you<</if>>. Playing such an equal sexual role with you definitely @@.mediumaquamarine;builds $his trust@@ in $his role. For _his2 part, $subSlave.slaveName is @@.gold;thoroughly degraded,@@ <<if _fit>>but physically unhurt.<<else>>and @@.orange;stretched out.@@<</if>>
<<set $activeSlave.trust += 4, $activeSlave.penetrativeCount++, $penetrativeTotal++>>
<<set $subSlave.trust -= 4>>
<<if _vaginal>>