From eaaa88af68bb6ecebc0416e1f4fa096b968c889c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 8 Nov 2020 05:51:54 -0500
Subject: [PATCH] various little fixes and tweaks
---
src/npc/descriptions/boobs/boobs.js | 14 +-
src/npc/descriptions/descriptionWidgets.js | 156 +++++++++++----------
src/npc/descriptions/womb/pregnancy.js | 4 +-
3 files changed, 93 insertions(+), 81 deletions(-)
diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js
index fa376797fdd..366846f2b8a 100644
--- a/src/npc/descriptions/boobs/boobs.js
+++ b/src/npc/descriptions/boobs/boobs.js
@@ -1800,10 +1800,18 @@ App.Desc.nipples = function(slave, {market, eventDescription} = {}) {
if ((slave.assignment === App.Data.Facilities.dairy.jobs.cow.assignment) && (V.dairyRestraintsSetting > 1)) {
r += ` The transparent lines coming off the cups attached to each of ${his} nipples are white with a constant stream of milk.`;
} else if (slave.lactation === 1) {
- if (slave.boobsMilk > 0) {
- r += ` ${His} breasts are painfully engorged with milk.`;
+ if (slave.boobs > 300) {
+ if (slave.boobsMilk > 0) {
+ r += ` ${His} breasts are painfully engorged with milk.`;
+ } else {
+ r += ` ${His} motherly breasts are full of milk.`;
+ }
} else {
- r += ` ${His} motherly breasts are full of milk.`;
+ if (slave.boobsMilk > 0) {
+ r += ` ${His} chest is painfully engorged with milk and leaks with the slightest provocation.`;
+ } else {
+ r += ` ${His} sensitive chest is swollen with milk.`;
+ }
}
} else if (slave.fuckdoll > 0) {
r += ` ${His} overworked, overfull breasts press its nipples through the holes mercilessly.`;
diff --git a/src/npc/descriptions/descriptionWidgets.js b/src/npc/descriptions/descriptionWidgets.js
index 6853a91f83a..50c04bce238 100644
--- a/src/npc/descriptions/descriptionWidgets.js
+++ b/src/npc/descriptions/descriptionWidgets.js
@@ -633,6 +633,7 @@ App.Desc.ageAndHealth = function(slave) {
}
}
} else if (slave.physicalAge !== slave.visualAge) {
+ let neoteny;
if (slave.geneticQuirks.neoteny === 2 && slave.physicalAge > slave.visualAge && (V.geneticMappingUpgrade >= 1 || slave.physicalAge >= slave.visualAge + 5)) {
if (V.geneticMappingUpgrade >= 1) {
r += `Due to ${his} neotenic qualities, `;
@@ -640,6 +641,7 @@ App.Desc.ageAndHealth = function(slave) {
r += `Oddly enough, `;
}
r += `${he} still resembles a young ${boy} of around ${slave.visualAge}. `;
+ neoteny = true;
} else if (slave.visualAge <= slave.physicalAge - 20 || slave.visualAge >= slave.physicalAge + 20) {
r += ` ${He} has undergone radical age therapy that makes ${him} look `;
} else if (slave.visualAge <= slave.physicalAge - 10 || slave.visualAge >= slave.physicalAge + 10) {
@@ -649,83 +651,85 @@ App.Desc.ageAndHealth = function(slave) {
} else {
r += ` For various reasons, ${he} looks `;
}
- if (slave.physicalAge > slave.visualAge) {
- if (slave.physicalAge < slave.visualAge + 5) {
- r += `a slightly younger ${slave.visualAge}. `;
- } else if (slave.visualAge < 20) {
- r += `like ${he}'s barely an adult. `;
- } else if (slave.visualAge < 25) {
- r += `barely into ${his} early twenties. `;
- } else if (slave.visualAge < 30) {
- r += `like ${he}'s still in ${his} twenties. `;
- } else if (slave.visualAge < 35) {
- r += `barely thirty. `;
- } else if (slave.visualAge < 40) {
- r += `still in ${his} thirties. `;
- } else if (slave.visualAge < 45) {
- r += `barely forty. `;
- } else if (slave.visualAge < 50) {
- r += `still in ${his} forties. `;
- } else if (slave.visualAge < 55) {
- r += `barely fifty. `;
- } else if (slave.visualAge < 60) {
- r += `still in ${his} fifties. `;
- } else if (slave.visualAge < 65) {
- r += `barely sixty. `;
- } else if (slave.visualAge < 70) {
- r += `still in ${his} sixties. `;
- } else if (slave.visualAge < 75) {
- r += `barely seventy. `;
- } else if (slave.visualAge < 80) {
- r += `still in ${his} seventies. `;
- } else if (slave.visualAge < 85) {
- r += `barely eighty. `;
- } else if (slave.visualAge < 90) {
- r += `still in ${his} eighties. `;
- } else if (slave.visualAge < 95) {
- r += `barely ninety. `;
- } else if (slave.visualAge < 100) {
- r += `still in ${his} nineties. `;
+ if (!neoteny) {
+ if (slave.physicalAge > slave.visualAge) {
+ if (slave.physicalAge < slave.visualAge + 5) {
+ r += `a slightly younger ${slave.visualAge}. `;
+ } else if (slave.visualAge < 20) {
+ r += `like ${he}'s barely an adult. `;
+ } else if (slave.visualAge < 25) {
+ r += `barely into ${his} early twenties. `;
+ } else if (slave.visualAge < 30) {
+ r += `like ${he}'s still in ${his} twenties. `;
+ } else if (slave.visualAge < 35) {
+ r += `barely thirty. `;
+ } else if (slave.visualAge < 40) {
+ r += `still in ${his} thirties. `;
+ } else if (slave.visualAge < 45) {
+ r += `barely forty. `;
+ } else if (slave.visualAge < 50) {
+ r += `still in ${his} forties. `;
+ } else if (slave.visualAge < 55) {
+ r += `barely fifty. `;
+ } else if (slave.visualAge < 60) {
+ r += `still in ${his} fifties. `;
+ } else if (slave.visualAge < 65) {
+ r += `barely sixty. `;
+ } else if (slave.visualAge < 70) {
+ r += `still in ${his} sixties. `;
+ } else if (slave.visualAge < 75) {
+ r += `barely seventy. `;
+ } else if (slave.visualAge < 80) {
+ r += `still in ${his} seventies. `;
+ } else if (slave.visualAge < 85) {
+ r += `barely eighty. `;
+ } else if (slave.visualAge < 90) {
+ r += `still in ${his} eighties. `;
+ } else if (slave.visualAge < 95) {
+ r += `barely ninety. `;
+ } else if (slave.visualAge < 100) {
+ r += `still in ${his} nineties. `;
+ } else {
+ r += `a younger ${slave.visualAge}. `;
+ }
} else {
- r += `a younger ${slave.visualAge}. `;
- }
- } else {
- if (slave.physicalAge > slave.visualAge - 5) {
- r += `a slightly older ${slave.visualAge}. `;
- } else if (slave.visualAge < 20) {
- r += `like a fresh adult. `;
- } else if (slave.visualAge < 25) {
- r += `just over twenty. `;
- } else if (slave.visualAge < 30) {
- r += `nearly thirty. `;
- } else if (slave.visualAge < 35) {
- r += `just over thirty. `;
- } else if (slave.visualAge < 40) {
- r += `nearly forty. `;
- } else if (slave.visualAge < 45) {
- r += `just over forty. `;
- } else if (slave.visualAge < 50) {
- r += `nearly fifty. `;
- } else if (slave.visualAge < 55) {
- r += `just over fifty. `;
- } else if (slave.visualAge < 60) {
- r += `nearly sixty. `;
- } else if (slave.visualAge < 65) {
- r += `just over sixty. `;
- } else if (slave.visualAge < 70) {
- r += `nearly seventy. `;
- } else if (slave.visualAge < 75) {
- r += `just over seventy. `;
- } else if (slave.visualAge < 80) {
- r += `nearly eighty. `;
- } else if (slave.visualAge < 85) {
- r += `just over eighty. `;
- } else if (slave.visualAge < 90) {
- r += `nearly ninety. `;
- } else if (slave.visualAge < 95) {
- r += `just over ninety. `;
- } else {
- r += `an ancient ${slave.visualAge}. `;
+ if (slave.physicalAge > slave.visualAge - 5) {
+ r += `a slightly older ${slave.visualAge}. `;
+ } else if (slave.visualAge < 20) {
+ r += `like a fresh adult. `;
+ } else if (slave.visualAge < 25) {
+ r += `just over twenty. `;
+ } else if (slave.visualAge < 30) {
+ r += `nearly thirty. `;
+ } else if (slave.visualAge < 35) {
+ r += `just over thirty. `;
+ } else if (slave.visualAge < 40) {
+ r += `nearly forty. `;
+ } else if (slave.visualAge < 45) {
+ r += `just over forty. `;
+ } else if (slave.visualAge < 50) {
+ r += `nearly fifty. `;
+ } else if (slave.visualAge < 55) {
+ r += `just over fifty. `;
+ } else if (slave.visualAge < 60) {
+ r += `nearly sixty. `;
+ } else if (slave.visualAge < 65) {
+ r += `just over sixty. `;
+ } else if (slave.visualAge < 70) {
+ r += `nearly seventy. `;
+ } else if (slave.visualAge < 75) {
+ r += `just over seventy. `;
+ } else if (slave.visualAge < 80) {
+ r += `nearly eighty. `;
+ } else if (slave.visualAge < 85) {
+ r += `just over eighty. `;
+ } else if (slave.visualAge < 90) {
+ r += `nearly ninety. `;
+ } else if (slave.visualAge < 95) {
+ r += `just over ninety. `;
+ } else {
+ r += `an ancient ${slave.visualAge}. `;
+ }
}
}
if (slave.geneMods.immortality === 1) {
diff --git a/src/npc/descriptions/womb/pregnancy.js b/src/npc/descriptions/womb/pregnancy.js
index 46642bde30b..7cce96f9d39 100644
--- a/src/npc/descriptions/womb/pregnancy.js
+++ b/src/npc/descriptions/womb/pregnancy.js
@@ -706,12 +706,12 @@ App.Desc.pregnancy = function(slave, {market, eventDescription} = {}) {
r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant > 0) {
r.push(`${He} has an abdominal implant, though it doesn't round out ${his} belly too much yet at a tiny ${slave.bellyImplant}ccs.`);
- } else if (slave.bellyImplant === 0) {
+ } else if (slave.bellyImplant === 0 && !market) {
r.push(`${He} has an abdominal implant, but it is completely empty.`);
} else if (slave.pregKnown === 1) {
r.push(`${He} is <span class="pink">pregnant,</span> though it isn't visible yet.`);
r.push(App.Desc.superfetation(slave, {market: market}));
- } else if (slave.preg > 0 && slave.pregKnown === 0) {
+ } else if (slave.preg > 0 && slave.pregKnown === 0 && !market) {
r.push(`${His} period is late.`);
}
if (slave.preg + 5 <= slave.pregWeek && slave.preg <= slave.pregData.normalBirth + 2 && slave.bellyPreg >= 100) {
--
GitLab