diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw index c09a754684946fb07687651e82ca3f6adeafdd2a..075124d81f5f6c74bc30a23bead9fd1426680109 100644 --- a/src/js/slaveSummaryWidgets.tw +++ b/src/js/slaveSummaryWidgets.tw @@ -229,14 +229,15 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.devotion < -20) { r += `<span class="mediumorchid">Res${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; } else if (slave.devotion <= 20) { - r += `<span class="yellow">Ambiv${V.summaryStats ? `[${slave.devotion$}]` : ''}</span>`; + r += `<span class="yellow">Ambiv${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; } else if (slave.devotion <= 50) { - r += `<span class="hotpink">Accept${V.summaryStats ? `[${slave.devotion$}]` : ''}</span>`; + r += `<span class="hotpink">Accept${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; } else if (slave.devotion <= 95) { - r += `<span class="deeppink">Devo${V.summaryStats ? `[${slave.devotion$}]` : ''}</span>`; + r += `<span class="deeppink">Devo${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; } else { - r += `<span class="magenta">Wor${V.summaryStats ? `[${slave.devotion$}]` : ''}</span>`; + r += `<span class="magenta">Wor${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; } + r += " "; if (slave.fetish === "mindbroken") { return; } else if (slave.trust < -95) { @@ -266,6 +267,7 @@ window.SlaveSummaryUncached = (function(){ r += `<span class="seagreen">VTrust ${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } } + r += " "; } function long_devotion(slave) { @@ -331,6 +333,7 @@ window.SlaveSummaryUncached = (function(){ r += `<strong>LS:Spa</strong>`; break; } + r += " "; if (canTalk(slave)) { switch (slave.speechRules) { case "permissive": @@ -346,6 +349,7 @@ window.SlaveSummaryUncached = (function(){ r += `<strong>SpR:R</strong>`; break; } + r += " "; } switch (slave.relationshipRules) { case "permissive": @@ -358,6 +362,7 @@ window.SlaveSummaryUncached = (function(){ r += `<strong>ReR:R</strong>`; break; } + r += " "; switch (slave.standardPunishment) { case "confinement": r += `<strong>Pun:Conf</strong>`; @@ -372,6 +377,7 @@ window.SlaveSummaryUncached = (function(){ r += `<strong>Pun:Situ</strong>`; break; } + r += " "; switch (slave.standardReward) { case "relaxation": r += `<strong>Rew:Relx</strong>`; @@ -386,6 +392,7 @@ window.SlaveSummaryUncached = (function(){ r += `<strong>Rew:Situ</strong>`; break; } + r += " "; switch (slave.releaseRules) { case "permissive": r += `<strong>MaR:P</strong>`; @@ -400,6 +407,7 @@ window.SlaveSummaryUncached = (function(){ r += `<strong>MaR:R</strong>`; break; } + r += " "; } function long_rules(slave) { @@ -459,6 +467,7 @@ window.SlaveSummaryUncached = (function(){ r += `<strong><span class="red">W++++++${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; } } + r += " "; } function long_weight(slave) { @@ -545,7 +554,7 @@ window.SlaveSummaryUncached = (function(){ r += `<strong>Di:F+</strong>`; break; } - r += `</span>`; + r += `</span> `; r += `<span class="cyan">`; if (slave.dietCum === 2) { r += `<strong>Cum++</strong>`; @@ -558,7 +567,7 @@ window.SlaveSummaryUncached = (function(){ } else if ((slave.dietMilk === 2)) { r += `<strong>Milk++</strong>`; } - r += `</span>`; + r += `</span> `; } function long_diet(slave) { @@ -618,6 +627,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.health > 20) { r += `<strong><span class="green">H${V.summaryStats? `[${slave.health}]` : ''}</span></strong>`; } + r += " "; } function long_health(slave) { @@ -742,14 +752,14 @@ window.SlaveSummaryUncached = (function(){ r += `<strong>Dr:groStim</strong>`; break; } - r += `</span>`; + r += `</span> `; r += `<span class="lightgreen">`; if (slave.curatives === 2) { r += `<strong>Cura</strong>`; } else if (slave.curatives === 1) { r += `<strong>Prev</strong>`; } - r += `</span>`; + r += `</span> `; if (slave.aphrodisiacs !== 0) { r += `<span class="lightblue">`; if (slave.aphrodisiacs === 1) { @@ -759,7 +769,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `<strong>Anaph</strong>`; } - r += `</span>`; + r += `</span> `; } if (slave.addict !== 0) { r += `<span class="cyan">Add</span>`; @@ -774,7 +784,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.hormones < 0) { r += `<strong>Ho:M</strong>`; } - r += `</span>`; + r += `</span> `; r += `<span class="mediumseagreen">`; if ((slave.bellyImplant > -1)) { r += `<strong>Belly Imp</strong>`; @@ -797,7 +807,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.pregKnown === 1) { r += `<strong>${slave.pregWeek} wks preg</strong>`; } - r += `</span>`; + r += `</span> `; if (slave.induce === 1) { r += `<span class="orange"><strong>Early Labor</strong></span>`; } @@ -817,7 +827,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.bellyFluid > 0) { r += `<strong>${slave.bellyFluid}ccs ${slave.inflationType}</strong>`; } - r += `</span>`; + r += `</span> `; } function long_drugs(slave) { @@ -1011,6 +1021,7 @@ window.SlaveSummaryUncached = (function(){ r += `${slave.race.charAt(0).toUpperCase() + slave.race.charAt(1) + slave.race.charAt(2)}`; break; } + r += " "; } function short_nationality(slave) { @@ -1681,7 +1692,7 @@ window.SlaveSummaryUncached = (function(){ r += `${slave.nationality.charAt(0) + slave.nationality.charAt(1) + slave.nationality.charAt(2)}`; break; } - r += `</span>`; + r += `</span> `; } function long_nationality(slave) { @@ -1740,7 +1751,7 @@ window.SlaveSummaryUncached = (function(){ r += `${slave.skin.charAt(0).toUpperCase() + slave.skin.charAt(1) + slave.skin.charAt(2)}`; break; } - r += `</span>`; + r += `</span> `; } function short_genitals(slave) { @@ -1774,7 +1785,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.balls > 3) { r += `Balls`; } - r += `</span>`; + r += `</span> `; } if (slave.vagina === 0) { r += `<span class="lime">VV</span>`; @@ -1798,7 +1809,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.anus > 2) { r += `A+`; } - r += `</span>`; + r += `</span> `; } function long_genitals(slave) { @@ -1882,6 +1893,7 @@ window.SlaveSummaryUncached = (function(){ if (slave.visualAge !== slave.physicalAge) { r += `Lks${slave.visualAge}`; } + r += " "; } function short_face(slave) { @@ -1900,6 +1912,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `<span class="pink">Face+++${V.summaryStats? `[${slave.face}]` : ''}</span>`; } + r += " "; } function short_eyes(slave) { @@ -1908,6 +1921,7 @@ window.SlaveSummaryUncached = (function(){ } else if (((slave.eyes === -1) && (slave.eyewear !== "corrective glasses") && (slave.eyewear !== "corrective contacts"))) { r += `<span class="yellow">Sight-</span>`; } + r += " "; } function short_lips(slave) { @@ -1924,6 +1938,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `<span class="red">Lips-</span>${V.summaryStats? `[${slave.lips}]` : ''}`; } + r += " "; } function short_teeth(slave) { @@ -1938,6 +1953,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.teeth === "pointy") { r += `Fangs`; } + r += " "; } function short_muscles(slave) { @@ -1964,6 +1980,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `<span class="red">Weak++</span>${V.summaryStats? `[${slave.muscles}]`: ''}`; } + r += " "; } function short_limbs(slave) { @@ -1981,6 +1998,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `Amp`; } + r += " "; } if (!canWalk(slave)) { r += `Immob`; @@ -1988,7 +2006,7 @@ window.SlaveSummaryUncached = (function(){ if (slave.heels === 1) { r += `Heel`; } - r += `</span>`; + r += `</span> `; } function short_voice(slave) { @@ -2005,6 +2023,7 @@ window.SlaveSummaryUncached = (function(){ r += `<span class="pink">Acc</span>`; } } + r += " "; } function short_tits_ass(slave) { @@ -2036,7 +2055,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.butt > 4) { r += `Ass`; } - r += `</span>`; + r += `</span> `; } function short_hips(slave) { @@ -2074,7 +2093,7 @@ window.SlaveSummaryUncached = (function(){ r += `Disp-`; } } - r += `</span>`; + r += `</span> `; } function short_waist(slave) { @@ -2093,6 +2112,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `<span class="pink">Wst+++${V.summaryStats? `[${slave.waist}]`: ''}</span>`; } + r += " "; } function short_implants(slave) { @@ -2102,6 +2122,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `Impl`; } + r += " "; } function short_lactation(slave) { @@ -2110,6 +2131,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.lactation === 2) { r += `Lact++`; } + r += " "; } function short_mods(slave) { @@ -2126,7 +2148,7 @@ window.SlaveSummaryUncached = (function(){ if (slave.brand !== 0) { r += `Br`; } - r += `</span>`; + r += `</span> `; } function long_age(slave) { @@ -2485,6 +2507,7 @@ window.SlaveSummaryUncached = (function(){ break; } } + r += " "; } function short_sex_skills(slave) { @@ -2507,8 +2530,9 @@ window.SlaveSummaryUncached = (function(){ r += `S-`; } if (V.summaryStats) { - r += `[${_SSkills}]`; + r += `[${_SSkills}] `; } + r += " "; if (slave.whoreSkill >= 100) { r += `W+++`; } else if (slave.whoreSkill > 60) { @@ -2520,9 +2544,10 @@ window.SlaveSummaryUncached = (function(){ } if (slave.whoreSkill > 10) { if (V.summaryStats) { - r += `[${slave.whoreSkill}]`; + r += `[${slave.whoreSkill}] `; } } + r += " "; if (slave.entertainSkill >= 100) { r += `E+++`; } else if (slave.entertainSkill > 60) { @@ -2534,9 +2559,10 @@ window.SlaveSummaryUncached = (function(){ } if (slave.entertainSkill > 10) { if (V.summaryStats) { - r += `[${slave.entertainSkill}]`; + r += `[${slave.entertainSkill}] `; } } + r += " "; } } @@ -2550,7 +2576,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.prestige === 1) { r += `Prest`; } - r += `</span>`; + r += `</span> `; } } @@ -2754,7 +2780,7 @@ window.SlaveSummaryUncached = (function(){ if (V.summaryStats) { r += `[${slave.fetishStrength}]`; } - r += `</span>`; + r += `</span> `; } function short_attraction(slave) { @@ -2779,6 +2805,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `<span class="green">XY+++${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; } + r += " "; if (slave.attrXX <= 5) { r += `<span class="red">XX---${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; } else if (slave.attrXX <= 15) { @@ -2794,6 +2821,7 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.attrXY <= 95) { r += `<span class="green">XX+++${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; } + r += " "; if (slave.energy > 95) { if ((slave.attrXY <= 95) || (slave.attrXX <= 95)) { r += `<span class="green">Nympho!</span>`; @@ -2809,6 +2837,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `<span class="red">SD--${V.summaryStats? `[${slave.energy}]`: ''}</span>`; } + r += " "; } function short_smart_fetish(slave) { @@ -2888,6 +2917,7 @@ window.SlaveSummaryUncached = (function(){ break; } } + r += " "; } function short_smart_attraction(slave) { @@ -2928,6 +2958,7 @@ window.SlaveSummaryUncached = (function(){ r += `SP:anti-men`; } } + r += " "; } function short_behavior_flaw(slave) { @@ -2964,7 +2995,7 @@ window.SlaveSummaryUncached = (function(){ slave.behavioralFlaw = "none"; break; } - r += `</span>`; + r += `</span> `; } function short_sex_flaw(slave) { @@ -3027,6 +3058,7 @@ window.SlaveSummaryUncached = (function(){ slave.sexualFlaw = "none"; break; } + r += " "; } function short_behavior_quirk(slave) { @@ -3063,6 +3095,7 @@ window.SlaveSummaryUncached = (function(){ slave.behavioralQuirk = "none"; break; } + r += " "; } function short_sex_quirk(slave) { @@ -3098,7 +3131,7 @@ window.SlaveSummaryUncached = (function(){ slave.sexualQuirk = "none"; break; } - r += `</span>`; + r += `</span> `; } function long_fetish(slave) { @@ -3536,15 +3569,17 @@ window.SlaveSummaryUncached = (function(){ _relationshipHandled = 1; } } + r += " "; } else if (slave.mother === -1) { r += `Your daughter`; if (slave.relationship === -3) { - r += `& wife`; + r += ` & wife`; _relationshipHandled = 1; } else if (slave.relationship === -2) { - r += `& lover`; + r += ` & lover`; _relationshipHandled = 1; } + r += " "; } if (slave.father > 0 && slave.father !== slave.mother) { let _ssj = V.slaves.findIndex(function(s) { @@ -3567,13 +3602,14 @@ window.SlaveSummaryUncached = (function(){ _relationshipHandled = 1; } } + r += " "; } else if (slave.father === -1 && slave.mother !== -1) { r += `Your daughter`; if (slave.relationship === -3) { - r += `& wife`; + r += ` & wife`; _relationshipHandled = 1; } else if (slave.relationship === -2) { - r += `& lover`; + r += ` & lover`; _relationshipHandled = 1; } } @@ -3598,6 +3634,7 @@ window.SlaveSummaryUncached = (function(){ _relationshipHandled = 1; } } + r += " "; _ssj = V.slaves.findIndex(function(s) { return s.father === slave.ID; }); @@ -3618,8 +3655,9 @@ window.SlaveSummaryUncached = (function(){ _relationshipHandled = 1; } } + r += " "; } else if (slave.daughters > 1) { - r += `multiple daughters`; + r += `multiple daughters `; } if (slave.sisters === 1) { let _ssj = V.slaves.findIndex(function(s) { @@ -3642,8 +3680,9 @@ window.SlaveSummaryUncached = (function(){ _relationshipHandled = 1; } } + r += " "; } else if (slave.sisters > 1) { - r += `multiple sisters`; + r += `multiple sisters `; } if (slave.relationship > 0 && _relationshipHandled !== 1) { let _ssj = V.slaves.findIndex(function(s) { @@ -3653,19 +3692,19 @@ window.SlaveSummaryUncached = (function(){ r += `${SlaveFullName(V.slaves[_ssj])}'s`; switch (slave.relationship) { case 1: - r += `friend`; + r += ` friend`; break; case 2: - r += `BFF`; + r += ` BFF`; break; case 3: - r += `FWB`; + r += ` FWB`; break; case 4: - r += `lover`; + r += ` lover`; break; case 5: - r += `wife`; + r += ` wife`; break; } } @@ -3676,72 +3715,73 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.relationship === -1) { r += `E Slut`; } + r += " "; } function short_legacy_family(slave) { if (slave.relation !== 0) { - let _ssj = V.slaves.findIndex(function(s) { - return s.ID === slave.relationTarget; - }); - if (_ssj !== -1) { - r += `${SlaveFullName(V.slaves[_ssj])}'s ${slave.relation}`; - } + let _ssj = V.slaves.findIndex(function(s) { + return s.ID === slave.relationTarget; + }); + if (_ssj !== -1) { + r += `${SlaveFullName(V.slaves[_ssj])}'s ${slave.relation}`; } - if (slave.relationship > 0) { - let _ssj = V.slaves.findIndex(function(s) { - return s.ID === slave.relationshipTarget; - }); - if (_ssj !== -1) { - switch (slave.relationship) { - case 1: - if (slave.relationshipTarget !== slave.relationTarget) { - r += `${SlaveFullName(V.slaves[_ssj])}'s`; - } else { - r += `&`; - } - r += `friend`; - break; - case 2: - if (slave.relationshipTarget !== slave.relationTarget) { - r += `${SlaveFullName(V.slaves[_ssj])}'s`; - } else { - r += `&`; - } - r += `BFF`; - break; - case 3: - if (slave.relationshipTarget !== slave.relationTarget) { - r += `${SlaveFullName(V.slaves[_ssj])}'s`; - } else { - r += `&`; - } - r += `FWB`; - break; - case 4: - if (slave.relationshipTarget !== slave.relationTarget) { - r += `${SlaveFullName(V.slaves[_ssj])}'s`; - } else { - r += `&`; - } - r += `lover`; - break; - case 5: - if (slave.relationshipTarget !== slave.relationTarget) { - r += `${SlaveFullName(V.slaves[_ssj])}'s`; - } else { - r += `&`; - } - r += `wife`; - break; - } + } + if (slave.relationship > 0) { + let _ssj = V.slaves.findIndex(function(s) { + return s.ID === slave.relationshipTarget; + }); + if (_ssj !== -1) { + switch (slave.relationship) { + case 1: + if (slave.relationshipTarget !== slave.relationTarget) { + r += `${SlaveFullName(V.slaves[_ssj])}'s`; + } else { + r += ` &`; + } + r += ` friend`; + break; + case 2: + if (slave.relationshipTarget !== slave.relationTarget) { + r += `${SlaveFullName(V.slaves[_ssj])}'s`; + } else { + r += ` &`; + } + r += ` BFF`; + break; + case 3: + if (slave.relationshipTarget !== slave.relationTarget) { + r += `${SlaveFullName(V.slaves[_ssj])}'s`; + } else { + r += ` &`; + } + r += ` FWB`; + break; + case 4: + if (slave.relationshipTarget !== slave.relationTarget) { + r += `${SlaveFullName(V.slaves[_ssj])}'s`; + } else { + r += ` &`; + } + r += ` lover`; + break; + case 5: + if (slave.relationshipTarget !== slave.relationTarget) { + r += `${SlaveFullName(V.slaves[_ssj])}'s`; + } else { + r += ` &`; + } + r += ` wife`; + break; } - } else if (slave.relationship === -3) { - r += `Your wife`; - } else if (slave.relationship === -2) { - r += `E Bonded`; - } else if (slave.relationship === -1) { - r += `E Slut`; } + } else if (slave.relationship === -3) { + r += `Your wife`; + } else if (slave.relationship === -2) { + r += `E Bonded`; + } else if (slave.relationship === -1) { + r += `E Slut`; + } } function short_rival(slave) { @@ -3759,7 +3799,7 @@ window.SlaveSummaryUncached = (function(){ } else { r += `Hates ${SlaveFullName(V.slaves[_ssj])}`; } - r += `</span>`; + r += `</span> `; } } }