From e1fb7d80a6fb1a17baf155482bcf2d9288e6a0af Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 12 Aug 2020 15:58:18 -0400
Subject: [PATCH] revert more either
---
src/npc/descriptions/dimensions.js | 42 ++++++++++++++--------------
src/npc/descriptions/ears.js | 14 +++++-----
src/npc/descriptions/style/collar.js | 2 +-
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/npc/descriptions/dimensions.js b/src/npc/descriptions/dimensions.js
index 25f5df24362..669f9deaf67 100644
--- a/src/npc/descriptions/dimensions.js
+++ b/src/npc/descriptions/dimensions.js
@@ -57,62 +57,62 @@ App.Desc.dimensions = function(slave) {
const r = [];
if (slave.weight > 190) {
if (V.arcologies[0].FSHedonisticDecadence !== "unset") {
- r.push(jsEither(`perfectly curvy.`, `perfectly plush.`));
+ r.push(either(`perfectly curvy.`, `perfectly plush.`));
} else {
- r.push(`<span class="red">${jsEither(`dangerously fat`, `dangerously overweight`, `extremely obese`)}.</span>`);
+ r.push(`<span class="red">${either(`dangerously fat`, `dangerously overweight`, `extremely obese`)}.</span>`);
}
} else if (slave.weight > 160) {
if (V.arcologies[0].FSHedonisticDecadence !== "unset") {
- r.push(jsEither(`spectacularly curvy.`, `spectacularly plush.`));
+ r.push(either(`spectacularly curvy.`, `spectacularly plush.`));
} else {
- r.push(`<span class="red">${jsEither(`extremely fat`, `extremely overweight`, `very obese`)}.</span>`);
+ r.push(`<span class="red">${either(`extremely fat`, `extremely overweight`, `very obese`)}.</span>`);
}
} else if (slave.weight > 130) {
if (V.arcologies[0].FSHedonisticDecadence !== "unset") {
- r.push(jsEither(`amazingly curvy.`, `amazingly plush.`));
+ r.push(either(`amazingly curvy.`, `amazingly plush.`));
} else {
- r.push(`<span class="red">${jsEither(`obese`, `very fat`, `very overweight`)}.</span>`);
+ r.push(`<span class="red">${either(`obese`, `very fat`, `very overweight`)}.</span>`);
}
} else if (slave.weight > 95) {
if (V.arcologies[0].FSHedonisticDecadence !== "unset") {
if (slave.hips > 1) {
- r.push(`${jsEither(`extremely curvy`, `extremely plush`)}, ${his} huge hips complementing ${his} plushness perfectly.`);
+ r.push(`${either(`extremely curvy`, `extremely plush`)}, ${his} huge hips complementing ${his} plushness perfectly.`);
} else {
- r.push(`${jsEither(`extremely curvy`, `extremely plush`)}.`);
+ r.push(`${either(`extremely curvy`, `extremely plush`)}.`);
}
} else if (slave.hips > 1) {
- r.push(`${jsEither(`extremely curvy`, `extremely plush`)}, but ${his} huge hips make the extra weight attractive on ${him}.`);
+ r.push(`${either(`extremely curvy`, `extremely plush`)}, but ${his} huge hips make the extra weight attractive on ${him}.`);
} else {
- r.push(`<span class="red">${jsEither(`carrying a lot of extra weight`, `fat`, `overweight`)}.</span>`);
+ r.push(`<span class="red">${either(`carrying a lot of extra weight`, `fat`, `overweight`)}.</span>`);
}
} else if (slave.weight > 30) {
if (V.arcologies[0].FSHedonisticDecadence !== "unset") {
if (slave.hips > 1) {
- r.push(`${jsEither(`quite curvy`, `very plush`)}, ${his} motherly hips adding to ${his} soft appeal.`);
+ r.push(`${either(`quite curvy`, `very plush`)}, ${his} motherly hips adding to ${his} soft appeal.`);
} else {
- r.push(`${jsEither(`quite curvy`, `very plush`)}.`);
+ r.push(`${either(`quite curvy`, `very plush`)}.`);
}
} else if (slave.hips > 1) {
- r.push(`${jsEither(`quite curvy`, `very plush`)}, but ${his} motherly hips make the extra weight attractive on ${him}.`);
+ r.push(`${either(`quite curvy`, `very plush`)}, but ${his} motherly hips make the extra weight attractive on ${him}.`);
} else {
- r.push(`<span class="red">${jsEither(`carrying extra weight`, `chubby`)}.</span>`);
+ r.push(`<span class="red">${either(`carrying extra weight`, `chubby`)}.</span>`);
}
} else if (slave.weight > 10) {
- r.push(jsEither(`nicely plush.`, `pleasingly curvy.`));
+ r.push(either(`nicely plush.`, `pleasingly curvy.`));
} else if (slave.weight >= -10) {
- r.push(jsEither(`a healthy weight.`, `an attractive weight for ${his} frame.`, `neither too fat nor too skinny.`));
+ r.push(either(`a healthy weight.`, `an attractive weight for ${his} frame.`, `neither too fat nor too skinny.`));
} else if (slave.weight >= -30) {
- r.push(jsEither(`appealingly skinny.`, `pleasingly thin.`));
+ r.push(either(`appealingly skinny.`, `pleasingly thin.`));
} else if (slave.weight >= -95) {
if (slave.hips > 1) {
- r.push(`${jsEither(`quite skinny`, `very thin`)}, but ${his} wide hips make the gap between ${his} thighs very noticeable.`);
+ r.push(`${either(`quite skinny`, `very thin`)}, but ${his} wide hips make the gap between ${his} thighs very noticeable.`);
} else if (slave.hips < -1) {
- r.push(`${jsEither(`quite skinny`, `very thin`)}, but ${his} trim hips make ${him} look like a model.`);
+ r.push(`${either(`quite skinny`, `very thin`)}, but ${his} trim hips make ${him} look like a model.`);
} else {
- r.push(`<span class="red">${jsEither(`rail thin`, `too skinny`, `underweight`)}.</span>`);
+ r.push(`<span class="red">${either(`rail thin`, `too skinny`, `underweight`)}.</span>`);
}
} else {
- r.push(`<span class="red">${jsEither(`dangerously skinny`, `emaciated`)}.</span>`);
+ r.push(`<span class="red">${either(`dangerously skinny`, `emaciated`)}.</span>`);
}
return r.join(" ");
}
diff --git a/src/npc/descriptions/ears.js b/src/npc/descriptions/ears.js
index 2928dd696ae..c647b2055e6 100644
--- a/src/npc/descriptions/ears.js
+++ b/src/npc/descriptions/ears.js
@@ -35,9 +35,9 @@ App.Desc.ears = function(slave) {
} 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 ${jsEither(`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 ${jsEither(`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") {
@@ -50,7 +50,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${jsEither(`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) {
@@ -61,7 +61,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${jsEither(`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) {
@@ -72,7 +72,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${jsEither(`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) {
@@ -83,7 +83,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${jsEither(`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) {
@@ -94,7 +94,7 @@ App.Desc.ears = function(slave) {
r.push(`sudden noises and`);
}
}
- r.push(`${jsEither(`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/style/collar.js b/src/npc/descriptions/style/collar.js
index e1b6787a4b1..5e402075de9 100644
--- a/src/npc/descriptions/style/collar.js
+++ b/src/npc/descriptions/style/collar.js
@@ -5,7 +5,7 @@
App.Desc.collar = function(slave) {
const r = [];
let daddy;
- const pregCollar = jsEither(1, 2, 3);
+ const pregCollar = either(1, 2, 3);
const {
he, him, his, He
} = getPronouns(slave);
--
GitLab