diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index c104e5d782ec031e38ee463a35028fd4de3243db..d661272f9ebc9389193d576fd44f3db9c3b56848 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -951,9 +951,6 @@ App.Update.globalVariables = function(node) { if (V.week > 11 && V.assistant.personality === 0) { V.assistant.personality = -1; } - if (V.week > 29 && V.eventResults.aid === 0) { - V.eventResults.aid = -1; - } App.Update.FCTV(); if (jQuery.isEmptyObject(V.arcologyUpgrade)) { V.arcologyUpgrade = { diff --git a/src/endWeek/saLongTermMentalEffects.js b/src/endWeek/saLongTermMentalEffects.js index 1eb131d8567a3990aef9c7c159f177aefdf5dee3..82923894e546a7d27f22c365550c38c00e7333de 100644 --- a/src/endWeek/saLongTermMentalEffects.js +++ b/src/endWeek/saLongTermMentalEffects.js @@ -1863,7 +1863,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla } } } - if (!slave.piercing.genitals.smart || slave.clitSetting === "off" || slave.clitSetting === "none" || slave.clitSetting === "all" || slave.clitSetting === "men" || slave.clitSetting === "women") { + if (!slave.piercing.genitals.smart || ["off", "none", "all", "men", "women", "anti-men", "anti-women"].includes(slave.clitSetting)) { if (canDoAnal(slave)) { if (slave.vagina > -1 && !canDoVaginal(slave)) { if (slave.fetishStrength <= 95) { diff --git a/src/events/nonRandom/pAidInvitation.js b/src/events/nonRandom/pAidInvitation.js index 362de9d163440d1c0660f3c101f5895dfd401690..2c58bbc85e88c2e2bf88a35b82d9ab89f1250d29 100644 --- a/src/events/nonRandom/pAidInvitation.js +++ b/src/events/nonRandom/pAidInvitation.js @@ -11,14 +11,14 @@ App.Events.pAidInvitation = class pAidInvitation extends App.Events.BaseEvent { return [ () => V.plot === 1, () => V.week >= 29, - () => !V.eventResults.hasOwnProperty("aid") + () => !V.eventResults.aid ]; } execute(node) { const trapped = []; let r = []; - V.eventResults.aid = 0; // Mark event as seen. + V.eventResults.aid = -2; // Mark event as seen. if (V.seeDicks <= 75) { trapped.push("convent"); trapped.push("school"); diff --git a/src/interaction/siRules.js b/src/interaction/siRules.js index 6034405bf2dcc7d0a8609d2ff2cf7f15de64c494..2b05a1c0f80b98d186b21c889b4c2db1f065c9dd 100644 --- a/src/interaction/siRules.js +++ b/src/interaction/siRules.js @@ -413,6 +413,7 @@ App.UI.SlaveInteract.rules = function(slave, refresh) { // Level level.set(`No sex`, `none`); level.set(`All sex`, `all`); + level.set(`Disabled`, `off`); // Body part bodyPart.set(`Vanilla`, `vanilla`);