From 2ee03218387a0d426994b8d0e05c2a037b252547 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Sat, 25 May 2019 13:56:08 +0200
Subject: [PATCH] remove duplicates
---
src/endWeek/saNanny.js | 2 +-
src/endWeek/saRest.js | 2 +-
src/endWeek/saServant.js | 2 +-
src/endWeek/saServeThePublic.js | 25 ++++---------------------
4 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js
index 6f7227f046f..247c482d7f7 100644
--- a/src/endWeek/saNanny.js
+++ b/src/endWeek/saNanny.js
@@ -5,7 +5,7 @@
window.saNanny = function saNanny(slave) {
"use strict";
const V = State.variables;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 009befc9e6b..61fab787504 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -4,7 +4,7 @@
*/
window.saRest = function saRest(slave) {
const V = State.variables;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 7125a95b18c..c40010c37fe 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -4,7 +4,7 @@
*/
window.saServant = function saServant(slave) {
const V = State.variables;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 2c54aa55d6c..26d7436a742 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -29,7 +29,8 @@ window.saServeThePublic = (function saServeThePublic() {
r = ` `;
pronouns = getPronouns(slave);
he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, girl = pronouns.noun;
- He = capFirstChar(he), His = capFirstChar(his);
+ He = capFirstChar(he);
+ His = capFirstChar(his);
girl === "girl" ? loli = "loli" : loli = "shota";
gatherStatistics(slave);
@@ -769,16 +770,7 @@ window.saServeThePublic = (function saServeThePublic() {
r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
}
} else if (arcology.FSPhysicalIdealist !== "unset") { // no muscle malus for muscle loving societies
- if (arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) { // reduced weight malus for fat loving societies
- if (arcology.FSSlimnessEnthusiast > 20) {
- r += ` The public enjoys ${his} fashionably sleek little body.`;
- } else {
- r += ` The public enjoys ${his} sleek, girlish figure.`;
- }
- if (canTalk(slave) && slave.voice > 2) {
- r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
- } else if (slave.weight <= 10) {
+ if ((arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) || slave.weight <= 10) { // reduced weight malus for fat loving societies
if (arcology.FSSlimnessEnthusiast > 20) {
r += ` The public enjoys ${his} fashionably sleek little body.`;
} else {
@@ -789,16 +781,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
}
} else if (arcology.FSHedonisticDecadence !== "unset" && slave.weight <= 30) { // reduced weight malus for fat loving societies
- if (arcology.FSHedonisticDecadenceStrongFat === 1) { // no muscle malus for muscle loving societies
- if (arcology.FSSlimnessEnthusiast > 20) {
- r += ` The public enjoys ${his} fashionably sleek little body.`;
- } else {
- r += ` The public enjoys ${his} sleek, girlish figure.`;
- }
- if (canTalk(slave) && slave.voice > 2) {
- r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
- } else if (slave.muscles <= 30) {
+ if (arcology.FSHedonisticDecadenceStrongFat === 1 || slave.muscles <= 30) { // no muscle malus for muscle loving societies
if (arcology.FSSlimnessEnthusiast > 20) {
r += ` The public enjoys ${his} fashionably sleek little body.`;
} else {
--
GitLab