diff --git a/src/js/releaseRules.js b/src/js/releaseRules.js index 03df626bd74b90d0fbcb0e48cba38d8649b61f4b..cd9352a1d149fdbf09601ea71c06cff3e94d2284 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); }; /**