From cde0b6065b729816af88e20d322a8b186f8384e2 Mon Sep 17 00:00:00 2001
From: cc54iw <cc54iwj8sqyn@mail.ru>
Date: Sun, 5 May 2019 08:47:48 -0700
Subject: [PATCH] Merge branch 'master' into 'pregmod-master'
Master
See merge request cc54iw/fc-pregmod!1
---
src/js/slaveStatsChecker.js | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index cbc92b028c7..3a225da8e26 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -386,16 +386,14 @@ window.canAchieveErection = function(slave) {
return false;
} else if (slave.aphrodisiacs > 1 || (slave.inflationType == "aphrodisiac" && slave.inflation >= 2)) {
return true;
- } else if (slave.balls > 0 ? slave.hormoneBalance < 100 : slave.hormoneBalance <= -100) {
- return false;
- } else if (slave.ballType !== "sterile") {
+ } else if (slave.ballType === "sterile") {
return false;
+ } else if ((slave.balls > 0 ? slave.hormoneBalance < 100 : slave.hormoneBalance <= -100) && slave.drugs !== "hormone blockers") {
+ return true;
} else if (slave.aphrodisiacs > 0 || slave.inflationType == "aphrodisiac") {
return true;
- } else if (slave.drugs === "hormone blockers") {
- return false;
}
- return true;
+ return false;
};
/**
--
GitLab