Merge branch 'pregmod-dev' into 'pregmod-master'

Fix pent up milk expansion bug

Closes #4686

See merge request !11424

src/endWeek/nextWeek/nextWeek.js

@@ -61,8 +61,15 @@ App.EndWeek.nextWeek = function() {
 	}
 	if (V.PC.lactation === 1) {
 		if (V.PC.lactationDuration === 1) {
-			V.PC.boobsMilk = milkAmount(V.PC) * 20;
+			let boobsMilkIntegrityPC = 0;
+			if (V.PC.boobsMilk > 0) {
+				boobsMilkIntegrityPC = V.PC.boobsMilk;
+				V.PC.boobs -= V.PC.boobsMilk;
+				V.PC.boobsMilk = 0;
+			}
 			// V.PC.boobsMilk = Math.round(10 * V.PC.lactationAdaptation);
+			V.PC.boobsMilk = milkAmount(V.PC) * 20;
+			V.PC.boobsMilk += boobsMilkIntegrityPC;
 			V.PC.boobsMilk = Math.round(V.PC.boobsMilk / 10) * 10;
 			V.PC.boobs += V.PC.boobsMilk;
 		}
@@ -175,8 +182,15 @@ App.EndWeek.nextWeek = function() {
 		}
 		if (slave.lactation === 1) {
 			if (slave.lactationDuration === 1) {
-				slave.boobsMilk = milkAmount(slave) * 20;
+				let boobsMilkIntegrity = 0;
+				if (slave.boobsMilk > 0) {
+					boobsMilkIntegrity = slave.boobsMilk;
+					slave.boobs -= slave.boobsMilk;
+					slave.boobsMilk = 0;
+				}
 				// slave.boobsMilk = Math.round(10 * slave.lactationAdaptation);
+				slave.boobsMilk = milkAmount(slave) * 20;
+				slave.boobsMilk += boobsMilkIntegrity;
 				slave.boobsMilk = Math.round(slave.boobsMilk / 10) * 10;
 				slave.boobs += slave.boobsMilk;
 			}