From f30e39836c283c26d54ca2d552ed3a7d39e888c2 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 26 Oct 2020 16:07:50 -0400
Subject: [PATCH] cleanup
---
devTools/types/FC/human.d.ts | 11 +++++++++++
src/descriptions/arcologyDescription.js | 4 ++--
src/endWeek/facilityLeaderSex.js | 2 +-
src/endWeek/saDiet.js | 2 +-
src/endWeek/saGetMilked.js | 8 ++++----
src/endWeek/saLongTermPhysicalEffects.js | 4 ++--
src/endWeek/saPregnancy.js | 8 ++++----
src/endWeek/saServeThePublic.js | 2 +-
src/endWeek/saSmartPiercingEffects.js | 2 +-
src/endWeek/saSocialEffects.js | 2 +-
src/endWeek/saWhore.js | 6 +++---
src/js/SlaveState.js | 4 ++--
12 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/devTools/types/FC/human.d.ts b/devTools/types/FC/human.d.ts
index b248d064ee4..83a96210997 100644
--- a/devTools/types/FC/human.d.ts
+++ b/devTools/types/FC/human.d.ts
@@ -353,6 +353,17 @@ declare global {
mLoss: GeneticQuirk;
/** slave can only ever birth girls */
girlsOnly: GeneticQuirk;
+ /** abnormal production of amniotic fluid
+ * only affects fetuses */
+ polyhydramnios: GeneticQuirk;
+ /** inappropriate lactation*/
+ galactorrhea: GeneticQuirk;
+ /** retains childlike characteristics*/
+ neoteny: GeneticQuirk;
+ /** rapid aging
+ *
+ * **neoteny + progeria** - progeria wins, not that she'll make it to the point that neoteny really kicks in */
+ progeria: GeneticQuirk,
}
interface FetusGenetics {
gender: GenderGenes;
diff --git a/src/descriptions/arcologyDescription.js b/src/descriptions/arcologyDescription.js
index ca595e1aa34..a554299ecae 100644
--- a/src/descriptions/arcologyDescription.js
+++ b/src/descriptions/arcologyDescription.js
@@ -81,7 +81,7 @@ App.Desc.playerArcology = function(lastElement) {
} else if (V.weatherToday.severity === 2 && V.weatherType === 6) {
buffer.push(`It's a nice day out today, and citizens are trading and speaking in the bustling marketplace as usual.`);
} else if (V.weatherToday.name === "Extreme T-Storms") {
- buffer.push(`It's a torrent of rain and thunder today. Lightning angrily flashes through the air and the streets are watery and clogged, the cracks of terrifying thunder threatening to smash against the walls of the arcology. Many citizesn are staying inside due to the awful storm.`);
+ buffer.push(`It's a torrent of rain and thunder today. Lightning angrily flashes through the air and the streets are watery and clogged, the cracks of terrifying thunder threatening to smash against the walls of the arcology. Many citizens are staying inside due to the awful storm.`);
} else if (V.weatherToday.name === "Heavy Acid Rain") {
buffer.push(`Intense acidic rain splashes down from the skies, sizzling and popping against the arcology walls. The acid rain today is bad enough to be painful on bare skin, and it slowly rusts away metal like a toxic miasma. Many citizens are staying inside to avoid the horrific, polluted rain.`);
} else if (V.weatherToday.severity === 3 && V.weatherType === 1) {
@@ -875,7 +875,7 @@ App.Desc.playerArcology = function(lastElement) {
buffer.push(`Every citizen has military responsibilities, which are a point of pride to many, with most opting to wear utilitarian clothing even when off duty.`);
}
if (A.FSNeoImperialistLaw1 === 1) {
- buffer.push(`Occasionally, an Imperial Knight in expensive battle armor wanders through the plaza, often accompaned by a small group of lesser soldiers with battle armor painted in the same fashion as the Knight's.`);
+ buffer.push(`Occasionally, an Imperial Knight in expensive battle armor wanders through the plaza, often accompanied by a small group of lesser soldiers with battle armor painted in the same fashion as the Knight's.`);
}
if (A.FSNeoImperialistLaw2 === 1) {
buffer.push(`You can see a Baron off in the distance, wearing a bright gold headband that shimmers in the dim neon light of the plaza, dictating some edict of yours down to a street merchant who scribbles down their words furiously.`);
diff --git a/src/endWeek/facilityLeaderSex.js b/src/endWeek/facilityLeaderSex.js
index 5e92d89f8e5..bc82fd9e9d2 100644
--- a/src/endWeek/facilityLeaderSex.js
+++ b/src/endWeek/facilityLeaderSex.js
@@ -44,7 +44,7 @@ App.EndWeek.getFLSex = function(facility) {
/** @param {App.Entity.SlaveState} emp */
function flWillFuck(emp) {
- const horny = (s) => s.devotion >= -50 /* not unhappy */ && s.energy > 20 /* not frigid */;
+ const horny = (s) => s.devotion >= -50 /* not unhappy */ && s.energy > 20/* not frigid */;
if (fl.assignment === Job.WARDEN && fl.fetish === "mindbroken") {
return true; // mindbroken warden ignores rules, rapes everyone
}
diff --git a/src/endWeek/saDiet.js b/src/endWeek/saDiet.js
index 7b623a625a6..0b176106b4b 100644
--- a/src/endWeek/saDiet.js
+++ b/src/endWeek/saDiet.js
@@ -1507,7 +1507,7 @@ App.SlaveAssignment.diet = (function() {
r.push(`${He} <span class="devotion inc">enjoys</span> the perversity of having large amounts of ejaculate in ${his} diet.`);
slave.devotion += 1;
} else { // high energy obscures cumlust
- r.push(`${He} <span class="devotion inc">seems to enjoy</span> consuming large amounts of ejaculate with each meal. ${He} indeniably <span class="fetish gain">has a taste for cum.</span>`);
+ r.push(`${He} <span class="devotion inc">seems to enjoy</span> consuming large amounts of ejaculate with each meal. ${He} undeniably <span class="fetish gain">has a taste for cum.</span>`);
slave.devotion += 1;
slave.fetishKnown = 1;
}
diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js
index 193928163bc..49fe61b3685 100644
--- a/src/endWeek/saGetMilked.js
+++ b/src/endWeek/saGetMilked.js
@@ -107,7 +107,7 @@ App.SlaveAssignment.getMilked = (function() {
}
/**
- * @param {object} incomeStats getSlaveStatistcData return value - FIXME should be a named type
+ * @param {object} incomeStats getSlaveStatisticData return value - FIXME should be a named type
*/
function recordFacilityStatistics(incomeStats) {
incomeStats.milk = r.milk;
@@ -679,13 +679,13 @@ App.SlaveAssignment.getMilked = (function() {
if (slave.health.tired > 90) {
r.text += ` exhaustion`;
} else if (slave.health.tired > 60) {
- r.text += ` fatique`;
+ r.text += ` fatigue`;
}
r.text += `.</span>`;
}
if (slave.assignment === Job.DAIRY) {
if (V.dairyRestraintsSetting > 1) {
- r.text += ` The milking machine is merciless in its extraction of fluids from ${him}, but ${his} body is supplied with chimical stimulants to keep fatigue from setting in.`;
+ r.text += ` The milking machine is merciless in its extraction of fluids from ${him}, but ${his} body is supplied with chemical stimulants to keep fatigue from setting in.`;
} else if (V.dairyRestraintsSetting > 0) {
if (slaveResting(slave)) {
r.text += ` Resting doesn't stop ${him} from being thoroughly milked, but it does free ${him} from some of the associated chores, allowing ${him} time <span class="green">to snooze</span> in ${his} harness post harvesting.`;
@@ -704,7 +704,7 @@ App.SlaveAssignment.getMilked = (function() {
if (V.dairyFeedersSetting + V.dairyStimulatorsSetting + V.dairyPregSetting > 0) {
r.text += `<span class="red">moreso given the dairy's settings,</span> `;
}
- r.text += `but it is mostly managable.`;
+ r.text += `but it is mostly manageable.`;
} else {
r.text += ` Spending so much time strapped to a machine and being forcibly drained is not only <span class="red">exhausting, `;
if (V.dairyFeedersSetting + V.dairyStimulatorsSetting + V.dairyPregSetting > 0) {
diff --git a/src/endWeek/saLongTermPhysicalEffects.js b/src/endWeek/saLongTermPhysicalEffects.js
index 8d790009592..619d5fd8c0f 100644
--- a/src/endWeek/saLongTermPhysicalEffects.js
+++ b/src/endWeek/saLongTermPhysicalEffects.js
@@ -689,14 +689,14 @@ App.SlaveAssignment.longTermPhysicalEffects = (function() {
if (V.geneticMappingUpgrade >= 1) {
r.push(`${His} progeria takes its toll, <span class="change negative">cruelly rushing ${him} to an early grave.</span>`);
} else {
- r.push(`Worringly, ${he} <span class="change negative">seems even older</span> this week than the last.`);
+ r.push(`Worryingly, ${he} <span class="change negative">seems even older</span> this week than the last.`);
}
} else {
r.push(`Oddly enough, ${he} <span class="change negative">seems a little older</span> this week than the last.`);
}
slave.physicalAge++;
slave.visualAge++;
- slave.ovaryAge += 5; // Since we are using .physicalAge, we need to manipulate things to prevent the posibility of pregnancy.
+ slave.ovaryAge += 5; // Since we are using .physicalAge, we need to manipulate things to prevent the possibility of pregnancy.
}
}
}
diff --git a/src/endWeek/saPregnancy.js b/src/endWeek/saPregnancy.js
index 721f0cdee32..e2c6a82a14a 100644
--- a/src/endWeek/saPregnancy.js
+++ b/src/endWeek/saPregnancy.js
@@ -295,13 +295,13 @@ App.SlaveAssignment.pregnancy = (function() {
*/
function pregnancyMentalEffects(slave) {
const child = (slave.pregType > 1 ? "children" : "child");
- const childis = (slave.pregType > 1 ? "children are" : "child is");
+ const childIs = (slave.pregType > 1 ? "children are" : "child is");
if (slave.career === "a dairy cow" && slave.devotion <= 50) {
r.push(`${He} <span class="devotion inc">feels right</span> to be growing heavy with child. To ${him}, a growing baby means better milk.`);
slave.devotion += 1;
} else if (slave.devotion <= 20 && slave.pregSource === -1) {
- r.push(`${He} is filled with a feeling of <span class="devotion dec">revulsion</span> that your ${childis} growing within ${his} body.`);
+ r.push(`${He} is filled with a feeling of <span class="devotion dec">revulsion</span> that your ${childIs} growing within ${his} body.`);
slave.devotion -= 1;
if (slave.relationship === -3) {
r.push(`This is compounded by the fact that you <span class="trust dec">forced ${him} to marry you</span> and <span class="devotion dec">raped ${him} pregnant.</span>`);
@@ -309,7 +309,7 @@ App.SlaveAssignment.pregnancy = (function() {
slave.trust -= -5;
}
} else if (slave.devotion > 50 && slave.pregSource === -1) {
- r.push(`${He} <span class="devotion inc">loves</span> that your ${childis} growing within ${him}.`);
+ r.push(`${He} <span class="devotion inc">loves</span> that your ${childIs} growing within ${him}.`);
slave.devotion += 1;
if (slave.relationship === -3) {
r.push(`This is compounded by the fact that ${he} is your <span class="devotion inc">devoted ${wife}</span> and <span class="trust inc">feels it is ${his} duty</span> to bear your children.`);
@@ -512,7 +512,7 @@ App.SlaveAssignment.pregnancy = (function() {
}
r.push(`but not enough to deter ${him} from ${his} work.`);
} else if (slave.pregControl === "labor suppressors") {
- r.push(`${His} ${childis} oddly calm; it is unlikely ${he} will give birth soon, despite being overdue.`);
+ r.push(`${His} ${childIs} oddly calm; it is unlikely ${he} will give birth soon, despite being overdue.`);
} else if (slave.broodmother === 0) {
if (slave.preg > slave.pregData.normalBirth + 1) {
r.push(`${He} is constantly beset by ${his} squirming`);
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index e077ce28252..261705930f3 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -842,7 +842,7 @@ App.SlaveAssignment.serveThePublic = (function() {
}
} else {
if (V.policies.gumjobFetishism === 1) {
- r += ` Most of the public is dissapointed that ${his} teeth don't come out.`;
+ r += ` Most of the public is disappointed that ${his} teeth don't come out.`;
}
}
diff --git a/src/endWeek/saSmartPiercingEffects.js b/src/endWeek/saSmartPiercingEffects.js
index 86811296978..f7b70c7c900 100644
--- a/src/endWeek/saSmartPiercingEffects.js
+++ b/src/endWeek/saSmartPiercingEffects.js
@@ -218,7 +218,7 @@ App.SlaveAssignment.SmartPiercing.vanilla = class extends App.SlaveAssignment.Sm
}
trigger(magnitude, plural) {
- // Vanilla does NOT increase the strength of the "none" fetish, but otherwise behaves like any other fetishe setting
+ // Vanilla does NOT increase the strength of the "none" fetish, but otherwise behaves like any other fetish setting
if (this.slave.fetish !== "none") {
return super.trigger(magnitude, plural);
}
diff --git a/src/endWeek/saSocialEffects.js b/src/endWeek/saSocialEffects.js
index be6fe7157b7..44308646310 100644
--- a/src/endWeek/saSocialEffects.js
+++ b/src/endWeek/saSocialEffects.js
@@ -291,7 +291,7 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
}
r.push(`child${slave.pregType > 1 ? 'ren are' : ' is'} growing within ${him}. The mark covering ${his} lower belly, coupled with ${his} gravidity and blessing, <span class="green">enamors</span> your populace.`);
V.failedElite -= (5 + slave.pregType);
- t.push(new SocialEffect("Eugenics", 3, "Breeder arrying elite baby", r.join(' ')));
+ t.push(new SocialEffect("Eugenics", 3, "Breeder carrying elite baby", r.join(' ')));
if (slave.abortionTat > 0) {
r = [];
r.push(`The `);
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index c5082940c62..67f32fa4e96 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -903,19 +903,19 @@ App.SlaveAssignment.whore = (function() {
}
} else if (slave.teeth === "pointy") {
if (V.policies.gumjobFetishism === 1) {
- r += ` Most customers are quite dissapointed with ${his} tooth-filled mouth, but there are a handful still interested in ${his} unusual dentistry.`;
+ r += ` Most customers are quite disappointed with ${his} tooth-filled mouth, but there are a handful still interested in ${his} unusual dentistry.`;
} else {
r += ` The extra attention ${he} receives due to ${his} sharp teeth is balanced by the customers who are scared off by them.`;
}
} else if (slave.teeth === "fangs") {
if (V.policies.gumjobFetishism === 1) {
- r += ` Most customers are quite dissapointed with ${his} tooth-filled mouth, but there are a handful still interested in ${his} unusual dentistry.`;
+ r += ` Most customers are quite disappointed with ${his} tooth-filled mouth, but there are a handful still interested in ${his} unusual dentistry.`;
} else {
r += ` The extra attention ${he} receives due to ${his} fangs is balanced by the customers who are scared off by them.`;
}
} else {
if (V.policies.gumjobFetishism === 1) {
- r += ` Most customers are quite dissapointed that ${his} teeth don't come out.`;
+ r += ` Most customers are quite disappointed that ${his} teeth don't come out.`;
}
}
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 93054bd17f9..8a34958763d 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1011,7 +1011,7 @@ App.Entity.SlaveState = class SlaveState {
this.lactation = 0;
/** how many more weeks until lactation dries up
*
- * usually 2 as interactions and lact. implant reset it to 2 */
+ * usually 2 as interactions and lactation implant reset it to 2 */
this.lactationDuration = 0;
/**
* odds of inducing lactation
@@ -2179,7 +2179,7 @@ App.Entity.SlaveState = class SlaveState {
polyhydramnios: 0,
/** Pleasurable pregnancy and orgasmic birth. Wider hips, looser and wetter vagina. High pregadaptation and low birth damage. */
uterineHypersensitivity: 0,
- /** inapropriate lacation*/
+ /** inappropriate lactation*/
galactorrhea: 0,
/** is abnormally tall. gigantism + dwarfism - is very average*/
gigantism: 0,
--
GitLab