diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index a5267015401d114f123c2fc815d21e291da45bc2..46c2ac94a06ab2dd878783de0dfd02b8e16a492b 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -75,7 +75,9 @@ window.illness = function illness(slave) {
}
return r;
} // Let's make sure agents don't get sick and accidentally die, they should take care of themselves
- if (slave.assignment === "get treatment in the clinic") {
+ if (slave.fuckdoll !== 0) {
+ assignBonus += 50;
+ } else if (slave.assignment === "get treatment in the clinic") {
assignBonus += 40;
} else if (slave.assignment === "rest in the spa" || slave.assignment === "rest") {
assignBonus += 20;
@@ -114,9 +116,10 @@ window.illness = function illness(slave) {
let health_adjusted = H.condition - H.longDamage - H.shortDamage * 1.25;
let age_modifier = Math.min(Math.trunc((slave.physicalAge - 18) / 3), 0);
let bonus_modifiers = random + assignBonus + nurse_effectiveness;
+ let curativesBonus = (slave.curatives > 1 || slave.inflationType === "curative") ? 2 : 1;
// When ill, a slave has a 60% chance of getting better the next week at complete default, 70% with a favourable assignment, 80% with curatives, 90% with both measures active and additional benefits depending on the nurse on duty
- if (H.illness > 0 && ((health_adjusted + age_modifier) / 3) + bonus_modifiers > 40 / Math.clamp(slave.curatives, 1, 2)) {
+ if (H.illness > 0 && ((health_adjusted + age_modifier) / 3) + bonus_modifiers > 40 / curativesBonus) {
if (nurse_effectiveness > 30 && (jsRandom(1, 2) === 2 || slave.assignment === "get treatment in the clinic") && H.illness > 1) { // A particularly effective nurse can improve illness faster
H.illness -= 2;
r += ` ${V.Nurse.slaveName} <span class="green">successfully treats</span> ${his} illness.`;
@@ -129,13 +132,13 @@ window.illness = function illness(slave) {
}
} else if (H.illness === 0) {
if (["guard you", "be the DJ", "be the Madam", "be confined in the arcade", "work a glory hole", "serve in the club", "serve the public", "whore", "work in the brothel"].includes(slave.assignment)) { // Limit to outside jobs only
- if (((Math.min(health_adjusted, 50) + age_modifier) / 3) + bonus_modifiers < 30 / Math.min(slave.curatives + 1, 2)) { // Chance of getting ill 30% at complete default, 20% with a favourable assignment, 15% with curatives or preventatives, 10% with both measures active and a small benefit from effective Nurse screening
+ if (((Math.min(health_adjusted, 50) + age_modifier) / 3) + bonus_modifiers < 30 / Math.min(curativesBonus + 1, 2)) { // Chance of getting ill 30% at complete default, 20% with a favourable assignment, 15% with curatives or preventatives, 10% with both measures active and a small benefit from effective Nurse screening
getIll(slave);
r += ` ${He} has come down with <span class="red">${addA(sicknessDegree[H.illness])}.</span>`;
}
}
} else {
- healthDamage(slave, (H.illness));
+ healthDamage(slave, Math.pow(H.illness, 2));
r += ` ${He} <span class="red">suffers under ${his} ${sicknessDegree[H.illness]}.</span>`;
}
/* eslint-enable camelcase */
@@ -152,7 +155,7 @@ window.getIll = function getIll(slave) {
const H = slave.health;
const illness = jsRandom(1, 6) + jsRandom(1, 6) + jsRandom(1, 6) - Math.trunc(slave.chem / 150) + Math.trunc(H.condition / 20);
if (V.seeIllness !== 0) {
- if (slave.curatives !== 1) {
+ if (slave.curatives !== 1 && slave.inflationType !== "curative") {
if (slave.assignment !== "get treatment in the clinic") {
if (illness < 4) {
H.illness = 5; // 1.8% chance
@@ -170,6 +173,22 @@ window.getIll = function getIll(slave) {
}
};
+/**
+ * Once a new illness is rolled this determines how bad it is initially, chem levels seriously increase the chances of a higher initial value. Health also factors in with weakened slaves being more likely to catch ill.
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
+window.passIllness = function passIllness(slave1, slave2) {
+ if (V.seeIllness !== 0) {
+ if (slave1.curatives !== 1) {
+ if (slave1.assignment !== "get treatment in the clinic") {
+ slave1.health.illness = ill;
+ }
+ }
+ }
+ return ` ${slave1.slaveName} has caught ${slave2.slaveName}'s sickness.`;
+};
+
/**
* Once a new illness is rolled this determines how bad it is initially, chem levels seriously increase the chances of a higher initial value
* @param {App.Entity.SlaveState} slave
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 8c3aaeaf776724c4b384cce62f5e3f79748b64d5..b320da3e58dcfabf93681bd4cb302ff619f4f671 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -174,7 +174,6 @@
''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as the Farmer.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -185,7 +184,6 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -253,7 +251,6 @@
<br> $He <<= saWorkTheFarm($slaves[$i])>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -266,7 +263,6 @@
<<include "SA chooses own job">>
<<run saWorkTheFarm($slaves[$i])>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index be2203b2895d64f33c041605431bca2e798a2fe5..46eed76b34e4c21d2b33223fa922708d1890eb29 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -19122,7 +19122,6 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
/* 000-250-006 */
r += `<strong><u><span class="pink">${SlaveFullName(Matron)}</span></u></strong> is serving as the Matron in ${V.nurseryName}.`;
r += `${saChoosesOwnClothes(Matron)}`;
- r += `${illness(Matron)}`;
r += `<<include "SA rules">>`;
r += `<<include "SA diet">>`;
r += `<<include "SA long term effects">>`;
@@ -19133,7 +19132,6 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
} else {
r += `<<silently>>
${saChoosesOwnClothes(Matron)}
- ${illness(Matron)}
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index c53c83ca3ac57e82ad34620100282323796f3b8d..4fdfdbf082a2121e033e7e46a37b0a77c5b5599b 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -389,25 +389,13 @@ App.Desc.ageAndHealth = function(slave) {
}
}
- if (H.illness > 0 || H.tired > 50) {
- r += ` Additionally, ${he} is currently `;
- if (slave.health.illness === 1) {
- r += ` <span class="yellow">feeling under the weather.</span>`;
- } else if (H.illness === 2) {
- r += ` <span class="yellow">somewhat ill.</span>`;
- } else if (H.illness === 3) {
- r += ` <span class="red">sick.</span>`;
- } else if (H.illness === 4) {
- r += ` <span class="red">very sick.</span>`;
- } else if (H.illness === 5) {
- r += ` <span class="red">terribly ill.</span>`;
- }
- if (H.illness > 0 && H.tired > 50) {
- r += ` and`;
- }
- if (H.tired > 80) {
+ if (H.tired > 30) {
+ r += ` Additionally, ${he} is also `;
+ if (H.tired > 90) {
r += ` <span class="red">exhausted.</span>`;
- } else if (H.tired > 50) {
+ } else if (H.tired > 60) {
+ r += ` <span class="orange">fatigued.</span>`;
+ } else {
r += ` <span class="yellow">tired.</span>`;
}
}
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 3f1d3a541b1098f76223a2e1840f8543e0a86b0b..8d7236d2f770f35847ae504d430b1191546ebd73 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -751,7 +751,7 @@ window.SlaveSummaryUncached = (function() {
makeSpan(c, `Ill${slave.health.illness}`, ["red", "strong"], true, slave.health.illness);
} else if (slave.health.illness > 2) {
makeSpan(c, `Ill${slave.health.illness}`, ["red", "strong"], true, slave.health.illness);
- } else if (slave.health.illness > 1) {
+ } else if (slave.health.illness > 0) {
makeSpan(c, `Ill${slave.health.illness}`, ["yellow", "strong"], true, slave.health.illness);
}
}
@@ -763,8 +763,8 @@ window.SlaveSummaryUncached = (function() {
makeSpan(c, "Very ill", ["red", "strong"], true, slave.health.illness);
} else if (slave.health.illness > 2) {
makeSpan(c, "Ill", ["red", "strong"], true, slave.health.illness);
- } else if (slave.health.illness > 1) {
- makeSpan(c, "Somewhat ill", "yellow", true, slave.health.illness);
+ } else if (slave.health.illness > 0) {
+ makeSpan(c, "Sick", "yellow", true, slave.health.illness);
}
}
@@ -772,7 +772,7 @@ window.SlaveSummaryUncached = (function() {
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);
+ makeSpan(c, "Tir+", "orange", true, slave.health.tired);
} else if (slave.health.tired > 30) {
makeSpan(c, "Tir", "yellow", true, slave.health.tired);
} else if (slave.health.tired < 0) {
@@ -784,7 +784,7 @@ window.SlaveSummaryUncached = (function() {
if (slave.health.tired > 90) {
makeSpan(c, "Exhausted", ["red", "strong"], true, slave.health.tired);
} else if (slave.health.tired > 60) {
- makeSpan(c, "Fatigued", "yellow", true, slave.health.tired);
+ makeSpan(c, "Fatigued", "orange", true, slave.health.tired);
} else if (slave.health.tired > 30) {
makeSpan(c, "Tired", "yellow", true, slave.health.tired);
} else if (slave.health.tired < 0) {
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index d83fd0e4a80fd0ab1b68f3c23ce899c5160337af..9109e9ce480a2bc7e511250a8e9cd10a620eeb32 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -141,7 +141,6 @@
<</if>>
<<if $showEWD != 0>>
<br>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -151,7 +150,6 @@
<br><<include "SA devotion">>
<<else>>
<<silently>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index a09713bd6c6548c5ab6181a97e49d6589ed47ab0..8c2ff8ef817d2ee8c79f504bfdbe27c0740c0008 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -191,7 +191,6 @@
''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as the Madam.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -202,7 +201,6 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -314,7 +312,6 @@
<br> $He <<= saWhore($slaves[$i])>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -327,7 +324,6 @@
<<include "SA chooses own job">>
<<run saWhore($slaves[$i])>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 48edbce1108221b20f5710d07f6e6001b43865d3..66dc0ed1eb7f963a999ee1948c8f94c1a42c6d70 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -138,7 +138,6 @@
''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__'' is serving as the Wardeness in $cellblockName.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -149,7 +148,6 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -263,7 +261,6 @@
<</if>>
<br> $He <<= saStayConfined($slaves[$i])>>
<br>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -275,7 +272,6 @@
<<silently>>
<<include "SA chooses own job">>
<<run saStayConfined($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 807319e7cac54b106d44056ce393ba7b1edcda9c..b5b7bbd57e05fee749764466ae9bb2c0be9d5417 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -213,7 +213,6 @@
''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as the clinical nurse.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -224,7 +223,6 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -336,7 +334,6 @@
<</if>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -349,7 +346,6 @@
<<include "SA chooses own job">>
<<run saRest($slaves[$i])>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index eaab937350d97b1f3c038f2f020716a687413c87..4fb40bec5a73e53b4e5ecee2e19febacc728dbfe 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -120,7 +120,6 @@
''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is performing as the DJ in $clubName.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -131,7 +130,6 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -229,7 +227,6 @@
<br> $He <<= saServeThePublic($slaves[$i])>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -242,7 +239,6 @@
<<include "SA chooses own job">>
<<run saServeThePublic($slaves[$i])>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 066a5693e47ce85c21bfbdefdae2523bb796accb..10f7a9ba214f1306a22a0f570e1d02b7dd9d1385 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -292,7 +292,6 @@
''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as your Milkmaid.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -303,7 +302,6 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -400,7 +398,6 @@
<</if>>
<br> $He <<= saGetMilked($slaves[$i])>>
<br>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -412,7 +409,6 @@
<<silently>>
<<include "SA chooses own job">>
<<run saGetMilked($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index 1f2ce0a6b263c78b3104187de1b462fc71903af5..e714555be74943edfb81d12df9f9cfc5e8939d0a 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -64,7 +64,6 @@
<<if $showEWD == 0>>
<<silently>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<run saChoosesOwnClothes($slaves[$i])>>
<<include "SA diet">>
@@ -74,7 +73,6 @@
<<include "SA rivalries">>
<</silently>>
<<else>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA diet">>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 1e2a6ad5051cdca94482b7a5f327f3f3fded8001..2e312a971cb4daabba934ce1b4fa2700d316771f 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2129,6 +2129,28 @@ $He is
<</if>>
<</if>>
<</if>>
+<<if $activeSlave.health.illness > 0>>
+ <<if $activeSlave.fuckdoll == 0>>
+ $He
+ <<else>>
+ $His suit reports that $he
+ <</if>>
+ <<if ($activeSlave.health.illness === 1)>>
+ <<if $activeSlave.fuckdoll == 0>>
+ is @@.red;feeling under the weather.@@
+ <<else>>
+ has @@.red;fallen ill.@@
+ <</if>>
+ <<elseif ($activeSlave.health.illness === 2)>>
+ is @@.red;somewhat ill.@@
+ <<elseif ($activeSlave.health.illness === 3)>>
+ is @@.red;sick.@@
+ <<elseif ($activeSlave.health.illness === 4)>>
+ is @@.red;very sick.@@
+ <<elseif ($activeSlave.health.illness === 5)>>
+ is @@.red;terribly ill.@@
+ <</if>>
+<</if>>
<br>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 522b3a5720fc7cf3a3fe01a5f6e91c84ad0b8347..9b726a8ca2eeae964a01950837d174c52d89f78c 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -375,7 +375,6 @@
<</if>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -393,7 +392,6 @@
<<set $servantMilkersMultiplier = 1>>
<</if>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 2cf9ea229230422cd886314f40150465d11a1142..fa8a1bac291e6ff32f2ed9fc9ad16ddf182bffbc 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -1321,13 +1321,43 @@
<<run healthDamage($slaves[$i], jsRandom(3, 5))>>
<</if>>
-<<if $slaves[$i].curatives < 2 && $slaves[$i].inflationType != "curative">>
- <<if $slaves[$i].health.condition < -50 && ($slaves[$i].assignment != "rest in the spa" && $slaves[$i].assignment != "rest" && $slaves[$i].assignment != "get treatment in the clinic")>>
- It's difficult being so in such poor condition, and $he @@.mediumorchid;resents you@@ for ignoring $his plight.
- <<set $slaves[$i].devotion -= 2>>
- <<elseif ($slaves[$i].health.condition > 50)>>
+<<if $slaves[$i].curatives < 2 && $slaves[$i].inflationType != "curative" && $slaves[$i].assignment != "rest in the spa" && $slaves[$i].assignment != "rest" && $slaves[$i].assignment != "get treatment in the clinic">>
+ <<if $slaves[$i].health.illness > 0>>
+ $He is
+ <<if $slaves[$i].health.illness > 4>>
+ deathly
+ <<elseif $slaves[$i].health.illness > 3>>
+ seriously
+ <<elseif $slaves[$i].health.illness < 2>>
+ slightly
+ <</if>>
<<if $slaves[$i].fuckdoll == 0>>
- <<if $slaves[$i].fetish != "mindbroken">>
+ <<if $slaves[$i].fetish == "mindbroken">>
+ ill, yet still continues to mindlessly carry out $his duties.
+ <<elseif $slaves[$i].health.illness < 2>>
+ ill, though not enough to complain about.
+ <<elseif $slaves[$i].devotion < 20>>
+ ill and @@.mediumorchid;hates@@ having $his health issues @@.gold;ignored.@@
+ <<set $slaves[$i].devotion -= $slaves[$i].health.illness * 2, $slaves[$i].trust -= $slaves[$i].health.illness>>
+ <<elseif $slaves[$i].devotion < 50>>
+ ill and @@.mediumorchid;resents@@ being @@.gold;denied@@ proper treatment.
+ <<set $slaves[$i].devotion -= $slaves[$i].health.illness * 3, $slaves[$i].trust -= $slaves[$i].health.illness * 2>>
+ <<elseif $slaves[$i].health.illness > 3>>
+ ill and @@.gold;struggles with@@ being withheld treatment.
+ <<set $slaves[$i].trust -= $slaves[$i].health.illness * 3>>
+ <<else>>
+ ill and does $his best to continue with $his duties out of dedication to you.
+ <</if>>
+ <<else>>
+ ill, triggering $his suit's preventative measures.
+ <</if>>
+ <</if>>
+ <<if $slaves[$i].fuckdoll == 0>>
+ <<if $slaves[$i].fetish != "mindbroken">>
+ <<if $slaves[$i].health.condition < -50>>
+ It's difficult being so in such poor condition, and $he @@.mediumorchid;resents you@@ for ignoring $his plight.
+ <<set $slaves[$i].devotion -= 2>>
+ <<elseif ($slaves[$i].health.condition > 50)>>
$He understands that $he owes $his near-perfect health to you and @@.hotpink;believes@@ that life with you is better than freedom in some ways.
<<set $slaves[$i].trust += 1>>
<</if>>
@@ -1335,6 +1365,8 @@
<</if>>
<</if>>
+<<= illness($slaves[$i])>>
+
<<if $slaves[$i].drugs != "stimulants" && $slaves[$i].inflationType != "stimulant">>
<<if ($slaves[$i].assignment != "rest in the spa" && $slaves[$i].assignment != "rest" && $slaves[$i].assignment != "get treatment in the clinic")>>
<<if $slaves[$i].health.tired > 90>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index cdfd16aafd5749b2f3351baf13aff8d79677f0a1..22193a1c14ad8a104e3027b1db5762f7ad14a679 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -1012,7 +1012,6 @@
<<if $showEWD == 0>>
<<silently>>
/*<<run saChoosesOwnClothes($slaves[$i])>>*/
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -1023,7 +1022,6 @@
<</silently>>
<<else>>
/*<<= saChoosesOwnClothes($slaves[$i])>>*/
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 12e0a8beb598ae72586dbf658a8be2cac01d6538..8c9d577f0b89203eb1cc1511634a5363d6c2fa53 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6621,24 +6621,6 @@
<</if>>
<</if>>
-<<if $slaves[$i].health.illness > 1 && ($slaves[$i].assignment != "rest in the spa" && $slaves[$i].assignment != "rest" && $slaves[$i].assignment != "get treatment in the clinic")>>
- $He is<<if $slaves[$i].health.illness > 4>> deathly<<elseif $slaves[$i].health.illness > 3>> seriously<</if>> ill
- <<if $slaves[$i].devotion < 20>>
- and @@.mediumorchid;hates@@ having $his health issues @@.gold;ignored.@@
- <<set $slaves[$i].devotion -= $slaves[$i].health.illness * 2, $slaves[$i].trust -= $slaves[$i].health.illness>>
- <<elseif $slaves[$i].devotion < 50 && $slaves[$i].health.illness > 3>>
- and @@.mediumorchid;resents@@ not given proper treatment.
- <<set $slaves[$i].devotion -= $slaves[$i].health.illness>>
- <<else>>
- and does $his best to continue with $his duties out of dedication to you, despite being sick.
- <</if>>
-<<elseif $slaves[$i].health.illness > 1 && $slaves[$i].assignment == "get treatment in the clinic">>
- $He is<<if $slaves[$i].health.illness > 4>> deathly<<elseif $slaves[$i].health.illness > 3>> seriously<</if>> ill and receiving appropriate treatment. $He is @@.hotpink;grateful@@ you help $him get well.
- <<set $slaves[$i].devotion += 2>>
-<<elseif $slaves[$i].health.illness == 1>>
- $He is a bit under the weather this week and $his productivity suffers; $he will hopefully recover soon.
-<</if>>
-
<<if $seeAge == 1>>
<<if $slaves[$i].visualAge > 15 && $slaves[$i].physicalAge > 15>>
<<if $slaves[$i].trust < -20 && $slaves[$i].devotion < -20>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 458d84800d10b33aae37c371cec13bbb0edfbde1..1def58e78d2535ee0158ff72f42a88da55039797 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -121,7 +121,6 @@
''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your Schoolteacher.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -132,7 +131,6 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -206,7 +204,6 @@
<br> $He <<= saTakeClasses($slaves[$i])>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -219,7 +216,6 @@
<<include "SA chooses own job">>
<<run saTakeClasses($slaves[$i])>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 54db0cb209068e95682686a7d76209b163757d0e..3d67aa66625684ac7b345e53eb432cf3817f4b70 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -194,7 +194,6 @@
''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as your Stewardess.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -205,7 +204,6 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -292,7 +290,6 @@
<</if>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -309,7 +306,6 @@
<<set _SQMilk += $milk, _SQMilkSale += $milkSale>>
<</if>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 13287bacaf98036f7a6fcda243ee21006e04595f..28d77963b349707c5dd73595fbd817e9e96133cf 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -235,7 +235,6 @@
''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__'' is serving as the Attendant in $spaName.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -246,7 +245,6 @@
<<else>>
<<silently>>
<<run saChoosesOwnClothes($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -322,7 +320,6 @@
<</if>>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
- <<= illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -335,7 +332,6 @@
<<include "SA chooses own job">>
<<run saChoosesOwnClothes($slaves[$i])>>
<<run saRest($slaves[$i])>>
- <<run illness($slaves[$i])>>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>