From f341e652b4b0ff598412cd6a07b91334e773fce2 Mon Sep 17 00:00:00 2001
From: Vas <whiterocket@outlook.com>
Date: Mon, 11 Jun 2018 17:50:44 +0300
Subject: [PATCH] assorted RAO bugs

---
 src/js/rulesAssistantOptions.tw | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 66b2959deed..8b4c0a1344a 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -507,7 +507,7 @@ window.rulesAssistantOptions = (function() {
 			this.appendChild(new AssignmentInclusion());
 			this.appendChild(new FacilityInclusion());
 			this.appendChild(new SpecialExclusion());
-			this.appendChild(new SpecificInclusionExclusion());
+			//this.appendChild(new SpecificInclusionExclusion());
 		}
 	}
 
@@ -985,7 +985,7 @@ window.rulesAssistantOptions = (function() {
 			this.appendChild(harsh);
 
 			this.setValue(current_rule.set.clothes);
-			this.onchange = (data) => current_rule.set.clothes = value;
+			this.onchange = (value) => current_rule.set.clothes = value;
 		}
 	}
 
@@ -1071,7 +1071,7 @@ window.rulesAssistantOptions = (function() {
 				else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1)
 					accs.push([acc.name + " (Purchased)", acc.value]);
 			});
-			super("Vaginal accessories for virgins");
+			super("Vaginal accessories for virgins", accs);
 			this.setValue(current_rule.set.virginAccessory);
 			this.onchange = (value) => current_rule.set.virginAccessory = value;
 		}
@@ -1086,7 +1086,7 @@ window.rulesAssistantOptions = (function() {
 				else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1)
 					accs.push([acc.name + " (Purchased)", acc.value]);
 			});
-			super("Vaginal accessories for anal virgins");
+			super("Vaginal accessories for anal virgins", accs);
 			this.setValue(current_rule.set.aVirginAccessory);
 			this.onchange = (value) => current_rule.set.aVirginAccessory = value;
 		}
@@ -1101,7 +1101,7 @@ window.rulesAssistantOptions = (function() {
 				else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1)
 					accs.push([acc.name + " (Purchased)", acc.value]);
 			});
-			super("Vaginal accessories for other slaves");
+			super("Vaginal accessories for other slaves", accs);
 			this.setValue(current_rule.set.vaginalAccessory);
 			this.onchange = (value) => current_rule.set.vaginalAccessory = value;
 		}
@@ -1132,7 +1132,7 @@ window.rulesAssistantOptions = (function() {
 				else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1)
 					accs.push([acc.name + " (Purchased)", acc.value]);
 			});
-			super("Buttplugs for anal virgins");
+			super("Buttplugs for anal virgins", accs);
 			this.setValue(current_rule.set.aVirginButtplug);
 			this.onchange = (value) => current_rule.set.aVirginButtplug = value;
 		}
@@ -1147,7 +1147,7 @@ window.rulesAssistantOptions = (function() {
 				else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1)
 					accs.push([acc.name + " (Purchased)", acc.value]);
 			});
-			super("Buttplugs for other slaves");
+			super("Buttplugs for other slaves", accs);
 			this.setValue(current_rule.set.buttplug);
 			this.onchange = (value) => current_rule.set.buttplug = value;
 		}
@@ -1551,6 +1551,12 @@ window.rulesAssistantOptions = (function() {
 		value2string(cum, milk) {
 			return `cum: ${cum}, milk: ${milk}`;
 		}
+
+		setValue(what) {
+			what = this.value2string(what.cum, what.milk)
+			super.setValue(what)
+		}
+
 	}
 
 	class MuscleList extends List {
@@ -1782,7 +1788,7 @@ window.rulesAssistantOptions = (function() {
 
 		render(color) {
 			const elem = document.createElement("div");
-			elem.innerHTML = "Eye coloring";
+			elem.innerHTML = "Eye coloring: ";
 			this.label = document.createElement("strong");
 			this.label.innerText = color;
 			elem.appendChild(this.label);
-- 
GitLab