From c674fee937eff956f96860dadd39c75cbc14e3e3 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 22 May 2021 09:01:11 -0400
Subject: [PATCH] finalizations
---
src/002-config/fc-version.js | 2 +-
src/js/statsChecker/statsChecker.js | 8 ++++++++
src/js/utilsPC.js | 2 ++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index ec1c17f77c9..2f2d540f2fb 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,6 +1,6 @@
App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
- pmod: "4.A.0",
+ pmod: "4.0.0-alpha.0",
commitHash: null,
release: 1130 // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
};
diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js
index fd9c58062c8..8ca229103b2 100644
--- a/src/js/statsChecker/statsChecker.js
+++ b/src/js/statsChecker/statsChecker.js
@@ -900,6 +900,14 @@ globalThis.isHindered = function(slave) {
} else if (slave.muscles < -30) {
return true;
}
+ // player exclusives
+ if (slave.ID === -1) {
+ if (onBedRest(slave)) {
+ return true;
+ } else if (slave.criticalDamage !== 0) {
+ return true;
+ }
+ }
return false;
};
diff --git a/src/js/utilsPC.js b/src/js/utilsPC.js
index 845579e23f7..905c6c460f3 100644
--- a/src/js/utilsPC.js
+++ b/src/js/utilsPC.js
@@ -627,6 +627,8 @@ globalThis.onBedRest = function(actor) {
// consider player health and injury in the future!
if (!actor) {
return null;
+ } else if (actor.health.shortDamage > 0) {
+ return true;
} else if (!canMove(actor)) {
return true;
} else if (actor.preg > actor.pregData.normalBirth / 1.33 && actor.womb.find((ft) => ft.genetics.geneticQuirks.polyhydramnios === 2 && ft.age >= 20)) {
--
GitLab