From 432555910427f867b09e3f547a4eeae47d2c1928 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Fri, 2 Nov 2018 11:25:11 -0400
Subject: [PATCH] Fixes
---
devNotes/twine JS.txt | 24 +-----------------------
src/js/assayJS.tw | 24 +-----------------------
src/uncategorized/nextWeek.tw | 3 +++
src/uncategorized/saChoosesOwnJob.tw | 2 +-
src/uncategorized/slaveSummary.tw | 5 +++++
src/uncategorized/surgeryDegradation.tw | 4 ++--
6 files changed, 13 insertions(+), 49 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 61ee520b3db..e2ac07598a9 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -7445,29 +7445,7 @@ window.newSlave = function newSlave(slave) {
V.REReductionCheckinIDs.push(slave.ID);
}
- if (slave.fuckdoll > 0) {
- slave.pronoun = "it";
- slave.possessivePronoun = "its";
- slave.possessive = "its";
- slave.object = "it";
- slave.objectReflexive = "itself";
- slave.noun = "toy";
- } else if (slave.dick > 0 && slave.vagina === -1 && V.diversePronouns === 1) {
- slave.pronoun = "he";
- slave.possessivePronoun = "his";
- slave.possessive = "his";
- slave.object = "him";
- slave.objectReflexive = "himself";
- slave.noun = "boy";
- } else {
- slave.pronoun = "she";
- slave.possessivePronoun = "hers";
- slave.possessive = "her";
- slave.object = "her";
- slave.objectReflexive = "herself";
- slave.noun = "girl";
- }
-
+ generatePronouns(slave);
SetBellySize(slave);
addSlave(slave);
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index f56a72a7d92..309257eaeac 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -337,29 +337,7 @@ window.newSlave = function newSlave(slave) {
V.REReductionCheckinIDs.push(slave.ID);
}
- if (slave.fuckdoll > 0) {
- slave.pronoun = "it";
- slave.possessivePronoun = "its";
- slave.possessive = "its";
- slave.object = "it";
- slave.objectReflexive = "itself";
- slave.noun = "toy";
- } else if (slave.dick > 0 && slave.vagina === -1 && V.diversePronouns === 1) {
- slave.pronoun = "he";
- slave.possessivePronoun = "his";
- slave.possessive = "his";
- slave.object = "him";
- slave.objectReflexive = "himself";
- slave.noun = "boy";
- } else {
- slave.pronoun = "she";
- slave.possessivePronoun = "hers";
- slave.possessive = "her";
- slave.object = "her";
- slave.objectReflexive = "herself";
- slave.noun = "girl";
- }
-
+ generatePronouns(slave);
SetBellySize(slave);
addSlave(slave);
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 2d0ecf86c63..249aa596877 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -213,6 +213,9 @@
<<if $slaves[_i].pornTypeMasochist > 0>><<set $pornStarMasochists++>><</if>>
<<if $slaves[_i].pornTypePregnancy > 0>><<set $pornStarPregnancySluts++>><</if>>
<</if>>
+ <<if $slaves[_i].choosesOwnAssignment > 0>>
+ <<= assignJob($slaves[_i], "choose her own job")>>
+ <</if>>
<</for>>
<<if _slavesContributing != 0>>
<<set $averageTrust = $averageTrust/_slavesContributing>>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index 70a86c4d097..69b834fa591 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -50,7 +50,7 @@
<<= assignJob($slaves[$i], "be a servant")>>
<</if>>
- <<elseif ($universalRulesAssignsSelfFacility == 1) && (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45) || ($slaves[$i].sexualQuirk == "caring"))>>
+ <<elseif ($universalRulesAssignsSelfFacility == 1) && (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45)) && ($slaves[$i].sexualQuirk == "caring") && $nurseryNannies > $nurserySlaves>>
<<set $slaves[$i].choosesOwnAssignmentText += " enjoys taking care of infants, so $he decides to work in $nurseryName.">>
<<= assignJob($slaves[$i], "work as a nanny")>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 0685dd1662f..3efe499ec94 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -657,6 +657,11 @@ will
<<else>>
| Confinement
<</if>>
+ <<if (_Slave.assignment != "choose her own job")>>
+ | <<link "Let _Slave.object choose" "Main">><<= assignJob($slaves[_ssi], "choose her own job")>><</link>>
+ <<else>>
+ | Let _Slave.object choose
+ <</if>>
<</if>> /* CLOSES FUCKDOLL CHECK */
<</if>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index ef660252099..bbae6494e15 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -2349,10 +2349,10 @@ As the remote surgery's long recovery cycle completes,
It's not immediately apparent to $him what kind of surgery $he received, since all $he's left with is a terrible nonspecific ache in $his lower belly. As with all invasive surgery @@.red;$his health has been greatly affected.@@
<<case "elasticity treatment">>
- The procedure spans the week, with $him spending every other day in the surgery room for a series of 4 sets of injections. A few hours after each session, $he feels terribly ill. $He doesn't quite understand what it's about, just that $he feels pretty bad. The process involves <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> injecting the serum across $his entire body, every few inches, leaving a small needle marks that fade out within minutes. Despite not leaving a lasting evidence, the process is very invasive work, and leaves $he @@.red;feeling weak and tired.@@
+ The procedure spans the week, with $him spending every other day in the surgery room for a series of 4 sets of injections. A few hours after each session, $he feels terribly ill. $He doesn't quite understand what it's about, just that $he feels pretty bad. The process involves <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> injecting the serum across $his entire body, every few inches, leaving small needle marks that fade out within minutes. Despite not leaving a lasting evidence, the process is very invasive work, and leaves $him @@.red;feeling weak and tired.@@
<<case "retrograde virus injection NCS">>
- The procedure spans the week, with $him spending every other day in the surgery room for a series of 4 sets of injections. A few hours after each session, $he feels terribly ill. $He doesn't quite understand what it's about, just that $he feels pretty bad. The process involves <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> injecting the serum across $his body entire body, every few inches, leaving a small needle marks that fade out within minutes. Despite not leaving a lasting evidence, the process is very invasive work, and leaves $he @@.red;feeling weak and tired.@@<br><br>
+ The procedure spans the week, with $him spending every other day in the surgery room for a series of 4 sets of injections. A few hours after each session, $he feels terribly ill. $He doesn't quite understand what it's about, just that $he feels pretty bad. The process involves <<if ($PC.medicine >= 100)>>you<<else>>the remote surgeon<</if>> injecting the serum across $his body entire body, every few inches, leaving small needle marks that fade out within minutes. Despite not leaving a lasting evidence, the process is very invasive work, and leaves $him @@.red;feeling weak and tired.@@<br><br>
/*
Generate the changes, into variables to set contexts.
*/
--
GitLab