From 2d248fe6fdbdf533adebdf1693fc8fcb9b8272c6 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Tue, 27 Oct 2020 16:44:45 +0100
Subject: [PATCH] Minor fixups
---
src/endWeek/healthFunctions.js | 2 +-
src/endWeek/slaveAssignmentReport.js | 10 +++++-----
src/player/js/PlayerState.js | 3 ++-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 4d21a1d18e5..98728279395 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -242,7 +242,7 @@ globalThis.nurseEffectiveness = function(slave) {
/**
* Run at the end of the week to take care of health changes
- * @param {App.Entity.SlaveState} slave
+ * @param {App.Entity.SlaveState | App.Entity.PlayerState} slave
* @returns {void}
*/
globalThis.endWeekHealthDamage = function(slave) {
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index eee83ba79fa..48a33a764a1 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -129,20 +129,20 @@ App.EndWeek.slaveAssignmentReport = function() {
slave.need = slave.energy / 5;
}
if (slave.balls > 0 && slave.pubertyXY === 1 && slave.physicalAge <= (slave.pubertyAgeXY + 1) && (slave.physicalAge > slave.pubertyAgeXY) && slave.physicalAge < 18) {
- slave.need = (slave.need * 1.25);
+ slave.need *= 1.25;
}
if ((slave.ovaries === 1 || slave.mpreg === 1) && slave.pubertyXX === 1 && slave.physicalAge <= (slave.pubertyAgeXX + 1) && (slave.physicalAge > slave.pubertyAgeXX) && slave.physicalAge < 18) {
- slave.need = (slave.need * 1.25);
+ slave.need *= 1.25;
}
if (slave.diet === "fertility") {
slave.need += 10;
}
if (slave.aphrodisiacs === -1) {
- slave.need = (slave.need * 0.5);
+ slave.need *= 0.5;
} else if (slave.aphrodisiacs === 1) {
- slave.need = (slave.need * 1.5);
+ slave.need *= 1.5;
} else if (slave.aphrodisiacs === 2) {
- slave.need = (slave.need * 2);
+ slave.need *= 2;
}
poorHealthNeedReduction(slave);
slave.need = Math.round(slave.need);
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index df6db7a0388..f5371f36de9 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -312,7 +312,8 @@ App.Entity.PlayerState = class PlayerState {
* * "luck"
*/
this.rumor = "wealth";
- /** Player's ID */
+ /** Player's ID
+ * @type {-1} */
this.ID = -1;
/** your ability to function normally in day to day affairs
*
--
GitLab