diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 3e6e8658808c61abaa3d0630bccc66eb497a59de..43e7517eef0ca420f2393310e4db0c8e189a6a47 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -253,12 +253,12 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
assignment -= Math.trunc(V.Attendant.skill.attendant / 10); // Maximum of 10 extra points of negative tiredness due to attendant skill
}
} else if (slave.assignment === "whore" || slave.assignment === "be a servant" || slave.assignment === "serve the public" || slave.assignment === "work a glory hole" || slave.assignment === "work in the brothel" || slave.assignment === "serve in the club" || slave.assignment === "be confined in the arcade" || slave.assignment === "work as a servant" || slave.assignment === "work as a farmhand") {
- assignment += normalRandInt(20, 2); // Increases tired by an average of 20 points while on a demanding assignment
+ assignment += normalRandInt(15, 2); // Increases tired by an average of 15 points while on a demanding assignment
} else if (slave.assignment === "be your agent" || slave.assignment === "live with your agent") {
assignment -= normalRandInt(15, 2); // Making sure agents don't get exhausted, surely they can afford to do some relaxing
} else if (slave.assignment === "work in the dairy") {
if (V.dairyRestraintsSetting > 1) {
- assignment += normalRandInt(20, 2); // Full industrial Dairy is exhausting
+ assignment += normalRandInt(15, 2); // Full industrial Dairy is exhausting
} else if (V.dairyRestraintsSetting > 0) {
assignment += normalRandInt(5); // Restraining while milking is a little stressful
} else {
@@ -282,8 +282,8 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
} else if (slave.devotion < -20 || slave.trust >= -20) {
reward = 0;
}
- V.spaSpots -= reward; // Reducing the available space in the spa depending on how often the slave can be found there
- reward = Math.min(normalRandInt(reward), 0) * (V.spaUpgrade + 1);
+ V.spaSpots += reward; // Reducing the available space in the spa depending on how often the slave can be found there
+ reward = Math.max(normalRandInt(reward), 0) * (V.spaUpgrade + 1);
}
// Muscles
@@ -294,7 +294,7 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
}
// Health
- health = Math.trunc((H.shortDamage / 2 - H.condition / 20) * (1 + normalRandInt(0, 5) / 100)); // Current condition reduces tiredness, health damage increases tiredness
+ health = Math.trunc((H.shortDamage / 2 - H.condition / 10) * (1 + normalRandInt(0, 5) / 100)); // Current condition reduces tiredness, health damage increases tiredness
tiredChange = livingRules + assignment + reward + muscles + health;
H.tired += tiredChange;
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 515740cc6511b39294cb58c48486108fe261f638..d373e57475b9f4e02836d2b7648e34232a19afe7 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1133,7 +1133,7 @@ window.rulesAssistantOptions = (function() {
["Custom", "custom"],
["Devotion", "devotion"],
["Trust", "trust"],
- ["Health", "health"],
+ ["Health", "health.health"],
["Sex", "genes"],
["Sex drive", "energy"],
["Height", "height"],
@@ -1180,7 +1180,7 @@ window.rulesAssistantOptions = (function() {
return [
"devotion",
"trust",
- "health",
+ "health.health",
"energy",
"height",
"weight",
@@ -1344,7 +1344,7 @@ window.rulesAssistantOptions = (function() {
return ({
"devotion": "Very Hateful: (-∞, -95), Hateful: [-95, -50), Resistant: [-50, -20), Ambivalent: [-20, 20], Accepting: (20, 50], Devoted: (50, 95], Worshipful: (95, ∞)",
"trust": "Extremely terrified: (-∞, -95), Terrified: [-95, -50), Frightened: [-50, -20), Fearful: [-20, 20], Careful: (20, 50], Trusting: (50, 95], Total trust: (95, ∞)",
- "health": "Death: (-∞, -100), Near Death: [-100, -90), Extremely Unhealthy: [-90, -50), Unhealthy: [-50, -20), Healthy: [-20, 20], Very Healthy: (20, 50], Extremely Healthy: (50, 90], Unnaturally Healthy: (90, ∞)",
+ "health.health": "Death: (-∞, -100), Near Death: [-100, -90), Extremely Unhealthy: [-90, -50), Unhealthy: [-50, -20), Healthy: [-20, 20], Very Healthy: (20, 50], Extremely Healthy: (50, 90], Unnaturally Healthy: (90, ∞)",
"energy": "Frigid: (-∞, 20], Poor: (20, 40], Average: (40, 60], Powerful: (60, 80], Sex Addict: (80, 100), Nympho: 100",
"weight": "Emaciated: (-∞, -95), Skinny: [-95, -30), Thin: [-30, -10), Average: [-10, 10], Plush: (10, 30], Fat: (30, 95], Overweight: (95, ∞)",
"lactation": "None: 0, 1: Natural, 2: Lactation implant",
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index 7f38f8b6c4a4e57bb547fd8c0fee82626c9c2a3b..125f996f967fbd73136b45bf746e983a8689221f 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -8,7 +8,6 @@
<</if>>
/* 000-250-006 */
-<<run illness($slaves[$i]), tired($slaves[$i])>>
<<setLocalPronouns $slaves[$i]>>
<<switch $slaves[$i].assignment>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 13885f18b982b55d6e718f02d1219ffd27128f91..2cefbf96e462a0c4d4d1283fbc7470ae55b434f4 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -4,8 +4,9 @@
<h1> $arcologies[0].name Weekly Slave Report - Week $week</h1>
-/** silent pass for any reassignments before generating reports */
+/** silent pass for any reassignments before generating reports as well as getting tired and illness calculations out of the way */
<<for $i = 0; $i < _SL; $i++>>
+ <<run tired($slaves[$i], illness($slaves[$i]))>>
<<if $slaves[$i].choosesOwnAssignment == 1>>
<<silently>>
<<include "SA chooses own job">>