diff --git a/src/js/fresult.tw b/src/js/fresult.tw index b4331c67577e524e631f757f325eb143abbfc8a4..1001cf910ea79a8e32a2ff4181add2bcde4de545 100644 --- a/src/js/fresult.tw +++ b/src/js/fresult.tw @@ -60,23 +60,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); } } @@ -194,11 +194,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.every(race => slave.race !== race)) V.racialVarieties.push(slave.race); } diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw index 613d7875a32d1569f1ce044f0556b07ebf3b9d03..14b93c45edd721748ce3b3a6855f4d23218eeea0 100644 --- a/src/js/slaveSummaryWidgets.tw +++ b/src/js/slaveSummaryWidgets.tw @@ -60,9 +60,8 @@ window.SlaveSummaryUncached = (function(){ r += ` `; } 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">`;