summary fixes

src/js/slaveSummaryWidgets.tw

@@ -22,10 +22,12 @@ window.SlaveSummary = function SlaveSummary(slave) {
 window.SlaveSummaryUncached = (function(){
 	"use strict";
 	let V, r;
+	var _relationshipHandled;
 	
 	function SlaveSummaryUncached(slave) {
 		V = State.variables;
 		r = "";
+		_relationshipHandled = 0;
 		if (V.abbreviateDevotion === 1)
 			short_devotion(slave);
 		else if (V.abbreviateDevotion === 2)
@@ -199,7 +201,7 @@ window.SlaveSummaryUncached = (function(){
 			if (V.abbreviateClothes === 2) {
 				r += `    `;
 				if (slave.choosesOwnClothes === 1)
-					r += `Dressing herself.`;
+					r += `Dressing herself. `;
 				long_clothes(slave);
 				long_collar(slave);
 				long_belly(slave);
@@ -1797,17 +1799,17 @@ window.SlaveSummaryUncached = (function(){
 		}
 		r += `<span class="pink">`;
 		if ((slave.vagina > 3) && (slave.anus > 3)) {
-			r += `V++A++`;
+			r += ` V++A++`;
 		} else if ((slave.vagina > 2) && (slave.anus > 2)) {
-			r += `V+A+`;
+			r += ` V+A+`;
 		} else if (slave.vagina > 3) {
-			r += `V++`;
+			r += ` V++`;
 		} else if (slave.vagina > 2) {
-			r += `V+`;
+			r += ` V+`;
 		} else if (slave.anus > 3) {
-			r += `A++`;
+			r += ` A++`;
 		} else if (slave.anus > 2) {
-			r += `A+`;
+			r += ` A+`;
 		}
 		r += `</span> `;
 	}
@@ -2562,8 +2564,8 @@ window.SlaveSummaryUncached = (function(){
 					r += `[${slave.entertainSkill}] `;
 				}
 			}
-			r += " ";
 		}
+		r += " ";
 	}
 	
 	function short_prestige(slave) {
@@ -3227,40 +3229,40 @@ window.SlaveSummaryUncached = (function(){
 	
 	function long_attraction(slave) {
 		if (slave.attrXY <= 5) {
-			r += `<span class="red">Disgusted by men${V.summaryStats? `[${slave.attrXY}]` : ''},</span>`;
+			r += `<span class="red">Disgusted by men${V.summaryStats? `[${slave.attrXY}]` : ''},</span> `;
 		} else if (slave.attrXY <= 15) {
-			r += `<span class="red">Turned off by men${V.summaryStats? `[${slave.attrXY}]` : ''},</span>`;
+			r += `<span class="red">Turned off by men${V.summaryStats? `[${slave.attrXY}]` : ''},</span> `;
 		} else if (slave.attrXY <= 35) {
-			r += `<span class="red">Not attracted to men${V.summaryStats? `[${slave.attrXY}]` : ''},</span>`;
+			r += `<span class="red">Not attracted to men${V.summaryStats? `[${slave.attrXY}]` : ''},</span> `;
 		} else if (slave.attrXY <= 65) {
-			r += `Indifferent to men${V.summaryStats? `[${slave.attrXY}]` : ''},`;
+			r += `Indifferent to men${V.summaryStats? `[${slave.attrXY}]` : ''}, `;
 		} else if (slave.attrXY <= 85) {
-			r += `<span class="green">Attracted to men${V.summaryStats? `[${slave.attrXY}]` : ''},</span>`;
+			r += `<span class="green">Attracted to men${V.summaryStats? `[${slave.attrXY}]` : ''},</span> `;
 		} else if (slave.attrXY <= 95) {
-			r += `<span class="green">Aroused by men${V.summaryStats? `[${slave.attrXY}]` : ''},</span>`;
+			r += `<span class="green">Aroused by men${V.summaryStats? `[${slave.attrXY}]` : ''},</span> `;
 		} else if (slave.attrXX > 95) {
 			if (slave.energy <= 95) {
-				r += `<span class="green">Omnisexual!</span>`;
+				r += `<span class="green">Omnisexual!</span> `;
 			} else {
-				r += `<span class="green">Omnisexual nymphomaniac!</span>`;
+				r += `<span class="green">Omnisexual nymphomaniac!</span> `;
 			}
 		} else {
-			r += `<span class="green">Passionate about men${V.summaryStats? `[${slave.attrXY}]` : ''},</span>`;
+			r += `<span class="green">Passionate about men${V.summaryStats? `[${slave.attrXY}]` : ''},</span> `;
 		}
 		if (slave.attrXX <= 5) {
-			r += `<span class="red">disgusted by women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span>`;
+			r += `<span class="red">disgusted by women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span> `;
 		} else if (slave.attrXX <= 15) {
-			r += `<span class="red">turned off by women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span>`;
+			r += `<span class="red">turned off by women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span> `;
 		} else if (slave.attrXX <= 35) {
-			r += `<span class="red">not attracted to women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span>`;
+			r += `<span class="red">not attracted to women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span> `;
 		} else if (slave.attrXX <= 65) {
 			r += `indifferent to women${V.summaryStats? `[${slave.attrXX}]` : ''}. `;
 		} else if (slave.attrXX <= 85) {
-			r += `<span class="green">attracted to women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span>`;
+			r += `<span class="green">attracted to women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span> `;
 		} else if (slave.attrXX <= 95) {
-			r += `<span class="green">aroused by women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span>`;
+			r += `<span class="green">aroused by women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span> `;
 		} else if (slave.attrXY <= 95) {
-			r += `<span class="green">passionate about women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span>`;
+			r += `<span class="green">passionate about women${V.summaryStats? `[${slave.attrXX}]` : ''}.</span> `;
 		}
 		if (slave.energy > 95) {
 			if ((slave.attrXY <= 95) || (slave.attrXX <= 95)) {
@@ -3828,7 +3830,7 @@ window.SlaveSummaryUncached = (function(){
 				r += `.</span> `;
 			}
 		} else if (slave.mother === -1) {
-			r += `Your`;
+			r += `Your `;
 			if (slave.relationship === -3) {
 				r += `<span class="lightgreen">daughter and wife.</span> `;
 				_relationshipHandled = 1;
@@ -3862,7 +3864,7 @@ window.SlaveSummaryUncached = (function(){
 				r += `.</span> `;
 			}
 		} else if (slave.father === -1 && slave.father !== slave.mother) {
-			r += `Your`;
+			r += `Your `;
 			if (slave.relationship === -3) {
 				r += `<span class="lightgreen">daughter and wife.</span> `;
 				_relationshipHandled = 1;
@@ -3961,7 +3963,7 @@ window.SlaveSummaryUncached = (function(){
 				return s.ID === slave.relationshipTarget;
 			});
 			if (_ssj !== -1) {
-				r += `${SlaveFullName(V.slaves[_ssj])}'s`;
+				r += `${SlaveFullName(V.slaves[_ssj])}'s `;
 				switch (slave.relationship) {
 					case 1:
 						r += `<span class="lightgreen">friend.</span> `;
@@ -3995,7 +3997,7 @@ window.SlaveSummaryUncached = (function(){
 				return s.ID === slave.relationTarget;
 			});
 			if (_ssj !== -1) {
-				r += `${SlaveFullName(V.slaves[_ssj])}'s`;
+				r += `${SlaveFullName(V.slaves[_ssj])}'s `;
 				if (slave.relationshipTarget !== slave.relationTarget) {
 					r += `<span class="lightgreen">${slave.relation}</span>. `;
 				} else {