From d884f1f34542b9ecf5dd53f21a26d13c37c0860c Mon Sep 17 00:00:00 2001
From: i107760 <13422-i107760@users.noreply.gitgud.io>
Date: Tue, 10 Nov 2020 17:08:02 -0800
Subject: [PATCH] Revert "remove redundant undefined and null checks"
This reverts commit 63c389dc7b4435538309cd4f432bdfb82787e30d.
---
src/js/DefaultRules.js | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 7a1f49a9e52..2dde6978006 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1166,15 +1166,21 @@ globalThis.DefaultRules = (function() {
*/
function ProcessDrugs(slave, rule) {
// First we check AssetGrowthDrugs, then if 1. no growth targets or 2. targets have been hit, we check other drugs.
+ if (slave.indentureRestrictions === 2) {
+ return;
+ }
if ((slave.drugs === "super fertility drugs" || slave.drugs === "fertility drugs") && isFertile(slave)) {
r += `<br>${slave.slaveName} is on ${slave.drugs} and will not be considered for drug enhancement until that regime is complete.`;
ProcessOtherDrugs(slave, rule);
- } else if (slave.indentureRestrictions > 1 || (rule.growth.boobs === null && rule.growth.butt === null && rule.growth.lips === null && rule.growth.dick === null && rule.growth.balls === null)) {
+ return;
+ } else if (rule.growth.boobs === null && rule.growth.butt === null && rule.growth.lips === null && rule.growth.dick === null && rule.growth.balls === null) {
ProcessOtherDrugs(slave, rule);
+ return;
}
- /** @typedef {"lips" | "boobs" | "butt" | "dick" | "balls"} DrugTarget */
+
+ /** @typedef {"lips" | "boobs" | "butt" | "dick" | "balls"} DrugTarget */
// Asset Growth
const growthDrugs = new Set(["breast injections", "breast redistributors", "butt injections", "butt redistributors", "hyper breast injections", "hyper butt injections", "hyper penis enhancement", "hyper testicle enhancement", "intensive breast injections", "intensive butt injections", "intensive penis enhancement", "intensive testicle enhancement", "lip atrophiers", "lip injections", "penis atrophiers", "penis enhancement", "testicle atrophiers", "testicle enhancement"]);
@@ -1313,7 +1319,7 @@ globalThis.DefaultRules = (function() {
r += `that is the only part of ${his} body that does not meet the targeted size.`;
}
}
- } else if (growthDrugs.has(slave.drugs)) {
+ } else if (growthDrugs.has(slave.drugs) && slave.drugs !== rule.drug) {
r += `<br>${slave.slaveName}'s body has met all relevant growth targets, so ${his} pharmaceutical regime has been ended.`;
ProcessOtherDrugs(slave,rule);
}
@@ -1325,7 +1331,7 @@ globalThis.DefaultRules = (function() {
*/
function ProcessOtherDrugs(slave, rule) {
// Other Drugs
- if (slave.indentureRestrictions < 2 && rule.drug !== null && slave.drugs !== rule.drug) {
+ if (rule.drug !== undefined && rule.drug !== null && slave.drugs !== rule.drug) {
let flag = true;
switch (rule.drug) {
case "anti-aging cream":
--
GitLab