diff --git a/src/endWeek/saChoosesOwnJob.js b/src/endWeek/saChoosesOwnJob.js
index 5c08029c433a542726925fa79861848b096a455f..ae1fdab11dfc9f0764c6e7f91d0ff74f9babff42 100644
--- a/src/endWeek/saChoosesOwnJob.js
+++ b/src/endWeek/saChoosesOwnJob.js
@@ -2,7 +2,6 @@
* This function is the old "first pass", which actually picks the job.
* The slaves' reasoning is saved in saVars for later use.
* @param {App.Entity.SlaveState} slave
- * @returns {string}
*/
App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
/** @type {string[]} */
@@ -156,8 +155,8 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
choice.push(`is obedient but not devoted, so ${he} <span class="job change">decides to work as a servant</span> since it's the least sexually demanding job available.`);
choice.push(assignJob(slave, "be a servant"));
}
- } else if (V.universalRulesAssignsSelfFacility === 1 && slave.devotion > 50 && canWalk(slave) && canSee(slave) && V.nursery > nurseryL && (V.cribs.findIndex((c) => (c.mother === slave.ID || c.father === slave.ID)))) {
- if (V.cribs.findIndex((c) => (c.mother === slave.ID || c.father === slave.ID))) {
+ } else if (V.universalRulesAssignsSelfFacility === 1 && slave.devotion > 50 && canWalk(slave) && canSee(slave) && V.nursery > nurseryL && (V.cribs.find((c) => (c.mother === slave.ID || c.father === slave.ID)))) {
+ if (V.cribs.find((c) => (c.mother === slave.ID || c.father === slave.ID))) {
choice.push(`wants to look after ${his} child, so ${he} <span class="job change">decides to work in ${V.nurseryName}.</span>`);
choice.push(assignJob(slave, "work as a nanny"));
} else { // motherly sexualQuirk
diff --git a/src/events/scheduled/sePCBirthday.desc.js b/src/events/scheduled/sePCBirthday.desc.js
index 3a5c9624c13660f76ad938974899f4ac46f174b7..a609c995ac881fae83656c3baf03d36616bbae31 100644
--- a/src/events/scheduled/sePCBirthday.desc.js
+++ b/src/events/scheduled/sePCBirthday.desc.js
@@ -188,7 +188,7 @@ App.Events.pcBirthday.Desc = (function(bday) {
When you look back down at your screen, you find a trio of beautiful, curvaceous slaves, fumbling over each other in a hedonistic pile. "...Maybe," you
hear ${data.assistPN.her} clarify.
</p>
- ${this.renderChoice_Business_AssistantVideo()}
+ ${this.renderChoice_Business_AssistantVideo(data)}
<p>
You look over at ${V.assistant.name} again. "Happy birthday, ${properTitle()}. I spent all week rendering it. Now let's make some money!"
</p>`;
@@ -212,8 +212,9 @@ App.Events.pcBirthday.Desc = (function(bday) {
},
/**
* Helper function for a mini-scene.
+ * @param {App.Events.pcBirthday.EventData} data
*/
- renderChoice_Business_AssistantVideo: function() {
+ renderChoice_Business_AssistantVideo: function(data) {
let slaveDescSing = "woman";
let slaveDescPlural = "women";
diff --git a/src/events/scheduled/sePCBirthday.js b/src/events/scheduled/sePCBirthday.js
index 98d37d7e3c051ca0caddc11f2ae84d660ca7da61..51274ce8de135086247e1e56dad6a5943cc94778 100644
--- a/src/events/scheduled/sePCBirthday.js
+++ b/src/events/scheduled/sePCBirthday.js
@@ -30,6 +30,7 @@ App.Events.SEpcBirthday = class SEpcBirthday extends App.Events.BaseEvent {
* @property {?App.Events.pcBirthday.PlannerData} planner The possible party planner and their role; may be `null` if none is found. See `determinePlanner()`.
* The scene doesn't *have* to use the planner, even if one is found.
* @property {App.Utils.Pronouns} assistPN Pronouns for the player's assistant.
+ * @property {App.Utils.Pronouns} marketPN Pronouns for the market assistant.
* @property {string} attire Records the dress type chosen by the player in some branches.
*/
diff --git a/src/facilities/incubator/inspectTankSettings.js b/src/facilities/incubator/inspectTankSettings.js
index d18fb381a9f8eca633c1e63f18a0fc057dc7efb0..8dc3c1492679e5502daacc308b3cf4a694b20879 100644
--- a/src/facilities/incubator/inspectTankSettings.js
+++ b/src/facilities/incubator/inspectTankSettings.js
@@ -1,7 +1,4 @@
App.UI.inspectTankSettings = function(isFetus, isPCMother = false) {
-
- // V.nextLink = "Incubator";
- // V.storedLink = "Incubator";
let tankSetting;
let child;
let fetus;
@@ -41,7 +38,7 @@ App.UI.inspectTankSettings = function(isFetus, isPCMother = false) {
/* Age */
if (isFetus) {
- let target = Math.round(tankSetting.targetAge); //This is fine because it will only be displayed when growTime has not been depeleted
+ let target = Math.round(tankSetting.targetAge); // This is fine because it will only be displayed when growTime has not been depleted
let r = [];
r.push("Target age for release:");
r.push(
@@ -84,7 +81,7 @@ App.UI.inspectTankSettings = function(isFetus, isPCMother = false) {
() => {
target = V.potencyAge;
tankSetting.targetAge = target;
- jQuery(container).empty().append(content());
+ jQuery(container).empty().append(content());
}
)
);
@@ -94,7 +91,7 @@ App.UI.inspectTankSettings = function(isFetus, isPCMother = false) {
() => {
target = 18;
tankSetting.targetAge = target;
- jQuery(container).empty().append(content());
+ jQuery(container).empty().append(content());
}
)
);
@@ -106,7 +103,7 @@ App.UI.inspectTankSettings = function(isFetus, isPCMother = false) {
if (isFetus) {
section.append(`Target age for release: ${tankSetting.targetAge}`);
} else {
- section.append(`Target age for release: ${child.physicalAge}`); //This is already set, apparently
+ section.append(`Target age for release: ${child.physicalAge}`); // This is already set, apparently
}
section.append(App.UI.DOM.makeElement("div", `Cannot be changed on tanks in use`));
node.append(section);
@@ -284,10 +281,9 @@ App.UI.inspectTankSettings = function(isFetus, isPCMother = false) {
if (isFetus) {
section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
}
+ }
- }
-
- if ( V.incubator.upgrade.reproduction === 1 && V.incubator.upgrade.pregAdaptation === 1 && !isFetus) {
+ if (V.incubator.upgrade.reproduction === 1 && V.incubator.upgrade.pregAdaptation === 1 && !isFetus) {
section.append(App.UI.DOM.makeElement("div", `Due to the high complexity and steep risks of the procedure, these settings cannot be changed on tanks in use.`));
}
node.append(section);
@@ -414,4 +410,4 @@ App.UI.inspectTankSettings = function(isFetus, isPCMother = false) {
}
);
}
-}
\ No newline at end of file
+};
diff --git a/src/npc/interaction/fDick.js b/src/npc/interaction/fDick.js
index 0b2e6e17e9923573f472278714cfe9972bc81154..ca1feda9145223c2f9b1b0af151862146b9e5b3d 100644
--- a/src/npc/interaction/fDick.js
+++ b/src/npc/interaction/fDick.js
@@ -12,7 +12,7 @@ App.Interact.fDick = function(slave) {
// TODO: .pregMood and more amp variants
- seX(slave, "penetrative", V.PC);
+ seX(slave, "penetrative", V.PC, V.PC.vagina !== -1 ? "vaginal" : "anal");
const cunt = V.PC.vagina !== -1 ? "cunt" : "rectal"; // TODO: probably ought to be able to *choose* vaginal or anal sex if they're both valid
const belly = bellyAdjective(slave);