From c8e28015cdf636150f53fc18596132c8bf8c04a7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 3 Feb 2020 15:02:17 -0500
Subject: [PATCH] work
---
Changelog.txt | 3 ++-
src/endWeek/healthFunctions.js | 6 +++++-
src/js/assayJS.js | 8 ++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index be90b286e59..327e02f0915 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,9 +7,10 @@ Pregmod
-illness tweaked
-slave performance listing
-reminder system
- -porn code optimization
+ -porn/ads code optimization
-expanded racial eye, hair and skin color ranges
-royal blood event can now use real dynasties
+ -CSS replacing SC formatting
-various fixes and balance changes
12/26/2019
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 0498c832510..ef8aa65ced5 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -373,6 +373,8 @@ window.tired = function tired(slave) {
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 (["guard you"].includes(slave.assignment)) {
+ assignment += 18; // A tough assignment with a girl that doesn't use her provided room unless it is attached to yours.
} else if (["recruit girls"].includes(slave.assignment)) {
if (H.tired > 80) { // I'll take it easy a week to better recruit the next.
assignment -= 20;
@@ -474,7 +476,9 @@ window.tired = function tired(slave) {
}
// Living Conditions
- if (slave.rules.living === "luxurious") {
+ if (slave.assignment === "guard you" && V.dojo === 2){
+ livingRules -= 20;
+ } else if (slave.rules.living === "luxurious") {
livingRules -= 15;
} else if (slave.rules.living === "spare") {
livingRules -= 2; // Barely reduce tiredness while sleeping in spare conditions
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 4508676cd48..8277eaad868 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1767,6 +1767,14 @@ window.Deadliness = function Deadliness(slave) {
deadliness += 2;
}
+ if (slave.health.tired > 90) {
+ deadliness -= 10;
+ } else if (slave.health.tired > 60) {
+ deadliness -= 3;
+ } else if (slave.health.tired > 30) {
+ deadliness -= 1;
+ }
+
return Math.max(deadliness, 1);
};
--
GitLab