From 739296779425c1db8d47861e4aebb8f395dcf86f Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 21 Feb 2020 21:48:41 -0500
Subject: [PATCH] chastity fs
---
js/003-data/miscData.js | 2 ++
src/js/itemAvailability.js | 24 ++++++++++--------------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index 73d33a01798..79b06b0afeb 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -2524,6 +2524,7 @@ App.Data.misc = {
{
name: "Choose own chastity",
value: "choose own chastity",
+ fs: "FSRestart",
updateSlave: {
choosesOwnChastity: 1
},
@@ -2531,6 +2532,7 @@ App.Data.misc = {
{
name: "Revoke choosing own chastity",
value: "revoke choosing own chastity",
+ fs: "FSRestart",
updateSlave: {
choosesOwnChastity: 0
},
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 9a80852dbdc..92a3f257d06 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -500,25 +500,21 @@ window.isClothingAccessible = (function() {
}
}
case "choose own chastity": {
- 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;
- }
+ if (slave.choosesOwnChastity !== 1 && slave.devotion > 20 && slave.trust > 0) {
+ if (slave.choosesOwnClothes === 1) {
+ return "Slave is not choosing own clothing";
+ } else {
+ return true;
}
}
return false;
}
case "revoke choosing own chastity": {
- 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;
- }
+ if (slave.choosesOwnChastity > 0 && slave.devotion > 20 && slave.trust > 0) {
+ if (slave.choosesOwnClothes === 1) {
+ return "Slave is not choosing own clothing";
+ } else {
+ return true;
}
}
return false;
--
GitLab