From 04db09dbda58a06ce167fc531501fa3d1aacc573 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 25 Apr 2019 17:07:01 -0400
Subject: [PATCH] consistency and RA ear/eyewear removal
---
src/js/rulesAssistantOptions.js | 2 ++
src/uncategorized/slaveInteract.tw | 18 +++++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index cb0de4b17f8..9c388cf8876 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -2228,6 +2228,7 @@ window.rulesAssistantOptions = (function() {
constructor() {
const pairs = [
["no default setting"],
+ ["none"],
["correct with glasses"],
["correct with contacts"],
["universal glasses"],
@@ -2333,6 +2334,7 @@ window.rulesAssistantOptions = (function() {
constructor() {
const pairs = [
["no default setting"],
+ ["none"],
["correct with hearing aids"],
["muffle with ear plugs"],
["deafen with ear plugs"]
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 0c96099dd8e..3141c161db5 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1436,18 +1436,18 @@ Hormones: <strong><span id="hormones">
| //$He has no muscles left to lose//
<</if>>
-<br>Diet Base: <strong><span id="dietBase"><<if $activeSlave.dietCum == 2>>Cum Based<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 0)>>Cum Added<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 1)>>Cum and Milk Added<<elseif ($activeSlave.dietMilk == 1) && ($activeSlave.dietCum == 0)>>Milk Added<<elseif ($activeSlave.dietMilk == 2)>>Milk Based<<elseif ($activeSlave.dietCum == 0) && ($activeSlave.dietMilk == 0)>>Normal<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>
-<<link "Normal">><<set $activeSlave.dietCum = 0>><<set $activeSlave.dietMilk = 0>><<replace "#dietBase">>Normal<</replace>><</link>> |
-<<link "Cum Added">><<set $activeSlave.dietCum = 1>><<set $activeSlave.dietMilk = 0>><<replace "#dietBase">>Cum Added<</replace>><</link>> |
-<<link "Milk Added">><<set $activeSlave.dietCum = 0>><<set $activeSlave.dietMilk = 1>><<replace "#dietBase">>Milk Added<</replace>><</link>> |
-<<link "Cum & Milk Added">><<set $activeSlave.dietCum = 1>><<set $activeSlave.dietMilk = 1>><<replace "#dietBase">>Cum & Milk Added<</replace>><</link>> |
-<<link "Cum Based">><<set $activeSlave.dietCum = 2>><<set $activeSlave.dietMilk = 0>><<replace "#dietBase">>Cum Based<</replace>><</link>> |
-<<link "Milk Based">><<set $activeSlave.dietCum = 0>><<set $activeSlave.dietMilk = 2>><<replace "#dietBase">>Milk Based<</replace>><</link>>
+<br>Diet Base: <strong><span id="dietBase"><<if $activeSlave.dietCum == 2>>cum based<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 0)>>cum added<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 1)>>cum and milk added<<elseif ($activeSlave.dietMilk == 1) && ($activeSlave.dietCum == 0)>>milk added<<elseif ($activeSlave.dietMilk == 2)>>milk based<<elseif ($activeSlave.dietCum == 0) && ($activeSlave.dietMilk == 0)>>normal<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>.
+<<link "Normal">><<set $activeSlave.dietCum = 0>><<set $activeSlave.dietMilk = 0>><<replace "#dietBase">>normal<</replace>><</link>> |
+<<link "Cum added">><<set $activeSlave.dietCum = 1>><<set $activeSlave.dietMilk = 0>><<replace "#dietBase">>cum added<</replace>><</link>> |
+<<link "Milk added">><<set $activeSlave.dietCum = 0>><<set $activeSlave.dietMilk = 1>><<replace "#dietBase">>milk added<</replace>><</link>> |
+<<link "Cum & milk added">><<set $activeSlave.dietCum = 1>><<set $activeSlave.dietMilk = 1>><<replace "#dietBase">>cum & milk added<</replace>><</link>> |
+<<link "Cum based">><<set $activeSlave.dietCum = 2>><<set $activeSlave.dietMilk = 0>><<replace "#dietBase">>cum based<</replace>><</link>> |
+<<link "Milk based">><<set $activeSlave.dietCum = 0>><<set $activeSlave.dietMilk = 2>><<replace "#dietBase">>milk based<</replace>><</link>>
<<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>
<br>Solid Slave Food Access: <strong><span id="snacks"><<if $activeSlave.onDiet == 0>>Free to stuff $himself.<<else>>On a strict diet.<</if>></span></strong>
- <<link "No Access">><<set $activeSlave.onDiet = 1>><<replace "#snacks">>On a strict diet.<</replace>><</link>> |
- <<link "Full Access">><<set $activeSlave.onDiet = 0>><<replace "#snacks">>Free to stuff $himself.<</replace>><</link>>
+ <<link "No access">><<set $activeSlave.onDiet = 1>><<replace "#snacks">>On a strict diet.<</replace>><</link>> |
+ <<link "Full access">><<set $activeSlave.onDiet = 0>><<replace "#snacks">>Free to stuff $himself.<</replace>><</link>>
<</if>>
<br><br>__Behavior__:<br>
--
GitLab