diff --git a/Changelog.txt b/Changelog.txt
index 8ca757c2fbbf18965130896152360dbe3f6136ec..524c3d0759bc2c1b3470b89e8cb82d297a8ecdc6 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -3,8 +3,8 @@ Pregmod
0.10.7.1-3.2.x
2
- -assignment tiredness affected by usage count
- -added tiredness clearing to health focused attention
+ -tiredness overhauled
+ -slave performance listing
-expanded racial eye, hair and skin color ranges
-various fixes and balance changes
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index cb33cf24d9a823fa7478ad8e20955607ab588bdd..8bb6da7b614f90be6165a71f794ee5cc9d7e8507 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -999,9 +999,10 @@ slave's illness state
health.tired:
slave's level of exhaustion
-0 - 50 - No effect
-51 - 80 - Tired, small penalty to productivity and increase in devotion/fear
-81 - 100 - Exhausted, medium penalty to productivity and increase in devotion/fear
+0 - 30 - No effect
+31 - 60 - Tired, increase in devotion or trust, depending on circumstances
+61 - 90 - Fatigued, penalty to productivity and health and increase in devotion/fear
+91 - 100 - Exhausted, major penalty to productivity, health and devotion/trust unless handled
health.health:
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 1710ed48a143d1fa0a144900e6e958bc5d0b97e2..363411ee7291e172ec788e2eebaa5f7af0ee67f4 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -239,6 +239,21 @@ window.endWeekHealthDamage = function endWeekHealthDamage(slave) {
H.health = H.condition - H.longDamage - H.shortDamage;
};
+/**
+ * Tells if a slave will try to work to death due to mental hangups
+ * @param {App.Entity.SlaveState} slave
+ * @returns {boolean}
+ */
+window.willWorkToDeath = function willWorkToDeath(slave) {
+ // More to come in the future
+ if (slave.trust < -50) { // Maybe lower
+ return true;
+ } else if (slave.sexualFlaw === "self hating") {
+ return true;
+ }
+ return false;
+};
+
/**
* Run at the end of the week to take care of tiredness changes
* @param {App.Entity.SlaveState} slave
@@ -254,62 +269,110 @@ window.tired = function tired(slave) {
let health;
let tiredChange;
- if (!slave.fuckdoll || slave.fetish !== "mindbroken") {
+ if (!slave.fuckdoll) {
// Assignment
- if (slave.assignment === "rest" || slave.assignment === "get treatment in the clinic") {
- assignment -= normalRandInt(15, 2); // Reduces tired by an average of 15 points while on a relaxing assignment
- } else if (slave.assignment === "serve in the master suite" || slave.assignment === "please you" || slave.assignment === "guard you" || slave.assignment === "be the Attendant" || slave.assignment === "be the Matron" || slave.assignment === "be the Stewardess" || slave.assignment === "be the Milkmaid" || slave.assignment === "be the Farmer" || slave.assignment === "be the DJ" || slave.assignment === "be your Concubine" || slave.assignment === "be the Madam" || slave.assignment === "be the Schoolteacher" || slave.assignment === "be the Wardeness" || slave.assignment === "be the Nurse" || slave.assignment === "be your Head Girl" || slave.assignment === "recruit girls" || slave.assignment === "learn in the schoolroom" || slave.assignment === "take classes" || slave.assignment === "live with your Head Girl") {
- assignment -= normalRandInt(5); // Reduces tired by an average of 5 points while on a relatively easy assignment/in a leadership position
- } else if (slave.assignment === "rest in the spa") {
- assignment -= normalRandInt(20, 1.5) * (V.spaUpgrade + 1); // Reduces tired by an average of 20 points while in the spa, 40 points with the upgraded spa
+ if (["rest in the spa"].includes(slave.assignment)) {
+ assignment -= 40 * (V.spaUpgrade + 1); // Reduces tired by an average of 40 points while in the spa, double with the upgraded spa
if (V.Attendant !== 0) {
- assignment -= Math.trunc(V.Attendant.skill.attendant / 10); // Maximum of 10 extra points of negative tiredness due to attendant skill
+ let skillBonus;
+ if (setup.attendantCareers.includes(V.Attendant.career)) {
+ skillBonus = 200;
+ } else {
+ skillBonus = V.Attendant.skill.attendant;
+ }
+ assignment -= Math.trunc(skillBonus / 10); // Maximum of 20 extra points of negative tiredness due to attendant skill
}
- } else if (slave.assignment === "whore" || slave.assignment === "work in the brothel" || slave.assignment === "work a glory hole" || slave.assignment === "be confined in the arcade" || slave.assignment === "serve the public" || slave.assignment === "serve in the club") {
- assignment += 0; // These assignments get their tiredness increase from tiredFucks()
- } else if (slave.assignment === "be confined in the arcade") {
- assignment += normalRandInt(5); // Arcade is a terrible place
- } else if (slave.assignment === "work as a farmhand") {
- assignment += normalRandInt(10, 2); // Increases tired by an average of 10 points while on a very demanding assignment
- } else if (slave.assignment === "be a servant") {
- assignment += normalRandInt(5); // Increases tired by an average of 5 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") {
+ } else if (["rest", "get treatment in the clinic"].includes(slave.assignment)) {
+ assignment -= 40; // Major tired reduction due to a solid week of rest
+ } else if (["guard you", "be the Attendant", "be the Matron", "be the Stewardess", "be the Milkmaid", "be the Farmer", "be the DJ", "be the Madam", "be the Schoolteacher", "be the Wardeness", "be the Nurse", "be your Head Girl"].includes(slave.assignment)) { // Heads are very busy, but always have luxurious conditions, so it balances out, save for the two exceptions
+ assignment += 15;
+ } else if (["get milked"].includes(slave.assignment)) {
+ if (slave.devotion > 20) {
+ assignment += 2;
+ } else {
+ assignment += 5;
+ }
+ } else if (["work in the dairy"].includes(slave.assignment)) {
if (V.dairyRestraintsSetting > 1) {
- assignment += normalRandInt(15, 2); // Full industrial Dairy is exhausting
+ assignment += 100; // Full industrial Dairy is exhausting
} else if (V.dairyRestraintsSetting > 0) {
- assignment += normalRandInt(5); // Restraining while milking is a little stressful
+ assignment += 10; // Restraining while milking is a little stressful
+ } else { // Being a free range cow is relatively relaxing
+ if (slave.devotion > 20) {
+ assignment += 2;
+ } else {
+ assignment += 5;
+ }
+ }
+ } else if (["be confined in the arcade"].includes(slave.assignment)) { // Brutal assignments
+ assignment += 50; // We should have a safeguard in place to prevent slave health meltdown while contained in the machine
+ } else if (["work a glory hole", "work as a farmhand"].includes(slave.assignment)) { // Hard assignments
+ if (!willWorkToDeath(slave)) {
+ if (slave.tired > 90) {
+ assignment += 1;
+ } else if (slave.tired > 60) {
+ assignment += 10;
+ }
+ } else {
+ if (slave.devotion > 20) {
+ assignment += 15;
+ } else {
+ assignment += 20;
+ }
+ }
+ } else if (["serve in the club", "serve the public", "whore", "work in the brothel"].includes(slave.assignment)) { // Moderate assignments
+ if (!willWorkToDeath(slave)) {
+ if (slave.tired > 90) {
+ assignment += 1;
+ } else if (slave.tired > 70) {
+ assignment += 7;
+ }
} else {
- assignment -= normalRandInt(5); // Being a free range cow is relatively relaxing
+ if (slave.devotion > 20) {
+ assignment += 10;
+ } else {
+ assignment += 15;
+ }
+ }
+ } else if (["serve in the master suite", "please you", "live with your Head Girl", "be a servant"].includes(slave.assignment)) { // Easy assignments
+ if (slave.tired > 75) {
+ assignment += 2;
+ } else if (slave.devotion > 20) {
+ assignment += 5;
+ } else {
+ assignment += 10;
+ }
+ } else if (["learn in the schoolroom", "take classes"].includes(slave.assignment)) { // Trivial assignments
+ if (slave.tired > 80) {
+ assignment += 2;
+ } else if (slave.devotion > 20) {
+ assignment += 2;
+ } else {
+ assignment += 5;
}
- } else if (slave.assignment === "get milked") {
- assignment -= normalRandInt(2); // Feels good to lighten the load
}
// Living Conditions
- // PM - What they return to after a day of work. Do this after the assignment to allow kinder facility decorations.
if (slave.rules.living === "spare") {
- livingRules -= 1; // Barely reduce tiredness while sleeping in spare conditions
+ livingRules -= 2; // Barely reduce tiredness while sleeping in spare conditions
if (V.dormitory < V.dormitoryPopulation) {
- livingRules += 5; // Overcrowding penalty
+ livingRules += 7; // Overcrowding penalty
}
} else if (slave.rules.living === "luxurious") {
- livingRules -= normalRandInt(10); // Reduces tired by an average of 10 points while sleeping under luxurious conditions
- // PM - Luxury rooms are rooms and not subject to overcrowding penalties.
+ livingRules -= 15;
} else {
- livingRules -= normalRandInt(5); // Reduces tired by an average of 5 points while sleeping under normal conditions
+ livingRules -= 10;
if (V.dormitory < V.dormitoryPopulation) {
- livingRules += 5; // Overcrowding penalty
+ livingRules += 17; // Overcrowding penalty
}
}
// Rewards
if (V.spaSpots > 0 && (slave.rules.reward === "relaxation" || slave.rules.reward === "situational")) {
if (slave.rules.reward === "relaxation") { // Considering the strength of the reward
- reward += 2;
+ reward += 5;
} else {
- reward += 1;
+ reward += 2;
}
if (slave.devotion > 50) { // Considering how often the slave gets rewarded
reward *= 3;
@@ -324,6 +387,7 @@ window.tired = function tired(slave) {
}
}
+ /* Disabled for balancing
// Muscles
if (slave.muscles < 0) {
muscles = -Math.trunc((slave.muscles / 10) * (1 + normalRandInt(0, 5) / 100)); // Being weak increases tiredness, building muscles eventually reduces tiredness
@@ -336,14 +400,22 @@ window.tired = function tired(slave) {
if (slave.assignment === "rest" || slave.assignment === "get treatment in the clinic" || slave.assignment === "rest in the spa") {
health = Math.max(0, health); // break vicious cycle - no additional tiredness accumulates from bad health for slaves assigned to rest
}
+ */
- tiredChange = livingRules + assignment + reward + muscles + health;
+ tiredChange = livingRules + assignment + reward; // + muscles + health
H.tired += tiredChange;
+ // H.tired = Math.clamp(H.tired, 0, 100); Disabled until hacky disabler is removed.
if (H.tired < 0 || V.disableTiredness) {
H.tired = 0;
+ } else if (H.tired > 100) {
+ H.tired = 100;
}
} else {
- H.tired = 49;
+ // fuckdolls get a static tiredness drop due to drugs and suit control
+ H.tired -= 30;
+ if (H.tired <= 0 || V.disableTiredness) {
+ H.tired = 1;
+ }
}
};
@@ -352,6 +424,7 @@ window.tired = function tired(slave) {
* @returns {void}
*/
window.tiredFucks = function tiredFucks(slave) {
+ /* temp disable
if (!slave.fuckdoll && slave.fetish !== "mindbroken") {
if (slave.assignment === "work a glory hole" || slave.assignment === "be confined in the arcade") {
let acceptance = 0;
@@ -369,4 +442,5 @@ window.tiredFucks = function tiredFucks(slave) {
slave.health.tired += Math.trunc(slave.sexAmount * (1 + normalRandInt(0, 5) / 100) / 25);
}
}
+ */
};
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 5554f8c35aff861c16f2ccd8b9da8732faf25dcb..bff88f5de3edf223a401d51e07409e6b83244e6f 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -635,9 +635,10 @@ App.Entity.SlaveState = class SlaveState {
illness: 0,
/**
* slave 's current level of exhaustion
- * * 0 - 50 : Perfectly fine
- * * 50 - 80 : tired
- * * 80 - 100 : exhausted
+ * * 0 - 30 : Perfectly fine
+ * * 31 - 60 : tired
+ * * 61 - 90 : fatigued
+ * * 91 - 100 : exhausted
*/
tired: 0,
/** slave 's combined health (condition - short - long) */