diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw index b1267e1a03f7e284214e58a63771c34802af2f99..893ee212e8d5d16387036b1f01d67b3e8ad45aa8 100644 --- a/src/init/setupVars.tw +++ b/src/init/setupVars.tw @@ -982,7 +982,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do <<set setup.badNames = ["Dipshit", "Asshole", "Cunt", "Whore", "Dick", "Pussy", "Slaver", "Assfucker", "Sodomite", "Rapist", "Despoiler", "Ruiner", "Ass", "Fucker", "Trash", "Traitor", "Cocksucker", "Dicksucker", "Ass Kisser", "Ass Licker", "Bitch", "Jerk", "Fuckface", "Prick", "Creep", "Retard", "Dumbass", "DumbFuck", "Douchebag"]>> -<<set setup.drugs = [{name: "No default setting", value: "no default setting"}, {name: "None", value: "none"}, {name: "Psychosuppresants", value: "psychosuppresants"}, {name: "Steroids", value: "steroids"}, {name: "Natural hormone enhancers", value: "hormone enhancers"}, {name: "Anti-aging cream", value: "Anti-aging cream"}]>> +<<set setup.drugs = [{name: "No default setting", value: "no default setting"}, {name: "None", value: "none"}, {name: "Psychosuppresants", value: "psychosuppresants"}, {name: "Steroids", value: "steroids"}, {name: "Natural hormone enhancers", value: "hormone enhancers"}, {name: "Growth Stimulants", value: "growth stimulants", rs: "growth"}, {name: "Sag-B-gone", value: "sag-B-gone", rs: "nosag"}, {name: "Female hormone injections", value: "female hormone injections", rs: "pubHorm"}, {name: "Male hormone injections", value: "male hormone injections", rs: "pubHorm"}, {name: "Anti-aging cream", value: "anti-aging cream", fs: "youth"}]>> <<set setup.harshCollars = [{name: "Tight steel", value: "tight steel"}, {name: "Cruel retirement counter", value: "cruel retirement counter", fs: "seeage"}, {name: "Uncomfortable leather", value: "uncomfortable leather"}, {name: "Pregnancy biometrics", value: "preg biometrics"}, {name: "Shock punishment", value: "shock punishment"}, {name: "Dildo gag", value: "dildo gag"}, {name: "Ball gag", value: "ball gag"}, {name: "Bit gag", value: "bit gag"}, {name: "Neck corset", value: "neck corset"}]>> <<set setup.shoes = [{name: "No default footwear setting", value: "no default setting"}, {name: "Barefoot", value: "none"}, {name: "Flats", value: "flats"}, {name: "Heels", value: "heels"}, {name: "Thigh boots", value: "boots"}, {name: "Painfully extreme heels", value: "extreme heels"}]>> <<set setup.bellyAccessories = [{name: "No default setting", value: "no default setting"}, {name: "None", value: "none"}, {name: "Tight corset", value: "a corset"}, {name: "Extreme corset", value: "an extreme corset"}, {name: "1st Trimester belly", value: "a small empathy belly", fs: "repopulation"}, {name: "2nd Trimester belly", value: "a medium empathy belly", fs: "repopulation"}, {name: "3rd Trimester belly", value: "a large empathy belly", fs: "repopulation"}, {name: "3rd Trimester twins belly", value: "a huge empathy belly", fs: "repopulation"}]>> diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw index 0ca520021039cda79a84f829d731edd147eb2f00..153fdf72a91fb8669b6bbae674c46b53348b1f20 100644 --- a/src/uncategorized/rulesAssistant.tw +++ b/src/uncategorized/rulesAssistant.tw @@ -1392,10 +1392,16 @@ Other drugs: // Will be overriden by hormones and other drugs where applicable./ <<for _i = 0; _i < setup.drugs.length; _i++>> <<if _i == 0>> - <<elseif ndef setup.drugs[_i].fs>> + <<elseif ndef setup.drugs[_i].fs && ndef setup.drugs[_i].rs>> | <<elseif $cheatMode == 1>> - | //FS// + | //CM// + <<elseif (setup.drugs[_i].rs == "growth" && $growthStim == 1)>> + | //Research// + <<elseif (setup.drugs[_i].rs == "pubHorm" && $precociousPuberty == 1 && $pubertyHormones == 1)>> + | //Research// + <<elseif (setup.drugs[_i].rs == "nosag" && $purchasedSagBGone == 1)>> + | //Product// <<elseif (setup.drugs[_i].fs == "slimness" && $arcologies[0].FSSlimnessEnthusiastResearch == 1)>> | //FS// <<elseif (setup.drugs[_i].fs == "youth" && $arcologies[0].FSYouthPreferentialistResearch == 1)>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 754cb625fc8b20e7e8d28579f45ad29f5fd40463..44edb3097b574e06b01dd014b73eaf7667a8e0db 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -3524,11 +3524,54 @@ Your brand design is ''$brandDesign.'' /* Closes single for loop for growth drugs. */ /* Other Drugs */ -<<set _tempDrugsDrugs = ["psychosuppresants", "no drugs", "steroids", "hormone enhancers", "none"]>> +<<set _tempDrugsDrugs = ["psychosuppresants", "no drugs", "steroids", "hormone enhancers", "anti-aging cream", "growth stimulants", "sag-B-gone", "male hormone injections", "female hormone injections", "none"]>> <<if _tempDrugsDrugs.includes(_combinedRule.drug)>> <<if _tempDrugsDrugs.includes($args[0].drugs) && ($args[0].drugs != _combinedRule.drug)>> - <<set $args[0].drugs = _combinedRule.drug >> - <br> $args[0].slaveName has been put on $args[0].drugs. + <<switch _combinedRule.drug>> + <<case "anti-aging cream">> + <<if $args[0].visualAge > 18>> + <<set $args[0].drugs = _combinedRule.drug >> + <br> $args[0].slaveName has been put on $args[0].drugs. + <<else>> + <<set $args[0].drugs = "no drugs" >> + <br> $args[0].slaveName can not benefit from her assigned drug and has been defaulted to $args[0].drugs. + <</if>> + <<case "growth stimulants">> + <<if $args[0].height < 274 && $args[0].height < Math.clamp((Height.mean($args[0]) * 1.25),0,274)>> + <<set $args[0].drugs = _combinedRule.drug >> + <br> $args[0].slaveName has been put on $args[0].drugs. + <<else>> + <<set $args[0].drugs = "no drugs" >> + <br> $args[0].slaveName can not benefit from her assigned drug and has been defaulted to $args[0].drugs. + <</if>> + <<case "sag-B-gone">> + <<if $args[0].boobs > 250 && $args[0].boobShape != "saggy">> + <<set $args[0].drugs = _combinedRule.drug >> + <br> $args[0].slaveName has been put on $args[0].drugs. + <<else>> + <<set $args[0].drugs = "no drugs" >> + <br> $args[0].slaveName can not benefit from her assigned drug and has been defaulted to $args[0].drugs. + <</if>> + <<case "female hormone injections">> + <<if $args[0].breedingMark != 1 && ($args[0].ovaries == 1 || $args[0].mpreg == 1) && $args[0].pubertyXX == 0>> + <<set $args[0].drugs = _combinedRule.drug >> + <br> $args[0].slaveName has been put on $args[0].drugs. + <<else>> + <<set $args[0].drugs = "no drugs" >> + <br> $args[0].slaveName can not benefit from her assigned drug and has been defaulted to $args[0].drugs. + <</if>> + <<case "male hormone injections">> + <<if $args[0].breedingMark != 1 && $args[0].balls > 0 && $args[0].pubertyXY == 0>> + <<set $args[0].drugs = _combinedRule.drug >> + <br> $args[0].slaveName has been put on $args[0].drugs. + <<else>> + <<set $args[0].drugs = "no drugs" >> + <br> $args[0].slaveName can not benefit from her assigned drug and has been defaulted to $args[0].drugs. + <</if>> + <<default>> + <<set $args[0].drugs = _combinedRule.drug >> + <br> $args[0].slaveName has been put on $args[0].drugs. + <</switch>> <</if>> <</if>>