diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 26099cb8dca0b7a1e1cf03f4107613a73f311daa..42b9ff9fced065eb519861379a1cc6ee270678d3 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 + 15 < slave.intelligence))) { + if (!((slave.intelligence < 100) && (slave.intelligence < origIntel + 15))) { flag = false; } break; diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index d619426034c2ca2645061a4b5e35ec6812a114f1..205a55bd984400cdbe0e8533fd3012bfd99b16cf 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -1458,7 +1458,7 @@ <</if>> <<case "psychostimulants">> <<set _origIntel = $genePool.find(function(s) { return s.ID == $slaves[$i].ID; }).intelligence>> - <<if (_origIntel+15 <= $slaves[$i].intelligence) || ($slaves[$i].intelligence >= 100)>> + <<if ($slaves[$i].intelligence >= _origIntel+15) || ($slaves[$i].intelligence >= 100)>> $His intelligence has been improved as much as a drink possibly can. @@.yellow;$His drug regimen has been ended.@@ <<set $slaves[$i].drugs = "no drugs">> <</if>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 5aa65c1c8aaa7839bde8d975a6e46094a650aeda..00509583666c8a2f523198e384da13f6a3788c38 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+15 < $activeSlave.intelligence) && ($activeSlave.intelligence < 100)>> + <<if ($activeSlave.intelligence < _origIntel+15) && ($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 3f38d74f89403a8f8e8bb5a8c28ac5e20f781571..2b0ceb06c6aed76402acf433d5928df72329e6fe 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -146,7 +146,7 @@ Call as <<SlaveInteractDrugs>> <</if>> <<if $arcologies[0].FSSlaveProfessionalismResearch == 1>> <<set _origIntel = $genePool.find(function(s) { return s.ID == $activeSlave.ID; }).intelligence>> - <<if (_origIntel+15 < $activeSlave.intelligence) && ($activeSlave.intelligence < 100)>> + <<if ($activeSlave.intelligence < _origIntel+15) && ($activeSlave.intelligence < 100)>> | <<link "Psychostimulants">><<set $activeSlave.drugs = "psychostimulants">><<SlaveInteractDrugs>><</link>> <<else>> | Psychostimulants