From 3eb770b692f886c72cdb42d83ed226fd8e3b85ee Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Thu, 15 Aug 2019 00:25:31 -0400
Subject: [PATCH] reoder drugs in RA

---
 src/js/rulesAssistantOptions.js | 111 ++++++++++++++++++++++----------
 1 file changed, 76 insertions(+), 35 deletions(-)

diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 10d0817b5eb..a3d7c5e4c33 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -2389,58 +2389,99 @@ window.rulesAssistantOptions = (function() {
 
 	class OtherDrugsList extends ListSelector {
 		constructor() {
-			const drugs = [
-				["none"],
-				["fertility drugs"],
-				["psychosuppressants"],
-				["steroids"],
-				["Natural hormone enhancers", "hormone enhancers"],
-				["hormone blockers"],
-				["Erectile dysfunction circumvention", "priapism agents"],
-				["breast injections"],
-				["intensive breast injections"],
-				["butt injections"],
-				["intensive butt injections"],
-				["lip injections"],
-				["penis enhancement"],
-				["intensive penis enhancement"],
-				["testicle enhancement"],
-				["intensive testicle enhancement"],
-			];
+			const drugs = [["none"]];
 
-			if (V.growthStim === 1) {
-				drugs.push(["Growth Stimulants (Research)", "growth stimulants"]);
+			// Lips
+			if (V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
+				drugs.push(["lip atrophiers"]);
 			}
-			if (V.precociousPuberty === 1 && V.pubertyHormones) {
-				drugs.push(["Female hormone injections (Research)", "female hormone injections"]);
-				drugs.push(["Male hormone injections (Research)", "male hormone injections"]);
+			drugs.push(["lip injections"]);
+
+			// Breasts
+			if (V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
+				drugs.push(["breast redistributors"]);
+			}
+			drugs.push(["breast injections"]);
+			drugs.push(["intensive breast injections"]);
+			if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
+				drugs.push(["hyper breast injections"]);
 			}
 			if (V.purchasedSagBGone === 1) {
 				drugs.push(["Sag-B-gone (Product)", "sag-B-gone"]);
 			}
 			if (V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
-				drugs.push(["Weight loss pills (FS)", "appetite suppressors"]);
-				drugs.push(["breast redistributors"]);
-				drugs.push(["butt redistributors"]);
 				drugs.push(["nipple atrophiers"]);
-				drugs.push(["lip atrophiers"]);
-				drugs.push(["penis atrophiers"]);
-				drugs.push(["testicle atrophiers"]);
-				drugs.push(["clitoris atrophiers"]);
+			}
+
+			// Womb
+			drugs.push(["fertility drugs"]);
+			if (V.seeHyperPreg === 1 && V.superFertilityDrugs === 1) {
+				drugs.push(["Super fertility drugs", "super fertility drugs"]);
+			}
+			if (V.precociousPuberty === 1 && V.pubertyHormones) {
+				drugs.push(["Female hormone injections (Research)", "female hormone injections"]);
+			}
+
+			// Vagina
+			if (V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
 				drugs.push(["labia atrophiers"]);
+				drugs.push(["clitoris atrophiers"]);
 			}
+
+			// Dicks
+			if (V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
+				drugs.push(["penis atrophiers"]);
+			}
+			drugs.push(["penis enhancement"]);
+			drugs.push(["intensive penis enhancement"]);
 			if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
-				drugs.push(["hyper breast injections"]);
-				drugs.push(["hyper butt injections"]);
 				drugs.push(["hyper penis enhancement"]);
+			}
+			drugs.push(["Erectile dysfunction circumvention", "priapism agents"]);
+
+			// Balls
+			if (V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
+				drugs.push(["testicle atrophiers"]);
+			}
+			drugs.push(["testicle enhancement"]);
+			drugs.push(["intensive testicle enhancement"]);
+			if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
 				drugs.push(["hyper testicle enhancement"]);
 			}
+			if (V.precociousPuberty === 1 && V.pubertyHormones) {
+				drugs.push(["Male hormone injections (Research)", "male hormone injections"]);
+			}
+
+			// Butt
+			if (V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
+				drugs.push(["butt redistributors"]);
+			}
+			drugs.push(["butt injections"]);
+			drugs.push(["intensive butt injections"]);
+			if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
+				drugs.push(["hyper butt injections"]);
+			}
+
+			// Body
+			if (V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
+				drugs.push(["Weight loss pills (FS)", "appetite suppressors"]);
+			}
+			drugs.push(["steroids"]);
+			if (V.growthStim === 1) {
+				drugs.push(["Growth Stimulants (Research)", "growth stimulants"]);
+			}
+
+			// Mind
+			drugs.push(["psychosuppressants"]);
+
+			// Hormones
+			drugs.push(["hormone blockers"]);
+			drugs.push(["Natural hormone enhancers", "hormone enhancers"]);
+
+			// Age
 			if (V.arcologies[0].FSYouthPreferentialistResearch === 1) {
 				drugs.push(["Anti-aging cream (FS)", "anti-aging cream"]);
 			}
-			if (V.seeHyperPreg === 1 && V.superFertilityDrugs === 1) {
-				drugs.push(["Super fertility drugs", "super fertility drugs"]);
-			}
 			super("Other drugs", drugs);
 			this.setValue(current_rule.set.drug);
 			this.onchange = (value) => current_rule.set.drug = value;
-- 
GitLab