From a3f6089409e8d84714fb1deb40e5cce4cb936dcf Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 18 Nov 2019 20:32:41 -0500
Subject: [PATCH] Drug condition fix
---
src/js/DefaultRules.js | 2 +-
src/uncategorized/slaveInteract.tw | 2 +-
src/utility/miscWidgets.tw | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 9341f094054..c01821f30fe 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1327,7 +1327,7 @@ window.DefaultRules = (function() {
case "psychostimulants":
let origIntel = V.genePool.find(s => s.ID === slave.ID).intelligence;
- if (!((slave.intelligence < 100) && (origIntel < slave.intelligence + 15))) {
+ if (!((slave.intelligence < 100) && (origIntel + 15 < slave.intelligence))) {
flag = false;
}
break;
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index d27a5913c59..5aa65c1c8aa 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1047,7 +1047,7 @@
<</if>>
<<if $arcologies[0].FSSlaveProfessionalismResearch == 1>>
<<set _origIntel = $genePool.find(function(s) { return s.ID == $activeSlave.ID; }).intelligence>>
- <<if (_origIntel < $activeSlave.intelligence+15) && ($activeSlave.intelligence < 100)>>
+ <<if (_origIntel+15 < $activeSlave.intelligence) && ($activeSlave.intelligence < 100)>>
| <<link "Psychostimulants">><<set $activeSlave.drugs = "psychostimulants">><<SlaveInteractDrugs>><</link>>
<<else>>
| Psychostimulants
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 7c520b6d80f..3f38d74f894 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -139,14 +139,14 @@ Call as <<SlaveInteractDrugs>>
<<SlaveInteractDrugs>>
<</link>>
<</if>>
- <<if ($activeSlave.intelligence+$activeSlave.intelligenceImplant > -100) && $activeSlave.indentureRestrictions < 1>>
+ <<if ($activeSlave.intelligence > -100) && $activeSlave.indentureRestrictions < 1>>
| <<link "Psychosuppressants">><<set $activeSlave.drugs = "psychosuppressants">><<SlaveInteractDrugs>><</link>>
<<else>>
| Psychosuppressants
<</if>>
<<if $arcologies[0].FSSlaveProfessionalismResearch == 1>>
<<set _origIntel = $genePool.find(function(s) { return s.ID == $activeSlave.ID; }).intelligence>>
- <<if (_origIntel < $activeSlave.intelligence+15) && ($activeSlave.intelligence < 100)>>
+ <<if (_origIntel+15 < $activeSlave.intelligence) && ($activeSlave.intelligence < 100)>>
| <<link "Psychostimulants">><<set $activeSlave.drugs = "psychostimulants">><<SlaveInteractDrugs>><</link>>
<<else>>
| Psychostimulants
--
GitLab