From aa7f74c6ca5cfe6fecdfb6c7397a06a8d839d8b4 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Tue, 24 Dec 2019 18:39:59 -0800
Subject: [PATCH] Make seeIncest lockout work even if extended family mode is
off
---
src/js/utilJS.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 6c26d1db905..21bf38bdb64 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -3252,7 +3252,8 @@ window.randomRapeRivalryTarget = function(slave, predicate) {
function canRape(rapist, rapee) {
const opportunity = (assignmentVisible(rapist) && assignmentVisible(rapee)) || rapist.assignment === rapee.assignment;
- const desire = !(rapist.relationship >= 3 && rapist.relationshipTarget === rapee.id) && (V.seeIncest === 1 || !areRelated(rapist, rapee));
+ const taboo = V.seeIncest === 0 && (V.familyTesting === 1 ? areRelated(rapist, rapee) : haveRelationP(rapist, rapee));
+ const desire = !(rapist.relationship >= 3 && rapist.relationshipTarget === rapee.id) && !taboo;
const permission = willIgnoreRules || App.Utils.sexAllowed(rapist, rapee);
return opportunity && desire && permission;
}
--
GitLab