From da31c4af470a905d8da64eca81511b80b72b09f8 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 23 Dec 2019 14:15:06 -0800
Subject: [PATCH] Simplify
---
src/js/releaseRules.js | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/js/releaseRules.js b/src/js/releaseRules.js
index 03df626bd74..cd9352a1d14 100644
--- a/src/js/releaseRules.js
+++ b/src/js/releaseRules.js
@@ -48,23 +48,12 @@ App.Utils.hasFamilySex = function hasFamilySex(slave) {
};
/**
- * Returns true if a slave has no practical form of release.
+ * Returns true if the slave has any kind of nonassignment sex with someone other than the PC.
* @param {App.Entity.SlaveState} slave
* @returns {boolean}
*/
-App.Utils.hasNoOutlet = function hasNoOutlet(slave) {
- const rel = slave.rules.release;
- return (rel.masturbation === 0) && (rel.master === 0) && (rel.slaves === 0) && !this.hasPartnerSex(slave) && !this.hasFamilySex(slave);
-};
-
-/**
- * Returns true if a slave's only practical form of release is masturbation.
- * @param {App.Entity.SlaveState} slave
- * @returns {boolean}
- */
-App.Utils.mustMasturbate = function mustMasturbate(slave) {
- const rel = slave.rules.release;
- return (rel.masturbation === 1) && (rel.master === 0) && (rel.slaves === 0) && !this.hasPartnerSex(slave) && !this.hasFamilySex(slave);
+App.Utils.hasNonassignmentSex = function hasNonassignmentSex(slave) {
+ return (slave.rules.release.slaves === 1) || this.hasFamilySex(slave) || this.hasPartnerSex(slave);
};
/**
--
GitLab