diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 108b8b39dfb6c57e3b0861fd5a1fa2e82d232952..ebf5f18282f7c1efb8f763de1bed0fde830fc254 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -235,13 +235,6 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
let health;
let tiredChange;
- // Living Conditions
- if (slave.livingRules === "spare") {
- livingRules += normalRandInt(10); // Increases tired by an average of 10 points while sleeping under sparse conditions
- } else if (slave.livingRules === "luxurious") {
- livingRules -= normalRandInt(5); // Reduces tired by an average of 5 points while sleeping under luxurious conditions
- }
-
// 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
@@ -252,8 +245,12 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
if (V.Attendant !== 0) {
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(15, 2); // Increases tired by an average of 15 points while on a demanding assignment
+ } else if (slave.assignment === "be confined in the arcade") {
+ assignment += normalRandInt(15, 2); // Increases tired by an average of 15 points while on an overwhelmingly demanding assignment
+ } else if (slave.assignment === "work a glory hole" || 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 === "whore" || slave.assignment === "be a servant" || slave.assignment === "serve the public" || slave.assignment === "work in the brothel" || slave.assignment === "serve in the club" || slave.assignment === "work as a servant") {
+ assignment += normalRandInt(15, 2); // 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") {
@@ -265,7 +262,7 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
assignment -= normalRandInt(5); // Being a free range cow is relatively relaxing
}
} else if (slave.assignment === "get milked") {
- assignment += normalRandInt(5);
+ assignment -= normalRandInt(2); // Feels good to lighten the load
}
// Living Conditions
@@ -287,9 +284,9 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
// Rewards
if (V.spaSpots > 0 && slave.assignment !== "rest in the spa" && slave.rules.reward === "relaxation" || slave.rules.reward === "situational") {
if (slave.rules.reward === "relaxation") { // Considering the strength of the reward
- reward = -2;
+ reward += 2;
} else {
- reward = -1;
+ reward += 1;
}
if (slave.devotion > 50) { // Considering how often the slave gets rewarded
reward *= 3;
@@ -305,7 +302,7 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
}
// Muscles
- if (slave.muscles < 50) {
+ if (slave.muscles < 0) {
muscles = -Math.trunc((slave.muscles / 10) * (1 + normalRandInt(0, 5) / 100)); // Being weak increases tiredness, building muscles eventually reduces tiredness
} else {
muscles = -Math.trunc(5 * (1 + normalRandInt(0, 5) / 100)); // Muscle benefits max out at 0
@@ -316,4 +313,7 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
tiredChange = livingRules + assignment + reward + muscles + health;
H.tired += tiredChange;
+ if (H.tired < 0) {
+ H.tired = 0;
+ }
};
diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js
index d36fc82c7ea67eba361ada2f94f7aa2808da7b75..6c7251d651ded37ff47c2887cb04adb2412bbae4 100644
--- a/src/endWeek/saGetMilked.js
+++ b/src/endWeek/saGetMilked.js
@@ -560,7 +560,7 @@ window.saGetMilked = (function saGetMilked() {
}
if (slave.health.illness > 0 || slave.health.tired > 50) {
- r += ` ${He} performed worse this week due to`;
+ r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
} else if (slave.health.illness === 2) {
@@ -580,7 +580,7 @@ window.saGetMilked = (function saGetMilked() {
} else {
r += ` exhaustion`;
}
- r += `.`;
+ r += `.</span>`;
}
if (slave.vasectomy === 1) {
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 7ca82781dc1d7b6ec799f888082a86dc00b34aab..d8b2a69684b42e0ccbaeb2204644949d68345d72 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -57,7 +57,7 @@ window.saRest = function saRest(slave) {
}
if (slave.health.illness > 0 || slave.health.tired > 50) {
- t += ` Since ${he} is`;
+ t += ` Since ${he} is<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
} else if (slave.health.illness === 2) {
@@ -77,7 +77,7 @@ window.saRest = function saRest(slave) {
} else {
t += ` exhausted`;
}
- t += ` ${he} greatly appreciates being allowed to rest.`;
+ t += `,</span> ${he} greatly appreciates being allowed to rest.`;
}
if (V.showVignettes === 1 && slave.assignment === Job.REST) {
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 7cd10dfe2d6f67af2a4acc495588290770121645..3c56cf89b7c49b8f1a12fdeeb5a30846e5a0fee0 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -64,7 +64,7 @@ window.saServant = function saServant(slave) {
}
if (slave.health.illness > 0 || slave.health.tired > 50) {
- t += ` ${He} performed worse this week due to`;
+ t += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
} else if (slave.health.illness === 2) {
@@ -84,7 +84,7 @@ window.saServant = function saServant(slave) {
} else {
t += ` exhaustion`;
}
- t += `.`;
+ t += `.</span>`;
}
// TODO: this flat unchecked oral sex is a bit problematic
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index e0fb9b588301779b18f263fcb8aed1e412667e25..32e25d8ef2f9e31595c241eaddbc4af1139d0b9d 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -365,7 +365,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
if (slave.health.illness > 0 || slave.health.tired > 50) {
- r += ` ${He} performed worse this week due to`;
+ r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
} else if (slave.health.illness === 2) {
@@ -385,7 +385,7 @@ window.saServeThePublic = (function saServeThePublic() {
} else {
r += ` exhaustion`;
}
- r += `.`;
+ r += `.</span>`;
}
if (canDoVaginal(slave)) {
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index 76c38b32852f48830dd89a74f27e4da2b8b89aab..67cf06914040383f68673afbe6e8c937c0ba7bf1 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -49,7 +49,7 @@ window.saStayConfined = function saStayConfined(slave) {
healthDamage(slave, 10);
if (slave.health.illness > 0 || slave.health.tired > 50) {
- t += ` ${He} is`;
+ t += ` ${He} is<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
} else if (slave.health.illness === 2) {
@@ -69,7 +69,7 @@ window.saStayConfined = function saStayConfined(slave) {
} else {
t += ` exhausted`;
}
- t += ` ${his} misery only grows.`;
+ t += `,</span> ${his} misery only grows.`;
}
} else {
t += `is oblivious to ${his} confinement.`;
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index b88d0560dcdcfe36ead97f1e59b05710b0f9cecd..032e367c5896e36d5ad9fb31ea88326ecba3f89b 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -97,7 +97,7 @@ window.saTakeClasses = (function saServeThePublic() {
}
if (slave.health.illness > 0 || slave.health.tired > 50) {
- r += ` ${He} performed worse this week due to`;
+ r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
} else if (slave.health.illness === 2) {
@@ -117,7 +117,7 @@ window.saTakeClasses = (function saServeThePublic() {
} else {
r += ` exhaustion`;
}
- r += `.`;
+ r += `.</span>`;
}
}
}
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 21e6071f05a530ea77067e9eed3f87b0204b8988..e4bd144f6998bc8eda25c0d1f25e679c377eb949 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -427,7 +427,7 @@ window.saWhore = (function saWhore() {
}
if (slave.health.illness > 0 || slave.health.tired > 50) {
- r += ` ${He} performed worse this week due to`;
+ r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
} else if (slave.health.illness === 2) {
@@ -447,7 +447,7 @@ window.saWhore = (function saWhore() {
} else {
r += ` exhaustion`;
}
- r += `.`;
+ r += `.</span>`;
}
if (canDoVaginal(slave)) {
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index 54fc0d8bcea003268b5e97dcdc80eefaa9cf8444..73e03974ccf74809f8767a079ad4407d17187241 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -129,7 +129,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
}
if (slave.health.illness > 0 || slave.health.tired > 50) {
- r += ` ${He} is`;
+ r += ` ${He} is<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
} else if (slave.health.illness === 2) {
@@ -149,7 +149,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
} else {
r += ` exhausted`;
}
- r += ` but no one cared.`;
+ r += `,</span> but no one cared.`;
}
if (slave.vagina === 0 && canDoVaginal(slave)) {
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 0be5f8c233a7567259c715e3a4d8de9821f0e425..74446470e6d6be23f41c80c8459d097a0fbaee2a 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -150,16 +150,9 @@ window.generateGenetics = (function() {
// motherName
function setMotherName(activeMother) {
let motherName;
- if (activeMother.ID === -1) {
- motherName = activeMother.name;
- if (activeMother.surname !== 0 && activeMother.surname !== "") {
- motherName += ` ${activeMother.surname}`;
- }
- } else {
- motherName = activeMother.slaveName;
- if (activeMother.slaveSurname !== 0 && activeMother.slaveSurname !== "") {
- motherName += ` ${activeMother.slaveSurname}`;
- }
+ motherName = activeMother.slaveName;
+ if (activeMother.slaveSurname !== 0 && activeMother.slaveSurname !== "") {
+ motherName += ` ${activeMother.slaveSurname}`;
}
return motherName;
}
@@ -173,16 +166,9 @@ window.generateGenetics = (function() {
function setFatherName(father, activeFather, actor2) {
let fatherName;
if (father !== 0) {
- if (father.ID === -1) {
- fatherName = activeFather.name;
- if (activeFather.surname !== 0 && activeFather.surname !== "") {
- fatherName += ` ${activeFather.surname}`;
- }
- } else {
- fatherName = activeFather.slaveName;
- if (activeFather.slaveSurname !== 0 && activeFather.slaveSurname !== "") {
- fatherName += ` ${activeFather.slaveSurname}`;
- }
+ fatherName = activeFather.slaveName;
+ if (activeFather.slaveSurname !== 0 && activeFather.slaveSurname !== "") {
+ fatherName += ` ${activeFather.slaveSurname}`;
}
} else {
switch (actor2) {
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index eae57b61bbeee7f6e669ff41f7664ec8a3a983db..d95b3d8505a0b18edfceeb76a2f44e30d731535e 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -1,37 +1,18 @@
:: Main [nobr]
<<if $releaseID >= 1000 || ["0.9", "0.8", "0.7", "0.6"].includes($ver)>>
- <<if $releaseID >= 1060>>
- <<elseif $releaseID < 1060>>
- ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. There have been multiple slave variable overhauls, so please run [[backwards compatibility|Backwards Compatibility]].
- <<elseif $releaseID < 1059>>
- ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. As the side bar may have become nonfunctional, here is [[backwards compatibility|Backwards Compatibility]].
- <<elseif $releaseID < 1057>>
- ''@@.red;MAJOR INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. Due to overwhleming changes to the player object, you must run [[backwards compatibility|Backwards Compatibility]].
- <<elseif $releaseID < 1050 && ndef $SecExp || ndef $secExpEnabled>>
- <<= App.SecExp.Check.general()>>
- <<goto "Main">>
- <<elseif $releaseID < 1047 && ndef $sideBarOptions>>
- ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. Due to major changes to the side bar, you must run [[backwards compatibility|Backwards Compatibility]].
- <<elseif $releaseID < 1046>>
- ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. Due to major changes to the Rules Assistant data scheme, you must run [[backwards compatibility|Backwards Compatibility]].
- <<elseif $releaseID < 1031>>
- ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. Due to a major overhaul to intelligence and education, it is advisable to run backwards compatibility.
- <<elseif $releaseID >= 1022 && ndef $SF>>
- ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. Due to major changes to the Security Force Mod, you must run backwards compatibility.
- <<elseif $releaseID >= 1022>>
- <<elseif $releaseID >= 1019>>
- ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. Due to a major change to nationality weighting, you must run backwards compatibility.
- <<else>>
- ''@@.red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver build $releaseID. Please select New Game Plus from the Options menu or start a new game.
- <br><br>
+ <<if $releaseID < App.Version.release>>
+ ''@@.red;INCOMPATIBILITY WARNING:@@'' your saved game was created using version: $ver, build: $releaseID. You must run [[Backwards Compatibility]].
+ <br><br>
<</if>>
<<else>>
- ''@@.red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver and you are using later version which New Game Plus cannot reconcile. Please start a new game.
+ ''@@.red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version: $ver, and you are using a later version which New Game Plus cannot reconcile. Please start a new game.
<br><br>
<</if>>
+
<<if $defaultRules.length > 0 && ($defaultRules[0].condition == undefined || $defaultRules[0].set == undefined)>>
- ''@@.red;INCOMPATIBILITY WARNING:@@'' the rules assistant format has changed. In the Options Menu, please ''Reset RA Rules''
+ ''@@.red;INCOMPATIBILITY WARNING:@@'' the rules assistant format has changed. In the Options Menu, please ''Reset RA Rules''.
+ <br><br>
<</if>>
<<if def $organsCompleted>>