From 18103e3939004ac91dc7e4b841d77eb37a5b8be1 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 9 Jan 2020 11:20:14 -0500
Subject: [PATCH] Base range tweaks
---
src/endWeek/saGetMilked.js | 8 ++++----
src/endWeek/saRest.js | 8 ++++----
src/endWeek/saServant.js | 8 ++++----
src/endWeek/saServeThePublic.js | 8 ++++----
src/endWeek/saStayConfined.js | 8 ++++----
src/endWeek/saTakeClasses.js | 8 ++++----
src/endWeek/saWhore.js | 8 ++++----
src/endWeek/saWorkAGloryHole.js | 8 ++++----
src/endWeek/saWorkTheFarm.js | 10 +++++-----
src/js/slaveSummaryWidgets.js | 20 ++++++++++++++------
10 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js
index 7c39a5350ab..c7cabdb48d1 100644
--- a/src/endWeek/saGetMilked.js
+++ b/src/endWeek/saGetMilked.js
@@ -559,7 +559,7 @@ window.saGetMilked = (function saGetMilked() {
r += ` ${His} poor health impedes semen production.`;
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -572,12 +572,12 @@ window.saGetMilked = (function saGetMilked() {
} else if (slave.health.illness === 5) {
r += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 15a8066a292..efb18a52696 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -56,7 +56,7 @@ window.saRest = function saRest(slave) {
}
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
t += ` Since ${he} is<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
@@ -69,12 +69,12 @@ window.saRest = function saRest(slave) {
} else if (slave.health.illness === 5) {
t += ` terribly ill`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
t += ` exhausted`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
t += ` tired`;
}
t += `,</span> ${he} greatly appreciates being allowed to rest.`;
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index e78fd73f4d1..213d877a50e 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -63,7 +63,7 @@ window.saServant = function saServant(slave) {
t += `so happy to serve your other slaves that ${he} often sees to their needs before they know they have them, and greatly <span class="yellowgreen">reduces the upkeep</span> of your slaves.`;
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
t += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
@@ -76,12 +76,12 @@ window.saServant = function saServant(slave) {
} else if (slave.health.illness === 5) {
t += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
t += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
t += ` being tired`;
}
t += `.</span>`;
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 40870d8afcf..42ff7390240 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -364,7 +364,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -377,12 +377,12 @@ window.saServeThePublic = (function saServeThePublic() {
} else if (slave.health.illness === 5) {
r += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index ac5e7ef9297..2259c017701 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -48,7 +48,7 @@ window.saStayConfined = function saStayConfined(slave) {
t += ` The stress of confinement <span class="red">damages ${his} health.</span>`;
healthDamage(slave, 10);
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
t += ` ${He} is<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
@@ -61,12 +61,12 @@ window.saStayConfined = function saStayConfined(slave) {
} else if (slave.health.illness === 5) {
t += ` terribly ill`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
t += ` exhausted`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
t += ` tired`;
}
t += `,</span> so ${his} misery only grows.`;
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index 77a9c4080d3..bab08437462 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -96,7 +96,7 @@ window.saTakeClasses = (function saServeThePublic() {
}
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -109,12 +109,12 @@ window.saTakeClasses = (function saServeThePublic() {
} else if (slave.health.illness === 5) {
r += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 86f2552a27e..5610dd838ae 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -426,7 +426,7 @@ window.saWhore = (function saWhore() {
}
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -439,12 +439,12 @@ window.saWhore = (function saWhore() {
} else if (slave.health.illness === 5) {
r += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index 066f8ff1761..f0bbfbc3b6d 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -128,7 +128,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
healthDamage(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} is<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -141,12 +141,12 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
} else if (slave.health.illness === 5) {
r += ` terribly ill`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 90) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhausted`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` tired`;
}
r += `,</span> but no one cared.`;
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 7c48f7cab7d..d6d94657d26 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -86,7 +86,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
t += `. `;
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
t += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
@@ -99,12 +99,12 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
} else if (slave.health.illness === 5) {
t += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
t += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
t += ` being tired`;
}
t += `.</span> `;
@@ -392,7 +392,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
if (slave.preg > 10) {
// TODO: write this
}
- if (slave.health.tired > 50) {
+ if (slave.health.tired > 60) {
t += `${He} is so tired that the energy in ${his} shows is basically nonexistent, affecting ${his} profits. `;
}
if (slave.chem > 10) {
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 68951645c85..aacb3a5061c 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -769,18 +769,26 @@ window.SlaveSummaryUncached = (function() {
}
function short_tired(slave, c) {
- if (slave.health.tired > 80) {
- makeSpan(c, "Ti", ["red", "strong"], true, slave.health.tired);
- } else if (slave.health.tired > 50) {
- makeSpan(c, "Ti", "yellow", true, slave.health.tired);
+ if (slave.health.tired > 90) {
+ makeSpan(c, "Exh", ["red", "strong"], true, slave.health.tired);
+ } else if (slave.health.tired > 60) {
+ makeSpan(c, "Tir+", "yellow", true, slave.health.tired);
+ } else if (slave.health.tired > 30) {
+ makeSpan(c, "Tir", "yellow", true, slave.health.tired);
+ } else if (slave.health.tired <= 0) {
+ makeSpan(c, "Ene", "green", true, slave.health.tired);
}
}
function long_tired(slave, c) {
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
makeSpan(c, "Exhausted", ["red", "strong"], true, slave.health.tired);
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
+ makeSpan(c, "Fatigued", "yellow", true, slave.health.tired);
+ } else if (slave.health.tired > 30) {
makeSpan(c, "Tired", "yellow", true, slave.health.tired);
+ } else if (slave.health.tired <= 0) {
+ makeSpan(c, "Energetic", "green", true, slave.health.tired);
}
}
--
GitLab