From 50c8d47500b7433eaa4ae808be03f064b7afa460 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 17 Mar 2021 19:31:47 -0400
Subject: [PATCH] Fix .boobsMilk issues
---
src/data/backwardsCompatibility/datatypeCleanup.js | 4 ++++
src/endWeek/saAgent.js | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 10eb4a744af..684b0d5a04f 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -624,6 +624,10 @@ globalThis.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
}
slave.lactation = Math.clamp(+slave.lactation, 0, 2) || 0;
slave.boobsMilk = Math.max(+slave.boobsMilk, 0) || 0;
+ if (slave.boobsMilk > 0 && slave.boobs - slave.boobsMilk - slave.boobsImplant < 0) {
+ // should never get here, but if it does, just immediately abort!
+ slave.boobsMilk = 0;
+ }
slave.lactationAdaptation = Math.clamp(+slave.lactationAdaptation, 0, 100) || 0;
}
diff --git a/src/endWeek/saAgent.js b/src/endWeek/saAgent.js
index 9e18932913d..7e176c5c074 100644
--- a/src/endWeek/saAgent.js
+++ b/src/endWeek/saAgent.js
@@ -556,9 +556,6 @@ App.SlaveAssignment.agent = function(slave) {
// handled in nextWeek?
// slave.boobsMilk = Math.round(10 * slave.lactationAdaptation);
// slave.boobs += slave.boobsMilk;
- slave.lactationDuration--;
- } else {
- slave.lactationDuration--;
}
} else {
slave.lactationDuration = 2;
--
GitLab