From 829744a96665dec904c97e82efd59d4fe939be81 Mon Sep 17 00:00:00 2001
From: Vas <whiterocket@outlook.com>
Date: Sun, 22 Jul 2018 19:39:50 +0300
Subject: [PATCH] twine js sync

---
 devNotes/twine JS.txt | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 144e82d1a96..e66f11d93b0 100644
--- a/devNotes/twine JS.txt	
+++ b/devNotes/twine JS.txt	
@@ -10305,7 +10305,7 @@ window.saChoosesOwnClothes = function saChoosesOwnClothes(slave) {
 	return r;
 };
 
-/*:: FResult [script]*/
+// :: FResult [script]
 
 // this is a port of the FResult widget
 // it has been broken up into several functions, because it grew too long
@@ -10337,7 +10337,7 @@ window.FResult = (function() {
 
 		if (slave.nipples === "fuckable")
 			calcFuckableTits(slave);
-
+			
 		if (V.seeAge === 1)
 			calcAge(slave);
 		if (slave.fetish === "mindbroken")
@@ -10367,23 +10367,23 @@ window.FResult = (function() {
 		else if (slave.muscles < -30)
 			V.FResult -= 2;
 
-		V.seed = V.oralUseWeight + V.vaginalUseWeight + V.analUseWeight;
-		if (V.seed <= 0) return;
+		const uses = V.oralUseWeight + V.vaginalUseWeight + V.analUseWeight;
+		if (uses <= 0) return;
 
-		V.FResult += (6+slave.tonguePiercing) * (V.oralUseWeight/V.seed) * (slave.oralSkill/30);
+		V.FResult += (6+slave.tonguePiercing) * (V.oralUseWeight/uses) * (slave.oralSkill/30);
 		if (slave.sexualFlaw === "cum addict")
-			V.FResult += (V.oralUseWeight/V.seed) * (slave.oralSkill/30);
+			V.FResult += (V.oralUseWeight/uses) * (slave.oralSkill/30);
 		if (canDoVaginal(slave)) {
-			V.FResult += 6 * (V.vaginalUseWeight/V.seed) * (slave.vaginalSkill/30);
+			V.FResult += 6 * (V.vaginalUseWeight/uses) * (slave.vaginalSkill/30);
 			V.FResult += (3 - slave.vagina);
 			V.FResult += slave.vaginaLube;
 		}
 		if (canDoAnal(slave)) {
-			V.FResult += 6 * (V.analUseWeight/V.seed) * (slave.analSkill/30);
+			V.FResult += 6 * (V.analUseWeight/uses) * (slave.analSkill/30);
 			if (slave.sexualFlaw === "anal addict")
-				V.FResult += (V.analUseWeight/V.seed) * (slave.analSkill/30);
+				V.FResult += (V.analUseWeight/uses) * (slave.analSkill/30);
 			if (slave.inflationType === "aphrodisiac")
-				V.FResult += (V.analUseWeight/V.seed) * (slave.inflation * 3);
+				V.FResult += (V.analUseWeight/uses) * (slave.inflation * 3);
 		}
 	}
 
@@ -10501,11 +10501,7 @@ window.FResult = (function() {
 
 	function calcEgyptianBonus(slave) {
 		if (V.racialVarieties === undefined) V.racialVarieties = [];
-		V.seed = 0;
-		V.racialVarieties.forEach(race => {
-			if (slave.race === race) V.seed = 1;
-		});
-		if (V.seed === 0)
+		if (!V.racialVarieties.includes(slave.race))
 			V.racialVarieties.push(slave.race);
 	}
 
@@ -18337,7 +18333,7 @@ window.I = function() {
 		name = V.incubatorNameCaps;
 	return `<<link "${name}""Incubator">><</link>> `}
 
-/*:: Slave Summary Widgets JS [script]*/
+// :: Slave Summary Widgets JS [script]
 
 window.clearSummaryCache = function clearSummaryCache(slave) {
 	if (!slave)
@@ -18399,9 +18395,8 @@ window.SlaveSummaryUncached = (function(){
 				r += `&nbsp;&nbsp;&nbsp;&nbsp;`;
 		}
 		V.desc = SlaveTitle(slave);
-		V.seed = V.desc.substring(0, 1);
-		V.seed = V.seed.toUpperCase();
-		V.desc = V.seed + V.desc.substring(1);
+		let first_letter = V.desc.substring(0, 1).toUpperCase();
+		V.desc = first_letter + V.desc.substring(1);
 		r += `<strong><span class="coral">${V.desc}${V.abbreviatePhysicals === 2? '.' : ''}</span></strong> `;
 		if (V.seeRace === 1) {
 			r += `<span class="tan">`;
@@ -18779,7 +18774,7 @@ window.SlaveSummaryUncached = (function(){
 				r += `<strong><span class="red">W++${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`;
 			}
 		} else if (slave.weight <= 130) {
-			if (slave.hips > 2 || V.arcologies[0].FSHedonisticDecadence !== "unset") {
+			if (slave.hips >= 2 || V.arcologies[0].FSHedonisticDecadence !== "unset") {
 				r += `<strong>W+++${V.summaryStats? `[${slave.weight}]` : ''}</strong>`;
 			} else {
 				r += `<strong><span class="red">W+++${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`;
@@ -18828,7 +18823,7 @@ window.SlaveSummaryUncached = (function(){
 				r += `<span class="red">Overweight${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`;
 			}
 		} else if (slave.weight <= 130) {
-			if (slave.hips > 2 || V.arcologies[0].FSHedonisticDecadence !== "unset") {
+			if (slave.hips >= 2 || V.arcologies[0].FSHedonisticDecadence !== "unset") {
 				r += `Pleasantly soft and shapely${V.summaryStats? `[${slave.weight}]`: ''}.`;
 			} else {
 				r += `<span class="red">Fat${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`;
-- 
GitLab