From 3f0af9c19bee375bdeb70bef4905a9c9a0f2acf2 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 25 Oct 2020 18:09:17 -0400
Subject: [PATCH] punc fixes
---
src/facilities/incubator/incubatorInteract.js | 22 +-
src/npc/generate/newChildIntro.js | 199 +++++++++---------
src/npc/generate/newSlaveIntro.js | 18 +-
3 files changed, 112 insertions(+), 127 deletions(-)
diff --git a/src/facilities/incubator/incubatorInteract.js b/src/facilities/incubator/incubatorInteract.js
index 6bc9b4db831..73fe25a2c5b 100644
--- a/src/facilities/incubator/incubatorInteract.js
+++ b/src/facilities/incubator/incubatorInteract.js
@@ -55,7 +55,7 @@ App.UI.incubator = function() {
} else if (incubatorSlaves > 0) {
r.push(`It's barely used; most of the tanks lie dormant.`);
} else {
- r.push(`It's empty and quiet. `);
+ r.push(`It's empty and quiet.`);
r.push(
choice(
"Decommission the incubator",
@@ -714,7 +714,7 @@ App.UI.incubator = function() {
r.push(App.UI.DOM.makeElement("span", V.tanks[i].slaveName, "pink"));
r.push(`occupies this tank.`);
if (V.geneticMappingUpgrade >= 1) {
- r.push(`${He} is a `);
+ r.push(`${He} is a`);
if (V.tanks[i].genes === "XX") {
r.push(`female`);
} else {
@@ -722,17 +722,17 @@ App.UI.incubator = function() {
}
r.push(`of ${V.tanks[i].race} descent with ${App.Desc.eyesColor(V.tanks[i])}, ${V.tanks[i].hColor} hair and ${V.tanks[i].skin} skin. Given ${his} parentage, ${he} is considered ${V.tanks[i].nationality}.`);
} else {
- r.push(`${He} appears to be `);
+ r.push(`${He} appears to be`);
if (V.tanks[i].genes === "XX") {
- r.push(`a natural girl`);
+ r.push(`a natural girl,`);
} else {
- r.push(`a natural boy`);
+ r.push(`a natural boy,`);
}
- r.push(`, with ${V.tanks[i].hColor} hair`);
+ r.push(`with ${V.tanks[i].hColor}`);
if (getBestVision(V.tanks[i]) === 0) {
- r.push(` and ${App.Desc.eyesColor(V.tanks[i])}.`);
+ r.push(`hair and ${App.Desc.eyesColor(V.tanks[i])}.`);
} else {
- r.push(`. ${He} most likely will be blind.`);
+ r.push(`hair. ${He} most likely will be blind.`);
}
}
if (V.tanks[i].preg > 0) {
@@ -904,7 +904,7 @@ App.UI.incubator = function() {
if ((V.incubatorPregAdaptationSetting === 1 && V.tanks[i].genes === "XX") || (V.incubatorPregAdaptationSetting === 2 && V.tanks[i].genes === "XY") || V.incubatorPregAdaptationSetting === 3) {
/* Should be visible only after incubatorUpgradeReproduction is installed and activated*/
r = [];
- r.push(`${His} reproductive organs are getting `);
+ r.push(`${His} reproductive organs are getting`);
if (V.tanks[i].incubatorPregAdaptationPower === 1) {
r.push(`an advanced`);
} else if (V.tanks[i].incubatorPregAdaptationPower === 2) {
@@ -919,7 +919,7 @@ App.UI.incubator = function() {
}
}
r = [];
- r.push(`Rename ${him}: `);
+ r.push(`Rename ${him}:`);
r.push(
App.UI.DOM.makeTextBox(
V.tanks[i].slaveName,
@@ -1062,7 +1062,7 @@ App.UI.incubator = function() {
App.UI.DOM.appendNewElement("div", p, App.UI.DOM.generateLinksStrip(linkArray));
if (V.tanks[i].voice === 0) {
r = [];
- r.push(`${He} appears to be mute: `);
+ r.push(`${He} appears to be mute:`);
if (tankOrgans.voicebox !== 1) {
r.push(makeLink("Prepare vocal cords", () => { App.Medicine.OrganFarm.growIncubatorOrgan(V.tanks[i], "voicebox"); }, refresh));
} else {
diff --git a/src/npc/generate/newChildIntro.js b/src/npc/generate/newChildIntro.js
index 7a57b3f661a..7ae8c62434f 100644
--- a/src/npc/generate/newChildIntro.js
+++ b/src/npc/generate/newChildIntro.js
@@ -39,11 +39,7 @@ App.UI.newChildIntro = function(slave) {
} else if (slave.geneticQuirks.neoteny && slave.actualAge > 12 && V.geneticMappingUpgrade === 0) {
r.push(`you have to make sure the right ${girl} was released. ${He} was supposed to be ${slave.actualAge}, not this child sitting before you. You double check the machine's logs to be certain and it turns out ${he} really is ${slave.actualAge}, just abnormally young looking for ${his} age.`);
} else {
- r.push(`you help ${him} to ${his} feet`);
- if (V.incubatorReproductionSetting > 1) {
- r.push(`, making sure to feel-up ${his} overdeveloped body,`);
- }
- r.push(` and walk ${him} to your penthouse.`);
+ r.push(`you help ${him} to ${his} feet${(V.incubatorReproductionSetting > 1) ? `, making sure to feel-up ${his} overdeveloped body,` : ``} and walk ${him} to your penthouse.`);
}
r.push(`Though first you must decide upon a name for the new ${girl}; it won't take long to reach your office, so you have only <span class="orange">one chance to name ${him}</span> before you arrive.`);
App.Events.addParagraph(el, r);
@@ -236,100 +232,6 @@ App.UI.newChildIntro = function(slave) {
}
// Parent naming
-
- function parentNaming(parent) {
- const el = new DocumentFragment();
- ({
- he2, his2, He2
- } = getPronouns(parent).appendSuffix("2"));
- if (parent.ID === V.ConcubineID) {
- App.UI.DOM.appendNewElement(
- "div",
- el,
- App.UI.DOM.link(
- `Permit your Concubine to name ${his2} ${daughter}`,
- () => {
- parentNames(parent, slave);
- slave.birthName = slave.slaveName;
- jQuery("#naming").empty().append(`After some careful consideration, ${parent.slaveName} picks a name ${he2} thinks you might find attractive; from now on ${his2} ${daughter} will be known as "${slave.slaveName}".`);
- const slaveName = document.createElement("span");
- slaveName.classList.add('slave-name');
- slaveName.append(slave.slaveName);
- jQuery("#newName").empty().append(slaveName);
- }
- )
- );
- } else if (parent.relationship === -3 && (parent.devotion >= -20)) {
- App.UI.DOM.appendNewElement(
- "div",
- el,
- App.UI.DOM.link(
- `Permit your ${wife2} to name ${his2} ${daughter}`,
- () => {
- parentNames(parent, slave);
- slave.birthName = slave.slaveName;
- jQuery("#naming").empty().append(`After some careful consideration,${parent.slaveName} picks a name suitable for your ${daughter}; from now on ${he2} will be known as "${slave.slaveName}".`);
- const slaveName = document.createElement("span");
- slaveName.classList.add('slave-name');
- slaveName.append(slave.slaveName);
- jQuery("#newName").empty().append(slaveName);
- }
- )
- );
- } else if (parent.ID === V.BodyguardID) {
- App.UI.DOM.appendNewElement(
- "div",
- el,
- App.UI.DOM.link(
- `Permit your bodyguard to name ${his2} ${daughter}`,
- () => {
- parentNames(parent, slave);
- slave.birthName = slave.slaveName;
- jQuery("#naming").empty().append(`After some careful consideration,${parent.slaveName} decides on "${slave.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station.`);
- const slaveName = document.createElement("span");
- slaveName.classList.add('slave-name');
- slaveName.append(slave.slaveName);
- jQuery("#newName").empty().append(slaveName);
- }
- )
- );
- } else if (parent.ID === V.HeadGirlID) {
- App.UI.DOM.appendNewElement(
- "div",
- el,
- App.UI.DOM.link(
- `Permit your Head Girl to name ${his2} ${daughter}`,
- () => {
- parentNames(parent, slave);
- slave.birthName = slave.slaveName;
- jQuery("#naming").empty().append(`After some careful consideration,${parent.slaveName} decides on "${slave.slaveName}" for ${his2} daughter, and hopes it will be a name your other slaves will learn to respect.`);
- const slaveName = document.createElement("span");
- slaveName.classList.add('slave-name');
- slaveName.append(slave.slaveName);
- jQuery("#newName").empty().append(slaveName);
- }
- )
- );
- } else if (parent.devotion > 50 && parent.trust > 50) {
- App.UI.DOM.appendNewElement(
- "div",
- el,
- App.UI.DOM.link(
- `Permit ${his} devoted mother to name ${his2} ${daughter}`,
- () => {
- parentNames(parent, slave);
- slave.birthName = slave.slaveName;
- jQuery("#naming").empty().append(`After some careful consideration, ${tempMom.slaveName} picks a name ${he2} hopes you'll like; from now on ${his2} ${daughter} will be known as "${slave.slaveName}".`);
- const slaveName = document.createElement("span");
- slaveName.classList.add('slave-name');
- slaveName.append(slave.slaveName);
- jQuery("#newName").empty().append(slaveName);
- }
- )
- );
- }
- return el;
- }
if (tempMom !== 0) {
naming.append(parentNaming(tempMom));
}
@@ -338,9 +240,6 @@ App.UI.newChildIntro = function(slave) {
}
el.append(naming);
-
- r = [];
-
const newName = document.createElement("span");
newName.id = "newName";
@@ -350,8 +249,8 @@ App.UI.newChildIntro = function(slave) {
newName.append(slaveName);
+ r = [];
r.push(newName);
-
r.push(`now stands before your desk`);
if (tempMom !== 0 && tempDad !== 0 && slave.father !== slave.mother) {
r.push(`alongside ${his} mother ${tempMom.slaveName} and father ${tempDad.slaveName}.`);
@@ -894,4 +793,98 @@ App.UI.newChildIntro = function(slave) {
);
return el;
+
+ function parentNaming(parent) {
+ const el = new DocumentFragment();
+ ({
+ he2, his2, He2
+ } = getPronouns(parent).appendSuffix("2"));
+ if (parent.ID === V.ConcubineID) {
+ App.UI.DOM.appendNewElement(
+ "div",
+ el,
+ App.UI.DOM.link(
+ `Permit your Concubine to name ${his2} ${daughter}`,
+ () => {
+ parentNames(parent, slave);
+ slave.birthName = slave.slaveName;
+ jQuery("#naming").empty().append(`After some careful consideration, ${parent.slaveName} picks a name ${he2} thinks you might find attractive; from now on ${his2} ${daughter} will be known as "${slave.slaveName}".`);
+ const slaveName = document.createElement("span");
+ slaveName.classList.add('slave-name');
+ slaveName.append(slave.slaveName);
+ jQuery("#newName").empty().append(slaveName);
+ }
+ )
+ );
+ } else if (parent.relationship === -3 && (parent.devotion >= -20)) {
+ App.UI.DOM.appendNewElement(
+ "div",
+ el,
+ App.UI.DOM.link(
+ `Permit your ${wife2} to name ${his2} ${daughter}`,
+ () => {
+ parentNames(parent, slave);
+ slave.birthName = slave.slaveName;
+ jQuery("#naming").empty().append(`After some careful consideration,${parent.slaveName} picks a name suitable for your ${daughter}; from now on ${he2} will be known as "${slave.slaveName}".`);
+ const slaveName = document.createElement("span");
+ slaveName.classList.add('slave-name');
+ slaveName.append(slave.slaveName);
+ jQuery("#newName").empty().append(slaveName);
+ }
+ )
+ );
+ } else if (parent.ID === V.BodyguardID) {
+ App.UI.DOM.appendNewElement(
+ "div",
+ el,
+ App.UI.DOM.link(
+ `Permit your bodyguard to name ${his2} ${daughter}`,
+ () => {
+ parentNames(parent, slave);
+ slave.birthName = slave.slaveName;
+ jQuery("#naming").empty().append(`After some careful consideration,${parent.slaveName} decides on "${slave.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station.`);
+ const slaveName = document.createElement("span");
+ slaveName.classList.add('slave-name');
+ slaveName.append(slave.slaveName);
+ jQuery("#newName").empty().append(slaveName);
+ }
+ )
+ );
+ } else if (parent.ID === V.HeadGirlID) {
+ App.UI.DOM.appendNewElement(
+ "div",
+ el,
+ App.UI.DOM.link(
+ `Permit your Head Girl to name ${his2} ${daughter}`,
+ () => {
+ parentNames(parent, slave);
+ slave.birthName = slave.slaveName;
+ jQuery("#naming").empty().append(`After some careful consideration,${parent.slaveName} decides on "${slave.slaveName}" for ${his2} daughter, and hopes it will be a name your other slaves will learn to respect.`);
+ const slaveName = document.createElement("span");
+ slaveName.classList.add('slave-name');
+ slaveName.append(slave.slaveName);
+ jQuery("#newName").empty().append(slaveName);
+ }
+ )
+ );
+ } else if (parent.devotion > 50 && parent.trust > 50) {
+ App.UI.DOM.appendNewElement(
+ "div",
+ el,
+ App.UI.DOM.link(
+ `Permit ${his} devoted mother to name ${his2} ${daughter}`,
+ () => {
+ parentNames(parent, slave);
+ slave.birthName = slave.slaveName;
+ jQuery("#naming").empty().append(`After some careful consideration, ${tempMom.slaveName} picks a name ${he2} hopes you'll like; from now on ${his2} ${daughter} will be known as "${slave.slaveName}".`);
+ const slaveName = document.createElement("span");
+ slaveName.classList.add('slave-name');
+ slaveName.append(slave.slaveName);
+ jQuery("#newName").empty().append(slaveName);
+ }
+ )
+ );
+ }
+ return el;
+ }
};
diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js
index f71a8020838..ba09c4b6975 100644
--- a/src/npc/generate/newSlaveIntro.js
+++ b/src/npc/generate/newSlaveIntro.js
@@ -3323,11 +3323,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
`Let it slide for now`,
() => {
const r = [];
- r.push(`You decide to yourself that it may be for the best to just send ${him} on ${his} way for now. You quietly order ${slave.slaveName} out into the penthouse, while you head off to wash out ${his} seed. You can't reasonably expect ${him} to know the full ramifications of what ${he} did; ${he} can't exactly be considered an adult`);
- if (slave.physicalAge < 18) {
- r.push(`, by any means`);
- }
- r.push(`. Indeed, the ${girl} is mostly just bewildered by your sudden change in mood, but seems pretty sure that <span class="orangered">${he} had nothing to do with it.</span>`);
+ r.push(`You decide to yourself that it may be for the best to just send ${him} on ${his} way for now. You quietly order ${slave.slaveName} out into the penthouse, while you head off to wash out ${his} seed. You can't reasonably expect ${him} to know the full ramifications of what ${he} did; ${he} can't exactly be considered an adult${(slave.physicalAge < 18) ? `, by any means` : ``}. Indeed, the ${girl} is mostly just bewildered by your sudden change in mood, but seems pretty sure that <span class="orangered">${he} had nothing to do with it.</span>`);
slave.trust += 20;
jQuery("#result2").empty().append(r.join(" "));
}
@@ -3715,11 +3711,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
`Let it slide for now`,
() => {
const r = [];
- r.push(`You decide to yourself that it may be for the best to just send ${him} on ${his} way for now. You quietly order ${slave.slaveName} out into the penthouse, while you fetch a towel to wipe off ${his} seed. You can't reasonably expect ${him} to know the full ramifications of what ${he} did; ${he} can't exactly be considered an adult`);
- if (slave.physicalAge < 18) {
- r.push(`, by any means`);
- }
- r.push(`. Indeed, the ${girl} is mostly just bewildered by your sudden change in mood, but seems pretty sure that <span class="orangered">${he} had nothing to do with it.</span>`);
+ r.push(`You decide to yourself that it may be for the best to just send ${him} on ${his} way for now. You quietly order ${slave.slaveName} out into the penthouse, while you fetch a towel to wipe off ${his} seed. You can't reasonably expect ${him} to know the full ramifications of what ${he} did; ${he} can't exactly be considered an adult${(slave.physicalAge < 18) ? `, by any means` : ``}. Indeed, the ${girl} is mostly just bewildered by your sudden change in mood, but seems pretty sure that <span class="orangered">${he} had nothing to do with it.</span>`);
slave.trust += 25;
jQuery("#result2").empty().append(r.join(" "));
}
@@ -3785,11 +3777,11 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`Suddenly, ${he} buries ${his} head into your cleavage, knocking you off balance and to the floor. As you try to right yourself, you notice ${he} has fallen asleep in your pillowy breasts. Sighing, you make yourself comfortable until ${he} finishes ${his} nap. When `);
if (canSee(slave)) {
- r.push(`the first thing ${he} sees when ${he} awakes is your face`);
+ r.push(`the first thing ${he} sees when ${he} awakes is your face,`);
} else {
- r.push(`he wakes up still enveloped in your bosom`);
+ r.push(`he wakes up still enveloped in your bosom,`);
}
- r.push(`, a <span class="hotpink">lasting bond</span> is established between you two. ${He} happily returns to snuggling your tits before you can help ${him} up and send ${him} off. ${He} might be turning into a breast fetishist, if you had to guess.`);
+ r.push(`a <span class="hotpink">lasting bond</span> is established between you two. ${He} happily returns to snuggling your tits before you can help ${him} up and send ${him} off. ${He} might be turning into a breast fetishist, if you had to guess.`);
slave.devotion += 5;
if (random(1, 100) > 40 && slave.fetish === "none") {
slave.fetish = "boobs";
--
GitLab