From c2985c067542e2e74480566a1985fbdbd8b958c7 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sat, 13 Jun 2020 22:26:19 -0400
Subject: [PATCH] tweaks
---
src/npc/descriptions/dimensions.js | 93 ++++++++++++++++--------------
1 file changed, 50 insertions(+), 43 deletions(-)
diff --git a/src/npc/descriptions/dimensions.js b/src/npc/descriptions/dimensions.js
index b9de28ef8cb..f108a20587f 100644
--- a/src/npc/descriptions/dimensions.js
+++ b/src/npc/descriptions/dimensions.js
@@ -13,27 +13,27 @@ App.Desc.dimensions = function(slave) {
if (slave.height <= (_averageHeight + 5) && slave.height >= (_averageHeight - 5)) {
r.push(`an average height`);
if (slave.physicalAge < 16) {
- r.push(` for ${his} age`);
+ r.push(`for ${his} age`);
}
} else if (slave.height < (_averageHeight - 15)) {
r.push(`petite`);
if (slave.physicalAge < 16) {
- r.push(` for ${his} age`);
+ r.push(`for ${his} age`);
}
} else if (slave.height < (_averageHeight - 5)) {
r.push(`short`);
if (slave.physicalAge < 16) {
- r.push(` for ${his} age`);
+ r.push(`for ${his} age`);
}
} else if (slave.height > (_averageHeight + 15)) {
r.push(`very tall`);
if (slave.physicalAge < 16) {
- r.push(` for ${his} age`);
+ r.push(`for ${his} age`);
}
} else if (slave.height > (_averageHeight + 5)) {
r.push(`tall`);
if (slave.physicalAge < 16) {
- r.push(` for ${his} age`);
+ r.push(`for ${his} age`);
}
}
if (V.showHeightCMs === 1) {
@@ -87,7 +87,7 @@ App.Desc.dimensions = function(slave) {
} else if (slave.weight > 10) {
r.push(either("nicely plush.", "pleasingly curvy."));
} else if (slave.weight >= -10) {
- r.push(`${either("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(either("appealingly skinny.", "pleasingly thin."));
} else if (slave.weight >= -95) {
@@ -223,40 +223,39 @@ App.Desc.dimensions = function(slave) {
if (slave.muscles > 95) {
r.push(`<span class="pink">extremely muscular,</span> with defined pecs, powerful glutes, and massive`);
if (slave.weight > 95) {
- r.push(`hidden beneath a layer of fat`);
+ r.push(`traps hidden beneath a layer of fat`);
} else {
r.push(`traps.`);
}
} else if (slave.muscles > 50) {
- r.push(`<span class="pink">quite muscular,</span> with ripped abs, strong shoulders, and defined `);
+ r.push(`<span class="pink">quite muscular,</span> with ripped abs, strong shoulders, and defined`);
if (slave.weight > 95) {
r.push(`lats hidden beneath a layer of fat`);
} else {
r.push(`lats.`);
}
} else if (slave.muscles > 30) {
- r.push(`<span class="pink">well built,</span> yet feminine with defined abs and strong shapely `);
+ r.push(`<span class="pink">well built,</span> yet feminine with defined abs and strong shapely`);
if (slave.weight > 95) {
r.push(`muscles hidden beneath a layer of fat`);
} else {
r.push(`muscles.`);
}
} else if (slave.muscles > 5) {
- r.push(`<span class="pink">well built,</span> yet feminine, with just - visible `);
+ r.push(`<span class="pink">well built,</span> yet feminine, with just - visible`);
if (slave.weight > 30) {
r.push(`muscles hidden beneath a layer of fat`);
} else {
r.push(`muscles.`);
}
- r.push(`.`);
} else if (slave.muscles > -6) {
r.push(`<span class="pink">soft and feminine,</span> with no visible muscles.`);
} else if (slave.muscles > -31) {
r.push(`<span class="pink">rather weak,</span> with barely any muscles.`);
} else if (slave.muscles > -96) {
- r.push(`<span class="pink">very weak;</span> ${he} struggles with day - to - day tasks.`);
+ r.push(`<span class="pink">very weak;</span> ${he} struggles with day-to-day tasks.`);
} else {
- r.push(`<span class="red">frail;</span> ${he} can barely hold ${him} self up.`);
+ r.push(`<span class="red">frail;</span> ${he} can barely hold ${himself} up.`);
}
if (V.arcologies[0].FSGenderFundamentalistLawBeauty + V.arcologies[0].FSGenderRadicalistLawBeauty + V.arcologies[0].FSSlimnessEnthusiastLaw > 0 && V.arcologies[0].FSPhysicalIdealist === "unset" && V.arcologies[0].FSHedonisticDecadenceStrongFat === 0) {
@@ -275,11 +274,11 @@ App.Desc.dimensions = function(slave) {
} else {
r.push(`a hugely thick arm`);
}
- r.push(` with sagging fat rolls`);
+ r.push(`with sagging fat`);
if (slave.muscles > 5) {
- r.push(` and`);
+ r.push(`rolls and`);
} else {
- r.push(`.`);
+ r.push(`rolls.`);
}
} else if (slave.weight > 160) {
r.push(`${He} has`);
@@ -288,35 +287,41 @@ App.Desc.dimensions = function(slave) {
} else {
r.push(`a thick arm`);
}
- r.push(` with drooping fat folds`);
+ r.push(`with drooping fat`);
if (slave.muscles > 5) {
- r.push(` and`);
+ r.push(`folds and`);
} else {
- r.push(`.`);
+ r.push(`folds.`);
}
} else if (slave.weight > 130) {
r.push(`${He} has`);
if (hasBothNaturalArms(slave)) {
- r.push(`plump arms`);
+ if (slave.muscles > 5) {
+ r.push(`plump arms with`);
+ } else {
+ r.push(`plump arms.`);
+ }
} else {
- r.push(`a plump arm`);
- }
- if (slave.muscles > 5) {
- r.push(` with`);
- } else {
- r.push(`.`);
+ if (slave.muscles > 5) {
+ r.push(`a plump arm with`);
+ } else {
+ r.push(`a plump arm.`);
+ }
}
} else if (slave.weight > 97) {
r.push(`${He} has`);
if (hasBothNaturalArms(slave)) {
- r.push(`chubby arms`);
- } else {
- r.push(`a chubby arm`);
- }
- if (slave.muscles > 5) {
- r.push(` with`);
+ if (slave.muscles > 5) {
+ r.push(`chubby arms with`);
+ } else {
+ r.push(`chubby arms.`);
+ }
} else {
- r.push(`.`);
+ if (slave.muscles > 5) {
+ r.push(`a chubby arm with`);
+ } else {
+ r.push(`a chubby arm.`);
+ }
}
} else if (slave.muscles > 5) {
r.push(`${He} has`);
@@ -325,26 +330,28 @@ App.Desc.dimensions = function(slave) {
} else {
r.push(`a normal arm`);
}
- r.push(` with`);
+ r.push(`with`);
}
+
if (slave.muscles > 95) {
- r.push(`huge muscles`);
if (slave.weight > 95) {
- r.push(` hidden beneath ${his} soft flesh`);
+ r.push(`huge muscles hidden beneath ${his} soft flesh.`);
+ } else {
+ r.push(`huge muscles.`);
}
- r.push(`.`);
} else if (slave.muscles > 30) {
- r.push(`obvious muscles`);
if (slave.weight > 95) {
- r.push(` hidden beneath ${his} soft flesh`);
+ r.push(`obvious muscles hidden beneath ${his} soft flesh.`);
+ } else {
+ r.push(`obvious muscles.`);
}
- r.push(`.`);
} else if (slave.muscles > 5) {
- r.push(`toned muscles`);
+ r.push(``);
if (slave.weight > 30) {
- r.push(` hidden beneath ${his} soft flesh`);
+ r.push(`toned muscles hidden beneath ${his} soft flesh.`);
+ } else {
+ r.push(`toned muscles.`);
}
- r.push(`.`);
} else {
// little muscle to them.
}
--
GitLab