From f5285bfd37dc7e22e4b90040556f62af797b42c8 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 21 Feb 2020 17:11:21 -0500
Subject: [PATCH] chooses own chastity
---
src/js/itemAvailability.js | 26 ++++++++++++++++++--------
src/uncategorized/slaveInteract.tw | 14 +-------------
2 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 82e682a85a8..9a80852dbdc 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -500,18 +500,28 @@ window.isClothingAccessible = (function() {
}
}
case "choose own chastity": {
- if (slave.choosesOwnChastity !== 1) {
- return true;
- } else {
- return false;
+ if (V.arcologies[0].FSRestart !== "unset" && slave.devotion > 20 && slave.trust > 0) {
+ if (slave.choosesOwnChastity !== 1) {
+ if (slave.choosesOwnClothes === 1) {
+ return "Slave is not choosing own clothing";
+ } else {
+ return true;
+ }
+ }
}
+ return false;
}
case "revoke choosing own chastity": {
- if (slave.choosesOwnChastity > 0) {
- return true;
- } else {
- return false;
+ if (V.arcologies[0].FSRestart !== "unset" && slave.devotion > 20 && slave.trust > 0) {
+ if (slave.choosesOwnChastity > 0) {
+ if (slave.choosesOwnClothes === 1) {
+ return "Slave is not choosing own clothing";
+ } else {
+ return true;
+ }
+ }
}
+ return false;
}
default:
return true;
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 2635df971c1..5ee25d6a021 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -239,23 +239,11 @@
<span id="chastity"></span>
<script>App.UI.Wardrobe.chastity(V.activeSlave)</script>
-
- <<if $arcologies[0].FSRestart != "unset" && $activeSlave.devotion > 20 && $activeSlave.trust > 0 && $activeSlave.choosesOwnClothes == 1>>
- <br>
- <<if $activeSlave.choosesOwnChastity == 1>>
- $He is allowed to decide whether $he to wear chastity devices.
- [[Withdraw Privilege|Slave Interact][$activeSlave.choosesOwnChastity = 0]]
- <<else>>
- $He is not allowed to choose whether to wear chastity devices.
- [[Allow Choice|Slave Interact][$activeSlave.choosesOwnChastity = 1]]
- <</if>>
- <</if>>
-
<</if>> /* CLOSES FUCKDOLL CHECK */
<</if>> /* CLOSES WARDROBE CHECK */
-<br><br>__Physical Regimen:__
+<br>__Physical Regimen:__
<span id="drugs"></span>
<script>App.UI.SlaveInteract.drugs(V.activeSlave)</script>
--
GitLab