diff --git a/src/npc/descriptions/boobs/boobsShape.js b/src/npc/descriptions/boobs/boobsShape.js
index 090a28976cfaa2d7e38a5b2894d10d3cfb257696..19e47533ed296adc21df6edea41531c30c124f5d 100644
--- a/src/npc/descriptions/boobs/boobsShape.js
+++ b/src/npc/descriptions/boobs/boobsShape.js
@@ -195,27 +195,27 @@ App.Desc.boobsShape = function(slave) {
if (slave.boobs >= 400) {
if (slave.boobs >= 10000) {
if (slave.boobsImplant / slave.boobs < .75) {
- r.push(`${His} breasts are < span class="red" > disgustingly natural</span > for their size.`);
+ r.push(`${His} breasts are <span class="red"> disgustingly natural</span> for their size.`);
} else {
- r.push(`${His} breasts are < span class="green" > obviously implants,</span > as they should be.`);
+ r.push(`${His} breasts are <span class="green"> obviously implants,</span> as they should be.`);
}
} else if (slave.boobs >= 2000) {
if (slave.boobsImplant / slave.boobs < .50) {
- r.push(`${His} breasts are < span class="red" > disgustingly natural</span > for their size.`);
+ r.push(`${His} breasts are <span class="red"> disgustingly natural</span> for their size.`);
} else {
- r.push(`${His} breasts are < span class="green" > obviously implants,</span > as they should be.`);
+ r.push(`${His} breasts are <span class="green"> obviously implants,</span> as they should be.`);
}
} else if (slave.boobs >= 1000) {
if (slave.boobsImplant / slave.boobs < .25) {
- r.push(`${His} breasts are < span class="red" > disgustingly natural</span > for their size.`);
+ r.push(`${His} breasts are <span class="red"> disgustingly natural</span> for their size.`);
} else {
- r.push(`${His} breasts are < span class="green" > obviously implants,</span > as they should be.`);
+ r.push(`${His} breasts are <span class="green"> obviously implants,</span> as they should be.`);
}
} else {
if (slave.boobsImplant / slave.boobs < .10) {
- r.push(`${His} breasts are < span class="red" > disgustingly natural</span > for their size.`);
+ r.push(`${His} breasts are <span class="red"> disgustingly natural</span> for their size.`);
} else {
- r.push(`${His} breasts are < span class="green" > obviously implants,</span > as they should be.`);
+ r.push(`${His} breasts are <span class="green"> obviously implants,</span> as they should be.`);
}
}
}
@@ -223,27 +223,27 @@ App.Desc.boobsShape = function(slave) {
if (slave.boobs >= 600) {
if (slave.boobs >= 10000) {
if (slave.boobsImplant / slave.boobs < .75) {
- r.push(`${His} breasts are < span class="red" > disgustingly natural</span > for their size.`);
+ r.push(`${His} breasts are <span class="red"> disgustingly natural</span> for their size.`);
} else {
- r.push(`${His} breasts are < span class="green" > obviously implants,</span > as they should be.`);
+ r.push(`${His} breasts are <span class="green"> obviously implants,</span> as they should be.`);
}
} else if (slave.boobs >= 2000) {
if (slave.boobsImplant / slave.boobs < .50) {
- r.push(`${His} breasts are < span class="red" > disgustingly natural</span > for their size.`);
+ r.push(`${His} breasts are <span class="red"> disgustingly natural</span> for their size.`);
} else {
- r.push(`${His} breasts are < span class="green" > obviously implants,</span > as they should be.`);
+ r.push(`${His} breasts are <span class="green"> obviously implants,</span> as they should be.`);
}
} else if (slave.boobs >= 1000) {
if (slave.boobsImplant / slave.boobs < .25) {
- r.push(`${His} breasts are < span class="red" > disgustingly natural</span > for their size.`);
+ r.push(`${His} breasts are <span class="red"> disgustingly natural</span> for their size.`);
} else {
- r.push(`${His} breasts are < span class="green" > obviously implants,</span > as they should be.`);
+ r.push(`${His} breasts are <span class="green"> obviously implants,</span> as they should be.`);
}
} else {
if (slave.boobsImplant / slave.boobs < .10) {
- r.push(`${His} breasts are < span class="red" > disgustingly natural</span > for their size.`);
+ r.push(`${His} breasts are <span class="red"> disgustingly natural</span> for their size.`);
} else {
- r.push(`${His} breasts are < span class="green" > obviously implants,</span > as they should be.`);
+ r.push(`${His} breasts are <span class="green"> obviously implants,</span> as they should be.`);
}
}
}
diff --git a/src/npc/descriptions/ears.js b/src/npc/descriptions/ears.js
index b225c362503c3db5ffe4673145fd44cb38403760..6d94ae8af562a0e5eb9110fc9aaa3cf2df733515 100644
--- a/src/npc/descriptions/ears.js
+++ b/src/npc/descriptions/ears.js
@@ -3,7 +3,7 @@ App.Desc.ears = function(slave) {
const {
he, him, his, hers, himself, boy, He, His
} = getPronouns(slave);
- /* ear shape description here */
+ // ear shape description here
if (slave.earShape === "none") {
if (slave.earImplant === 1) {
if (slave.earT !== "none") {
@@ -12,7 +12,7 @@ App.Desc.ears = function(slave) {
r.push(`${He} has nothing but small, perforated metal disks where ${his} ears should be.`);
}
} else if (slave.earwear === "none") {
- r.push(`${He} has small unsightly holes on the sides of ${his} head. /*That can't be sanitary.*/`);
+ r.push(`${He} has small unsightly holes on the sides of ${his} head.`); // That can't be sanitary.
} else {
r.push(`The sides of ${his} head are smooth where ${his} ears should be, but upon closer inspection it is revealed that`);
if (slave.earwear === "hearing aids") {
@@ -24,16 +24,16 @@ App.Desc.ears = function(slave) {
} else if (slave.earShape === "damaged") {
r.push(`${His} outer ears have been severely damaged.`);
} else if (slave.earShape === "normal" && slave.earT !== "none") {
- r.push(`/* Ears are expected, so lets only mention them if we have two sets */`);
+ // Ears are expected, so lets only mention them if we have two sets
r.push(`${He} has perfectly ordinary ears.`);
} else if (slave.earShape === "robot") {
- r.push(`${He} has high tech cyber-ears that could be mistaken for headphones. /*not yet implemented*/`);
+ r.push(`${He} has high tech cyber-ears that could be mistaken for headphones.`);// not yet implemented
} else if (slave.earShape === "pointy") {
r.push(`${His} small, ${either("elfin", "leaf-shaped", "pointed")} ears are quite cute and give ${him} an exotic appearance.`);
} else if (slave.earShape === "elven") {
- r.push(`${He} has long, thin elven ears that ${either("tend to droop when ${he} is relaxed or sad", "tend to waggle up and down when ${he} is excited", "twitch at the slightest touch")}.`);
+ r.push(`${He} has long, thin elven ears that ${either(`tend to droop when ${he} is relaxed or sad`, `tend to waggle up and down when ${he} is excited`, `twitch at the slightest touch`)}.`);
} else if (slave.earShape === "ushi") {
- r.push(`${He} has long, floppy cow ears. /* that ${either("tend to droop when ${he} is relaxed or sad", "tend waggle up and down when ${he} is excited", "twitch at the slightest touch")}. These don't make sense for the most part. */`);
+ r.push(`${He} has long, floppy cow ears.`); // that ${either(`tend to droop when ${he} is relaxed or sad`, `tend waggle up and down when ${he} is excited`, `twitch at the slightest touch`)}. These don't make sense for the most part.
}
if (slave.earT === "neko") {
@@ -46,7 +46,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${either("tend to droop when ${he} is relaxed or sad", "twitch at the slightest touch")}.`);
+ r.push(`${either(`tend to droop when ${he} is relaxed or sad`, `twitch at the slightest touch`)}.`);
} else if (slave.earT === "inu") {
r.push(`${He} has cute, ${slave.earTColor} dog ears on ${his} head; they`);
if (slave.earImplant === 1) {
@@ -57,7 +57,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${either("tend to droop when ${he} is relaxed or sad", "twitch at the slightest touch")}.`);
+ r.push(`${either(`tend to droop when ${he} is relaxed or sad`, `twitch at the slightest touch`)}.`);
} else if (slave.earT === "kit") {
r.push(`${He} has elegant, ${slave.earTColor} fox ears on ${his} head; they`);
if (slave.earImplant === 1) {
@@ -68,7 +68,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${either("tend to droop when ${he} is relaxed or sad", "twitch at the slightest touch")}.`);
+ r.push(`${either(`tend to droop when ${he} is relaxed or sad`, `twitch at the slightest touch`)}.`);
} else if (slave.earT === "tanuki") {
r.push(`${He} has adorable, ${slave.earTColor}, round tanuki ears on ${his} head; they`);
if (slave.earImplant === 1) {
@@ -79,7 +79,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${either("tend to droop when ${he} is relaxed or sad", "twitch at the slightest touch")}.`);
+ r.push(`${either(`tend to droop when ${he} is relaxed or sad`, `twitch at the slightest touch`)}.`);
} else if (slave.earT === "usagi") {
r.push(`${He} has long, ${slave.earTColor}, fluffy rabbit ears on ${his} head; they`);
if (slave.earImplant === 1) {
@@ -90,7 +90,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${either("tend to droop when ${he} is relaxed or sad", "twitch at the slightest touch")}.`);
+ r.push(`${either(`tend to droop when ${he} is relaxed or sad`, `twitch at the slightest touch`)}.`);
} else if (slave.earT === "normal") {
r.push(`${He} has`);
if (slave.earShape !== "none") {
diff --git a/src/npc/descriptions/face.js b/src/npc/descriptions/face.js
index 74b8fbcb24c4e57d972caaaa1f1abe7bdf8502de..ffed0ce46ca4aeb95e09709972bf65131a94d504 100644
--- a/src/npc/descriptions/face.js
+++ b/src/npc/descriptions/face.js
@@ -4,7 +4,7 @@ App.Desc.face = function(slave) {
he, him, his, hers, himself, boy, He, His
} = getPronouns(slave);
- r.push(`${His}<span class="pink">face is`);
+ r.push(`${His} <span class="pink">face is`);
switch (slave.faceShape) {
case "masculine":
@@ -126,7 +126,7 @@ App.Desc.face = function(slave) {
} else if (slave.face < 1) {
r.push(`it's hard to see this past the suit, since its face is shaped to make ${him} seem prettier.`);
} else {
- r.push(`the suit obscures all but the shape of ${him} pretty face.`);
+ r.push(`the suit obscures all but the shape of ${his} pretty face.`);
}
} else {
if (slave.markings === "beauty mark") {
@@ -197,5 +197,6 @@ App.Desc.face = function(slave) {
if (slave.fuckdoll === 0) {
r.push(App.Desc.makeup(slave));
}
- } return r.join(" ");
+ }
+ return r.join(" ");
};
diff --git a/src/npc/descriptions/heels.js b/src/npc/descriptions/heels.js
index 72247b86f35376930199dbdf7ec13abc01e428dd..27beec101b51436ce53371e258ac75954bb02f91 100644
--- a/src/npc/descriptions/heels.js
+++ b/src/npc/descriptions/heels.js
@@ -3,25 +3,23 @@ App.Desc.heels = function(slave) {
const {
he, him, his, hers, himself, boy, He, His
} = getPronouns(slave);
- if (slave.heels === 1) {
+ if (slave.heels === 1 && hasAnyLegs(slave)) {
r.push(`${His}`);
if (hasBothLegs(slave)) {
r.push(`<span class="pink">legs have been altered</span>`);
- } else if (hasAnyLegs(slave)) {
+ } else {
r.push(`<span class="pink">leg has been altered</span>`);
}
r.push(`so that ${he} must wear heels in order to walk.`);
if (V.showClothing === 1 && V.saleDescription === 0) {
- if (hasAnyLegs(slave)) {
- if (slave.shoes !== "none" && slave.shoes !== "flats") {
- r.push(`${He} is, so ${he} can walk reasonably well.`);
+ if (slave.shoes !== "none" && slave.shoes !== "flats") {
+ r.push(`${He} is, so ${he} can walk reasonably well.`);
+ } else {
+ r.push(`Since ${he} is without them, ${he}'s crawling on `);
+ if (!hasAllLimbs(slave)) {
+ r.push(`the ground.`);
} else {
- r.push(`Since ${he} is without them, ${he}'s crawling on `);
- if (!hasAllLimbs(slave)) {
- r.push(`the ground.`);
- } else {
- r.push(`all fours.`);
- }
+ r.push(`all fours.`);
}
}
}
diff --git a/src/npc/descriptions/heightImplant.js b/src/npc/descriptions/heightImplant.js
index 1f5d40fe63e99c712c65411999fe82580bc9d6ae..17eb02b9eceed8a4173f27ce3ac81390ea01c306 100644
--- a/src/npc/descriptions/heightImplant.js
+++ b/src/npc/descriptions/heightImplant.js
@@ -8,18 +8,18 @@ App.Desc.heightImplant = function(slave) {
r.push(`are wrong; it's obvious that they have been artificially lengthened.`);
} else if (slave.heightImplant > 0) {
r = limbs();
- r.push(` are odd, as though they have been artificially lengthened.`);
+ r.push(`are odd, as though they have been artificially lengthened.`);
} else if (slave.heightImplant < -1) {
r = limbs();
- r.push(` are wrong; it's obvious that they have been artificially shortened.`);
+ r.push(`are wrong; it's obvious that they have been artificially shortened.`);
} else if (slave.heightImplant < 0) {
r = limbs();
- r.push(` are odd, as though they have been artificially shortened.`);
+ r.push(`are odd, as though they have been artificially shortened.`);
}
function limbs() {
const r = [];
- r.push(`The proportions of ${his} `);
+ r.push(`The proportions of ${his}`);
if (hasAnyArms(slave)) {
if (hasBothArms(slave)) {
r.push(`arms`);
@@ -27,7 +27,7 @@ App.Desc.heightImplant = function(slave) {
r.push(`arm`);
}
if (hasAnyLegs(slave)) {
- r.push(` and `);
+ r.push(`and`);
}
}
if (hasAnyLegs(slave)) {
diff --git a/src/npc/descriptions/horns.js b/src/npc/descriptions/horns.js
index b57d12d9574f8520f7351b5c6175a93704960598..053687b0d854d2f56be03142be7fc7a419bcc247 100644
--- a/src/npc/descriptions/horns.js
+++ b/src/npc/descriptions/horns.js
@@ -23,16 +23,16 @@ App.Desc.horns = function(slave) {
} else if (slave.horn === "cow horns") {
r.push(`${He} has two ${slave.hornColor} cow horns on the sides of ${his} head; they curve sharply upward.`);
} else if (slave.horn === "two long oni horns") {
- r.push(`${He} has two long ${slave.hornColor} horns sticking straight up out of ${his} forehead`);
+ r.push(`${He} has two long ${slave.hornColor} horns sticking straight up out of ${his}`);
if (slave.devotion > 20) {
- r.push(`${he} holds them up proudly.`);
+ r.push(`forehead; ${he} holds them up proudly.`);
} else {
r.push(`forehead.`);
}
} else if (slave.horn === "one long oni horn") {
r.push(`${He} has a long ${slave.hornColor} horn sticking straight up out of ${his}`);
if (slave.devotion > 20) {
- r.push(`forehead ${he} holds it up proudly`);
+ r.push(`forehead; ${he} holds it up proudly`);
} else {
r.push(`forehead.`);
}
diff --git a/src/npc/descriptions/mouth.js b/src/npc/descriptions/mouth.js
index 50f45594b00ac84e784d242834e70a15a7309265..9999113115871da6760ad4e9f09274df41ce6703 100644
--- a/src/npc/descriptions/mouth.js
+++ b/src/npc/descriptions/mouth.js
@@ -1,7 +1,7 @@
App.Desc.mouth = function(slave) {
const r = [];
const {
- he, him, his, hers, himself, boy, He, His
+ he, him, his, hers, himself, boy, He, His, woman, girl
} = getPronouns(slave);
r.push(`${He} has`);
diff --git a/src/npc/descriptions/skin.js b/src/npc/descriptions/skin.js
index 41bba0961a02ccaa1b2fa9bcd5fa73cfcb42bdee..507f2a612ffebbbded00295e49bbd3d0faf74a45 100644
--- a/src/npc/descriptions/skin.js
+++ b/src/npc/descriptions/skin.js
@@ -59,7 +59,9 @@ App.Desc.skin = function(slave) {
r.push(`${His} skin is`);
r = r.concat(freckles());
r = r.concat(tanned());
- } return r.join(" ");
+ }
+
+ return r.join(" ");
function freckles() {
const r = [];
diff --git a/src/player/desc/playerButt.js b/src/player/desc/playerButt.js
index 003ffac3862a62272b239ca8f429755fbc985ca1..9def855ad5157f96b2f5517c66621bc143b8d080 100644
--- a/src/player/desc/playerButt.js
+++ b/src/player/desc/playerButt.js
@@ -228,5 +228,6 @@ App.Desc.Player.butt = function() {
r.push(`butt makes for a comfortable seat.`);
}
}
- } return r.join(" ");
+ }
+ return r.join(" ");
};
diff --git a/src/player/desc/playerCrotch.js b/src/player/desc/playerCrotch.js
index 30d3893efd3b9119b3f893574f0160f942c4a96f..1ed89d53f948673cbb5533c81c8ce31b4368c830 100644
--- a/src/player/desc/playerCrotch.js
+++ b/src/player/desc/playerCrotch.js
@@ -120,7 +120,7 @@ App.Desc.Player.crotch = function() {
r.push(`<span class="lime">tight vagina.</span> You're no virgin, but you've taken care of yourself.`);
}
}
- } else if (_passage === "Economics") {
+ } else if (passage() === "Economics") {
if (V.PC.career === "servant") {
if (V.PC.balls >= 30) {
r.push(`Your dress and apron bulge with your enormous balls; you had to have your dresses tailored so that the swinging mass of your sack would stop bursting seams inadvertently.`);