diff --git a/src/js/raSelectorJS.tw b/src/js/raSelectorJS.tw
index 7956a377ee140162af6c447af5b78d5cac4d9a84..759de56211a868bd155f8e8081a932b1604c0ec6 100644
--- a/src/js/raSelectorJS.tw
+++ b/src/js/raSelectorJS.tw
@@ -5,18 +5,6 @@ window.growAdvSelector = function(slave, rule) {
var ret = "";
var setd = 0;
- if ((rule.breastSize == "small" && slave.boobs < 350) ||
- (rule.breastSize == "c-cup" && slave.boobs < 550) ||
- (rule.breastSize == "f-cup" && slave.boobs < 1100) ||
- (rule.breastSize == "k-cup" && slave.boobs < 2150) ||
- (rule.breastSize == "p-cup" && slave.boobs < 3700) ||
- (rule.breastSize == "unlimited" && slave.boobs < 24000))
- {
- slave.drugs = "breast injections";
- ret = slave.slaveName + "'s boobs could be bigger, so she's been put on breast injections.";
- return ret;
- }
-
if ((rule.breastSize == "small" && slave.boobs < 350) ||
(rule.breastSize == "c-cup" && slave.boobs < 550) ||
(rule.breastSize == "f-cup" && slave.boobs < 1100) ||
@@ -120,7 +108,7 @@ window.growAdvSelectorSlim = function(slave, rule) {
(rule.penisSize == "big" && slave.dick > 4) ||
(rule.penisSize == "huge" && slave.dick > 6))
{
- slave.drugs = "penis enhancement";
+ slave.drugs = "penis atrophiers";
ret = slave.slaveName + "'s dick is too big, so she's been put on penis atrophiers.";
return ret;
}
@@ -130,7 +118,7 @@ window.growAdvSelectorSlim = function(slave, rule) {
(rule.lipSize == "plush" && slave.lips > 55) ||
(rule.lipSize == "huge" && slave.lips > 85))
{
- slave.drugs = "lip injections";
+ slave.drugs = "lip atrophiers";
ret = slave.slaveName + "'s lips are too big, so she's been put on lips atrophiers.";
return ret;
}
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index 61e49199fcfee713012acc7272a55bef46013fa4..ddedc1d65c5ad2b118873f0a301810cca7f37562 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -1623,9 +1623,9 @@ Other drugs: // Will be overriden by hormones and other drugs where applicable./
|
<<elseif $cheatMode == 1>>
| //FS//
- <<elseif ($drugs[_i].fs == "slimness" && $arcologies[0].FSSlimnessEnthusiastResarch == 1)>>
+ <<elseif ($drugs[_i].fs == "slimness" && $arcologies[0].FSSlimnessEnthusiastResearch == 1)>>
| //FS//
- <<elseif ($drugs[_i].fs == "youth" && $arcologies[0].FSYouthPreferentialistResarch == 1)>>
+ <<elseif ($drugs[_i].fs == "youth" && $arcologies[0].FSYouthPreferentialistResearch == 1)>>
| //FS//
<<elseif ($drugs[_i].fs == "puberty" && $precociousPuberty == 1 && $pubertyHormones == 1)>>
|
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index c1ba8b3c365190c3e21a7166bc520cb1d8972344..85342d257b0889d795cbce665b9817f6f4613d5f 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -3810,8 +3810,10 @@ check if a rule attribute, any one, is defined and otherwise skip everything.
<<if (def _combinedRule.drug) && (_combinedRule.drug != "no default setting") && ($args[0].indentureRestrictions < 2)>>
<<switch _combinedRule.drug>>
<<case "none">>
- <<set $args[0].drugs = "no drugs">>
- <br>$args[0].slaveName has been taken off drugs.
+ <<if $args[0].drugs != "no drugs">>
+ <<set $args[0].drugs = "no drugs">>
+ <br>$args[0].slaveName has been taken off drugs.
+ <</if>>
<<case "psychosuppresants">>
<<if $args[0].intelligence > -2 && $args[0].drugs != "psychosuppresants">>
<<set $args[0].drugs = "psychosuppresants">>
@@ -3858,6 +3860,7 @@ check if a rule attribute, any one, is defined and otherwise skip everything.
<<elseif $args[0].drugs == "weight-loss pills">>
<<set $args[0].drugs = "no drugs">>
<br>$args[0].slaveName has been taken off of weight-loss drugs as she would likely starve with further treatments.
+ <</if>>
<<case "anti-aging cream">>
<<if $args[0].visualAge > 18 && $args[0].drugs != "anti-aging cream">>
<<set $args[0].drugs = "anti-aging cream">>
@@ -3865,6 +3868,7 @@ check if a rule attribute, any one, is defined and otherwise skip everything.
<<elseif $args[0].drugs == "anti-aging cream">>
<<set $args[0].drugs = "no drugs">>
<br>$args[0].slaveName is youthful enough that further anti-aging treatments will have no effect.
+ <</if>>
<</switch>>
<</if>>
@@ -3893,7 +3897,7 @@ check if a rule attribute, any one, is defined and otherwise skip everything.
<<elseif ($args[0].drugs == "lip injections") || ($args[0].drugs == "breast injections") || ($args[0].drugs == "butt injections")>>
<<set $args[0].drugs = "no drugs">>
<br>$args[0].slaveName has reached growth targets and has been taken off growth injections.
- <<if $arcologies[0].FSSlimnessEnthusiastResarch == 1>>
+ <<elseif $arcologies[0].FSSlimnessEnthusiastResarch == 1>>
<<if ($args[0].butt > 2)>>
<<set $args[0].drugs = "butt redistributors">>
<br>$args[0].slaveName's butt is too big, so she's been put on buttock reduction drugs.
@@ -3906,9 +3910,10 @@ check if a rule attribute, any one, is defined and otherwise skip everything.
<<elseif ($args[0].drugs == "lip atrophiers") || ($args[0].drugs == "breast atrophiers") || ($args[0].drugs == "butt atrophiers")>>
<<set $args[0].drugs = "no drugs">>
<br>$args[0].slaveName has reached growth targets and has been taken off growth injections.
+ <</if>>
<</if>>
<<elseif (_combinedRule.growth == "stacked")>>
- <<if $FSAssetExpansionistResearch == 1>>
+ <<if $arcologies[0].FSAssetExpansionistResearch == 1>>
<<set _hyper = "">>
<<else>>
<<set _hyper = "hyper ">>
@@ -3937,10 +3942,10 @@ check if a rule attribute, any one, is defined and otherwise skip everything.
<</if>>
<<elseif (_combinedRule.growth == "advSelect")>>
<br><<print growAdvSelector($args[0], _combinedRule)>>
-<<elseif (_combinedRule.growth == "advSelect") && $FSSlimnessEnthusiastResearch == 1>>
+<<elseif (_combinedRule.growth == "advSelect") && $arcologies[0].FSSlimnessEnthusiastResearch == 1>>
<br><<print growAdvSelectorSlim($args[0], _combinedRule)>>
<<else>>
- <<if $FSAssetExpansionistResearch == 1>>
+ <<if $arcologies[0].FSAssetExpansionistResearch == 1>>
<<set _hyper = "">>
<<else>>
<<set _hyper = "hyper ">>