diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index 3805e6025d81a8442c5e6bb5ff6b224a2fa6ecc6..fb5e539ba5cb20d4c139dcd859b43e1da81cf0e2 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -1,4 +1,5 @@ :: Encyclopedia [nobr] + <<switch $encyclopedia>> /********** diff --git a/src/js/fresult.tw b/src/js/fresult.tw index 22141b5042510ce5158ded803c364ff0d3e43d1e..861a46cca1c87be0491256c77e88ee1212a79438 100644 --- a/src/js/fresult.tw +++ b/src/js/fresult.tw @@ -91,23 +91,27 @@ window.FResult = (function() { } function calcWorksWithRelativesVanilla(slave) { - const fre = getSlave(slave.relationTarget) - if (free !== null && sameAssignmentP(slave, fre)) + const fre = V.slaves.findIndex(s => { + return haveRelationP(slave, s) && sameAssignmentP(slave, s); + }); + if (fre !== -1) { V.FResult += 2; if (incest_bonus) V.FResult += 2; } } function calcWorksWithRelationship(slave) { - const fre = getSlave(slave.relationshipTarget) - if (fre !== null && sameAssignmentP(slave, fre)) - V.FResult += 1; + const fre = V.slaves.findIndex(s => { + return haveRelationshipP(slave, s) && sameAssignmentP(slave, s); + }); + if (fre !== -1) V.FResult += 1; } function calcWorksWithRival(slave) { - const en = getSlave(slave.rivalryTarget) - if (en !== null && sameAssignmentP(slave, en)) - V.FResult -= 1; + const en = V.slaves.findIndex(s => { + return isRivalP(slave, s) && sameAssignmentP(slave, s); + }); + if (en !== -1) V.FResult -= 1; } function calcHInjectionsDiet(slave) { diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index cdfcb45781e11386b6fd8c0d0ee5b2b7c5ca059e..14826cfd4882243d1b519f934be05a921b439413 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -6459,7 +6459,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?" expansive <<elseif $activeSlave.weight > 130>> fat - <<elseif $activeSlave.weight > 950>> + <<elseif $activeSlave.weight > 95>> thick <<else>> chubby