From d13dbee9a973df2a605ee32bcb3c4666f7008581 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 3 Jan 2019 11:31:28 -0500
Subject: [PATCH] fixes and made player birth to incubator more obvious
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++++
devNotes/twine JS.txt | 8 +++++--
src/js/datatypeCleanupJS.tw | 8 +++++--
src/pregmod/sePlayerBirth.tw | 8 +++----
src/uncategorized/slaveSummary.tw | 24 ++++++++++----------
5 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 92aa3bc8a2f..c3d9ccf08c6 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,11 @@
0.10.7.1-1.5.x
+01/02/2019
+
+ 1
+ -fixes
+
01/01/2019
0
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index b1cad638cdf..8ad86dbfe60 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -36849,7 +36849,9 @@ window.slaveGenitaliaDatatypeCleanup = function slaveGenitaliaDatatypeCleanup(sl
slave.prostate = Math.clamp(+slave.prostate, 0, 3) || 0;
}
slave.balls = Math.max(+slave.balls, 0) || 0;
- slave.scrotum = Math.max(+slave.scrotum, 0) || slave.balls;
+ if (slave.scrotum !== 0) {
+ slave.scrotum = Math.max(+slave.scrotum, 0) || slave.balls;
+ }
};
window.slaveImplantsDatatypeCleanup = function slaveImplantsDatatypeCleanup(slave) {
@@ -37402,7 +37404,9 @@ window.childGenitaliaDatatypeCleanup = function childGenitaliaDatatypeCleanup(ch
child.prostate = Math.clamp(+child.prostate, 0, 3) || 0;
}
child.balls = Math.max(+child.balls, 0) || 0;
- child.scrotum = Math.max(+child.scrotum, 0) || child.balls;
+ if (child.scrotum !== 0) {
+ child.scrotum = Math.max(+child.scrotum, 0) || child.balls;
+ }
};
window.childImplantsDatatypeCleanup = function childImplantsDatatypeCleanup(child) {
diff --git a/src/js/datatypeCleanupJS.tw b/src/js/datatypeCleanupJS.tw
index 748d5f6b5a2..55d221bf9ac 100644
--- a/src/js/datatypeCleanupJS.tw
+++ b/src/js/datatypeCleanupJS.tw
@@ -245,7 +245,9 @@ window.slaveGenitaliaDatatypeCleanup = function slaveGenitaliaDatatypeCleanup(sl
slave.prostate = Math.clamp(+slave.prostate, 0, 3) || 0;
}
slave.balls = Math.max(+slave.balls, 0) || 0;
- slave.scrotum = Math.max(+slave.scrotum, 0) || slave.balls;
+ if (slave.scrotum !== 0) {
+ slave.scrotum = Math.max(+slave.scrotum, 0) || slave.balls;
+ }
};
window.slaveImplantsDatatypeCleanup = function slaveImplantsDatatypeCleanup(slave) {
@@ -798,7 +800,9 @@ window.childGenitaliaDatatypeCleanup = function childGenitaliaDatatypeCleanup(ch
child.prostate = Math.clamp(+child.prostate, 0, 3) || 0;
}
child.balls = Math.max(+child.balls, 0) || 0;
- child.scrotum = Math.max(+child.scrotum, 0) || child.balls;
+ if (child.scrotum !== 0) {
+ child.scrotum = Math.max(+child.scrotum, 0) || child.balls;
+ }
};
window.childImplantsDatatypeCleanup = function childImplantsDatatypeCleanup(child) {
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 54136564b2b..38535127c87 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -472,11 +472,11 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<</if>>
<<if $PC.curBabies[0].reserve === "incubator">>
- You set <<if _gender == "XX">>her<<else>>him<</if>> aside for incubation.
+ @@.pink;You set <<if _gender == "XX">>her<<else>>him<</if>> aside for incubation.@@
<<set $activeSlave = generateChild($PC, $PC.curBabies[0], 1)>>
<<include "Incubator Workaround">>
<<elseif $PC.curBabies[0].reserve === "nursery">>
- You set <<if _gender == "XX">>her<<else>>him<</if>> aside for incubation.
+ @@.pink;You set <<if _gender == "XX">>her<<else>>him<</if>> aside for incubation.@@
<<set $activeSlave = generateChild($PC, $PC.curBabies[0])>>
<<include "Nursery Workaround">>
<</if>>
@@ -515,14 +515,14 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
looks nothing like you; it's hard to believe <<if $PC.curBabies[_p].genetics.gender == "XX">>she's your daughter<<else>>he's you son<</if>>
<</if>>
<<if $PC.curBabies[_p].reserve == "incubator">>
- You set <<if $PC.curBabies[_p].genetics.gender == "XX">>her<<else>>him<</if>> aside for incubation.
+ @@.pink;You set <<if $PC.curBabies[_p].genetics.gender == "XX">>her<<else>>him<</if>> aside for incubation.@@
<<set $activeSlave = generateChild($PC, $PC.curBabies[_p], 1)>>
<<include "Incubator Workaround">>
<<run $PC.curBabies.splice($PC.curBabies[_p], 1)>>
<<set _p--, _curBabies-->>
<<set $PC.reservedChildren-->>
<<elseif $PC.curBabies[_p].reserve == "nursery">>
- You set <<if $PC.curBabies[_p].genetics.gender == "XX">>her<<else>>him<</if>> aside to be raised in the penthouse.
+ @@.pink;You set <<if $PC.curBabies[_p].genetics.gender == "XX">>her<<else>>him<</if>> aside to be raised in the penthouse.@@
<<set $activeSlave = generateChild($PC, $PC.curBabies[_p])>>
<<include "Nursery Workaround">>
<<run $PC.curBabies.splice($PC.curBabies[_p], 1)>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 63683a9a63e..b2899b3eebe 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -3,10 +3,10 @@
<<set setup.passagePreFilters = setup.passagePreFilters || {
"Main": s => (s.assignmentVisible == 1),
"Personal Attention Select": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0),
- "Agent Select": s => (s.fuckdoll == 0 && s.devotion > 20 && s.intelligence+s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark != 1 || $propOutcome == 0)),
- "BG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "guard you" && canWalk(s) && canSee(s) && (s.breedingMark != 1 || $propOutcome == 0)),
+ "Agent Select": s => (s.fuckdoll == 0 && s.devotion > 20 && s.intelligence+s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark != 1 || $propOutcome == 0)),
+ "BG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "guard you" && canWalk(s) && canSee(s) && canHear(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Recruiter Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "recruit girls" && canWalk(s) && canSee(s) && canTalk(s)),
- "HG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "be your Head Girl" && canWalk(s) && canSee(s) && canTalk(s)),
+ "HG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "be your Head Girl" && canWalk(s) && canHear(s) && canSee(s) && canTalk(s)),
"Head Girl Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark != 1 || $propOutcome == 0))
|| ($Flag != 0 && s.assignment == "live with your Head Girl"))),
@@ -15,22 +15,22 @@
($Flag == 0 && s.assignment != "rest in the spa")
|| ($Flag == 1 && s.assignment == "rest in the spa")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Attendant.ID))),
- "Attendant Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s)),
+ "Attendant Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canHear(s)),
"Nursery": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (s.devotion > 20 || s.trust > 20) && (
($Flag == 0 && s.assignment != "work as a nanny")
|| ($Flag == 1 && s.assignment == "work as a nanny")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Matron.ID))),
- "Matron Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s)) && s.fetish != "mindbroken",
+ "Matron Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canHear(s)),
"Brothel": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "work in the brothel")
|| ($Flag == 1 && s.assignment == "work in the brothel")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Madam.ID))),
- "Madam Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && (s.breedingMark != 1 || $propOutcome == 0)),
+ "Madam Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Club": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "serve in the club")
|| ($Flag == 1 && s.assignment == "serve in the club")
|| ($Flag != 0 && $Flag != 1 && s.ID == $DJ.ID))),
- "DJ Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canTalk(s) && canWalk(s) && (s.breedingMark != 1 || $propOutcome == 0)),
+ "DJ Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canTalk(s) && canHear(s) && canWalk(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Clinic": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "get treatment in the clinic")
|| ($Flag == 1 && s.assignment == "get treatment in the clinic")
@@ -40,22 +40,22 @@
($Flag == 0 && s.fetish != "mindbroken" && s.assignment != "learn in the schoolroom")
|| ($Flag == 1 && s.assignment == "learn in the schoolroom")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Schoolteacher.ID))),
- "Schoolteacher Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canTalk(s) && canWalk(s) && canSee(s)),
+ "Schoolteacher Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canTalk(s) && canHear(s) && canSee(s)),
"Dairy": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "work in the dairy")
|| ($Flag == 1 && s.assignment == "work in the dairy")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Milkmaid.ID))),
- "Milkmaid Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 20 && canWalk(s) && canSee(s)),
+ "Milkmaid Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 20 && canWalk(s) && canSee(s) && canHear(s)),
"Farmyard": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && canWalk(s) && (
($Flag == 0 && s.assignment != "work as a farmhand")
|| ($Flag == 1 && s.assignment == "work as a farmhand")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Farmer.ID))),
- "Farmer Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
+ "Farmer Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)),
"Servants' Quarters": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "work as a servant")
|| ($Flag == 1 && s.assignment == "work as a servant")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Stewardess.ID))),
- "Stewardess Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s)),
+ "Stewardess Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s)),
"Master Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "serve in the master suite")
|| ($Flag == 1 && s.assignment == "serve in the master suite")
@@ -65,7 +65,7 @@
($Flag == 0 && s.assignment != "be confined in the cellblock")
|| ($Flag == 1 && s.assignment == "be confined in the cellblock")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Wardeness.ID))),
- "Wardeness Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
+ "Wardeness Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)),
"Arcade": s => (s.assignmentVisible == 1 && ($arcade >= $arcadeSlaves || $arcadeUpgradeFuckdolls == 1) && (
($Flag == 0 && s.assignment != "be confined in the arcade")
|| ($Flag != 0 && s.assignment == "be confined in the arcade"))),
--
GitLab