From 3f13f4048d567cc359347e731c5070e3ae8f805f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 11 Apr 2018 23:31:45 -0400
Subject: [PATCH] Temp revert of fresult.tw
---
src/gui/Encyclopedia/encyclopedia.tw | 1 +
src/js/fresult.tw | 20 ++++++++++++--------
src/uncategorized/RESS.tw | 2 +-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 3805e6025d8..fb5e539ba5c 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 22141b50425..861a46cca1c 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 cdfcb45781e..14826cfd488 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
--
GitLab