diff --git a/src/endWeek/clinicReport.js b/src/endWeek/clinicReport.js
index c0fb64dc636767a98a69b88d3778f6cb3e84479a..d238016c83e466694c904af421fe1764ccf0a9ae 100644
--- a/src/endWeek/clinicReport.js
+++ b/src/endWeek/clinicReport.js
@@ -379,7 +379,7 @@ App.EndWeek.clinicReport = function() {
}
$(slaveEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> `);
if (slave.choosesOwnAssignment === 2) {
- $(slaveEntry).append(`${App.SlaveAssignment.choosesOwnJob(slave)}`);
+ $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
} else {
$(slaveEntry).append(`is receiving treatment in ${V.clinicName}.`);
}
diff --git a/src/endWeek/nurseryReport.js b/src/endWeek/nurseryReport.js
index ae26293a119a1b2ca4cccdfa62e94a40a0a98c01..6b564bf847da06a1165f04078fb1f5034027d744 100644
--- a/src/endWeek/nurseryReport.js
+++ b/src/endWeek/nurseryReport.js
@@ -219,7 +219,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
$(slaveEntry).append(`<span class="slave-name">${SlaveFullName(slave)}</span> `);
if (slave.choosesOwnAssignment === 2) {
- $(slaveEntry).append(`${App.SlaveAssignment.choosesOwnJob(slave)}`);
+ $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
} else {
$(slaveEntry).append(`is working out of ${V.nurseryName}.`);
}
diff --git a/src/endWeek/saChoosesOwnJob.js b/src/endWeek/saChoosesOwnJob.js
index 88ca68829fa87ba74efd3dceabaea47031df858a..d80f1e6e02b1db494de8c9a777ce341aee9c1903 100644
--- a/src/endWeek/saChoosesOwnJob.js
+++ b/src/endWeek/saChoosesOwnJob.js
@@ -2,7 +2,6 @@ App.SlaveAssignment.choosesOwnJob = (function() {
"use strict";
let r;
- let choice;
// eslint-disable-next-line no-unused-vars
let he, him, his, hers, himself, girl, loli, He, His;
@@ -26,7 +25,6 @@ App.SlaveAssignment.choosesOwnJob = (function() {
*/
function saChoosesOwnJob(slave) {
r = [];
- choice = [];
clinicL = App.Entity.facilities.clinic.employeesIDs().size;
schoolL = App.Entity.facilities.schoolroom.employeesIDs().size;
@@ -69,6 +67,8 @@ App.SlaveAssignment.choosesOwnJob = (function() {
*
*/
function jobSelection(slave) {
+ let choice = [];
+
choice.push(`was assigned to ${slave.assignment}. ${He} ${canSee(slave) ? "watches" : "observes"} your other slaves to decide what to do, <span class="devotion inc">happy</span> to be permitted a choice and a little more <span class="trust inc">confident</span> than if you had just given ${him} orders. The ${SlaveTitle(slave)}`);
if (slave.devotion <= 20 && slave.trust >= -20) {
@@ -76,69 +76,69 @@ App.SlaveAssignment.choosesOwnJob = (function() {
choice.push(`is reluctantly married to you, and ${he} thinks of all the ways ${he} <span class="devotion dec">can take advantage of this,</span>`);
if (V.universalRulesAssignsSelfFacility === 1 && V.spa > spaL) {
choice.push(`so ${he} heads straight to ${V.spaName} to relax.`);
- choice.push(`${assignJob(slave, "rest in the spa")}`);
+ choice.push(assignJob(slave, "rest in the spa"));
} else {
choice.push(`so ${he} cheerfully decides to lounge about the penthouse.`);
- choice.push(`${removeJob(slave, slave.assignment)}`);
+ choice.push(removeJob(slave, slave.assignment));
}
} else {
choice.push(`decides to rest, taking advantage of your permission to <span class="devotion dec">remain indolent.</span>`);
- choice.push(`${removeJob(slave, slave.assignment)}`);
+ choice.push(removeJob(slave, slave.assignment));
}
slave.devotion -= 5;
} else if (slave.health.illness > 1) {
if (V.universalRulesAssignsSelfFacility === 1 && V.clinic > clinicL) {
choice.push(`is ill, so ${he} decides to get treatment at${V.clinicName}.`);
- choice.push(`${assignJob(slave, "get treatment in the clinic")}`);
+ choice.push(assignJob(slave, "get treatment in the clinic"));
} else {
choice.push(`is ill, so ${he} decides to rest.`);
- choice.push(`${removeJob(slave, slave.assignment)}`);
+ choice.push(removeJob(slave, slave.assignment));
}
} else if (slave.health.condition < 20) {
if (V.universalRulesAssignsSelfFacility === 1 && V.spa > spaL) {
choice.push(`is unhealthy, so ${he} decides to get recover at ${V.spaName}.`);
- choice.push(`${assignJob(slave, "rest in the spa")}`);
+ choice.push(assignJob(slave, "rest in the spa"));
} else {
choice.push(`is unhealthy, so ${he} decides to rest.`);
- choice.push(`${removeJob(slave, slave.assignment)}`);
+ choice.push(removeJob(slave, slave.assignment));
}
} else if (slave.health.tired > 45) {
if (V.universalRulesAssignsSelfFacility === 1 && V.spa > spaL) {
choice.push(`is tired, so ${he} decides to recover at ${V.spaName}.`);
- choice.push(`${assignJob(slave, "rest in the spa")}`);
+ choice.push(assignJob(slave, "rest in the spa"));
} else {
choice.push(`is tired, so ${he} decides to rest.`);
- choice.push(`${removeJob(slave, slave.assignment)}`);
+ choice.push(removeJob(slave, slave.assignment));
}
} else if (slave.boobsMilk > 0) {
choice.push(`rushes to get milked since ${his} breasts have become painfully engorged.`);
- choice.push(`${assignJob(slave, "get milked")}`);
+ choice.push(assignJob(slave, "get milked"));
} else if (slave.intelligenceImplant < 15 && slave.intelligence > 10 && (arcology.FSPaternalist > 20 || arcology.FSSlaveProfessionalism > 20) && arcology.FSGenderFundamentalistLawBimbo !== 1 ) {
if (V.universalRulesAssignsSelfFacility === 1 && V.schoolroom > schoolL) {
choice.push(`is uneducated, so ${he} sits ${himself} down in ${V.schoolroomName}.`);
- choice.push(`${assignJob(slave, "learn in the schoolroom")}`);
+ choice.push(assignJob(slave, "learn in the schoolroom"));
} else {
choice.push(`is uneducated, so ${he} sits ${himself} down to learn.`);
- choice.push(`${assignJob(slave, "take classes")}`);
+ choice.push(assignJob(slave, "take classes"));
}
} else if ((S.Attendant && V.universalRulesAssignsSelfFacility === 1) && (slave.devotion < 45 || slave.trust < 45 || (slave.sexualFlaw !== "none" && !setup.paraphiliaList.includes(slave.sexualFlaw)) || slave.behavioralFlaw !== "none")) {
choice.push(`could use some counseling, so ${he} decides to visit ${V.spaName}.`);
- choice.push(`${assignJob(slave, "rest in the spa")}`);
+ choice.push(assignJob(slave, "rest in the spa"));
} else if (slave.devotion <= 50 && canWalk(slave) && canSee(slave)) {
if (V.universalRulesAssignsSelfFacility === 1 && V.servantsQuarters > servQL) {
choice.push(`is obedient but not devoted, so ${he} decides to work from ${V.servantsQuartersName} since it's the least sexually demanding job available.`);
- choice.push(`${assignJob(slave, "work as a servant")}`);
+ choice.push(assignJob(slave, "work as a servant"));
} else {
choice.push(`is obedient but not devoted, so ${he} decides to work as a servant since it's the least sexually demanding job available.`);
- choice.push(`${assignJob(slave, "be a servant")}`);
+ choice.push(assignJob(slave, "be a servant"));
}
- } else if (V.universalRulesAssignsSelfFacility === 1 && slave.devotion > 50 && canWalk(slave) && canSee(slave) && V.nurseryNannies > nurseryL && (V.cribs.findIndex(function(c) { (c.mother === slave.ID || c.father === slave.ID); }))) {
+ } else if (V.universalRulesAssignsSelfFacility === 1 && slave.devotion > 50 && canWalk(slave) && canSee(slave) && V.nurseryNannies > nurseryL && (V.cribs.findIndex((c) => (c.mother === slave.ID || c.father === slave.ID)))) {
if (V.cribs.findIndex(function(c) { (c.mother === slave.ID || c.father === slave.ID); })) {
choice.push(`wants to look after ${his} child, so ${he} decides to work in ${V.nurseryName}.`);
- choice.push(`${assignJob(slave, "work as a nanny")}`);
+ choice.push(assignJob(slave, "work as a nanny"));
} else { // motherly sexualQuirk
choice.push(`enjoys taking care of children, so ${he} decides to work in ${V.nurseryName}.`);
- choice.push(`${assignJob(slave, "work as a nanny")}`);
+ choice.push(assignJob(slave, "work as a nanny"));
}
} else if (slave.relationship === -1) {
choice.push(`relies on promiscuity to fulfill ${his} emotional needs,`);
@@ -146,19 +146,19 @@ App.SlaveAssignment.choosesOwnJob = (function() {
choice.push(`and doesn't mind being a whore, so ${he} prostitutes ${himself}`);
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`in ${V.brothelName}.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`on the streets.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
} else {
choice.push(`so ${he} eagerly decides to slut around`);
if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`in ${V.clubName}.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
} else {
choice.push(`on the streets.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
}
@@ -168,48 +168,48 @@ App.SlaveAssignment.choosesOwnJob = (function() {
choice.push(`but insecure, so ${he} decides to make you money by prostituting ${himself}`);
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`in ${V.brothelName}.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`on the streets.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (slave.behavioralQuirk === "advocate") {
choice.push(`and an advocate for slavery, so ${he} decides to burnish your reputation by slutting it up`);
if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`in ${V.clubName}.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
} else {
choice.push(`on the streets.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
} else if (slave.energy > 60) {
choice.push(`and ${he} thinks of little but sex with you,`);
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`so ${he} heads straight to ${V.masterSuiteName}.`);
- choice.push(`${assignJob(slave, "serve in the master suite")}`);
+ choice.push(assignJob(slave, "serve in the master suite"));
} else {
choice.push(`so ${he} cheerfully designates ${himself} one of your fucktoys.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
} else if (canSee(slave) && canWalk(slave)) {
choice.push(`so ${he} decides to work`);
if (V.universalRulesAssignsSelfFacility === 1 && V.servantsQuarters > servQL) {
choice.push(`from ${V.servantsQuartersName} to make your penthouse as clean and homelike as possible.`);
- choice.push(`${assignJob(slave, "work as a servant")}`);
+ choice.push(assignJob(slave, "work as a servant"));
} else {
choice.push(`as a servant to make your penthouse as clean and homelike as possible.`);
- choice.push(`${assignJob(slave, "be a servant")}`);
+ choice.push(assignJob(slave, "be a servant"));
}
} else {
choice.push(`but unable to do much on ${his} own,`);
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`so ${he} heads straight to ${V.masterSuiteName} to await your caress.`);
- choice.push(`${assignJob(slave, "serve in the master suite")}`);
+ choice.push(assignJob(slave, "serve in the master suite"));
} else {
choice.push(`so ${he} cheerfully designates ${himself} one of your fucktoys to be close to you.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
}
} else if (slave.relationship === -3) {
@@ -225,122 +225,122 @@ App.SlaveAssignment.choosesOwnJob = (function() {
choice.push(`and ${he} thinks of little but sex with you,`);
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`so ${he} heads straight to ${V.masterSuiteName}.`);
- choice.push(`${assignJob(slave, "serve in the master suite")}`);
+ choice.push(assignJob(slave, "serve in the master suite"));
} else {
choice.push(`so ${he} cheerfully designates ${himself} one of your fucktoys.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
} else if (canSee(slave) && canWalk(slave)) {
choice.push(`so ${he} decides to work`);
if (V.universalRulesAssignsSelfFacility === 1 && V.servantsQuarters > servQL) {
choice.push(`from ${V.servantsQuartersName} to make your penthouse as clean and homelike as possible.`);
- choice.push(`${assignJob(slave, "work as a servant")}`);
+ choice.push(assignJob(slave, "work as a servant"));
} else {
choice.push(`as a servant to make your penthouse as clean and homelike as possible.`);
- choice.push(`${assignJob(slave, "be a servant")}`);
+ choice.push(assignJob(slave, "be a servant"));
}
} else {
choice.push(`but unable to do much on ${his} own`);
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`so ${he} heads straight to ${V.masterSuiteName} to await your caress.`);
- choice.push(`${assignJob(slave, "serve in the master suite")}`);
+ choice.push(assignJob(slave, "serve in the master suite"));
} else {
choice.push(`so ${he} cheerfully designates ${himself} one of your fucktoys to be close to you.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
}
} else if (slave.devotion < -20) {
choice.push(`and ${he} is scared of you, so ${he} chooses to work as a servant so that ${he} may serve you without "serving" you.`);
- choice.push(`${assignJob(slave, "be a servant")}`);
+ choice.push(assignJob(slave, "be a servant"));
} else {
if (slave.energy > 60) {
choice.push(`and ${he} thinks of little but sex,`);
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`so ${he} heads straight to ${V.masterSuiteName}.`);
- choice.push(`${assignJob(slave, "serve in the master suite")}`);
+ choice.push(assignJob(slave, "serve in the master suite"));
} else {
choice.push(`so ${he} cheerfully designates ${himself} one of your fucktoys.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
} else if (canSee(slave) && canWalk(slave)) {
choice.push(`so ${he} decides to work`);
if (V.universalRulesAssignsSelfFacility === 1 && V.servantsQuarters > servQL) {
choice.push(`from ${V.servantsQuartersName} to make your penthouse as clean and homelike as possible.`);
- choice.push(`${assignJob(slave, "work as a servant")}`);
+ choice.push(assignJob(slave, "work as a servant"));
} else {
choice.push(`as a servant to make your penthouse as clean and homelike as possible.`);
- choice.push(`${assignJob(slave, "be a servant")}`);
+ choice.push(assignJob(slave, "be a servant"));
}
} else {
choice.push(`but unable to do much on ${his} own, so ${he} designates ${himself} one of your fucktoys to get more intimate with you.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
}
} else if (slave.fetishKnown === 1 || jsRandom(1, 100) > 5) { // Yes, this segways into other things than fetish. PM - I added a 5% chance for her to not think of something just for flavor.
if (slave.fetish === "submissive" && canWalk(slave) && canSee(slave)) {
if (V.universalRulesAssignsSelfFacility === 1 && V.servantsQuarters > servQL) {
choice.push(`thinks ${he} belongs at the bottom of the penthouse hierarchy, so ${he} goes to live in ${V.servantsQuartersName}.`);
- choice.push(`${assignJob(slave, "work as a servant")}`);
+ choice.push(assignJob(slave, "work as a servant"));
} else {
choice.push(`thinks ${he} belongs at the bottom of the penthouse hierarchy, so ${he} decides ${he} should be a servant.`);
- choice.push(`${assignJob(slave, "be a servant")}`);
+ choice.push(assignJob(slave, "be a servant"));
}
} else if (slave.fetish === "dom" || slave.fetish === "sadist") {
if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`is self-confident, so ${he} decides to work in ${V.clubName}.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
} else {
choice.push(`is self-confident, so ${he} decides to work as a public servant.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
} else if (slave.fetish === "masochist") {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`enjoys abuse, so ${he} hurries down to ${V.brothelName}.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`enjoys abuse, so ${he} decides to become a whore.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (slave.fetish === "cumslut") {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`hurries down to ${V.brothelName} to suck cocks.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`decides to become a whore, mostly to suck cock.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (slave.fetish === "humiliation") {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`decides to work in ${V.brothelName}, since it's even more embarrassing to be a whore than a club slut.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`decides to whore, since it's even more embarrassing to be a whore than to be a public servant.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (slave.fetish === "buttslut") {
if (slave.balls > 0 && slave.prostate > 0 && V.universalRulesAssignsSelfFacility === 1 && V.dairyRestraintsSetting < 2 && V.dairyStimulatorsSetting > 0 && V.dairy > dairyL) {
choice.push(`chooses confinement in ${V.dairyName}, since all ${he} will be expected to do is produce cum by orgasming to buttsex.`);
- choice.push(`${assignJob(slave, "work in the dairy")}`);
+ choice.push(assignJob(slave, "work in the dairy"));
} else if (canDoAnal(slave)){
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`decides to work in ${V.brothelName}, since whores get buttfucked more than anyone else.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`decides to whore, since whores get buttfucked more than anyone else.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else {
if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`decides to shake ${his} money maker in ${V.clubName}.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
} else {
choice.push(`decides to shake ${his} money maker on the streets.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
}
@@ -348,78 +348,78 @@ App.SlaveAssignment.choosesOwnJob = (function() {
if (V.PC.dick > 0 && isFertile(slave)) {
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`decides to serve you in ${V.masterSuiteName}, hoping that you'll get ${him} pregnant.`);
- choice.push(`${assignJob(slave, "serve in the master suite")}`);
+ choice.push(assignJob(slave, "serve in the master suite"));
} else {
choice.push(`decides to be your fucktoy, hoping that you'll get ${him} pregnant.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
} else if (V.universalRulesAssignsSelfFacility === 1 && V.dairyPregSetting > 0 && V.dairy > dairyL && isFertile(slave)) {
if (V.dairyPregSetting > 1) {
choice.push(`eagerly rushes to ${V.dairyName} in the hopes that ${his} fertile womb will be packed full of children.`);
- choice.push(`${assignJob(slave, "work in the dairy")}`);
+ choice.push(assignJob(slave, "work in the dairy"));
} else {
choice.push(`rushes to ${V.dairyName} in the hopes that ${his} fertile womb will be rented out.`);
- choice.push(`${assignJob(slave, "work in the dairy")}`);
+ choice.push(assignJob(slave, "work in the dairy"));
}
} else if (slave.bellyPreg >= 1500) {
if (arcology.FSRepopulationFocus > 20) {
if (V.cash < 10000) {
if (V.brothel > brothelL && V.universalRulesAssignsSelfFacility === 1) {
choice.push(`heads to ${V.brothelName} since ${he} wants to set an example for any unimpregnated girls.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`heads to the streets to lavish in the attention given to pregnant prostitutes.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
} else {
if (V.club > clubL && V.universalRulesAssignsSelfFacility === 1) {
choice.push(`heads to ${V.clubName} to show off ${his} growing middle and lavish in the public's attention.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
} else {
choice.push(`heads to the streets to contribute to the number of visibly pregnant women around.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
}
}
slave.sexAmount = 10;
} else if (V.masterSuite > masterSL && V.universalRulesAssignsSelfFacility === 1) {
choice.push(`heads straight to ${V.masterSuiteName} to share the intimacy of ${his} pregnant body with you.`);
- choice.push(`${assignJob(slave, "serve in the master suite")}`);
+ choice.push(assignJob(slave, "serve in the master suite"));
} else {
choice.push(`decides to be your fucktoy to share the intimacy of ${his} pregnant body with you.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
} else if (slave.pregKnown === 1) {
if (V.masterSuite > masterSL && V.universalRulesAssignsSelfFacility === 1) {
choice.push(`heads straight to ${V.masterSuiteName} so you may watch for the day that ${he} finally starts to show.`);
- choice.push(`${assignJob(slave, "serve in the master suite")}`);
+ choice.push(assignJob(slave, "serve in the master suite"));
} else {
choice.push(`decides to be your fucktoy so you may enjoy watching ${him} begin showing.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
} else if (canGetPregnant(slave)) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`can't indulge ${his} pregnancy fetish without getting dicked, so ${he} heads down to ${V.brothelName} to do just that.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`can't indulge ${his} pregnancy fetish without getting dicked, so ${he} decides to be a whore to get seeded.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (slave.lactation > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.dairyRestraintsSetting < 2 && V.dairy > dairyL) {
choice.push(`heads down to ${V.dairyName} to be around other lactating girls.`);
- choice.push(`${assignJob(slave, "work in the dairy")}`);
+ choice.push(assignJob(slave, "work in the dairy"));
} else {
choice.push(`decides to get milked, since ${he} is already lactating.`);
- choice.push(`${assignJob(slave, "get milked")}`);
+ choice.push(assignJob(slave, "get milked"));
}
} else {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`can't indulge ${his} fetish by getting pregnant ${himself}, so ${he} just heads down to ${V.brothelName}.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`can't indulge ${his} fetish by getting pregnant ${himself}, so ${he} glumly decides to be a whore.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
}
@@ -427,144 +427,144 @@ App.SlaveAssignment.choosesOwnJob = (function() {
if (slave.lactation > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.dairyRestraintsSetting < 2 && V.dairy > dairyL) {
choice.push(`heads down to ${V.dairyName} for all the attention that'll be lavished on ${his} nipples.`);
- choice.push(`${assignJob(slave, "work in the dairy")}`);
+ choice.push(assignJob(slave, "work in the dairy"));
} else {
choice.push(`decides to get milked, since ${he} loves getting off to it.`);
- choice.push(`${assignJob(slave, "get milked")}`);
+ choice.push(assignJob(slave, "get milked"));
}
} else if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`decides to work in ${V.clubName} so ${he} can show off ${his} bare breasts.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
slave.sexAmount = 10;
} else {
choice.push(`decides to work as a public servant so ${he} can show off ${his} bare breasts.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
slave.sexAmount = 10;
}
} else if (slave.attrXX > 85) {
if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`decides to work in ${V.clubName} so ${he} can hit on hot girls.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
} else {
choice.push(`decides to work as a public servant so ${he} can hit on hot girls.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
} else if (slave.attrXY > 85) {
if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`decides to work in ${V.clubName} so ${he} can hit on cute boys.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
} else {
choice.push(`decides to work as a public servant so ${he} can hit on cute boys.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
} else if (slave.energy > 95) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`decides to help those of your slaves who mind taking dick all day by working in ${V.brothelName}.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`decides to help those of your slaves who mind taking dick all day by working as a whore.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (arcology.FSChattelReligionist > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`slave.choosesOwnAssignmentText += " is a pure and faithful slave, so ${he} sells ${his} body in the holy brothel.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`slave.choosesOwnAssignmentText += " is a pure and faithful slave, so ${he} sells ${his} body as a holy prostitute.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (arcology.FSEgyptianRevivalist > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`is a devoted slave, so ${he} immediately joins your harem.`);
- choice.push(`${assignJob(slave, "serve in the master suite")}`);
+ choice.push(assignJob(slave, "serve in the master suite"));
} else {
choice.push(`is a devoted slave, so ${he} immediately joins your harem.`);
- choice.push(`${assignJob(slave, "please you")}`);
+ choice.push(assignJob(slave, "please you"));
}
} else if (arcology.FSRomanRevivalist > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`is a devoted slave, so ${he} decides ${he} can best serve the state by raising money for the treasury, by selling ${his} body in ${V.brothelName}.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`is a devoted slave, so ${he} decides ${he} can best serve the state by raising money for the treasury, by selling ${his} body as a prostitute.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (arcology.FSAztecRevivalist > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`is a devoted slave, so ${he} decides ${he} can best serve the empire by serving at the fertility temple.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`is a devoted slave, so ${he} decides ${he} can best serve the empire by offering ${himself} to the public.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
} else if (arcology.FSPaternalist > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`decides to work in ${V.brothelName}, a respectable position for a slave in this enlightened arcology.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`decides to be a whore, a respectable position for a slave in this enlightened arcology.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (arcology.FSPastoralist > 0) {
if (slave.lactation > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.dairyRestraintsSetting < 2 && V.dairy > dairyL) {
choice.push(`hurries to join your herd of dairy cows.`);
- choice.push(`${assignJob(slave, "work in the dairy")}`);
+ choice.push(assignJob(slave, "work in the dairy"));
} else {
choice.push(`hurries to join your herd of cows.`);
- choice.push(`${assignJob(slave, "get milked")}`);
+ choice.push(assignJob(slave, "get milked"));
}
} else {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`decides to work in ${V.brothelName} to help raise money to get more girls lactating properly.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`decides to prostitute ${himself} to help raise money to get more girls lactating properly.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
}
} else if (arcology.FSHedonisticDecadence > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.spa > spaL && (slave.trust < 60 || slave.devotion <= 60)) {
choice.push(`could use a break, so ${he} heads to take a dip in the spa.`);
- choice.push(`${assignJob(slave, "rest in the spa")}`);
+ choice.push(assignJob(slave, "rest in the spa"));
} else {
choice.push(`could use a meal and a nap, so ${he} grabs a cup of food and heads to bed.`);
- choice.push(`${assignJob(slave, "rest")}`);
+ choice.push(removeJob(slave, slave.assignment));
}
} else {
if (slave.skill.whoring > slave.skill.entertainment) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`decides to work in ${V.brothelName}, since ${he} thinks ${himself} a better whore than a public slut.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`decides to whore, since ${he} thinks ${himself} a better whore than a public slut.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
} else if (slave.skill.entertainment > slave.skill.whoring) {
if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`decides to be a club ${girl}, since ${he} thinks ${himself} a better public slut than a whore.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
} else {
choice.push(`decides to serve the public, since ${he} thinks ${himself} a better public slut than a whore.`);
- choice.push(`${assignJob(slave, "serve the public")}`);
+ choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
} else {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`decides to join ${his} sisters and work in ${V.brothelName}.`);
- choice.push(`${assignJob(slave, "work in the brothel")}`);
+ choice.push(assignJob(slave, "work in the brothel"));
} else {
choice.push(`decides to prostitute ${himself} to help you upgrade ${arcology.name} and improve everyone's life.`);
- choice.push(`${assignJob(slave, "whore")}`);
+ choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
}
@@ -572,14 +572,14 @@ App.SlaveAssignment.choosesOwnJob = (function() {
} else {
if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`decides to be a club ${girl}, since partying is better than sitting around and failing to think of a job to do.`);
- choice.push(`${assignJob(slave, "serve in the club")}`);
+ choice.push(assignJob(slave, "serve in the club"));
slave.sexAmount = 10;
} else if (canWalk(slave) && canSee(slave)) {
choice.push(`decides to tidy up the penthouse a little while ${he} thinks.`);
- choice.push(`${assignJob(slave, "be a servant")}`);
+ choice.push(assignJob(slave, "be a servant"));
} else {
choice.push(`stays in bed, unable to come up with anything.`);
- choice.push(`${removeJob(slave, slave.assignment)}`);
+ choice.push(removeJob(slave, slave.assignment));
}
}
diff --git a/src/endWeek/schoolroomReport.js b/src/endWeek/schoolroomReport.js
index 48fe016abaa784c625e99df3e33320a5606231f0..5a98eff826c44d82787978f1af915e1d459a4f76 100644
--- a/src/endWeek/schoolroomReport.js
+++ b/src/endWeek/schoolroomReport.js
@@ -215,7 +215,7 @@ App.EndWeek.schoolroomReport = function() {
}
$(slaveEntry).append(`<span class='slave-name'>${slave.slaveName}</span> `);
if (slave.choosesOwnAssignment === 2) {
- $(slaveEntry).append(`${App.SlaveAssignment.choosesOwnJob(slave)}`);
+ $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
} else {
$(slaveEntry).append(`is studying in ${V.schoolroomName}.`);
}
diff --git a/src/endWeek/servantsQuartersReport.js b/src/endWeek/servantsQuartersReport.js
index abd29313ce7c14463f740dd9bb04068c48212ad7..c5facef9e5595a5436e317fe474ea238e1e7fedb 100644
--- a/src/endWeek/servantsQuartersReport.js
+++ b/src/endWeek/servantsQuartersReport.js
@@ -289,7 +289,7 @@ App.EndWeek.servantsQuartersReport = function() {
}
$(slaveEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> `);
if (slave.choosesOwnAssignment === 2) {
- $(slaveEntry).append(`${App.SlaveAssignment.choosesOwnJob(slave)}`);
+ $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
} else {
$(slaveEntry).append(`is working out of ${V.servantsQuartersName}.`);
}
diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js
index bfd061f3a7afa70203c8f0707fcbf23406c7641b..63ee5047bedad2ad0db79b4d8c8371bb54a1cef4 100644
--- a/src/facilities/farmyard/reports/farmyardReport.js
+++ b/src/facilities/farmyard/reports/farmyardReport.js
@@ -374,7 +374,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
$(slaveEntry).append(`<span class="slave-name">${SlaveFullName(slave)}</span> `);
if (slave.choosesOwnAssignment === 2) {
- $(slaveEntry).append(`${App.SlaveAssignment.choosesOwnJob(slave)}`);
+ $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
} else {
$(slaveEntry).append(`is working out of ${V.farmyardName}.`);
}