From ea3822bc2c025deab6b02caf6aec8d13ff49bf15 Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Thu, 25 Apr 2019 23:17:55 -0400 Subject: [PATCH] Added quotation marks to selectors, updated sanityCheck --- sanityCheck.sh | 6 +- src/SpecialForce/Firebase.tw | 2 +- src/SpecialForce/SpecialForce.js | 28 +- src/endWeek/minorInjuryResponse.js | 16 +- src/endWeek/saChoosesOwnClothes.js | 4 +- src/endWeek/saRest.js | 54 +-- src/endWeek/saServant.js | 60 +-- src/endWeek/saServeThePublic.js | 114 ++--- src/endWeek/saStayConfined.js | 18 +- src/endWeek/saWhore.js | 118 ++--- src/endWeek/saWorkAGloryHole.js | 44 +- src/endWeek/saWorkTheFarm.js | 80 ++-- src/interaction/main/mainLinks.js | 56 +-- src/js/DefaultRules.js | 4 +- src/js/assayJS.js | 12 +- src/js/descriptionWidgets.js | 24 +- src/js/economyJS.js | 18 +- src/js/futureSocietyJS.js | 2 +- src/js/pregJS.js | 8 +- src/js/rulesAutosurgery.js | 2 +- src/js/slaveGenerationJS.js | 6 +- src/js/slaveSummaryWidgets.js | 673 +++++++++++++++-------------- src/js/utilJS.js | 92 ++-- src/js/vignettes.js | 2 +- 24 files changed, 723 insertions(+), 720 deletions(-) diff --git a/sanityCheck.sh b/sanityCheck.sh index 70019b29d5c..35da8a7b18d 100755 --- a/sanityCheck.sh +++ b/sanityCheck.sh @@ -131,8 +131,10 @@ $GREP -e ".\=.\/\*\*" --or -e "slave\s\*\/" -- src/*.js --exclude 'src/interacti #$GREP "\S\*\/" -- src/* --exclude 'src/001-lib/jquery/Jquery.js' | myprint "MissingWhitespace" disabled until I can figure out to exclude files # Check for var instead of let or const #$GREP "var\s" -- src/*.js | myprint "UseLetOrConst" disabled until I can figure out how to exclude certain files -#Check for non lethal or non-lethal instead of nonlethal -$GREP "[Nn]on.lethal" -- 'src/*' | myprint "ShouldBeNonlethal" +# Check for non lethal or non-lethal instead of nonlethal +$GREP -i "non.lethal" -- 'src/*' | myprint "ShouldBeNonlethal" +# Check for missing quotation marks around selectors +$GREP "span class=[^\"]" -- src/*.js | myprint "MissingQuotes" # Check that we do not have any variables that we use only once. e.g. $onlyUsedOnce # Ignore *Nationalities diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw index fc68eb2a0dd..59406c612b0 100644 --- a/src/SpecialForce/Firebase.tw +++ b/src/SpecialForce/Firebase.tw @@ -159,7 +159,7 @@ <</if>> <<if _T1 && _LB> 0>> <br><br>''Launch Bay:'' <<if $SF.Squad.Satellite.lv > 0>> <<= UnitText('sat')>> - <<if $SF.Squad.Satellite.InOrbit < 1>> <br> [[Launch it into geostationary orbit.|Firebase][$SF.Squad.Satellite.InOrbit=1]] //You <span class='red'>cannot</span> upgrade the satellite once it has been launched.// <</if>> + <<if $SF.Squad.Satellite.InOrbit < 1>> <br> [[Launch it into geostationary orbit.|Firebase][$SF.Squad.Satellite.InOrbit=1]] //You <span class="red">cannot</span> upgrade the satellite once it has been launched.// <</if>> <</if>> <<= UnitText('GR')>> <<= UnitText('ms')>> <</if>> diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js index fad7cbf6908..5d9e19acccc 100644 --- a/src/SpecialForce/SpecialForce.js +++ b/src/SpecialForce/SpecialForce.js @@ -642,22 +642,22 @@ window.SFReport = function() { r += `<br>A ${V.SF.UC.Assign < 2 ? 'small':'large'} portion of the force was assigned as ${V.SF.UC.Assign < 2 ? 'part':'full'} time undercover officers.`; } if (deaths > 0) { - r += ` <span class='red'>${deaths} soldiers fatally overdosed on the drug cocktail</span>`; + r += ` <span class="red">${deaths} soldiers fatally overdosed on the drug cocktail</span>`; if (V.SF.MercCon.CanAttend === -1) r += `, The Colonel's much heavier than average drug use saves her from this side effect.`; } - r += `<br>These activities have, overall, <span class='green'>improved your arcology's prosperity</span>.`; + r += `<br>These activities have, overall, <span class="green">improved your arcology's prosperity</span>.`; r += ` The goods procured by ${V.SF.Lower} after accounting for the spoils retained by individual soldiers were `; if (profit > 0) { - r += `<span class='green'>more than sufficient to cover expenses.</span> Excess material and human assets totaling <span class='yellowgreen'>${cashFormat(income)}</span> (after liquidation) were transferred to your accounts.`; - if (V.economy < 100) r += ` The rapidly degrading global economy has one upside,<span class='green'> ${V.SF.Caps} was able to more easily use more 'persuasive' techniques thus leading to an increase in profit</span>.`; + r += `<span class="green">more than sufficient to cover expenses.</span> Excess material and human assets totaling <span class="yellowgreen">${cashFormat(income)}</span> (after liquidation) were transferred to your accounts.`; + if (V.economy < 100) r += ` The rapidly degrading global economy has one upside,<span class="green"> ${V.SF.Caps} was able to more easily use more 'persuasive' techniques thus leading to an increase in profit</span>.`; } else { - r += `<span class='red'>barely enough to cover expenses.</span> More growth will be needed to ensure profitability, <span class='yellow'>hopefully purchasing more upgrades will help</span>.`; - r += ` Per the estimates that ${SFC()} provides, an additional <span class='yellowgreen'>${cashFormat(target-income)}</span> is required for sufficient cover.`; + r += `<span class="red">barely enough to cover expenses.</span> More growth will be needed to ensure profitability, <span class="yellow">hopefully purchasing more upgrades will help</span>.`; + r += ` Per the estimates that ${SFC()} provides, an additional <span class="yellowgreen">${cashFormat(target-income)}</span> is required for sufficient cover.`; } - r += ` ${V.SF.Caps} managed to recruit ${FNG} new soldiers this week, and your reputation has <span class='green'>increased through the improvement of trade security</span>.`; + r += ` ${V.SF.Caps} managed to recruit ${FNG} new soldiers this week, and your reputation has <span class="green">increased through the improvement of trade security</span>.`; r += `<br>//Your instructions to ${SFC()}://`; r += `<br> Deployment focus: `; // The below lines are indented to increase readability. @@ -885,23 +885,23 @@ window.Interactions = function() { if (V.choice === 1) { choice += `${V.SF.Caps} is turning over spare capital in tribute this week. `; if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) { - choice += `"I think I can find <span class='yellowgreen'>${cashFormat(Math.ceil(V.CashGift))}</span> for you, boss."`; + choice += `"I think I can find <span class="yellowgreen">${cashFormat(Math.ceil(V.CashGift))}</span> for you, boss."`; } else { - choice += `"We can spare <span class='yellowgreen'>${cashFormat(Math.ceil(V.CashGift))}</span> in tribute this week, boss".`; + choice += `"We can spare <span class="yellowgreen">${cashFormat(Math.ceil(V.CashGift))}</span> in tribute this week, boss".`; } } else if (V.choice === 2) { choice += `${V.SF.Caps} will be throwing a military parade this week. `; if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) { - choice += `"I expect the <span class='green'>public to enjoy</span> the parade, boss."`; + choice += `"I expect the <span class="green">public to enjoy</span> the parade, boss."`; } else { - choice += `"I'll have plans for an <span class='green'>popular parade</span> on your desk, boss".`; + choice += `"I'll have plans for an <span class="green">popular parade</span> on your desk, boss".`; } } else if (V.choice === 3) { choice += `${V.SF.Caps} will be conducting corporate sabotage on rival arcologies' businesses. `; if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) { - choice += `"Our interests should see a <span class='yellowgreen'>big boost,</span> boss."`; + choice += `"Our interests should see a <span class="yellowgreen">big boost,</span> boss."`; } else { - choice += `"Your <span class='yellowgreen'>arcology's business prospects should see an improvement</span> this week, boss".`; + choice += `"Your <span class="yellowgreen">arcology's business prospects should see an improvement</span> this week, boss".`; } } } @@ -1609,7 +1609,7 @@ window.UnitText = function(input) { } V.Cash -= cost; V.SF.FS.Upgrade = 1; - <</link>> //costs <span class='yellowgreen'>${cashFormat($Cost)},</span> `; + <</link>> //costs <span class="yellowgreen">${cashFormat($Cost)},</span> `; if (ArraryName !== 'ColonelGift') { text += `increases`; } else { text += `reduces`; } text += ` The Colonel's annoyance by 15%`; if (ArraryName !== 'ColonelGift') { text += ` and will increase the acceptance of this FS by `; diff --git a/src/endWeek/minorInjuryResponse.js b/src/endWeek/minorInjuryResponse.js index b4e27481cd6..49416c41d34 100644 --- a/src/endWeek/minorInjuryResponse.js +++ b/src/endWeek/minorInjuryResponse.js @@ -15,30 +15,30 @@ window.minorInjuryResponse = function minorInjuryResponse(slave) { r += ` ${He} carries on, knowing that in your degradationist arcology, this is accepted behavior.`; } else if (arcology.FSPaternalist > 20) { if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) { - r += ` The security drones successfully detain him and oblige him to pay significant <span class=yellowgreen>compensation,</span> since abusing slaves is discouraged here.`; + r += ` The security drones successfully detain him and oblige him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`; cashX(50, "slaveUpkeep", slave); } else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) { - r += ` The computer systems successfully detain him and require him to pay significant <span class=yellowgreen>compensation,</span> since abusing slaves is discouraged here.`; + r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`; cashX(50, "slaveUpkeep", slave); } else if (slave.skill.whoring > jsRandom(1, 100)) { - r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class=yellowgreen>compensation,</span> since abusing slaves is discouraged here.`; + r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`; cashX(50, "slaveUpkeep", slave); } else if (slave.skill.combat > 0) { - r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class=yellowgreen>compensation,</span> since abusing slaves is discouraged here.`; + r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`; cashX(50, "slaveUpkeep", slave); } } else { if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) { - r += ` The security drones successfully detain him and oblige him to pay minor <span class=yellowgreen>compensation.</span>`; + r += ` The security drones successfully detain him and oblige him to pay minor <span class="yellowgreen">compensation.</span>`; cashX(10, "slaveUpkeep", slave); } else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) { - r += ` The computer systems successfully detain him and require him to pay minor <span class=yellowgreen>compensation.</span>`; + r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`; cashX(10, "slaveUpkeep", slave); } else if (slave.skill.whoring > jsRandom(1, 100)) { - r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class=yellowgreen>compensation.</span>`; + r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`; cashX(10, "slaveUpkeep", slave); } else if (slave.skill.combat > 0) { - r += ` ${slave.slaveName} can take care of ${himself}, and $he successfully forces him to pay minor <span class=yellowgreen>compensation.</span>`; + r += ` ${slave.slaveName} can take care of ${himself}, and $he successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`; cashX(10, "slaveUpkeep", slave); } } diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js index 1e9a6be0552..6411730f5ac 100644 --- a/src/endWeek/saChoosesOwnClothes.js +++ b/src/endWeek/saChoosesOwnClothes.js @@ -55,7 +55,7 @@ window.saChoosesOwnClothes = (function() { r += `${shoeChoice.text} `; slave.shoes = shoeChoice.shoes; } - r += `<span class=mediumorchid>increasing ${his} independence.</span>`; + r += `<span class="mediumorchid">increasing ${his} independence.</span>`; slave.devotion -= 5; } else { const neckChoice = todaysCollar(slave); @@ -64,7 +64,7 @@ window.saChoosesOwnClothes = (function() { slave.collar = neckChoice.collar; slave.bellyAccessory = corsetChoice.bellyAccessory; slave.clothes = clothingChoice.clothes; - r += `${He} <span class=hotpink>loves</span> being able to dress ${himself}, ${neckChoice.text} ${corsetChoice.text} ${clothingChoice.text} `; + r += `${He} <span class="hotpink">loves</span> being able to dress ${himself}, ${neckChoice.text} ${corsetChoice.text} ${clothingChoice.text} `; slave.devotion += 1; if (V.arcologies[0].FSRestart !== "unset" && slave.choosesOwnChastity === 1) { diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js index fad01c69f3c..009befc9e6b 100644 --- a/src/endWeek/saRest.js +++ b/src/endWeek/saRest.js @@ -31,13 +31,13 @@ window.saRest = function saRest(slave) { if (slave.health > 90) { t += ` ${His} health is so outstanding that rest does not improve it.`; } else if (slave.health > -100) { - t += ` ${His} <span class='green'>health recovers</span> with rest.`; + t += ` ${His} <span class="green">health recovers</span> with rest.`; slave.health += 10; if (!(canHear(slave))) { - t += ` Since ${he} is deaf, the hustle and bustle of daily life in the penthouse <span class='green'>didn't bother ${him} at all.</span>`; + t += ` Since ${he} is deaf, the hustle and bustle of daily life in the penthouse <span class="green">didn't bother ${him} at all.</span>`; slave.health += 3; } else if ((slave.hears === -1 && slave.earwear !== "hearing aids") || (slave.hears === 0 && slave.earwear === "muffling ear plugs")) { - t += ` Since ${he} is hard of hearing, the hustle and bustle of daily life in the penthouse <span class='green'>didn't disturb ${his} rest as much.</span>`; + t += ` Since ${he} is hard of hearing, the hustle and bustle of daily life in the penthouse <span class="green">didn't disturb ${his} rest as much.</span>`; slave.health += 1; } } @@ -45,18 +45,18 @@ window.saRest = function saRest(slave) { if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") { if (slave.devotion > 20) { if (slave.trust <= 20) { - t += ` Being allowed to rest <span class='mediumaquamarine'>reduces ${his} fear</span> of you.`; + t += ` Being allowed to rest <span class="mediumaquamarine">reduces ${his} fear</span> of you.`; slave.trust += 4; } else if (slave.trust <= 50) { - t += ` Being allowed to rest <span class='mediumaquamarine'>builds ${his} trust</span> in you.`; + t += ` Being allowed to rest <span class="mediumaquamarine">builds ${his} trust</span> in you.`; slave.trust += 2; } else { - t += ` Being allowed to rest <span class='mediumaquamarine'>confirms ${his} trust</span> in you.`; + t += ` Being allowed to rest <span class="mediumaquamarine">confirms ${his} trust</span> in you.`; slave.trust += 2; } } else { if (slave.trust < -20) { - t += ` Being allowed to rest <span class='mediumaquamarine'>reduces ${his} fear</span> of you.`; + t += ` Being allowed to rest <span class="mediumaquamarine">reduces ${his} fear</span> of you.`; slave.trust += 4; } } @@ -67,9 +67,9 @@ window.saRest = function saRest(slave) { t += ` __This week__ ${_vignette.text} `; if (_vignette.type === "cash") { if (_vignette.effect > 0) { - t += `<span class='yellowgreen'>making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`; + t += `<span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`; } else if (_vignette.effect < 0) { - t += `<span class='red'>losing you ${cashFormat(Math.abs(Math.trunc(V.FResult*_vignette.effect)))}.</span>`; + t += `<span class="red">losing you ${cashFormat(Math.abs(Math.trunc(V.FResult*_vignette.effect)))}.</span>`; } else { t += `an incident without lasting effect.`; } @@ -77,23 +77,23 @@ window.saRest = function saRest(slave) { } else if (_vignette.type === "devotion") { if (_vignette.effect > 0) { if (slave.devotion > 50) { - t += `<span class='hotpink'>increasing ${his} devotion to you.</span>`; + t += `<span class="hotpink">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class='hotpink'>increasing ${his} acceptance of you.</span>`; + t += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class='hotpink'>reducing ${his} dislike of you.</span>`; + t += `<span class="hotpink">reducing ${his} dislike of you.</span>`; } else { - t += `<span class='hotpink'>reducing ${his} hatred of you.</span>`; + t += `<span class="hotpink">reducing ${his} hatred of you.</span>`; } } else if (_vignette.effect < 0) { if (slave.devotion > 50) { - t += `<span class='mediumorchid'>reducing ${his} devotion to you.</span>`; + t += `<span class="mediumorchid">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class='mediumorchid'>reducing ${his} acceptance of you.</span>`; + t += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class='mediumorchid'>increasing ${his} dislike of you.</span>`; + t += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; } else { - t += `<span class='mediumorchid'>increasing ${his} hatred of you.</span>`; + t += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; } } else { t += `an incident without lasting effect.`; @@ -102,19 +102,19 @@ window.saRest = function saRest(slave) { } else if (_vignette.type === "trust") { if (_vignette.effect > 0) { if (slave.trust > 20) { - t += `<span class='mediumaquamarine'>increasing ${his} trust in you.</span>`; + t += `<span class="mediumaquamarine">increasing ${his} trust in you.</span>`; } else if (slave.trust > -10) { - t += `<span class='mediumaquamarine'>reducing ${his} fear of you.</span>`; + t += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; } else { - t += `<span class='mediumaquamarine'>reducing ${his} terror of you.</span>`; + t += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; } } else if (_vignette.effect < 0) { if (slave.trust > 20) { - t += `<span class='gold'>reducing ${his} trust in you.</span>`; + t += `<span class="gold">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - t += `<span class='gold'>increasing ${his} fear of you.</span>`; + t += `<span class="gold">increasing ${his} fear of you.</span>`; } else { - t += `<span class='gold'>increasing ${his} terror of you.</span>`; + t += `<span class="gold">increasing ${his} terror of you.</span>`; } } else { t += `an incident without lasting effect.`; @@ -122,18 +122,18 @@ window.saRest = function saRest(slave) { slave.trust += (1 * _vignette.effect); } else if (_vignette.type === "health") { if (_vignette.effect > 0) { - t += `<span class='green'>improving ${his} health.</span>`; + t += `<span class="green">improving ${his} health.</span>`; } else if (_vignette.effect < 0) { - t += `<span class='red'>affecting ${his} health.</span>`; + t += `<span class="red">affecting ${his} health.</span>`; } else { t += `an incident without lasting effect.`; } slave.health += (2 * _vignette.effect); } else { if (_vignette.effect > 0) { - t += `<span class='green'>gaining you a bit of reputation.</span>`; + t += `<span class="green">gaining you a bit of reputation.</span>`; } else if (_vignette.effect < 0) { - t += `<span class='red'>losing you a bit of reputation.</span>`; + t += `<span class="red">losing you a bit of reputation.</span>`; } else { t += `an incident without lasting effect.`; } diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js index f44e150408f..4e4c53ba764 100644 --- a/src/endWeek/saServant.js +++ b/src/endWeek/saServant.js @@ -27,14 +27,14 @@ window.saServant = function saServant(slave) { if (V.Stewardess !== 0) { t += ` This brings ${him} under ${V.Stewardess.slaveName}'s supervision. The Stewardess `; if (slave.devotion < -20) { - t += `subjects ${him} to <span class='gold'>corrective rape</span> when ${his} service is imperfect, <span class='hotpink'>when ${he} steps out of line,</span> or when the Stewardess just feels like raping ${him}, forcing the poor slave to <span class='yellowgreen'>find refuge in work.</span>`; + t += `subjects ${him} to <span class="gold">corrective rape</span> when ${his} service is imperfect, <span class="hotpink">when ${he} steps out of line,</span> or when the Stewardess just feels like raping ${him}, forcing the poor slave to <span class="yellowgreen">find refuge in work.</span>`; slave.devotion += 2; slave.trust -= 2; } else if (slave.devotion <= 20) { - t += `molests ${him}, encouraging the poor slave to <span class='hotpink'>keep ${his} head down</span> and <span class='yellowgreen'>work harder.</span>`; + t += `molests ${him}, encouraging the poor slave to <span class="hotpink">keep ${his} head down</span> and <span class="yellowgreen">work harder.</span>`; slave.devotion += 2; } else { - t += `uses <span class='hotpink'>sex as a reward,</span> getting ${him} off when ${he} <span class='yellowgreen'>works harder.</span>`; + t += `uses <span class="hotpink">sex as a reward,</span> getting ${him} off when ${he} <span class="yellowgreen">works harder.</span>`; slave.devotion++; } if (!(canHear(slave))) { @@ -52,21 +52,21 @@ window.saServant = function saServant(slave) { t += ` ${He} is `; if (slave.trust < -20) { - t += "frightened of punishment and works very hard, <span class='yellowgreen'>reducing the upkeep</span> of your slaves."; + t += "frightened of punishment and works very hard, <span class="yellowgreen">reducing the upkeep</span> of your slaves."; } else if (slave.devotion < -20) { if (slave.trust >= 20) { - t += `uninterested in doing such work and barely lifts a finger to <span class='yellowgreen'>reduce the upkeep</span> of your slaves.`; + t += `uninterested in doing such work and barely lifts a finger to <span class="yellowgreen">reduce the upkeep</span> of your slaves.`; } else { - t += `reluctant, requiring your other slaves to force ${his} services, and does not <span class='yellowgreen'>reduce upkeep</span> of your slaves much.`; + t += `reluctant, requiring your other slaves to force ${his} services, and does not <span class="yellowgreen">reduce upkeep</span> of your slaves much.`; } } else if (slave.devotion <= 20) { - t += `hesitant, requiring your other slaves to demand ${his} services, and only slightly <span class='yellowgreen'>reduces upkeep</span> of your slaves.`; + t += `hesitant, requiring your other slaves to demand ${his} services, and only slightly <span class="yellowgreen">reduces upkeep</span> of your slaves.`; } else if (slave.devotion <= 50) { - t += `obedient, offering your other slaves ${his} services, and moderately <span class='yellowgreen'>reduces the upkeep</span> of your slaves.`; + t += `obedient, offering your other slaves ${his} services, and moderately <span class="yellowgreen">reduces the upkeep</span> of your slaves.`; } else if (slave.devotion <= 95) { - t += `devoted, happily giving your other slaves ${his} services, and <span class='yellowgreen'>reduces the upkeep</span> of your slaves.`; + t += `devoted, happily giving your other slaves ${his} services, and <span class="yellowgreen">reduces the upkeep</span> of your slaves.`; } else { - t += `so happy to serve your other slaves that ${he} often sees to their needs before they know they have them, and greatly <span class='yellowgreen'>reduces the upkeep</span> of your slaves.`; + t += `so happy to serve your other slaves that ${he} often sees to their needs before they know they have them, and greatly <span class="yellowgreen">reduces the upkeep</span> of your slaves.`; } if (slave.releaseRules !== "chastity") { @@ -127,9 +127,9 @@ window.saServant = function saServant(slave) { t += ` __This week__ ${_vignette.text} `; if (_vignette.type === "cash") { if (_vignette.effect > 0) { - t += `<span class='yellowgreen'>making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`; + t += `<span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`; } else if (_vignette.effect < 0) { - t += `<span class='red'>losing you ${cashFormat(Math.abs(Math.trunc(V.FResult*_vignette.effect)))}.</span>`; + t += `<span class="red">losing you ${cashFormat(Math.abs(Math.trunc(V.FResult*_vignette.effect)))}.</span>`; } else { t += `an incident without lasting effect.`; } @@ -137,23 +137,23 @@ window.saServant = function saServant(slave) { } else if (_vignette.type === "devotion") { if (_vignette.effect > 0) { if (slave.devotion > 50) { - t += `<span class='hotpink'>increasing ${his} devotion to you.</span>`; + t += `<span class="hotpink">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class='hotpink'>increasing ${his} acceptance of you.</span>`; + t += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class='hotpink'>reducing ${his} dislike of you.</span>`; + t += `<span class="hotpink">reducing ${his} dislike of you.</span>`; } else { - t += `<span class='hotpink'>reducing ${his} hatred of you.</span>`; + t += `<span class="hotpink">reducing ${his} hatred of you.</span>`; } } else if (_vignette.effect < 0) { if (slave.devotion > 50) { - t += `<span class='mediumorchid'>reducing ${his} devotion to you.</span>`; + t += `<span class="mediumorchid">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class='mediumorchid'>reducing ${his} acceptance of you.</span>`; + t += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class='mediumorchid'>increasing ${his} dislike of you.</span>`; + t += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; } else { - t += `<span class='mediumorchid'>increasing ${his} hatred of you.</span>`; + t += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; } } else { t += `an incident without lasting effect.`; @@ -162,19 +162,19 @@ window.saServant = function saServant(slave) { } else if (_vignette.type === "trust") { if (_vignette.effect > 0) { if (slave.trust > 20) { - t += `<span class='mediumaquamarine'>increasing ${his} trust in you.</span>`; + t += `<span class="mediumaquamarine">increasing ${his} trust in you.</span>`; } else if (slave.trust > -10) { - t += `<span class='mediumaquamarine'>reducing ${his} fear of you.</span>`; + t += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; } else { - t += `<span class='mediumaquamarine'>reducing ${his} terror of you.</span>`; + t += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; } } else if (_vignette.effect < 0) { if (slave.trust > 20) { - t += `<span class='gold'>reducing ${his} trust in you.</span>`; + t += `<span class="gold">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - t += `<span class='gold'>increasing ${his} fear of you.</span>`; + t += `<span class="gold">increasing ${his} fear of you.</span>`; } else { - t += `<span class='gold'>increasing ${his} terror of you.</span>`; + t += `<span class="gold">increasing ${his} terror of you.</span>`; } } else { t += `an incident without lasting effect.`; @@ -182,18 +182,18 @@ window.saServant = function saServant(slave) { slave.trust += (1 * _vignette.effect); } else if (_vignette.type === "health") { if (_vignette.effect > 0) { - t += `<span class='green'>improving ${his} health.</span>`; + t += `<span class="green">improving ${his} health.</span>`; } else if (_vignette.effect < 0) { - t += `<span class='red'>affecting ${his} health.</span>`; + t += `<span class="red">affecting ${his} health.</span>`; } else { t += `an incident without lasting effect.`; } slave.health += (2 * _vignette.effect); } else { if (_vignette.effect > 0) { - t += `<span class='green'>gaining you a bit of reputation.</span>`; + t += `<span class="green">gaining you a bit of reputation.</span>`; } else if (_vignette.effect < 0) { - t += `<span class='red'>losing you a bit of reputation.</span>`; + t += `<span class="red">losing you a bit of reputation.</span>`; } else { t += `an incident without lasting effect.`; } diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js index f89e2b623c8..af4c7696163 100644 --- a/src/endWeek/saServeThePublic.js +++ b/src/endWeek/saServeThePublic.js @@ -197,10 +197,10 @@ window.saServeThePublic = (function saServeThePublic() { } if (V.DJignoresFlaws !== 1) { if (!["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes(slave.sexualFlaw) && jsRandom(1, 100) > 90) { - r += ` ${SlaveFullName(V.DJ)} manages to <span class=green>break</span> ${slave.slaveName} of ${his} sexual flaws.`; + r += ` ${SlaveFullName(V.DJ)} manages to <span class="green">break</span> ${slave.slaveName} of ${his} sexual flaws.`; slave.sexualFlaw = "none"; } else if (slave.behavioralFlaw !== "none" && jsRandom(1, 100) > 90) { - r += ` ${SlaveFullName(V.DJ)} manages to <span class=green>break</span> ${slave.slaveName} of ${his} flaws.`; + r += ` ${SlaveFullName(V.DJ)} manages to <span class="green">break</span> ${slave.slaveName} of ${his} flaws.`; slave.behavioralFlaw = "none"; } } @@ -285,18 +285,18 @@ window.saServeThePublic = (function saServeThePublic() { */ function mentalEffects(slave) { if (slave.behavioralQuirk === "advocate") { - r += ` ${slave.slaveName} <span class=hotpink>really enjoys</span> being able to share ${his} convert's enthusiasm about slavery with new people.`; + r += ` ${slave.slaveName} <span class="hotpink">really enjoys</span> being able to share ${his} convert's enthusiasm about slavery with new people.`; slave.devotion += 1; } else if (slave.behavioralQuirk === "funny") { - r += ` ${slave.slaveName} <span class=hotpink>really enjoys</span> making so many people laugh.`; + r += ` ${slave.slaveName} <span class="hotpink">really enjoys</span> making so many people laugh.`; slave.devotion += 1; } if (slave.sexualQuirk === "tease") { - r += ` ${slave.slaveName} <span class=mediumaquamarine>trusts your judgment</span> in assigning ${him} a job that affords ${him} a chance to tease and flirt.`; + r += ` ${slave.slaveName} <span class="mediumaquamarine">trusts your judgment</span> in assigning ${him} a job that affords ${him} a chance to tease and flirt.`; slave.trust += 1; } if (slave.assignment === "serve in the club" && slave.devotion > 50) { - r += ` Being so far from your presence <span class=mediumorchid>weakens ${his} intense devotion to you.</span>`; + r += ` Being so far from your presence <span class="mediumorchid">weakens ${his} intense devotion to you.</span>`; } } @@ -316,18 +316,18 @@ window.saServeThePublic = (function saServeThePublic() { } r += ` protect ${him} from the wear of being a slut.`; } else if (slave.health < -50) { - r += ` The stress of being a slut while ill is <span class=red>very hard on ${him}.</span>`; + r += ` The stress of being a slut while ill is <span class="red">very hard on ${him}.</span>`; slave.health -= 10; injury = 1; } else if (slave.health < -20 && jsRandom(1, 100) > 50) { - r += ` The stress of being a slut while ill is <span class=red>hard on ${him}.</span>`; + r += ` The stress of being a slut while ill is <span class="red">hard on ${him}.</span>`; slave.health -= 7; injury = 1; } else if (slave.vagina < 0) { if ((slave.skill.anal + slave.skill.oral) >= 200) { r += ` ${He}'s such an expert public servant that ${he} copes with the stress of being a ${SlaveTitle(slave)} slut.`; } else if (jsRandom(1, 100) > (40 + (10 * (slave.skill.anal + slave.skill.oral)))) { - r += ` The stress of being a ${SlaveTitle(slave)} slut is <span class=red>hard on ${him}.</span>`; + r += ` The stress of being a ${SlaveTitle(slave)} slut is <span class="red">hard on ${him}.</span>`; slave.health -= 7; injury = 1; } @@ -336,7 +336,7 @@ window.saServeThePublic = (function saServeThePublic() { if ((slave.skill.anal + slave.skill.oral) >= 200) { r += ` ${He}'s such an expert slut that ${he} copes with the stress of being limited to buttsex and oral.`; } else if (jsRandom(1, 100) > (40 + (10 * (slave.skill.anal + slave.skill.oral)))) { - r += ` The stress of being limited to buttsex and oral is <span class=red>hard on ${him}.</span>`; + r += ` The stress of being limited to buttsex and oral is <span class="red">hard on ${him}.</span>`; slave.health -= 7; injury = 1; } @@ -344,7 +344,7 @@ window.saServeThePublic = (function saServeThePublic() { if (slave.skill.oral >= 100) { r += ` ${He}'s such an expert slut that ${he} copes with the stress of being limited to oral.`; } else if (jsRandom(1, 100) > (40 + (10 * slave.skill.oral))) { - r += ` The stress of being limited to oral sex is <span class=red>hard on ${him}.</span>`; + r += ` The stress of being limited to oral sex is <span class="red">hard on ${him}.</span>`; slave.health -= 7; injury = 1; } @@ -365,45 +365,45 @@ window.saServeThePublic = (function saServeThePublic() { } if (injuryChance > 80) { slave.minorInjury = "sore ass"; - r += ` Rough anal with a careless citizen left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` Rough anal with a careless citizen left ${him} with a <span class="red">${slave.minorInjury}.</span>`; r += minorInjuryResponse(slave); } else if (injuryChance > 60) { slave.minorInjury = "black eye"; - r += ` A violent citizen left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` A violent citizen left ${him} with a <span class="red">${slave.minorInjury}.</span>`; r += minorInjuryResponse(slave); } else if (injuryChance > 40) { slave.minorInjury = "split lip"; - r += ` An abusive citizen left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` An abusive citizen left ${him} with a <span class="red">${slave.minorInjury}.</span>`; r += minorInjuryResponse(slave); } else if (injuryChance > 20) { slave.minorInjury = "bad bruise"; - r += ` A rough citizen left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` A rough citizen left ${him} with a <span class="red">${slave.minorInjury}.</span>`; r += minorInjuryResponse(slave); } else { slave.minorInjury = "sore muscle"; - r += ` The hard labor of constant sex left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` The hard labor of constant sex left ${him} with a <span class="red">${slave.minorInjury}.</span>`; } } if (canDoVaginal(slave)) { if (slave.vagina === 0) { if (slave.aphrodisiacs > 1 || slave.inflationType === "aphrodisiac") { - r += ` ${His} virginity goes to the <span class=green>citizen who most deserves the gift of a slave's cherry.</span> ${He}'s so full of aphrodisiacs that ${he} <span class=hotpink>enjoys the experience.</span> <span class=lime>${His} pussy is now broken in.</span>`; + r += ` ${His} virginity goes to the <span class="green">citizen who most deserves the gift of a slave's cherry.</span> ${He}'s so full of aphrodisiacs that ${he} <span class="hotpink">enjoys the experience.</span> <span class="lime">${His} pussy is now broken in.</span>`; slave.devotion += 4; slave.vagina = 1; } else if (slave.devotion > 20) { - r += ` ${His} virginity goes to the <span class=green>citizen who most deserves the gift of a slave's cherry.</span> Losing ${his} virginity in this way <span class=hotpink>confirms ${his} submission to you.</span> <span class=lime>${His} pussy is now broken in.</span>`; + r += ` ${His} virginity goes to the <span class="green">citizen who most deserves the gift of a slave's cherry.</span> Losing ${his} virginity in this way <span class="hotpink">confirms ${his} submission to you.</span> <span class="lime">${His} pussy is now broken in.</span>`; slave.devotion += 4; slave.vagina = 1; } else { - r += ` ${His} virginity goes to the <span class=green>citizen who most deserves the gift of a slave's cherry.</span> ${He} tries to resist, and losing ${his} virginity to a rape makes ${him} <span class=mediumorchid>hate</span> and <span class=gold>fear</span> you a great deal. <span class=lime>${His} pussy is now broken in.</span>`; + r += ` ${His} virginity goes to the <span class="green">citizen who most deserves the gift of a slave's cherry.</span> ${He} tries to resist, and losing ${his} virginity to a rape makes ${him} <span class="mediumorchid">hate</span> and <span class="gold">fear</span> you a great deal. <span class="lime">${His} pussy is now broken in.</span>`; slave.devotion -= 10; slave.trust -= 10; slave.vagina = 1; } } else if (slave.vagina < 3) { if (jsRandom(1, 100) > ((170 - slave.sexAmount) + (slave.vagina * 10) + (slave.skill.vaginal / 3))) { - r += ` <span class=lime>${His} pussy gets loosened by the intense use.</span>`; + r += ` <span class="lime">${His} pussy gets loosened by the intense use.</span>`; slave.vagina += 1; } } @@ -412,15 +412,15 @@ window.saServeThePublic = (function saServeThePublic() { if (canDoAnal(slave)) { if (slave.anus === 0) { if (slave.aphrodisiacs > 1 || slave.inflationType === "aphrodisiac") { - r += ` ${His} tight little anus goes to the <span class=green>most prominent citizen</span> to show an interest in an anal virgin. ${He}'s so full of aphrodisiacs that ${he} <span class=hotpink>enjoys the experience.</span> ${His} fresh asshole is fucked all week, and by the end of it <span class=lime>${he} won't sit down.</span>`; + r += ` ${His} tight little anus goes to the <span class="green">most prominent citizen</span> to show an interest in an anal virgin. ${He}'s so full of aphrodisiacs that ${he} <span class="hotpink">enjoys the experience.</span> ${His} fresh asshole is fucked all week, and by the end of it <span class="lime">${he} won't sit down.</span>`; slave.devotion += 4; slave.anus = 2; } else if (slave.devotion > 20) { - r += ` ${His} tight little anus goes to the <span class=green>most prominent citizen</span> to show an interest in an anal virgin. The pain and humiliation <span class=hotpink>confirm ${his} submission to you.</span> ${His} fresh asshole is fucked all week, and by the end of it <span class=lime>${he} won't sit down.</span>`; + r += ` ${His} tight little anus goes to the <span class="green">most prominent citizen</span> to show an interest in an anal virgin. The pain and humiliation <span class="hotpink">confirm ${his} submission to you.</span> ${His} fresh asshole is fucked all week, and by the end of it <span class="lime">${he} won't sit down.</span>`; slave.devotion += 4; slave.anus = 2; } else { - r += ` ${His} tight little anus goes to the <span class=green>most prominent citizen</span> to show an interest in an anal virgin. The pain and humiliation increases ${his} <span class=mediumorchid>hatred</span> and <span class=gold>fear</span> for you. ${His} fresh asshole is fucked all week, and by the end of it <span class=lime>${he} won't sit down.</span>`; + r += ` ${His} tight little anus goes to the <span class="green">most prominent citizen</span> to show an interest in an anal virgin. The pain and humiliation increases ${his} <span class="mediumorchid">hatred</span> and <span class="gold">fear</span> for you. ${His} fresh asshole is fucked all week, and by the end of it <span class="lime">${he} won't sit down.</span>`; slave.devotion -= 5; slave.trust -= 5; slave.anus = 2; @@ -428,17 +428,17 @@ window.saServeThePublic = (function saServeThePublic() { } else if (slave.anus < 3) { if (slave.vagina < 0) { if (jsRandom(1, 100) > ((150 - slave.sexAmount) + (slave.anus * 10) + (slave.skill.anal / 6))) { - r += ` <span class=lime>${His} asshole sees constant use in place of a pussy and loosens.</span>`; + r += ` <span class="lime">${His} asshole sees constant use in place of a pussy and loosens.</span>`; slave.anus += 1; } } else if (!canDoVaginal(slave)) { if (jsRandom(1, 100) > ((150 - slave.sexAmount) + (slave.anus * 10) + (slave.skill.anal / 6))) { - r += ` <span class=lime>${His} asshole sees constant use in place of ${his} protected pussy and loosens.</span>`; + r += ` <span class="lime">${His} asshole sees constant use in place of ${his} protected pussy and loosens.</span>`; slave.anus += 1; } } else { if (jsRandom(1, 100) > ((160 - slave.sexAmount) + (slave.anus * 10) + (slave.skill.anal / 6))) { - r += ` <span class=lime>${His} asshole loosens with constant use.</span>`; + r += ` <span class="lime">${His} asshole loosens with constant use.</span>`; slave.anus += 1; } } @@ -476,20 +476,20 @@ window.saServeThePublic = (function saServeThePublic() { } if (slave.aphrodisiacs > 1 || slave.inflationType === "aphrodisiac") { - r += ` The aphrodisiac cocktail has ${him} so desperately horny that regardless of ${his} personal feelings, ${he} <span class=hotpink>gets off with the public all week.</span> In ${his} drug-addled state ${he} doesn't remember enough to learn sexual skills.`; + r += ` The aphrodisiac cocktail has ${him} so desperately horny that regardless of ${his} personal feelings, ${he} <span class="hotpink">gets off with the public all week.</span> In ${his} drug-addled state ${he} doesn't remember enough to learn sexual skills.`; slave.devotion += 4; } else if (slave.devotion <= 20 && slave.energy <= 95) { if (slave.trust >= -20) { - r += ` ${He} tries to refuse being treated as an open slut, so ${he} is restrained for public use. ${He} loses a bit of ${himself} to a week of rape, but remembers enough to know <span class=mediumorchid>you're responsible,</span> and <span class=gold>can force ${him} if necessary.</span>`; + r += ` ${He} tries to refuse being treated as an open slut, so ${he} is restrained for public use. ${He} loses a bit of ${himself} to a week of rape, but remembers enough to know <span class="mediumorchid">you're responsible,</span> and <span class="gold">can force ${him} if necessary.</span>`; slave.devotion -= 5; slave.trust -= 5; } else { - r += ` ${He} doesn't show much enthusiasm, but the habit of sexual slavery <span class=hotpink>wears away at ${his} will.</span>`; + r += ` ${He} doesn't show much enthusiasm, but the habit of sexual slavery <span class="hotpink">wears away at ${his} will.</span>`; slave.devotion += 4; } } else { if ((slave.skill.oral + slave.skill.anal >= 200) && ((slave.skill.vaginal >= 100) || !canDoVaginal(slave))) { - r += ` ${He}'s a <span class=aquamarine>sexual master</span> `; + r += ` ${He}'s a <span class="aquamarine">sexual master</span> `; if (canDoVaginal(slave)) { r += `whose`; } else { @@ -501,7 +501,7 @@ window.saServeThePublic = (function saServeThePublic() { } r += ` front hole, ${his}`; } - r += ` charms are only for the <span class=green>most prominent citizens.</span> When ${he}'s not `; + r += ` charms are only for the <span class="green">most prominent citizens.</span> When ${he}'s not `; if (canDoVaginal(slave) && jsRandom(1, 4) === 1) { r += `pleasing high society with ${his} `; if (slave.prestige > 1 || slave.pornPrestige > 2) { @@ -531,7 +531,7 @@ window.saServeThePublic = (function saServeThePublic() { } r += ` ${he} offers personal training and sexual therapy.`; } else { - r += ` ${He} shows diligence, and ${his} <span class=green>sexual skills improve,</span> according to what the citizens demand`; + r += ` ${He} shows diligence, and ${his} <span class="green">sexual skills improve,</span> according to what the citizens demand`; if (!canDoVaginal(slave)) { r += ` and what's possible for ${him}`; } @@ -1209,13 +1209,13 @@ window.saServeThePublic = (function saServeThePublic() { if (slave.devotion < 10) { if (jsRandom(1, 100) > 70) { if (slave.skill.vaginal <= 30 && canDoVaginal(slave)) { - r += ` After being fucked too hard too often, ${he} now <span class=red>dislikes being penetrated.</span>`; + r += ` After being fucked too hard too often, ${he} now <span class="red">dislikes being penetrated.</span>`; slave.sexualFlaw = "hates penetration"; } else if (slave.skill.anal <= 30 && canDoAnal(slave)) { - r += ` After so much anal pain, ${he} now <span class=red>dislikes being buttfucked.</span>`; + r += ` After so much anal pain, ${he} now <span class="red">dislikes being buttfucked.</span>`; slave.sexualFlaw = "hates anal"; } else if (slave.skill.oral <= 30) { - r += ` After one too many facials, ${he} now <span class=red>dislikes sucking cock.</span>`; + r += ` After one too many facials, ${he} now <span class="red">dislikes sucking cock.</span>`; slave.sexualFlaw = "hates oral"; } } @@ -1471,12 +1471,12 @@ window.saServeThePublic = (function saServeThePublic() { } if (slave.energy > 40 && slave.energy < 95) { - r += ` Being used sexually all week <span class=lime>increases ${his} sex drive.</span>`; + r += ` Being used sexually all week <span class="lime">increases ${his} sex drive.</span>`; slave.energy += 1; } if (cervixPump > 0) { - r += ` ${He} notices ${his} <span class=lime>belly has swollen</span> from all the `; + r += ` ${He} notices ${his} <span class="lime">belly has swollen</span> from all the `; if (slave.cervixImplant === 1) { r += `vaginal`; } else if (slave.cervixImplant === 2) { @@ -1499,9 +1499,9 @@ window.saServeThePublic = (function saServeThePublic() { r += ` __This week__ ${vignette.text} `; if (vignette.type === "cash") { if (vignette.effect > 0) { - r += `<span class=yellowgreen>making you an extra ${cashFormat(Math.trunc(slave.sexQuality * vignette.effect))}.</span>`; + r += `<span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(slave.sexQuality * vignette.effect))}.</span>`; } else if (vignette.effect < 0) { - r += `<span class=red>losing you ${cashFormat(Math.abs(Math.trunc(slave.sexQuality * vignette.effect)))}.</span>`; + r += `<span class="red">losing you ${cashFormat(Math.abs(Math.trunc(slave.sexQuality * vignette.effect)))}.</span>`; } else { r += `an incident without lasting effect.`; } @@ -1510,23 +1510,23 @@ window.saServeThePublic = (function saServeThePublic() { } else if (vignette.type === "devotion") { if (vignette.effect > 0) { if (slave.devotion > 50) { - r += `<span class=hotpink>increasing ${his} devotion to you.</span>`; + r += `<span class="hotpink">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class=hotpink>increasing ${his} acceptance of you.</span>`; + r += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class=hotpink>reducing ${his} dislike of you.</span>`; + r += `<span class="hotpink">reducing ${his} dislike of you.</span>`; } else { - r += `<span class=hotpink>reducing ${his} hatred of you.</span>`; + r += `<span class="hotpink">reducing ${his} hatred of you.</span>`; } } else if (vignette.effect < 0) { if (slave.devotion > 50) { - r += `<span class=mediumorchid>reducing ${his} devotion to you.</span>`; + r += `<span class="mediumorchid">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class=mediumorchid>reducing ${his} acceptance of you.</span>`; + r += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class=mediumorchid>increasing ${his} dislike of you.</span>`; + r += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; } else { - r += `<span class=mediumorchid>increasing ${his} hatred of you.</span>`; + r += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; } } else { r += `an incident without lasting effect.`; @@ -1535,19 +1535,19 @@ window.saServeThePublic = (function saServeThePublic() { } else if (vignette.type === "trust") { if (vignette.effect > 0) { if (slave.trust > 20) { - r += `<span class=mediumaquamarine>increasing ${his} trust in you.</span>`; + r += `<span class="mediumaquamarine">increasing ${his} trust in you.</span>`; } else if (slave.trust >= -50) { - r += `<span class=mediumaquamarine>reducing ${his} fear of you.</span>`; + r += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; } else { - r += `<span class=mediumaquamarine>reducing ${his} terror of you.</span>`; + r += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; } } else if (vignette.effect < 0) { if (slave.trust > 20) { - r += `<span class=gold>reducing ${his} trust in you.</span>`; + r += `<span class="gold">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - r += `<span class=gold>increasing ${his} fear of you.</span>`; + r += `<span class="gold">increasing ${his} fear of you.</span>`; } else { - r += `<span class=gold>increasing ${his} terror of you.</span>`; + r += `<span class="gold">increasing ${his} terror of you.</span>`; } } else { r += `an incident without lasting effect.`; @@ -1555,18 +1555,18 @@ window.saServeThePublic = (function saServeThePublic() { slave.trust += (1 * vignette.effect); } else if (vignette.type === "health") { if (vignette.effect > 0) { - r += `<span class=green>improving ${his} health.</span>`; + r += `<span class="green">improving ${his} health.</span>`; } else if (vignette.effect < 0) { - r += `<span class=red>affecting ${his} health.</span>`; + r += `<span class="red">affecting ${his} health.</span>`; } else { r += `an incident without lasting effect.`; } slave.health += (2 * vignette.effect); } else { if (vignette.effect > 0) { - r += `<span class=green>gaining you a bit of reputation.</span>`; + r += `<span class="green">gaining you a bit of reputation.</span>`; } else if (vignette.effect < 0) { - r += `<span class=red>losing you a bit of reputation.</span>`; + r += `<span class="red">losing you a bit of reputation.</span>`; } else { r += `an incident without lasting effect.`; } diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js index 7d701ea44b5..a76ddbb0f2c 100644 --- a/src/endWeek/saStayConfined.js +++ b/src/endWeek/saStayConfined.js @@ -20,28 +20,28 @@ window.saStayConfined = function saStayConfined(slave) { if (slave.fetish !== "mindbroken") { if (slave.devotion < -50) { - t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. ${He} still hates ${his} place in the world, but being forced to rely on slave life as ${his} only human contact <span class='hotpink'>grinds down ${his} resistance.</span>`; + t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. ${He} still hates ${his} place in the world, but being forced to rely on slave life as ${his} only human contact <span class="hotpink">grinds down ${his} resistance.</span>`; slave.devotion += 2; } else if (slave.devotion <= 20) { - t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. With nothing to do but look forward to the next time ${he}'s let out to serve, <span class='hotpink'>${he} begins to rely on servitude.</span>`; + t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. With nothing to do but look forward to the next time ${he}'s let out to serve, <span class="hotpink">${he} begins to rely on servitude.</span>`; slave.devotion += 1; } else if (slave.devotion <= 50) { t += `accepts solitary confinement whenever ${he} is not being forced to do something else. Since ${he} is obedient, the mental torture neither breaks ${him} further nor causes ${him} to hate you.`; } else { - t += `accepts solitary confinement whenever ${he} is not being forced to do something else. ${He} spends ${his} time wondering hopelessly how ${he} has failed you, <span class='mediumorchid'>damaging ${his} devotion to you.</span>`; + t += `accepts solitary confinement whenever ${he} is not being forced to do something else. ${He} spends ${his} time wondering hopelessly how ${he} has failed you, <span class="mediumorchid">damaging ${his} devotion to you.</span>`; slave.devotion -= 2; } if (slave.trust < -50) { t += ` ${He} is so terrified of you that this confinement does not make ${him} fear you any more.`; } else if (slave.trust < -20) { - t += ` ${He} is already afraid of you, but this confinement makes ${him} <span class='gold'>fear you even more.</span>`; + t += ` ${He} is already afraid of you, but this confinement makes ${him} <span class="gold">fear you even more.</span>`; slave.trust -= 2; } else if (slave.trust <= 20) { - t += ` This confinement makes ${him} <span class='gold'>fear your power</span> over ${him}.`; + t += ` This confinement makes ${him} <span class="gold">fear your power</span> over ${him}.`; slave.trust -= 4; } else { - t += ` This confinement makes ${him} <span class='gold'>trust you less,</span> and fear you more.`; + t += ` This confinement makes ${him} <span class="gold">trust you less,</span> and fear you more.`; slave.trust -= 5; } @@ -51,7 +51,7 @@ window.saStayConfined = function saStayConfined(slave) { } } - t += ` The stress of confinement <span class='red'>damages ${his} health.</span>`; + t += ` The stress of confinement <span class="red">damages ${his} health.</span>`; slave.health -= 10; } else { t += `is oblivious to ${his} confinement.`; @@ -79,9 +79,9 @@ window.saStayConfined = function saStayConfined(slave) { if (slave.fetish === "mindbroken") { t += ` ${His} broken mind hinges entirely on other's guidance,`; } else { - t += ` ${He} is now willing to <span class='hotpink'>do as ${he}'s told,</span>`; + t += ` ${He} is now willing to <span class="hotpink">do as ${he}'s told,</span>`; } - t += ` so <span class='yellow'>${his} assignment has defaulted to rest.</span>`; + t += ` so <span class="yellow">${his} assignment has defaulted to rest.</span>`; if (slave.assignment === "be confined in the cellblock") { State.temporary.brokenSlaves++; State.temporary.DL--; diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js index 3aa23bffb26..f20b84685d1 100644 --- a/src/endWeek/saWhore.js +++ b/src/endWeek/saWhore.js @@ -358,10 +358,10 @@ window.saWhore = (function saWhore() { } if (V.MadamIgnoresFlaws !== 1) { if (!["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "none", "self hating"].includes(slave.sexualFlaw) && jsRandom(1, 100) > 90) { - r += ` ${SlaveFullName(V.Madam)} manages to <span class=green>break</span> ${slave.slaveName} of ${his} sexual flaws.`; + r += ` ${SlaveFullName(V.Madam)} manages to <span class="green">break</span> ${slave.slaveName} of ${his} sexual flaws.`; slave.sexualFlaw = "none"; } else if (slave.behavioralFlaw !== "none" && jsRandom(1, 100) > 90) { - r += ` ${SlaveFullName(V.Madam)} manages to <span class=green>break</span> ${slave.slaveName} of ${his} flaws.`; + r += ` ${SlaveFullName(V.Madam)} manages to <span class="green">break</span> ${slave.slaveName} of ${his} flaws.`; slave.behavioralFlaw = "none"; } } @@ -438,18 +438,18 @@ window.saWhore = (function saWhore() { */ function mentalEffects(slave) { if (slave.behavioralQuirk === "sinful") { - r += ` ${slave.slaveName} <span class=hotpink>secretly enjoys</span> how utterly sinful and depraved it is for ${him} to sell ${his} body.`; + r += ` ${slave.slaveName} <span class="hotpink">secretly enjoys</span> how utterly sinful and depraved it is for ${him} to sell ${his} body.`; slave.devotion += 1; } else if (slave.behavioralQuirk === "cutting") { - r += ` ${slave.slaveName} <span class=hotpink>openly enjoys</span> the direct, frank language of prostitution, and delights customers with cutting remarks even as they fuck ${him}.`; + r += ` ${slave.slaveName} <span class="hotpink">openly enjoys</span> the direct, frank language of prostitution, and delights customers with cutting remarks even as they fuck ${him}.`; slave.devotion += 1; } if (slave.sexualQuirk === "caring") { - r += ` ${slave.slaveName} sees ${his} role as helping people with their sexual needs, and ${he} <span class=mediumaquamarine>trusts that ${his} place</span> in society is an important one.`; + r += ` ${slave.slaveName} sees ${his} role as helping people with their sexual needs, and ${he} <span class=">trusts that ${his} place</span> in society is an important one.`; slave.trust += 1; } if (slave.assignment === "work in the brothel" && slave.devotion > 50) { - r += ` Being so far from your presence <span class=mediumorchid>weakens ${his} intense devotion to you.</span>`; + r += ` Being so far from your presence <span class="mediumorchid">weakens ${his} intense devotion to you.</span>`; } } @@ -468,18 +468,18 @@ window.saWhore = (function saWhore() { } r += ` protect ${him} from the wear of whoring.`; } else if (slave.health < -50) { - r += ` The stress of whoring while ill is <span class=red>very hard on ${him}.</span>`; + r += ` The stress of whoring while ill is <span class="red">very hard on ${him}.</span>`; slave.health -= 10; injury = 1; } else if (slave.health < -20 && jsRandom(1, 100) > 50) { - r += ` The stress of whoring while ill is <span class=red>hard on ${him}.</span>`; + r += ` The stress of whoring while ill is <span class="red">hard on ${him}.</span>`; slave.health -= 7; injury = 1; } else if (slave.vagina < 0) { if ((slave.skill.anal + slave.skill.oral) >= 200) { r += ` $He's such an expert whore that $he copes with the stress of being a ${SlaveTitle(slave)} slut.`; } else if (jsRandom(1, 100) > (40 + (10 * (slave.skill.anal + slave.skill.oral)))) { - r += ` The stress of being a ${SlaveTitle(slave)} prostitute is <span class=red>hard on ${him}.</span>`; + r += ` The stress of being a ${SlaveTitle(slave)} prostitute is <span class="red">hard on ${him}.</span>`; slave.health -= 7; injury = 1; } @@ -488,7 +488,7 @@ window.saWhore = (function saWhore() { if ((slave.skill.anal + slave.skill.oral) >= 200) { r += ` ${He}'s such an expert whore that ${he} copes with the stress of being limited to buttsex and oral.`; } else if (jsRandom(1, 100) > (40 + (10 * (slave.skill.anal + slave.skill.oral)))) { - r += ` The stress of being limited to buttsex and oral is <span class=red>hard on ${him}.</span>`; + r += ` The stress of being limited to buttsex and oral is <span class="red">hard on ${him}.</span>`; slave.health -= 7; injury = 1; } @@ -496,7 +496,7 @@ window.saWhore = (function saWhore() { if (slave.skill.oral >= 100) { r += ` ${He}'s such an expert whore that ${he} copes with the stress of being limited to oral.`; } else if (jsRandom(1, 100) > (40 + (10 * slave.skill.oral))) { - r += ` The stress of being limited to oral sex is <span class=red>hard on ${him}.</span>`; + r += ` The stress of being limited to oral sex is <span class="red">hard on ${him}.</span>`; slave.health -= 7; injury = 1; } @@ -517,45 +517,45 @@ window.saWhore = (function saWhore() { } if (injuryChance > 80) { slave.minorInjury = "sore ass"; - r += ` Rough anal with a careless customer left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` Rough anal with a careless customer left ${him} with a <span class="red">${slave.minorInjury}.</span>`; r += minorInjuryResponse(slave); } else if (injuryChance > 60) { slave.minorInjury = "black eye"; - r += ` A violent customer left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` A violent customer left ${him} with a <span class="red">${slave.minorInjury}.</span>`; r += minorInjuryResponse(slave); } else if (injuryChance > 40) { slave.minorInjury = "split lip"; - r += ` An abusive customer left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` An abusive customer left ${him} with a <span class="red">${slave.minorInjury}.</span>`; r += minorInjuryResponse(slave); } else if (injuryChance > 20) { slave.minorInjury = "bad bruise"; - r += ` A rough customer left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` A rough customer left ${him} with a <span class="red">${slave.minorInjury}.</span>`; r += minorInjuryResponse(slave); } else { slave.minorInjury = "sore muscle"; - r += ` The hard labor of constant sex left ${him} with a <span class=red>${slave.minorInjury}.</span>`; + r += ` The hard labor of constant sex left ${him} with a <span class="red">${slave.minorInjury}.</span>`; } } if (canDoVaginal(slave)) { if (slave.vagina === 0) { if (slave.aphrodisiacs > 1 || slave.inflationType === "aphrodisiac") { - r += ` ${His} virginity goes to the highest bidder, earning ${cashFormat(beauty * 10)}. ${He}'s so full of aphrodisiacs that ${he} <span class=hotpink>enjoys the experience.</span> <span class=lime>${His} pussy is now broken in.</span>`; + r += ` ${His} virginity goes to the highest bidder, earning ${cashFormat(beauty * 10)}. ${He}'s so full of aphrodisiacs that ${he} <span class="hotpink">enjoys the experience.</span> <span class="lime">${His} pussy is now broken in.</span>`; slave.devotion += 4; slave.vagina = 1; } else if (slave.devotion > 20) { - r += ` ${His} virginity goes to the highest bidder, earning ${cashFormat(beauty * 10)}. Losing ${his} virginity in this way <span class=hotpink>confirms ${his} submission to you.</span> <span class=lime>${His} pussy is now broken in.</span>`; + r += ` ${His} virginity goes to the highest bidder, earning ${cashFormat(beauty * 10)}. Losing ${his} virginity in this way <span class="hotpink">confirms ${his} submission to you.</span> <span class="lime">${His} pussy is now broken in.</span>`; slave.devotion += 4; slave.vagina = 1; } else { - r += ` ${His} virginity goes to the highest bidder, earning ${cashFormat(beauty * 10)}. ${He} tries to resist, and losing ${his} virginity to a rape makes ${him} <span class=mediumorchid>hate</span> and <span class=gold>fear</span> you a great deal. <span class=lime>${His} pussy is now broken in.</span>`; + r += ` ${His} virginity goes to the highest bidder, earning ${cashFormat(beauty * 10)}. ${He} tries to resist, and losing ${his} virginity to a rape makes ${him} <span class="mediumorchid">hate</span> and <span class="gold">fear</span> you a great deal. <span class="lime">${His} pussy is now broken in.</span>`; slave.devotion -= 10; slave.trust -= 10; slave.vagina = 1; } } else if (slave.vagina < 3) { if (jsRandom(1, 100) > ((170 - slave.sexAmount) + (slave.vagina * 10) + (slave.skill.vaginal / 3))) { - r += ` <span class=lime>${His} pussy gets loosened by the intense use.</span>`; + r += ` <span class="lime">${His} pussy gets loosened by the intense use.</span>`; slave.vagina += 1; } } @@ -564,15 +564,15 @@ window.saWhore = (function saWhore() { if (canDoAnal(slave)) { if (slave.anus === 0) { if (slave.aphrodisiacs > 1 || slave.inflationType === "aphrodisiac") { - r += ` ${His} tight little anus goes to the highest bidder, earning ${cashFormat(beauty * 5)}. ${He}'s so full of aphrodisiacs that ${he} <span class=hotpink>enjoys the experience.</span> ${His} fresh asshole is fucked all week, and by the end of it <span class=lime>${he} won't sit down.</span>`; + r += ` ${His} tight little anus goes to the highest bidder, earning ${cashFormat(beauty * 5)}. ${He}'s so full of aphrodisiacs that ${he} <span class="hotpink">enjoys the experience.</span> ${His} fresh asshole is fucked all week, and by the end of it <span class="lime">${he} won't sit down.</span>`; slave.devotion += 4; slave.anus = 2; } else if (slave.devotion > 20) { - r += ` ${His} tight little anus goes to the highest bidder, earning ${cashFormat(beauty * 5)}. The pain and humiliation <span class=hotpink>confirm ${his} submission to you.</span> ${His} fresh asshole is fucked all week, and by the end of it <span class=lime>${he} won't sit down.</span>`; + r += ` ${His} tight little anus goes to the highest bidder, earning ${cashFormat(beauty * 5)}. The pain and humiliation <span class="hotpink">confirm ${his} submission to you.</span> ${His} fresh asshole is fucked all week, and by the end of it <span class="lime">${he} won't sit down.</span>`; slave.devotion += 4; slave.anus = 2; } else { - r += ` ${His} tight little anus goes to the highest bidder, earning ${cashFormat(beauty * 5)}. The pain and humiliation increases ${his} <span class=mediumorchid>hatred</span> and <span class=gold>fear</span> for you. ${His} fresh asshole is fucked all week, and by the end of it <span class=lime>${he} won't sit down.</span>`; + r += ` ${His} tight little anus goes to the highest bidder, earning ${cashFormat(beauty * 5)}. The pain and humiliation increases ${his} <span class="mediumorchid">hatred</span> and <span class="gold">fear</span> for you. ${His} fresh asshole is fucked all week, and by the end of it <span class="lime">${he} won't sit down.</span>`; slave.devotion -= 5; slave.trust -= 5; slave.anus = 2; @@ -580,17 +580,17 @@ window.saWhore = (function saWhore() { } else if (slave.anus < 3) { if (slave.vagina < 0) { if (jsRandom(1, 100) > ((150 - slave.sexAmount) + (slave.anus * 10) + (slave.skill.anal / 6))) { - r += ` <span class=lime>${His} asshole sees constant use in place of a pussy and loosens.</span>`; + r += ` <span class="lime">${His} asshole sees constant use in place of a pussy and loosens.</span>`; slave.anus += 1; } } else if (!canDoVaginal(slave)) { if (jsRandom(1, 100) > ((150 - slave.sexAmount) + (slave.anus * 10) + (slave.skill.anal / 6))) { - r += ` <span class=lime>${His} asshole sees constant use in place of ${his} protected pussy and loosens.</span>`; + r += ` <span class="lime">${His} asshole sees constant use in place of ${his} protected pussy and loosens.</span>`; slave.anus += 1; } } else { if (jsRandom(1, 100) > ((160 - slave.sexAmount) + (slave.anus * 10) + (slave.skill.anal / 6))) { - r += ` <span class=lime>${His} asshole loosens with constant use.</span>`; + r += ` <span class="lime">${His} asshole loosens with constant use.</span>`; slave.anus += 1; } } @@ -630,7 +630,7 @@ window.saWhore = (function saWhore() { if (slave.amp !== 1) { if (slave.skill.whoring < 100) { slave.skill.whoring += 10 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32); - r += ` ${He} <span class=green>gains experience as a prostitute,</span> and gets better at `; + r += ` ${He} <span class="green">gains experience as a prostitute,</span> and gets better at `; if (slave.skill.whoring <= 30) { r += `basic street smarts.`; } else if (slave.skill.whoring <= 60) { @@ -642,20 +642,20 @@ window.saWhore = (function saWhore() { } if (slave.aphrodisiacs > 1 || slave.inflationType === "aphrodisiac") { - r += ` The aphrodisiac cocktail has ${him} so desperately horny that regardless of ${his} personal feelings, ${he} <span class=hotpink>gets off with customers all week.</span> In ${his} drug-addled state ${he} doesn't remember enough to learn sexual skills.`; + r += ` The aphrodisiac cocktail has ${him} so desperately horny that regardless of ${his} personal feelings, ${he} <span class="hotpink">gets off with customers all week.</span> In ${his} drug-addled state ${he} doesn't remember enough to learn sexual skills.`; slave.devotion += 4; } else if (slave.devotion <= 20 && slave.energy <= 95) { if (slave.trust >= -20) { - r += ` ${He} tries to refuse being sold as a whore, so ${he} is restrained for sale. ${He} loses a bit of ${himself} to a week of rape, but remembers enough to know <span class=mediumorchid>you're responsible,</span> and <span class=gold>can force ${him} if necessary.</span>`; + r += ` ${He} tries to refuse being sold as a whore, so ${he} is restrained for sale. ${He} loses a bit of ${himself} to a week of rape, but remembers enough to know <span class="mediumorchid">you're responsible,</span> and <span class="gold">can force ${him} if necessary.</span>`; slave.devotion -= 5; slave.trust -= 5; } else { - r += ` ${He} doesn't show much enthusiasm, but the habit of sexual prostitution <span class=hotpink>wears away at ${his} will.</span>`; + r += ` ${He} doesn't show much enthusiasm, but the habit of sexual prostitution <span class="hotpink">wears away at ${his} will.</span>`; slave.devotion += 4; } } else { if ((slave.skill.oral + slave.skill.anal >= 200) && ((slave.skill.vaginal >= 100) || !canDoVaginal(slave))) { - r += ` ${He}'s a <span class=aquamarine>sexual master</span> `; + r += ` ${He}'s a <span class="aquamarine">sexual master</span> `; if (canDoVaginal(slave)) { r += `whose`; } else { @@ -667,7 +667,7 @@ window.saWhore = (function saWhore() { } r += ` front hole, ${his}`; } - r += ` body commands <span class=yellowgreen>a high price.</span> When ${he}'s not `; + r += ` body commands <span class="yellowgreen">a high price.</span> When ${he}'s not `; if (canDoVaginal(slave) && jsRandom(1, 4) === 1) { r += `pleasing the rich with ${his} `; if (slave.prestige > 1 || slave.pornPrestige > 2) { @@ -699,7 +699,7 @@ window.saWhore = (function saWhore() { } r += ` ${he} works social gatherings and high society.`; } else { - r += ` ${He} shows diligence, and ${his} <span class=green>sexual skills improve,</span> according to what the customers demand`; + r += ` ${He} shows diligence, and ${his} <span class="green">sexual skills improve,</span> according to what the customers demand`; if (!canDoVaginal(slave)) { r += ` and what's possible for ${him}`; } @@ -1370,13 +1370,13 @@ window.saWhore = (function saWhore() { if (slave.devotion < 10) { if (jsRandom(1, 100) > 70) { if (slave.skill.vaginal <= 30 && canDoVaginal(slave)) { - r += ` After being fucked too hard too often, ${he} now <span class=red>dislikes being penetrated.</span>`; + r += ` After being fucked too hard too often, ${he} now <span class="red">dislikes being penetrated.</span>`; slave.sexualFlaw = "hates penetration"; } else if (slave.skill.anal <= 30 && canDoAnal(slave)) { - r += ` After so much anal pain, ${he} now <span class=red>dislikes being buttfucked.</span>`; + r += ` After so much anal pain, ${he} now <span class="red">dislikes being buttfucked.</span>`; slave.sexualFlaw = "hates anal"; } else if (slave.skill.oral <= 30) { - r += ` After one too many facials, ${he} now <span class=red>dislikes sucking cock.</span>`; + r += ` After one too many facials, ${he} now <span class="red">dislikes sucking cock.</span>`; slave.sexualFlaw = "hates oral"; } } @@ -1402,7 +1402,7 @@ window.saWhore = (function saWhore() { * @param {App.Entity.SlaveState} slave */ function addCashText(slave) { - r += ` In total, you were paid <span class=yellowgreen>${cashFormat(cash)}</span> for the use of ${slave.slaveName}'s body this week.`; + r += ` In total, you were paid <span class="yellowgreen">${cashFormat(cash)}</span> for the use of ${slave.slaveName}'s body this week.`; } /** @@ -1634,12 +1634,12 @@ window.saWhore = (function saWhore() { } if (slave.energy > 40 && slave.energy < 95) { - r += ` Being used sexually all week <span class=lime>increases ${his} sex drive.</span>`; + r += ` Being used sexually all week <span class="lime">increases ${his} sex drive.</span>`; slave.energy += 1; } if (cervixPump > 0) { - r += ` ${He} notices ${his} <span class=lime>belly has swollen</span> from all the `; + r += ` ${He} notices ${his} <span class="lime">belly has swollen</span> from all the `; if (slave.cervixImplant === 1) { r += `vaginal`; } else if (slave.cervixImplant === 2) { @@ -1660,9 +1660,9 @@ window.saWhore = (function saWhore() { if (vignette.type === "cash") { const cashVign = Math.trunc(FuckResult * vignette.effect); if (vignette.effect > 0) { - r += `<span class=yellowgreen>making you an extra ${cashFormat(cashVign)}.</span>`; + r += `<span class="yellowgreen">making you an extra ${cashFormat(cashVign)}.</span>`; } else if (vignette.effect < 0) { - r += `<span class=red>losing you ${cashFormat(Math.abs(cashVign))}.</span>`; + r += `<span class="red">losing you ${cashFormat(Math.abs(cashVign))}.</span>`; } else { r += `an incident without lasting effect.`; } @@ -1677,23 +1677,23 @@ window.saWhore = (function saWhore() { } else if (vignette.type === "devotion") { if (vignette.effect > 0) { if (slave.devotion > 50) { - r += `<span class=hotpink>increasing ${his} devotion to you.</span>`; + r += `<span class="hotpink">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class=hotpink>increasing ${his} acceptance of you.</span>`; + r += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class=hotpink>reducing ${his} dislike of you.</span>`; + r += `<span class="hotpink">reducing ${his} dislike of you.</span>`; } else { - r += `<span class=hotpink>reducing ${his} hatred of you.</span>`; + r += `<span class="hotpink">reducing ${his} hatred of you.</span>`; } } else if (vignette.effect < 0) { if (slave.devotion > 50) { - r += `<span class=mediumorchid>reducing ${his} devotion to you.</span>`; + r += `<span class="mediumorchid">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class=mediumorchid>reducing ${his} acceptance of you.</span>`; + r += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class=mediumorchid>increasing ${his} dislike of you.</span>`; + r += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; } else { - r += `<span class=mediumorchid>increasing ${his} hatred of you.</span>`; + r += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; } } else { r += `an incident without lasting effect.`; @@ -1702,19 +1702,19 @@ window.saWhore = (function saWhore() { } else if (vignette.type === "trust") { if (vignette.effect > 0) { if (slave.trust > 20) { - r += `<span class=mediumaquamarine>increasing ${his} trust in you.</span>`; + r += `<span class="mediumaquamarine">increasing ${his} trust in you.</span>`; } else if (slave.trust >= -50) { - r += `<span class=mediumaquamarine>reducing ${his} fear of you.</span>`; + r += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; } else { - r += `<span class=mediumaquamarine>reducing ${his} terror of you.</span>`; + r += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; } } else if (vignette.effect < 0) { if (slave.trust > 20) { - r += `<span class=gold>reducing ${his} trust in you.</span>`; + r += `<span class="gold">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - r += `<span class=gold>increasing ${his} fear of you.</span>`; + r += `<span class="gold">increasing ${his} fear of you.</span>`; } else { - r += `<span class=gold>increasing ${his} terror of you.</span>`; + r += `<span class="gold">increasing ${his} terror of you.</span>`; } } else { r += `an incident without lasting effect.`; @@ -1722,18 +1722,18 @@ window.saWhore = (function saWhore() { slave.trust += (1 * vignette.effect); } else if (vignette.type === "health") { if (vignette.effect > 0) { - r += `<span class=green>improving ${his} health.</span>`; + r += `<span class="green">improving ${his} health.</span>`; } else if (vignette.effect < 0) { - r += `<span class=red>affecting ${his} health.</span>`; + r += `<span class="red">affecting ${his} health.</span>`; } else { r += `an incident without lasting effect.`; } slave.health += (2 * vignette.effect); } else { if (vignette.effect > 0) { - r += `<span class=green>gaining you a bit of reputation.</span>`; + r += `<span class="green">gaining you a bit of reputation.</span>`; } else if (vignette.effect < 0) { - r += `<span class=red>losing you a bit of reputation.</span>`; + r += `<span class="red">losing you a bit of reputation.</span>`; } else { r += `an incident without lasting effect.`; } diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js index f5e0a84e150..2c0d00d18dd 100644 --- a/src/endWeek/saWorkAGloryHole.js +++ b/src/endWeek/saWorkAGloryHole.js @@ -108,25 +108,25 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() { } r += ` protect ${his} health from the stress of being used as a sexual appliance.`; } else if (slave.health < -50) { - r += ` The stress of being used while very ill <span class=red>damaged ${his} health.</span>`; + r += ` The stress of being used while very ill <span class="red">damaged ${his} health.</span>`; slave.health -= Math.max(Math.trunc((slave.sexAmount - 100) / 25) + jsRandom(-2, 2), 1); } else if (slave.health < -10) { if (jsRandom(1, 100) < 10) { - r += ` The stress of being used while weak has <span class=red>damaged ${his} health.</span>`; + r += ` The stress of being used while weak has <span class="red">damaged ${his} health.</span>`; slave.health -= Math.max(Math.trunc((slave.sexAmount - 100) / 25) + jsRandom(-2, 2), 1); } } else if (!canDoVaginal(slave) && !canDoAnal(slave)) { if (jsRandom(1, 100) < 75) { - r += ` The stress of being used repeatedly in only one hole has <span class=red>damaged ${his} health.</span>`; + r += ` The stress of being used repeatedly in only one hole has <span class="red">damaged ${his} health.</span>`; slave.health -= Math.max(Math.trunc((slave.sexAmount - 100) / 25) + jsRandom(-2, 2), 1); } } else if (!canDoVaginal(slave)) { if (jsRandom(1, 100) < 50) { - r += ` The stress of being used in only two holes has <span class=red>damaged ${his} health.</span>`; + r += ` The stress of being used in only two holes has <span class="red">damaged ${his} health.</span>`; slave.health -= Math.max(Math.trunc((slave.sexAmount - 100) / 25) + jsRandom(-2, 2), 1); } } else if (jsRandom(1, 100) < 25) { - r += ` The stress of being used has <span class=red>damaged ${his} health.</span>`; + r += ` The stress of being used has <span class="red">damaged ${his} health.</span>`; slave.health -= Math.max(Math.trunc((slave.sexAmount - 100) / 25) + jsRandom(-2, 2), 1); } @@ -137,12 +137,12 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() { } else { r += `Fuckdoll`; } - r += ` user takes ${his} virginity. He does not notice or care. <span class=lime>${His} pussy has been broken in</span> in a <span class=gold>painful</span> and <span class=mediumorchid>degrading</span> way.`; + r += ` user takes ${his} virginity. He does not notice or care. <span class="lime">${His} pussy has been broken in</span> in a <span class="gold">painful</span> and <span class="mediumorchid">degrading</span> way.`; slave.devotion -= 10; slave.trust -= 10; slave.vagina = 1; } else if (slave.vagina < 3 && canDoVaginal(slave) && jsRandom(1, 100) > ((310 - beauty) + (slave.vagina * 10))) { - r += ` <span class=lime>${His} pussy gets stretched out by the use.</span>`; + r += ` <span class="lime">${His} pussy gets stretched out by the use.</span>`; slave.vagina += 1; } @@ -159,12 +159,12 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() { } else { r += `a Fuckdoll`; } - r += ` is so great. <span class=lime>${His} ass has been broken in</span> in a <span class=gold>painful</span> and <span class=mediumorchid>degrading</span> way.`; + r += ` is so great. <span class="lime">${His} ass has been broken in</span> in a <span class="gold">painful</span> and <span class="mediumorchid">degrading</span> way.`; slave.devotion -= 5; slave.trust -= 5; slave.anus = 1; } else if (slave.anus < 3 && canDoAnal(slave) && jsRandom(1, 100) > ((290 - beauty) + (slave.anus * 10))) { - r += ` <span class=lime>${His} asshole sees constant use and loosens.</span>`; + r += ` <span class="lime">${His} asshole sees constant use and loosens.</span>`; slave.anus += 1; } } @@ -195,15 +195,15 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() { slave.behavioralFlaw = "odd"; } if (slave.devotion > 50) { - r += ` ${He} does $his best to tolerate ${his} sentence to the glory hole, but <span class=mediumorchid>${his} devotion is hurt</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` ${He} does $his best to tolerate ${his} sentence to the glory hole, but <span class="mediumorchid">${his} devotion is hurt</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } else if (slave.devotion > 20) { - r += ` ${He} does not understand why ${his} obedience has earned ${him} a sentence to this torture. <span class=mediumorchid>${His} obedience is hurt</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` ${He} does not understand why ${his} obedience has earned ${him} a sentence to this torture. <span class="mediumorchid">${His} obedience is hurt</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } else if (slave.devotion >= -20) { - r += ` ${His} fear of you turns to desperation during ${his} sentence. <span class=mediumorchid>${His} obedience is reduced</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` ${His} fear of you turns to desperation during ${his} sentence. <span class="mediumorchid">${His} obedience is reduced</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } else if (slave.devotion >= -50) { - r += ` Though ${he} is only temporarily sentenced to suffer, <span class=mediumorchid>${his} resistance is increased</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` Though ${he} is only temporarily sentenced to suffer, <span class="mediumorchid">${his} resistance is increased</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } else { - r += ` ${He} has hope ${he}'ll be released after ${his} sentence, but <span class=mediumorchid>${his} hatred of you is increased</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` ${He} has hope ${he}'ll be released after ${his} sentence, but <span class="mediumorchid">${his} hatred of you is increased</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } slave.devotion -= 5; slave.trust -= 5; @@ -213,15 +213,15 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() { slave.behavioralFlaw = "odd"; } if (slave.devotion > 50) { - r += ` ${He} feels starved of personal contact. <span class=mediumorchid>${His} devotion is hurt</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` ${He} feels starved of personal contact. <span class="mediumorchid">${His} devotion is hurt</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } else if (slave.devotion > 20) { - r += ` ${He} does not understand why ${his} obedience has earned ${him} this immurement. <span class=mediumorchid>${His} obedience is hurt</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` ${He} does not understand why ${his} obedience has earned ${him} this immurement. <span class="mediumorchid">${His} obedience is hurt</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } else if (slave.devotion >= -20) { - r += ` ${His} fear of you has increased into something like a pathology. <span class=mediumorchid>${His} obedience is reduced</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` ${His} fear of you has increased into something like a pathology. <span class="mediumorchid">${His} obedience is reduced</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } else if (slave.devotion >= -50) { - r += ` ${His} resistance is deepening into hatred. <span class=mediumorchid>${His} resistance is increased</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` ${His} resistance is deepening into hatred. <span class="mediumorchid">${His} resistance is increased</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } else { - r += ` <span class=mediumorchid>${His} helpless hatred of you is increased</span> and ${he} is <span class=gold>filled with fear</span> ${he} won't be let out.`; + r += ` <span class="mediumorchid">${His} helpless hatred of you is increased</span> and ${he} is <span class="gold">filled with fear</span> ${he} won't be let out.`; } slave.devotion -= 10; slave.trust -= 10; @@ -236,9 +236,9 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() { function jobBody(slave) { r += ` ${His} feelings, skills, and appearance do not matter. ${He} is condemned to a world that consists of a tiny cell, featureless except for the never-ending dicks ${he} is required to service. You `; if (V.publicFuckdolls === 0) { - r += `were paid <span class=yellowgreen>${cashFormat((Math.trunc(beauty * FResult)))}</span>`; + r += `were paid <span class="yellowgreen">${cashFormat((Math.trunc(beauty * FResult)))}</span>`; } else { - r += `<span class=green>gained reputation</span>`; + r += `<span class="green">gained reputation</span>`; } r += ` for the use of ${slave.slaveName}'s holes this week.`; } @@ -425,7 +425,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() { } if (cervixPump > 0) { - r += ` ${He} notices ${his} <span class=lime>belly has swollen</span> from all the `; + r += ` ${He} notices ${his} <span class="lime">belly has swollen</span> from all the `; if (slave.cervixImplant === 1) { r += `vaginal `; } else if (slave.cervixImplant === 2) { diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js index cbac27f2039..a45c1172457 100644 --- a/src/endWeek/saWorkTheFarm.js +++ b/src/endWeek/saWorkTheFarm.js @@ -95,7 +95,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { if (slave.tired === 1) { t += `${He} is so tired that ${he} doesn't have the energy to work efficiently, impacting ${his} production. `; } - t += `As a result, ${he} produces <span class=chocolate>${ massFormat(food) }</span> of food over the week. `; + t += `As a result, ${he} produces <span class="chocolate">${ massFormat(food) }</span> of food over the week. `; // Close Food Production @@ -110,12 +110,12 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { if (arcology.FSSupremacist !== "unset") { if (slave.race === arcology.FFSupremacistRace) { - t += `Society <span class=red>disapproves</span> of your allowing a member of the elite race to be degraded in such a fashion, and thus ${he} didn't earn as much. `; + t += `Society <span class="red">disapproves</span> of your allowing a member of the elite race to be degraded in such a fashion, and thus ${he} didn't earn as much. `; } } if (arcology.FSSubjugationist !== "unset") { if (slave.race === arcology.FSSubjugationistRace) { - t += `Society <span class=green>approves</span> of the degradation you submit your ${ arcology.FSSubjugationistRace } slaves to, and so ${he} earns you a bit more. `; + t += `Society <span class="green">approves</span> of the degradation you submit your ${ arcology.FSSubjugationistRace } slaves to, and so ${he} earns you a bit more. `; } else { t += `Society doesn't disapprove of ${him} not being ${ arcology.FSSubjugationistRace }, but ${he} doesn't earn as much as ${he} would if ${he} was ${ arcology.FSSubjugationistRace }. `; } @@ -123,9 +123,9 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { if (arcology.FSRepopulationFocus !== "unset") { if (slave.pregWeek > 16) { if (slave.eggType !== "human") { - t += `Society is <span class=red>disgusted</span> by ${his} pregnancy when they realize that what it is in ${his} womb is not human. `; + t += `Society is <span class="red">disgusted</span> by ${his} pregnancy when they realize that what it is in ${his} womb is not human. `; } else { - t += `Society <span class=green>greatly approves</span> of your having pregnant slaves `; + t += `Society <span class="green">greatly approves</span> of your having pregnant slaves `; if (V.seeBestiality === 1) { t += `have sex`; } else { @@ -140,7 +140,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { if (slave.eggType !== "human") { t += `Society is disgusted by ${his} pregnancy until they learn that what is in ${his} womb is not human. `; } else { - t += `Society is <span class=red>extremely disgusted</span> by ${his} pregnancy and the fact that you would have ${him} `; + t += `Society is <span class="red">extremely disgusted</span> by ${his} pregnancy and the fact that you would have ${him} `; if (V.seeBestiality === 1) { t += `have sex`; } else if (V.farmyardShows) { @@ -152,14 +152,14 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { } if (arcology.FSGenderRadicalist !== "unset") { if (slave.dick > 0) { - t += `${His} patrons <span class=green>approve</span> of the fact that ${he} has a dick. `; + t += `${His} patrons <span class="green">approve</span> of the fact that ${he} has a dick. `; } else { // TODO: not sure what to do for this } } if (arcology.FSGenderFundamentalist !== "unset") { if (slave.pregWeek > 16) { - t += `${His} patrons <span class=green>approve</span> of the fact that ${he} is sporting a baby bump.`; + t += `${His} patrons <span class="green">approve</span> of the fact that ${he} is sporting a baby bump.`; } else { // TODO: also this } @@ -169,16 +169,16 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { } if (arcology.FSPaternalist !== "unset") { if (V.seeBestiality === 1 && V.farmyardBreeding) { - t += `Your citizens are <span class=red>very disapproving</span> of the fact that you would allow something as degrading as having your slaves to be knocked up by filthy beasts. `; + t += `Your citizens are <span class="red">very disapproving</span> of the fact that you would allow something as degrading as having your slaves to be knocked up by filthy beasts. `; } else { - t += `Your citizens <span class=red>disapprove</span> of the fact that you would allow your slaves to be degraded in such a manner. `; + t += `Your citizens <span class="red">disapprove</span> of the fact that you would allow your slaves to be degraded in such a manner. `; } } if (arcology.FSDegradationist !== "unset") { if (V.seeBestiality === 1 && V.farmyardBreeding) { - t += `Your citizens are <span class=green>very approving</span> of the fact that you would allow something as degrading as having your slaves to be knocked up by filthy beasts. `; + t += `Your citizens are <span class="green">very approving</span> of the fact that you would allow something as degrading as having your slaves to be knocked up by filthy beasts. `; } else { - t += `Your citizens <span class=green>approve</span> of the fact that you would allow your slaves to be degraded in such a manner. `; + t += `Your citizens <span class="green">approve</span> of the fact that you would allow your slaves to be degraded in such a manner. `; } } if (arcology.FSBodyPurist !== "unset") { @@ -213,21 +213,21 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { } if (arcology.FSYouthPreferentialist !== "unset") { if (slave.visualAge > 25) { // TODO: not sure about this age - t += `${arcology.name }'s citizens <span class=red>disapprove</span> of your using such old slaves to put on shows. `; + t += `${arcology.name }'s citizens <span class="red">disapprove</span> of your using such old slaves to put on shows. `; } else { - t += `${arcology.name }'s citizens <span class=green>approve</span> of your using young slaves to put on shows. `; + t += `${arcology.name }'s citizens <span class="green">approve</span> of your using young slaves to put on shows. `; } } if (arcology.FSMaturityPreferentialist !== "unset") { if (slave.visualAge > 25) { // TODO: not sure about this age - t += `${arcology.name }'s citizens <span class=green>approve</span> of your using mature slaves to put on shows. `; + t += `${arcology.name }'s citizens <span class="green">approve</span> of your using mature slaves to put on shows. `; } else { - t += `${arcology.name }'s citizens <span class=red>disapprove</span> of your using such young slaves to put on shows. `; + t += `${arcology.name }'s citizens <span class="red">disapprove</span> of your using such young slaves to put on shows. `; } } if (arcology.FSSlimnessEnthusiast !== "unset") { if (slave.weight > 10) { - t += `Society finds a slave with such a flabby body <span class=red>absolutely disgusting.</span> `; + t += `Society finds a slave with such a flabby body <span class="red">absolutely disgusting.</span> `; } if (slave.boobs > 799) { t += `Your citizens `; @@ -417,9 +417,9 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { if (slave.fetishKnown && (slave.fetish === "submissive" || slave.fetish === "humiliation" || slave.fetish === "masochist") || slave.energy > 95) { if (V.farmyardShows) { if (V.seeBestiality === 1) { - t += `Getting fucked by animals is the perfect job for ${him}, as far as ${he} can tell. <span class=hotpink>${He} is happy</span> to spend ${his} days being utterly degraded. `; + t += `Getting fucked by animals is the perfect job for ${him}, as far as ${he} can tell. <span class="hotpink">${He} is happy</span> to spend ${his} days being utterly degraded. `; } else { - t += `${He} loves putting on shows with animals, and as far as ${he} can tell, it's the perfect job for ${him}. <span class=hotpink>${He} is happy</span> to spend ${his} days doing something so degrading. `; // TODO: not sure how degrading putting on shows is + t += `${He} loves putting on shows with animals, and as far as ${he} can tell, it's the perfect job for ${him}. <span class="hotpink">${He} is happy</span> to spend ${his} days doing something so degrading. `; // TODO: not sure how degrading putting on shows is } } slave.devotion += 1; @@ -428,7 +428,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { } } if (slave.behavioralQuirk === "fitness") { - t += `${slave.slaveName } <span class=hotpink>privately enjoys</span> the exercise ${he} receives while working in ${farmyardName}. `; + t += `${slave.slaveName } <span class="hotpink">privately enjoys</span> the exercise ${he} receives while working in ${farmyardName}. `; slave.devotion += 1; } @@ -442,9 +442,9 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { if (vignette.type === "cash") { FResult(slave); if (vignette.effect > 0) { - t += ` <span class=yellowgreen>making you an extra ${ cashFormat(Math.trunc(V.FResult*vignette.effect)) }.</span> `; + t += ` <span class="yellowgreen">making you an extra ${ cashFormat(Math.trunc(V.FResult*vignette.effect)) }.</span> `; } else if (vignette.effect < 0) { - t += ` <span class=red>losing you ${ cashFormat(Math.abs(Math.trunc(V.FResult*vignette.effect))) }.</span> `; + t += ` <span class="red">losing you ${ cashFormat(Math.abs(Math.trunc(V.FResult*vignette.effect))) }.</span> `; } else { t += ` an incident without lasting effect. `; } @@ -453,23 +453,23 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { } else if (vignette.type === "devotion") { if (vignette.effect > 0) { if (slave.devotion > 50) { - t += ` <span class=hotpink>increasing ${his} devotion to you.</span> `; + t += ` <span class="hotpink">increasing ${his} devotion to you.</span> `; } else if (slave.devotion >= -20) { - t += ` <span class=hotpink>increasing ${his} acceptance of you.</span> `; + t += ` <span class="hotpink">increasing ${his} acceptance of you.</span> `; } else if (slave.devotion >= -20) { - t += ` <span class=hotpink>reducing ${his} dislike of you.</span> `; + t += ` <span class="hotpink">reducing ${his} dislike of you.</span> `; } else { - t += ` <span class=hotpink>reducing ${his} hatred of you.</span> `; + t += ` <span class="hotpink">reducing ${his} hatred of you.</span> `; } } else if (vignette.effect < 0) { if (slave.devotion > 50) { - t += ` <span class=mediumorchid>reducing ${his} devotion to you.</span> `; + t += ` <span class="mediumorchid">reducing ${his} devotion to you.</span> `; } else if (slave.devotion >= 20) { - t += ` <span class=mediumorchid>reducing ${his} acceptance of you.</span> `; + t += ` <span class="mediumorchid">reducing ${his} acceptance of you.</span> `; } else if (slave.devotion >= -20) { - t += ` <span class=mediumorchid>increasing ${his} dislike of you.</span> `; + t += ` <span class="mediumorchid">increasing ${his} dislike of you.</span> `; } else { - t += ` <span class=mediumorchid>increasing ${his} hatred of you.</span> `; + t += ` <span class="mediumorchid">increasing ${his} hatred of you.</span> `; } } else { t += ` an incident without lasting effect. `; @@ -478,19 +478,19 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { } else if (vignette.type === "trust") { if (vignette.effect > 0) { if (slave.trust > 20) { - t += ` <span class=mediumaquamarine>increasing ${his} trust in you.</span> `; + t += ` <span class="mediumaquamarine">increasing ${his} trust in you.</span> `; } else if (slave.trust >= -20) { - t += ` <span class=mediumaquamarine>reducing ${his} fear of you.</span> `; + t += ` <span class="mediumaquamarine">reducing ${his} fear of you.</span> `; } else { - t += ` <span class=mediumaquamarine>reducing ${his} terror of you.</span> `; + t += ` <span class="mediumaquamarine">reducing ${his} terror of you.</span> `; } } else if (vignette.effect < 0) { if (slave.trust > 20) { - t += ` <span class=gold>reducing ${his} trust in you.</span> `; + t += ` <span class="gold">reducing ${his} trust in you.</span> `; } else if (slave.trust >= -20) { - t += ` <span class=gold>increasing ${his} fear of you.</span> `; + t += ` <span class="gold">increasing ${his} fear of you.</span> `; } else { - t += ` <span class=gold>increasing ${his} terror of you.</span> `; + t += ` <span class="gold">increasing ${his} terror of you.</span> `; } } else { t += ` an incident without lasting effect. `; @@ -498,9 +498,9 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { slave.trust += 1 * vignette.effect; } else if (vignette.type === "health") { if (vignette.effect > 0) { - t += ` <span class=green>improving ${his} health.</span> `; + t += ` <span class="green">improving ${his} health.</span> `; } else if (vignette.effect < 0) { - t += ` <span class=red>affecting ${his} health.</span> `; + t += ` <span class="red">affecting ${his} health.</span> `; } else { t += ` an incident without lasting effect. `; } @@ -508,9 +508,9 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { } else { FResult(slave); if (vignette.effect > 0) { - t += ` <span class=green>gaining you a bit of reputation.</span> `; + t += ` <span class="green">gaining you a bit of reputation.</span> `; } else if (vignette.effect < 0) { - t += ` <span class=red>losing you a bit of reputation.</span> `; + t += ` <span class="red">losing you a bit of reputation.</span> `; } else { t += ` an incident without lasting effect. `; } diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js index a8829ab1bde..65430da9617 100644 --- a/src/interaction/main/mainLinks.js +++ b/src/interaction/main/mainLinks.js @@ -74,7 +74,7 @@ App.UI.View.MainLinks = function() { if (dwi > 0 && dwi === l - 1) { r += ` and `; } - r += `<strong><u><span class=pink>${SlaveFullName(PA[dwi])}</span></u></strong> to ${V.personalAttention[dwi].trainingRegimen}`; + r += `<strong><u><span class="pink">${SlaveFullName(PA[dwi])}</span></u></strong> to ${V.personalAttention[dwi].trainingRegimen}`; if (dwi > 0 && dwi < l - 2) { r += `,`; } @@ -86,39 +86,39 @@ App.UI.View.MainLinks = function() { } if (V.PCWounded !== 1) { - r += ` <span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> <span class=cyan>[A]</span>`; + r += ` <span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> <span class="cyan">[A]</span>`; } if (V.useSlaveSummaryOverviewTab !== 1) { if (typeof V.slaveIndices[V.HeadGirl.ID] !== 'undefined') { - r += `<br><strong><u><span class=pink>${SlaveFullName(V.HeadGirl)}</span></u></strong> is serving as your Head Girl`; + r += `<br><strong><u><span class="pink">${SlaveFullName(V.HeadGirl)}</span></u></strong> is serving as your Head Girl`; if (V.arcologies[0].FSEgyptianRevivalistLaw === 1) { r += ` and Consort`; } - r += `. <span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> <span class=cyan>[H]</span>`; + r += `. <span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> <span class="cyan">[H]</span>`; } else if (typeof V.slaveIndices[V.HeadGirl.ID] === 'undefined' && (V.slaves.length > 1)) { r += `<br>You have not selected a Head Girl`; if (V.arcologies[0].FSEgyptianRevivalistLaw === 1) { r += ` and Consort`; } - r += `. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> <span class=cyan>[H]</span>`; + r += `. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> <span class="cyan">[H]</span>`; } else if (typeof V.slaveIndices[V.HeadGirl.ID] === 'undefined') { r += `//You do not have enough slaves to keep a Head Girl//`; } r += `<br>`; if (typeof V.slaveIndices[V.Recruiter.ID] !== 'undefined') { - r += `<strong><u><span class=pink>${SlaveFullName(V.Recruiter)}</span></u></strong> is working to recruit girls. <span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> <span class=cyan>[U]</span>`; + r += `<strong><u><span class="pink">${SlaveFullName(V.Recruiter)}</span></u></strong> is working to recruit girls. <span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> <span class="cyan">[U]</span>`; } else { - r += `You have not selected a Recruiter. <span id="manageRecruiter"><strong><<link "Select one">><<goto "Recruiter Select">><</link>></strong></span> <span class=cyan>[U]</span>`; + r += `You have not selected a Recruiter. <span id="manageRecruiter"><strong><<link "Select one">><<goto "Recruiter Select">><</link>></strong></span> <span class="cyan">[U]</span>`; } if (V.dojo) { r += `<br>`; if (typeof V.slaveIndices[V.Bodyguard.ID] !== 'undefined') { - r += `<strong><u><span class=pink>${SlaveFullName(V.Bodyguard)}</span></u></strong> is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> <span class=cyan>[B]</span>`; + r += `<strong><u><span class="pink">${SlaveFullName(V.Bodyguard)}</span></u></strong> is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> <span class="cyan">[B]</span>`; } else { - r += `You have not selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> <span class=cyan>[B]</span>`; + r += `You have not selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> <span class="cyan">[B]</span>`; } } } @@ -137,13 +137,13 @@ App.UI.View.MainLinks = function() { }); /* if the interrogated slave has one or more organs ready: */ if (slaveOrgans > 0) { - r += '<br><span class=yellow>The fabricator has completed '; + r += '<br><span class="yellow">The fabricator has completed '; if (slaveOrgans > 1) { r += `${slaveOrgans} organs`; } else { r += 'an organ'; } - r += ` for </span><<link "<<print $slaves[${i}].slaveName>>">><<set $activeSlave = $slaves[${i}]>><<goto "Slave Interact">><</link>>, <span class=yellow> which `; + r += ` for </span><<link "<<print $slaves[${i}].slaveName>>">><<set $activeSlave = $slaves[${i}]>><<goto "Slave Interact">><</link>>, <span class="yellow"> which `; if (slaveOrgans > 1) { r += 'are'; } else { @@ -159,7 +159,7 @@ App.UI.View.MainLinks = function() { if (getSlave(V.adjustProsthetics[j].slaveID) !== undefined) { let i = V.slaveIndices[V.adjustProsthetics[j].slaveID]; if (V.adjustProsthetics[j].workLeft <= 0) { - r += `<br><span class=yellow>The lab has completed <<= addA(setup.prosthetics[$adjustProsthetics[${j}].id].name)>> for</span> <span id="name"><<= "[[SlaveFullName($slaves[${i}])|Slave Interact][$activeSlave = $slaves[${i}]]]">>,</span> <span class=yellow> which is ready to be attached.</span>`; + r += `<br><span class="yellow">The lab has completed <<= addA(setup.prosthetics[$adjustProsthetics[${j}].id].name)>> for</span> <span id="name"><<= "[[SlaveFullName($slaves[${i}])|Slave Interact][$activeSlave = $slaves[${i}]]]">>,</span> <span class="yellow"> which is ready to be attached.</span>`; } } else { V.adjustProsthetics.splice(j, 1); @@ -169,51 +169,51 @@ App.UI.View.MainLinks = function() { } if (V.completedOrgans.length > 0 && V.adjustProstheticsCompleted > 0) { - r += `<br>[[Implant and Attach|Multiple Organ Implant]] <span class=yellow>all organs and prosthetics that are ready.</span>`; + r += `<br>[[Implant and Attach|Multiple Organ Implant]] <span class="yellow">all organs and prosthetics that are ready.</span>`; } else if (V.completedOrgans.length > 0) { - r += `<br>[[Implant|Multiple Organ Implant]] <span class=yellow>all organs that are ready for implantation.</span>`; + r += `<br>[[Implant|Multiple Organ Implant]] <span class="yellow">all organs that are ready for implantation.</span>`; } else if (V.adjustProstheticsCompleted > 0) { - r += `<br>[[Attach|Multiple Organ Implant]] <span class=yellow>all prosthetics that are ready to be attached.</span>`; + r += `<br>[[Attach|Multiple Organ Implant]] <span class="yellow">all prosthetics that are ready to be attached.</span>`; } if (V.slaveCostFactor > 1.05) { - r += `<br><span class=yellow>There is a bull market for slaves; the price of slaves is very high.</span>`; + r += `<br><span class="yellow">There is a bull market for slaves; the price of slaves is very high.</span>`; } else if (V.slaveCostFactor > 1) { - r += `<br><span class=yellow>The slave market is bullish; the price of slaves is high.</span>`; + r += `<br><span class="yellow">The slave market is bullish; the price of slaves is high.</span>`; } else if (V.slaveCostFactor < 0.95) { - r += `<br><span class=yellow>There is a bear market for slaves; the price of slaves is very low.</span>`; + r += `<br><span class="yellow">There is a bear market for slaves; the price of slaves is very low.</span>`; } else if (V.slaveCostFactor < 1) { - r += `<br><span class=yellow>The slave market is bearish; the price of slaves is low.</span>`; + r += `<br><span class="yellow">The slave market is bearish; the price of slaves is low.</span>`; } else { r += `<br>The slave market is stable; the price of slaves is average.`; } - r += ` <span id="buySlaves"><strong><<link "Buy Slaves">><<goto "Buy Slaves">><</link>></strong></span> <span class=cyan>[S]</span>`; + r += ` <span id="buySlaves"><strong><<link "Buy Slaves">><<goto "Buy Slaves">><</link>></strong></span> <span class="cyan">[S]</span>`; if (V.TSS.schoolSale !== 0) { - r += `<br><span class=yellow>For your first purchase, </span><strong>[[The Slavegirl School][$slavesSeen += 1]]</strong><span class=yellow> will sell at half price this week.</span>`; + r += `<br><span class="yellow">For your first purchase, </span><strong>[[The Slavegirl School][$slavesSeen += 1]]</strong><span class="yellow"> will sell at half price this week.</span>`; } if (V.GRI.schoolSale !== 0) { - r += `<br><span class=yellow>For your first purchase, </span><strong>[[Growth Research Institute][$slavesSeen += 1]]</strong><span class=yellow> will sell at half price this week.</span>`; + r += `<br><span class="yellow">For your first purchase, </span><strong>[[Growth Research Institute][$slavesSeen += 1]]</strong><span class="yellow"> will sell at half price this week.</span>`; } if (V.SCP.schoolSale !== 0) { - r += `<br><span class=yellow>For your first purchase, </span><strong>[[St. Claver Preparatory][$slavesSeen += 1]]</strong><span class=yellow> will sell at half price this week.</span>`; + r += `<br><span class="yellow">For your first purchase, </span><strong>[[St. Claver Preparatory][$slavesSeen += 1]]</strong><span class="yellow"> will sell at half price this week.</span>`; } if (V.TCR.schoolSale !== 0) { - r += `<br><span class=yellow>For your first purchase, </span><strong>[[The Cattle Ranch][$slavesSeen += 1]]</strong><span class=yellow> will sell at half price this week.</span>`; + r += `<br><span class="yellow">For your first purchase, </span><strong>[[The Cattle Ranch][$slavesSeen += 1]]</strong><span class="yellow"> will sell at half price this week.</span>`; } if (V.HA.schoolSale !== 0) { - r += `<br><span class=yellow>For your first purchase, </span><strong>[[The Hippolyta Academy][$slavesSeen += 1]]</strong><span class=yellow> will sell at half price this week.</span>`; + r += `<br><span class="yellow">For your first purchase, </span><strong>[[The Hippolyta Academy][$slavesSeen += 1]]</strong><span class="yellow"> will sell at half price this week.</span>`; } if (V.seeDicks !== 0) { if (V.LDE.schoolSale !== 0) { - r += `<br><span class=yellow>For your first purchase, </span><strong>[[L'École des Enculées][$slavesSeen += 1]]</strong><span class=yellow> will sell at half price this week.</span>`; + r += `<br><span class="yellow">For your first purchase, </span><strong>[[L'École des Enculées][$slavesSeen += 1]]</strong><span class="yellow"> will sell at half price this week.</span>`; } if (V.TGA.schoolSale !== 0) { - r += `<br><span class=yellow>For your first purchase, </span><strong>[[The Gymnasium-Academy][$slavesSeen += 1]]</strong><span class=yellow> will sell at half price this week.</span>`; + r += `<br><span class="yellow">For your first purchase, </span><strong>[[The Gymnasium-Academy][$slavesSeen += 1]]</strong><span class="yellow"> will sell at half price this week.</span>`; } if (V.TFS.schoolSale !== 0) { - r += `<br><span class=yellow>For your first purchase, </span><strong>[[The Futanari Sisters][$slavesSeen += 1]]</strong><span class=yellow> will sell at half price this week.</span>`; + r += `<br><span class="yellow">For your first purchase, </span><strong>[[The Futanari Sisters][$slavesSeen += 1]]</strong><span class="yellow"> will sell at half price this week.</span>`; } } return r; diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 842b2b6e7f9..7d9282ce389 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -305,7 +305,7 @@ window.DefaultRules = (function() { break; default: - r += "<span class=\"red\">raWidgets missing case for assignment 'V.{rule.setAssignment}'</span>."; + r += `<span class="red">raWidgets missing case for assignment 'V.{rule.setAssignment}'</span>.`; break; } return rule; @@ -2903,7 +2903,7 @@ window.DefaultRules = (function() { } slave.trust -= 5; slave.health -= 10; - r += `<br>${slave.slaveName} has been branded, with <span class=gold>fear</span>${slave.devotion < 18 ? `, <span class=mediumorchid>regard,</span>` : ``} and <span class=red>health</span> consequences.`; + r += `<br>${slave.slaveName} has been branded, with <span class="gold">fear</span>${slave.devotion < 18 ? `, <span class="mediumorchid">regard,</span>` : ``} and <span class="red">health</span> consequences.`; } } } diff --git a/src/js/assayJS.js b/src/js/assayJS.js index 24150191818..b259946ef55 100644 --- a/src/js/assayJS.js +++ b/src/js/assayJS.js @@ -2051,17 +2051,17 @@ window.faceIncrease = function faceIncrease(slave, amount) { const His = capFirstChar(his); let r = ""; if (slave.face <= -95) - r += `<span class=green>${His} face is no longer horrifying,</span> and is now merely ugly.`; + r += `<span class="green">${His} face is no longer horrifying,</span> and is now merely ugly.`; else if (slave.face <= -40 && slave.face + amount > -40) - r += `<span class=green>${His} face is no longer ugly,</span> and is now merely unattractive.`; + r += `<span class="green">${His} face is no longer ugly,</span> and is now merely unattractive.`; else if (slave.face <= -10 && slave.face + amount > -10) - r += `<span class=green>${His} face is no longer unattractive,</span> and is now somewhat tolerable.`; + r += `<span class="green">${His} face is no longer unattractive,</span> and is now somewhat tolerable.`; else if (slave.face <= 10 && slave.face + amount > 10) - r += `<span class=green>${His} face is now decently attractive,</span> rather than merely tolerable.`; + r += `<span class="green">${His} face is now decently attractive,</span> rather than merely tolerable.`; else if (slave.face <= 40 && slave.face + amount > 40) - r += `<span class=green>${His} face is now quite beautiful,</span> rather than merely pretty.`; + r += `<span class="green">${His} face is now quite beautiful,</span> rather than merely pretty.`; else if (slave.face <= 95 && slave.face + amount > 95) - r += `<span class=green>${His} face is now perfect.</span> It's difficult to imagine how it could be any more beautiful.`; + r += `<span class="green">${His} face is now perfect.</span> It's difficult to imagine how it could be any more beautiful.`; slave.face = Math.clamp(slave.face + amount, -100, 100); if (slave.face > 95) slave.face = 100; return r; diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index 014dc0e3af3..cd503f1ab64 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -620,19 +620,19 @@ App.Desc.amputee = function(slave) { if (slave.amp) { if (slave.amp === -1) { - r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with a set of modern prosthetic limbs that allow ${him} a fairly normal life. `; + r += `${slave.slaveName} is a <span class="pink">quadruple amputee,</span> but ${he}'s equipped with a set of modern prosthetic limbs that allow ${him} a fairly normal life. `; } else if (slave.amp === -2) { - r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with P-Limbs customized for sex. ${His} fingertips vibrate, ${his} finger joints are masked to prevent pinching, and ${his} hands can dispense lube. `; + r += `${slave.slaveName} is a <span class="pink">quadruple amputee,</span> but ${he}'s equipped with P-Limbs customized for sex. ${His} fingertips vibrate, ${his} finger joints are masked to prevent pinching, and ${his} hands can dispense lube. `; } else if (slave.amp === -3) { - r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with P-Limbs customized to look natural. They are covered in a material that closely mimics living ${slave.skin} skin, and their servos are noise dampened. `; + r += `${slave.slaveName} is a <span class="pink">quadruple amputee,</span> but ${he}'s equipped with P-Limbs customized to look natural. They are covered in a material that closely mimics living ${slave.skin} skin, and their servos are noise dampened. `; } else if (slave.amp === -4) { - r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with P-Limbs customized for combat. They're hardened, strengthened, and more responsive, and they conceal taser knuckles and extensible forearm blades. `; + r += `${slave.slaveName} is a <span class="pink">quadruple amputee,</span> but ${he}'s equipped with P-Limbs customized for combat. They're hardened, strengthened, and more responsive, and they conceal taser knuckles and extensible forearm blades. `; } else if (slave.amp === -5) { - r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> but ${he}'s equipped with advanced cybernetic P-Limbs. The ultimate fusion of combat effectiveness and instruments of pleasure, they're capable of performing multiple functions. They can enhance sex through ${his} vibrating hands and increase ${his} combat skills with hardened, yet flexible artificial muscles. They have an advanced artificial skin that can send electrical impulses that can cause stimulation or extreme pain. `; + r += `${slave.slaveName} is a <span class="pink">quadruple amputee,</span> but ${he}'s equipped with advanced cybernetic P-Limbs. The ultimate fusion of combat effectiveness and instruments of pleasure, they're capable of performing multiple functions. They can enhance sex through ${his} vibrating hands and increase ${his} combat skills with hardened, yet flexible artificial muscles. They have an advanced artificial skin that can send electrical impulses that can cause stimulation or extreme pain. `; } else if (slave.amp > 0) { - r += `${slave.slaveName} is a <span class=pink>quadruple amputee,</span> making ${him} a convenient torso-only sex toy. `; + r += `${slave.slaveName} is a <span class="pink">quadruple amputee,</span> making ${him} a convenient torso-only sex toy. `; } else { - r += `The most obvious thing about ${slave.slaveName} is that ${he} is a <span class=pink>quadruple amputee:</span> ${he} has neither arms nor legs. `; + r += `The most obvious thing about ${slave.slaveName} is that ${he} is a <span class="pink">quadruple amputee:</span> ${he} has neither arms nor legs. `; } return r; } @@ -667,7 +667,7 @@ App.Desc.waist = function(slave) { r += `${He} has `; if (slave.waist > 95) { - r += `a badly <span class=red>masculine waist</span> that ruins ${his} figure`; + r += `a badly <span class="red">masculine waist</span> that ruins ${his} figure`; if (slave.weight > 30) { r += ` and greatly exaggerates how fat ${he} is. `; } else if (slave.weight < -30) { @@ -784,7 +784,7 @@ App.Desc.waist = function(slave) { } } } else if (slave.waist > 10) { - r += `an <span class=red>unattractive waist</span> that conceals ${his} `; + r += `an <span class="red">unattractive waist</span> that conceals ${his} `; if (slave.visualAge > 25) { r += `girlish`; } else { @@ -885,7 +885,7 @@ App.Desc.waist = function(slave) { } } } else if (slave.waist > -40) { - r += `a nice <span class=pink>feminine waist</span> that gives ${him} a `; + r += `a nice <span class="pink">feminine waist</span> that gives ${him} a `; if (slave.visualAge > 25) { r += `girlish`; } else { @@ -939,7 +939,7 @@ App.Desc.waist = function(slave) { } } else if (slave.waist > -40) { - r += `a nice <span class=pink>feminine waist</span> that gives ${him} a ` + r += `a nice <span class="pink">feminine waist</span> that gives ${him} a ` if (slave.visualAge > 25) { r += `girlish`; } else { @@ -999,7 +999,7 @@ App.Desc.waist = function(slave) { } } } else { - r += `an <span class=pink>absurdly narrow waist</span> that gives ${him} a cartoonishly hourglass figure`; + r += `an <span class="pink">absurdly narrow waist</span> that gives ${him} a cartoonishly hourglass figure`; if (slave.weight > 30) { r += ` made even more ludicrous by ${his} extra weight. `; } else if (slave.weight < -30) { diff --git a/src/js/economyJS.js b/src/js/economyJS.js index fc58dd3d9aa..7573cff3fab 100644 --- a/src/js/economyJS.js +++ b/src/js/economyJS.js @@ -1003,23 +1003,23 @@ window.slaveJobValues = function() { }); if (V.DJ !== 0) { if (!canTalk(V.DJ)) { - // <strong><u><span class=pink>$DJ.slaveName</span></u></strong> can't speak <span class=yellow>and cannot serve as your DJ any more.</span><br> + // <strong><u><span class="pink">$DJ.slaveName</span></u></strong> can't speak <span class="yellow">and cannot serve as your DJ any more.</span><br> V.DJ = 0; V.unDJ = 1; } else if (V.DJ.preg > 37 && V.DJ.broodmother === 2) { - // <strong><u><span class=pink>$DJ.slaveName</span></u></strong> spends so much time giving birth and laboring that <span class=yellow>$he cannot effectively serve as your DJ any longer.</span> + // <strong><u><span class="pink">$DJ.slaveName</span></u></strong> spends so much time giving birth and laboring that <span class="yellow">$he cannot effectively serve as your DJ any longer.</span> V.DJ = 0; V.unDJ = 2; } else if (V.DJ.fetish === "mindbroken") { - // <strong><u><span class=pink>$DJ.slaveName</span></u></strong> is mindbroken <span class=yellow>and cannot serve as your DJ any more.</span><br> + // <strong><u><span class="pink">$DJ.slaveName</span></u></strong> is mindbroken <span class="yellow">and cannot serve as your DJ any more.</span><br> V.DJ = 0; V.unDJ = 3; } else if (!canWalk(V.DJ)) { - // <strong><u><span class=pink>$DJ.slaveName</span></u></strong> is no longer independently mobile <span class=yellow>and cannot serve as your DJ any more.</span><br> + // <strong><u><span class="pink">$DJ.slaveName</span></u></strong> is no longer independently mobile <span class="yellow">and cannot serve as your DJ any more.</span><br> V.DJ = 0; V.unDJ = 4; } else if (!canHear(V.DJ)) { - // <strong><u><span class=pink>$DJ.slaveName</span></u></strong> can no longer hear <span class=yellow>and cannot serve as your DJ any more.</span><br> + // <strong><u><span class="pink">$DJ.slaveName</span></u></strong> can no longer hear <span class="yellow">and cannot serve as your DJ any more.</span><br> V.DJ = 0; V.unDJ = 5; } @@ -1036,16 +1036,16 @@ window.slaveJobValues = function() { // Though $DJ.slaveName does $his best to lead on the club, with $his lack of skill $he can do little. } else if (V.DJ.skill.entertainment <= 30) { DJRepBonus += 0.05; - // $DJ.slaveName's basic skills marginally <span class=green>improve</span> the atmosphere on $clubName. + // $DJ.slaveName's basic skills marginally <span class="green">improve</span> the atmosphere on $clubName. } else if (V.DJ.skill.entertainment <= 60) { DJRepBonus += 0.1; - // $DJ.slaveName's skills <span class=green>improve</span> the atmosphere on $clubName. + // $DJ.slaveName's skills <span class="green">improve</span> the atmosphere on $clubName. } else if (V.DJ.skill.entertainment < 100) { DJRepBonus += 0.15; - // $DJ.slaveName's skills greatly <span class=green>improve</span> the atmosphere on $clubName. + // $DJ.slaveName's skills greatly <span class="green">improve</span> the atmosphere on $clubName. } else if (V.DJ.skill.entertainment >= 100) { DJRepBonus += 0.20; - // $DJ.slaveName's mastery immensely <span class=gree>;improves</span> the atmosphere on $clubName. + // $DJ.slaveName's mastery immensely <span class="green">;improves</span> the atmosphere on $clubName. } if (V.DJ.muscles > 5 && V.DJ.muscles <= 95) { V.DJRepBonus += 0.05; diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js index 02f9f097034..0cf8241d6f1 100644 --- a/src/js/futureSocietyJS.js +++ b/src/js/futureSocietyJS.js @@ -423,7 +423,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier = 1) { } break; default: - errorMessage += '<span class=\'red\'>ERROR: bad FS reference</span>'; + errorMessage += `<span class="red">ERROR: bad FS reference</span>`; } return errorMessage; }; diff --git a/src/js/pregJS.js b/src/js/pregJS.js index 1a8f9c6fdbb..ceee11ec88f 100644 --- a/src/js/pregJS.js +++ b/src/js/pregJS.js @@ -425,9 +425,9 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) { } else if (!displayOverride) { target.pregKnown = 1; if (target.ID === -1) { - /* r += "<span class=lime>You have gotten pregnant.</span>"; */ + /* r += "<span class="lime">You have gotten pregnant.</span>"; */ } else { - r += `<span class=lime>${He} has become pregnant.</span>`; + r += `<span class="lime">${He} has become pregnant.</span>`; } } else { target.pregKnown = 1; @@ -449,9 +449,9 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) { } else if (!displayOverride) { target.pregKnown = 1; if (target.ID === -1) { - /* r += "<span class=lime>You have gotten pregnant.</span>"; */ + /* r += "<span class="lime">You have gotten pregnant.</span>"; */ } else { - r += `<span class=lime>${He} has become pregnant.</span>`; + r += `<span class="lime">${He} has become pregnant.</span>`; } if (target.geneticQuirks.superfetation === 2 && target.womb.length > 0) { if (V.seeHyperPreg === 1) { diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js index 27193ccf2a0..6cc77c4bfc9 100644 --- a/src/js/rulesAutosurgery.js +++ b/src/js/rulesAutosurgery.js @@ -586,7 +586,7 @@ window.rulesAutosurgery = (function() { surgeriesDisplay = surgeries.slice(0, surgeries.length - 1).join(", "); surgeriesDisplay += `, and ${surgeries[surgeries.length - 1]}`; } - r += `${V.assistantName === "your personal assistant" ? "Your personal assistant" : V.assistantName}, ordered to apply surgery, gives ${slave.slaveName} <span class=lime>${surgeriesDisplay}.</span>`; + r += `${V.assistantName === "your personal assistant" ? "Your personal assistant" : V.assistantName}, ordered to apply surgery, gives ${slave.slaveName} <span class="lime">${surgeriesDisplay}.</span>`; } /** diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js index f489f27fe81..4bed7f0d770 100644 --- a/src/js/slaveGenerationJS.js +++ b/src/js/slaveGenerationJS.js @@ -1378,7 +1378,7 @@ window.checkForGingering = function checkForGingering() { default: r += `${He} is acting oddly, presenting ${his} ass in an awkward way and acting uncomfortable. ${He}'s obviously had an irritant shoved up ${his} butt to make ${him} act like an anal whore.`; } - r += ` It's a trick you're very familiar with, given your <span class=springgreen>training as a slaver.</span>`; + r += ` It's a trick you're very familiar with, given your <span class="springgreen">training as a slaver.</span>`; } else { /* not slaver */ if (V.PC.warfare >= 100 && jsRandom(1, 2) === 1) { @@ -1414,9 +1414,9 @@ window.checkForGingering = function checkForGingering() { r += `${He} is acting oddly, presenting ${his} ass in an awkward way and acting uncomfortable. ${He} may be considerably less interested in anal sex than ${he} seems. `; } if (V.gingeringDetection === "mercenary") { - r += `The nervous seller confirms this in response to a direct inquiry. Your intimidating reputation from your <span class=springgreen>extensive combat training</span> has its uses.`; + r += `The nervous seller confirms this in response to a direct inquiry. Your intimidating reputation from your <span class="springgreen">extensive combat training</span> has its uses.`; } else if (V.gingeringDetection === "force") { - r += `The nervous seller confirms this in response to a direct inquiry. Your reputation as a <span class=springgreen> ${V.PCTitle ? "man" : "woman"} of blood</span> has its uses.`; + r += `The nervous seller confirms this in response to a direct inquiry. Your reputation as a <span class="springgreen"> ${V.PCTitle ? "man" : "woman"} of blood</span> has its uses.`; } } } /* gingering detected */ diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 7a351d8a356..2bdfb6fd51c 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -106,9 +106,9 @@ window.SlaveSummaryUncached = (function() { V.desc = SlaveTitle(slave); const 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> `; + r += `<strong><span class="coral">${V.desc}${V.abbreviatePhysicals === 2? '.' : ''}</span></strong> `; if (V.seeRace === 1) { - r += `<span class=tan>`; + r += `<span class="tan">`; if (V.abbreviateRace === 1) { short_race(slave); } else if (V.abbreviateRace === 2) { @@ -124,7 +124,7 @@ window.SlaveSummaryUncached = (function() { if (V.abbreviatePhysicals === 1) { short_skin(slave); } else { - r += `<span class=pink>${slave.skin.charAt(0).toUpperCase() + slave.skin.slice(1)} skin.</span> `; + r += `<span class="pink">${slave.skin.charAt(0).toUpperCase() + slave.skin.slice(1)} skin.</span> `; } if (V.abbreviateGenitalia === 1) { short_genitals(slave); @@ -174,18 +174,19 @@ window.SlaveSummaryUncached = (function() { } if (V.abbreviateHormoneBalance === 1) { if (slave.hormoneBalance <= -21) { - r += `<span class=deepskyblue>`; + r += `<span class="deepskyblue">`; r += ` <strong>HB:M</strong>`; } else if (slave.hormoneBalance <= 20) { - r += `<span class=pink>`; + r += `<span class="pink">`; r += ` <strong>HB:N</strong>`; } else if (slave.hormoneBalance <= 500) { - r += `<span class=pink>`; + r += `<span class="pink">`; r += ` <strong>HB:F</strong>`; } r += `</span>`; } else if (V.abbreviateHormoneBalance === 2) { - r += `<span class=`; if (slave.hormoneBalance <= -21) { + r += `<span class=`; + if (slave.hormoneBalance <= -21) { r += `deepskyblue`; } else { r += `pink`; @@ -275,7 +276,7 @@ window.SlaveSummaryUncached = (function() { long_sex_quirk(slave); } if (slave.custom.label) { - r += `<strong><span class=yellow>${capFirstChar(slave.custom.label)}</span></strong>`; + r += `<strong><span class="yellow">${capFirstChar(slave.custom.label)}</span></strong>`; } if ((slave.relationship !== 0) || (slave.relation !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) { r += `<br>`; @@ -284,7 +285,7 @@ window.SlaveSummaryUncached = (function() { } } if (V.abbreviateMental === 1) { - r += `<span class=lightgreen>`; + r += `<span class="lightgreen">`; if (V.familyTesting === 1) { short_extended_family(slave); } else { @@ -336,50 +337,50 @@ window.SlaveSummaryUncached = (function() { */ function short_devotion(slave) { if (slave.fetish === "mindbroken") { - r += `<span class=red>MB</span>`; + r += `<span class="red">MB</span>`; } else if (slave.devotion < -95) { - r += `<span class=darkviolet>Hate${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; + r += `<span class="darkviolet">Hate${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; } else if (slave.devotion < -50) { - r += `<span class=darkviolet>Hate${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; + r += `<span class="darkviolet">Hate${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; } else if (slave.devotion < -20) { - r += `<span class=mediumorchid>Res${V.summaryStats ? `[${slave.devotion}]` : ''}</span>`; + 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) { - r += `<span class=darkgoldenrod>ETerr${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="darkgoldenrod">ETerr${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } else if (slave.trust < -50) { - r += `<span class=goldenrod>Terr${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="gold"enrod>Terr${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } else if (slave.trust < -20) { - r += `<span class=gold>Fright${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="gold">Fright${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } else if (slave.trust <= 20) { - r += `<span class=yellow>Fear${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="yellow">Fear${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } else if (slave.trust <= 50) { if (slave.devotion < -20) { - r += `<span class=orange>Caref${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="orange">Caref${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } else { - r += `<span class=mediumaquamarine>Caref${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="mediumaquamarine">Caref${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } } else if (slave.trust < 95) { if (slave.devotion < -20) { - r += `<span class=orangered>Bold${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="orange"red>Bold${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } else { - r += `<span class=mediumseagreen>Trust${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="mediumseagreen">Trust${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } } else { if (slave.devotion < -20) { - r += `<span class=darkred>Defiant${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="darkred">Defiant${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } else { - r += `<span class=seagreen>VTrust ${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; + r += `<span class="seagreen">VTrust ${V.summaryStats ? `[${slave.trust}]` : ''}</span>`; } } r += " "; @@ -390,50 +391,50 @@ window.SlaveSummaryUncached = (function() { */ function long_devotion(slave) { if (slave.fetish === "mindbroken") { - r += `<span class=red>Mindbroken.</span>`; + r += `<span class="red">Mindbroken.</span>`; } else if (slave.devotion < -95) { - r += `<span class=darkviolet>Very hateful${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; + r += `<span class="darkviolet">Very hateful${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; } else if (slave.devotion < -50) { - r += `<span class=darkviolet>Hateful${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; + r += `<span class="darkviolet">Hateful${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; } else if (slave.devotion < -20) { - r += `<span class=mediumorchid>Resistant${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; + r += `<span class="mediumorchid">Resistant${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; } else if (slave.devotion <= 20) { - r += `<span class=yellow>Ambivalent${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; + r += `<span class="yellow">Ambivalent${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; } else if (slave.devotion <= 50) { - r += `<span class=hotpink>Accepting${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; + r += `<span class="hotpink">Accepting${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; } else if (slave.devotion <= 95) { - r += `<span class=deeppink>Devoted${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; + r += `<span class="deeppink">Devoted${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; } else { - r += `<span class=magenta>Worshipful${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; + r += `<span class="magenta">Worshipful${V.summaryStats ? `[${slave.devotion}]` : ''}.</span>`; } r += " "; if (slave.fetish === "mindbroken") { return; } else if (slave.trust < -95) { - r += `<span class=darkgoldenrod>Extremely terrified${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="darkgoldenrod">Extremely terrified${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } else if (slave.trust < -50) { - r += `<span class=goldenrod>Terrified${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="gold"enrod>Terrified${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } else if (slave.trust < -20) { - r += `<span class=gold>Frightened${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="gold">Frightened${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } else if (slave.trust <= 20) { - r += `<span class=yellow>Fearful${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="yellow">Fearful${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } else if (slave.trust <= 50) { if (slave.devotion < -20) { - r += `<span class=orange>Careful${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="orange">Careful${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } else { - r += `<span class=mediumaquamarine>Careful${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="mediumaquamarine">Careful${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } } else if (slave.trust < 95) { if (slave.devotion < -20) { - r += `<span class=orangered>Bold${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="orange"red>Bold${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } else { - r += `<span class=mediumseagreen>Trusting${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="mediumseagreen">Trusting${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } } else { if (slave.devotion < -20) { - r += `<span class=darkred>Defiant${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="darkred">Defiant${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } else { - r += `<span class=seagreen>Profoundly trusting${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; + r += `<span class="seagreen">Profoundly trusting${V.summaryStats ? `[${slave.trust}]` : ''}.</span>`; } } r += " "; @@ -553,12 +554,12 @@ window.SlaveSummaryUncached = (function() { */ function short_weight(slave) { if (slave.weight < -95) { - r += `<strong><span class=red>W---${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; + r += `<strong><span class="red">W---${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; } else if (slave.weight < -30) { if (slave.hips < -1) { r += `<strong>W--${V.summaryStats? `[${slave.weight}]` : ''}</strong>`; } else { - r += `<strong><span class=red>W--${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; + r += `<strong><span class="red">W--${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; } } else if (slave.weight < -10) { r += `<strong>W-${V.summaryStats? `[${slave.weight}]` : ''}</strong>`; @@ -570,31 +571,31 @@ window.SlaveSummaryUncached = (function() { if (slave.hips > 1 || 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>`; + 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") { r += `<strong>W+++${V.summaryStats? `[${slave.weight}]` : ''}</strong>`; } else { - r += `<strong><span class=red>W+++${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; + r += `<strong><span class="red">W+++${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; } } else if (slave.weight <= 160) { if (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>`; + r += `<strong><span class="red">W++++${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; } } else if (slave.weight <= 190) { if (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>`; + r += `<strong><span class="red">W+++++${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; } } else { if (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>`; + r += `<strong><span class="red">W++++++${V.summaryStats? `[${slave.weight}]` : ''}</span></strong>`; } } r += " "; @@ -605,12 +606,12 @@ window.SlaveSummaryUncached = (function() { */ function long_weight(slave) { if (slave.weight < -95) { - r += `<span class=red>Emaciated${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; + r += `<span class="red">Emaciated${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; } else if (slave.weight < -30) { if (slave.hips < -1) { r += `Model-thin${V.summaryStats? `[${slave.weight}]`: ''}.`; } else { - r += `<span class=red>Very thin${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; + r += `<span class="red">Very thin${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; } } else if (slave.weight < -10) { r += `Thin${V.summaryStats? `[${slave.weight}]`: ''}.`; @@ -622,31 +623,31 @@ window.SlaveSummaryUncached = (function() { if (slave.hips > 1 || V.arcologies[0].FSHedonisticDecadence !== "unset") { r += `Nicely chubby${V.summaryStats? `[${slave.weight}]`: ''}.`; } else { - r += `<span class=red>Overweight${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; + r += `<span class="red">Overweight${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; } } else if (slave.weight <= 130) { 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>`; + r += `<span class="red">Fat${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; } } else if (slave.weight <= 160) { if (V.arcologies[0].FSHedonisticDecadence !== "unset") { r += `Amazingly voluptuous${V.summaryStats? `[${slave.weight}]`: ''}.`; } else { - r += `<span class=red>Obese${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; + r += `<span class="red">Obese${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; } } else if (slave.weight <= 190) { if (V.arcologies[0].FSHedonisticDecadence !== "unset") { r += `SSBBW${V.summaryStats? `[${slave.weight}]`: ''}.`; } else { - r += `<span class=red>Super Obese${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; + r += `<span class="red">Super Obese${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; } } else { if (V.arcologies[0].FSHedonisticDecadence !== "unset") { r += `Perfectly massive${V.summaryStats? `[${slave.weight}]`: ''}.`; } else { - r += `<span class=red>Dangerously Obese${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; + r += `<span class="red">Dangerously Obese${V.summaryStats ? `[${slave.weight}]`: ''}.</span>`; } } r += " "; @@ -656,7 +657,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_diet(slave) { - r += `<span class=teal>`; + r += `<span class="teal">`; switch (slave.diet) { case "restricted": r += `<strong>Di:W-</strong>`; @@ -691,7 +692,7 @@ window.SlaveSummaryUncached = (function() { } r += `</span> `; - r += `<span class=cyan>`; + r += `<span class="cyan">`; if (slave.dietCum === 2) { r += `<strong>Cum++</strong>`; } else if (((slave.dietCum === 1) && (slave.dietMilk === 0))) { @@ -710,7 +711,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function long_diet(slave) { - r += `<span class=teal>`; + r += `<span class="teal">`; switch (slave.diet) { case "restricted": r += `Dieting.`; @@ -746,15 +747,15 @@ window.SlaveSummaryUncached = (function() { } r += `</span> `; if (slave.dietCum === 2) { - r += `Diet base: <span class=cyan>Cum Based.</span>`; + r += `Diet base: <span class="cyan">Cum Based.</span>`; } else if (((slave.dietCum === 1) && (slave.dietMilk === 0))) { - r += `Diet base: <span class=cyan>Cum Added.</span>`; + r += `Diet base: <span class="cyan">Cum Added.</span>`; } else if (((slave.dietCum === 1) && (slave.dietMilk === 1))) { - r += `Diet base: <span class=cyan>Milk & Cum Added.</span>`; + r += `Diet base: <span class="cyan">Milk & Cum Added.</span>`; } else if (((slave.dietCum === 0) && (slave.dietMilk === 1))) { - r += `Diet base: <span class=cyan>Milk Added.</span>`; + r += `Diet base: <span class="cyan">Milk Added.</span>`; } else if ((slave.dietMilk === 2)) { - r += `Diet base: <span class=cyan>Milk Based.</span>`; + r += `Diet base: <span class="cyan">Milk Based.</span>`; } r += " "; } @@ -764,11 +765,11 @@ window.SlaveSummaryUncached = (function() { */ function short_health(slave) { if (slave.health < -20) { - r += `<strong><span class=red>H${V.summaryStats? `[${slave.health}]` : ''}</span></strong>`; + r += `<strong><span class="red">H${V.summaryStats? `[${slave.health}]` : ''}</span></strong>`; } else if (slave.health <= 20) { - r += `<strong><span class=yellow>H${V.summaryStats? `[${slave.health}]` : ''}</span></strong>`; + r += `<strong><span class="yellow">H${V.summaryStats? `[${slave.health}]` : ''}</span></strong>`; } else if (slave.health > 20) { - r += `<strong><span class=green>H${V.summaryStats? `[${slave.health}]` : ''}</span></strong>`; + r += `<strong><span class="green">H${V.summaryStats? `[${slave.health}]` : ''}</span></strong>`; } r += " "; } @@ -778,19 +779,19 @@ window.SlaveSummaryUncached = (function() { */ function long_health(slave) { if (slave.health < -90) { - r += `<span class=red>On the edge of death${V.summaryStats? `[${slave.health}]` : ''}.</span>`; + r += `<span class="red">On the edge of death${V.summaryStats? `[${slave.health}]` : ''}.</span>`; } else if (slave.health < -50) { - r += `<span class=red>Extremely unhealthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; + r += `<span class="red">Extremely unhealthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; } else if (slave.health < -20) { - r += `<span class=red>Unhealthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; + r += `<span class="red">Unhealthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; } else if (slave.health <= 20) { - r += `<span class=yellow>Healthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; + r += `<span class="yellow">Healthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; } else if (slave.health <= 50) { - r += `<span class=green>Very healthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; + r += `<span class="green">Very healthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; } else if (slave.health <= 90) { - r += `<span class=green>Extremely healthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; + r += `<span class="green">Extremely healthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; } else { - r += `<span class=green>Unnaturally healthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; + r += `<span class="green">Unnaturally healthy${V.summaryStats? `[${slave.health}]` : ''}.</span>`; } r += " "; } @@ -799,7 +800,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_drugs(slave) { - r += `<span class=tan>`; + r += `<span class="tan">`; switch (slave.drugs) { case "breast injections": r += `<strong>Dr:Boobs+</strong>`; @@ -903,7 +904,7 @@ window.SlaveSummaryUncached = (function() { } r += `</span> `; - r += `<span class=lightgreen>`; + r += `<span class="lightgreen">`; if (slave.curatives === 2) { r += `<strong>Cura</strong>`; } else if (slave.curatives === 1) { @@ -911,7 +912,7 @@ window.SlaveSummaryUncached = (function() { } r += `</span> `; if (slave.aphrodisiacs !== 0) { - r += `<span class=lightblue>`; + r += `<span class="lightblue">`; if (slave.aphrodisiacs === 1) { r += `<strong>Aph</strong>`; } else if (slave.aphrodisiacs === 2) { @@ -922,9 +923,9 @@ window.SlaveSummaryUncached = (function() { r += `</span> `; } if (slave.addict !== 0) { - r += `<span class=cyan>Add</span>`; + r += `<span class="cyan">Add</span>`; } - r += `<span class=lightsalmon>`; + r += `<span class="lightsalmon">`; if (slave.hormones > 1) { r += `<strong>Ho:F+</strong>`; } else if (slave.hormones > 0) { @@ -935,7 +936,7 @@ window.SlaveSummaryUncached = (function() { r += `<strong>Ho:M</strong>`; } r += `</span> `; - r += `<span class=mediumseagreen>`; + r += `<span class="mediumseagreen">`; if ((slave.bellyImplant > -1)) { r += `<strong>Belly Imp</strong>`; } else if (((slave.preg <= -2) || (slave.ovaries === 0)) && (slave.vagina !== -1)) { @@ -959,7 +960,7 @@ window.SlaveSummaryUncached = (function() { } r += `</span> `; if (slave.induce === 1) { - r += `<span class=orange><strong>Early Labor</strong></span>`; + r += `<span class="orange"><strong>Early Labor</strong></span>`; } if (slave.pubertyXY === 0 && slave.balls > 0) { r += `<strong>Prepub balls</strong>`; @@ -967,7 +968,7 @@ window.SlaveSummaryUncached = (function() { if (slave.balls > 0 && slave.vasectomy === 1) { r += `<strong>Vasect</strong>`; } - r += `<span class=springgreen>`; + r += `<span class="springgreen">`; if (slave.inflation === 3) { r += `<strong>8 ltr ${slave.inflationType}</strong>`; } else if (slave.inflation === 2) { @@ -985,16 +986,16 @@ window.SlaveSummaryUncached = (function() { */ function long_drugs(slave) { if ((slave.drugs !== "no drugs") && (slave.drugs !== "none")) { - r += `<span class=tan>On ${slave.drugs}.</span> `; + r += `<span class="tan">On ${slave.drugs}.</span> `; } - r += `<span class=lightgreen>`; + r += `<span class="lightgreen">`; if (slave.curatives === 2) { r += `On curatives.`; } else if (slave.curatives === 1) { r += `On preventatives.`; } r += `</span> `; - r += `<span class=lightblue>`; + r += `<span class="lightblue">`; if (slave.aphrodisiacs > 0) { r += `On ${slave.aphrodisiacs > 1 ? 'extreme': ''} aphrodisiacs.`; } else if (slave.aphrodisiacs === -1) { @@ -1002,9 +1003,9 @@ window.SlaveSummaryUncached = (function() { } r += `</span> `; if (slave.addict !== 0) { - r += `<span class=cyan>Addict.</span>`; + r += `<span class="cyan">Addict.</span>`; } - r += `<span class=lightsalmon>`; + r += `<span class="lightsalmon">`; if (slave.hormones > 1) { r += `Heavy female hormones.`; } else if (slave.hormones > 0) { @@ -1015,7 +1016,7 @@ window.SlaveSummaryUncached = (function() { r += `Male hormones.`; } r += `</span> `; - r += `<span class=mediumseagreen>`; + r += `<span class="mediumseagreen">`; if ((slave.bellyImplant > -1)) { r += `Belly Implant.`; } else if (((slave.preg <= -2) || (slave.ovaries === 0)) && (slave.vagina !== -1)) { @@ -1069,7 +1070,7 @@ window.SlaveSummaryUncached = (function() { } r += `</span> `; if (slave.induce === 1) { - r += `<span class=orange>Showing signs of early labor.</span>`; + r += `<span class="orange">Showing signs of early labor.</span>`; } if (slave.pubertyXY === 0 && slave.balls > 0) { r += `Has not had first ejaculation.`; @@ -1077,7 +1078,7 @@ window.SlaveSummaryUncached = (function() { if (slave.balls > 0 && slave.vasectomy === 1) { r += `Vasectomy.`; } - r += `<span class=springgreen>`; + r += `<span class="springgreen">`; if (slave.inflation === 3) { r += `Filled with 8 liters of ${slave.inflationType}.`; } else if (slave.inflation === 2) { @@ -1190,7 +1191,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_nationality(slave) { - r += `<span class=tan>`; + r += `<span class="tan">`; switch (slave.nationality) { case "Afghan": r += `Afg`; @@ -1867,7 +1868,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function long_nationality(slave) { - r += `<span class=tan>`; + r += `<span class="tan">`; switch (slave.nationality) { case "a Cook Islander": r += `Cook Islander.`; @@ -1905,7 +1906,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_skin(slave) { - r += `<span class=pink>`; + r += `<span class="pink">`; switch (slave.skin) { case "pure white": r += `P. Whi`; @@ -1969,7 +1970,7 @@ window.SlaveSummaryUncached = (function() { */ function short_genitals(slave) { if (slave.dick > 0) { - r += `<span class=pink>`; + r += `<span class="pink">`; if (slave.balls === 0) { r += `Geld`; } @@ -2001,14 +2002,14 @@ window.SlaveSummaryUncached = (function() { r += `</span> `; } if (slave.vagina === 0) { - r += `<span class=lime>VV</span>`; + r += `<span class="lime">VV</span>`; } else if ((slave.pregKnown === 1) && canWalk(slave) && (slave.clothes === "no clothing" || slave.clothes === "body oil") && (slave.shoes === "none")) { - r += `<span class=pink>NBP</span>`; + r += `<span class="pink">NBP</span>`; } if (slave.anus === 0) { - r += ` <span class=lime>AV</span>`; + r += ` <span class="lime">AV</span>`; } - r += `<span class=pink>`; + r += `<span class="pink">`; if ((slave.vagina > 3) && (slave.anus > 3)) { r += ` V++A++`; } else if ((slave.vagina > 2) && (slave.anus > 2)) { @@ -2030,7 +2031,7 @@ window.SlaveSummaryUncached = (function() { */ function long_genitals(slave) { if (slave.dick > 0) { - r += `<span class=pink>`; + r += `<span class="pink">`; if (slave.balls === 0) { r += `Gelded.`; } @@ -2062,14 +2063,14 @@ window.SlaveSummaryUncached = (function() { r += `</span> `; } if (slave.vagina === 0) { - r += `<span class=lime>Virgin.</span> `; + r += `<span class="lime">Virgin.</span> `; } else if ((slave.pregKnown === 1) && canWalk(slave) && (slave.clothes === "no clothing" || slave.clothes === "body oil") && (slave.shoes === "none")) { - r += `<span class=pink>Naked, barefoot, and pregnant.</span> `; + r += `<span class="pink">Naked, barefoot, and pregnant.</span> `; } if (slave.anus === 0) { - r += `<span class=lime>Anal virgin.</span> `; + r += `<span class="lime">Anal virgin.</span> `; } - r += `<span class=pink>`; + r += `<span class="pink">`; if ((slave.vagina > 3) && (slave.anus > 3)) { r += `Blown out holes.`; } else if ((slave.vagina > 2) && (slave.anus > 2)) { @@ -2090,7 +2091,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_age(slave) { - r += `<span class=pink>`; + r += `<span class="pink">`; if (V.showAgeDetail === 1) { r += slave.actualAge; } else if (slave.actualAge >= 40) { @@ -2120,19 +2121,19 @@ window.SlaveSummaryUncached = (function() { */ function short_face(slave) { if (slave.face < -95) { - r += `<span class=red>Face---${V.summaryStats? `[${slave.face}]` : ''}</span>`; + r += `<span class="red">Face---${V.summaryStats? `[${slave.face}]` : ''}</span>`; } else if (slave.face < -40) { - r += `<span class=red>Face--${V.summaryStats? `[${slave.face}]` : ''}</span>`; + r += `<span class="red">Face--${V.summaryStats? `[${slave.face}]` : ''}</span>`; } else if (slave.face < -10) { - r += `<span class=red>Face-${V.summaryStats? `[${slave.face}]` : ''}</span>`; + r += `<span class="red">Face-${V.summaryStats? `[${slave.face}]` : ''}</span>`; } else if (slave.face <= 10) { r += `Face${V.summaryStats? `[${slave.face}]` : ''}`; } else if (slave.face <= 40) { - r += `<span class=pink>Face+${V.summaryStats? `[${slave.face}]` : ''}</span>`; + r += `<span class="pink">Face+${V.summaryStats? `[${slave.face}]` : ''}</span>`; } else if (slave.face <= 95) { - r += `<span class=pink>Face++${V.summaryStats? `[${slave.face}]` : ''}</span>`; + r += `<span class="pink">Face++${V.summaryStats? `[${slave.face}]` : ''}</span>`; } else { - r += `<span class=pink>Face+++${V.summaryStats? `[${slave.face}]` : ''}</span>`; + r += `<span class="pink">Face+++${V.summaryStats? `[${slave.face}]` : ''}</span>`; } r += " "; } @@ -2142,9 +2143,9 @@ window.SlaveSummaryUncached = (function() { */ function short_eyes(slave) { if (slave.eyes === -2) { - r += `<span class=red>Blind</span>`; + r += `<span class="red">Blind</span>`; } else if (((slave.eyes === -1) && (slave.eyewear !== "corrective glasses") && (slave.eyewear !== "corrective contacts")) || (slave.eyewear === "blurring glasses") || (slave.eyewear === "blurring contacts")) { - r += `<span class=yellow>Sight-</span>`; + r += `<span class="yellow">Sight-</span>`; } r += " "; } @@ -2154,9 +2155,9 @@ window.SlaveSummaryUncached = (function() { */ function short_ears(slave) { if (slave.hears === -2) { - r += `<span class=red>Deaf</span>`; + r += `<span class="red">Deaf</span>`; } else if ((slave.hears === -1) && (slave.earwear !== "hearing aids")) { - r += `<span class=yellow>Hearing-</span>`; + r += `<span class="yellow">Hearing-</span>`; } r += " "; } @@ -2176,7 +2177,7 @@ window.SlaveSummaryUncached = (function() { } else if (slave.lips > 10) { r += `Lips${V.summaryStats? `[${slave.lips}]` : ''}`; } else { - r += `<span class=red>Lips-${V.summaryStats? `[${slave.lips}]` : ''}</span>`; + r += `<span class="red">Lips-${V.summaryStats? `[${slave.lips}]` : ''}</span>`; } r += " "; } @@ -2186,9 +2187,9 @@ window.SlaveSummaryUncached = (function() { */ function short_teeth(slave) { if (slave.teeth === "crooked") { - r += `<span class=yellow>Cr Teeth</span>`; + r += `<span class="yellow">Cr Teeth</span>`; } else if (slave.teeth === "gapped") { - r += `<span class=yellow>Gap</span>`; + r += `<span class="yellow">Gap</span>`; } else if (slave.teeth === "cosmetic braces") { r += `Cos Braces`; } else if (slave.teeth === "straightening braces") { @@ -2219,18 +2220,18 @@ window.SlaveSummaryUncached = (function() { r += `Soft${V.summaryStats? `[${slave.muscles}]`: ''}`; } else if (slave.muscles > -31) { if (V.arcologies[0].FSPhysicalIdealist === "unset") { - r += `<span class=red>Weak</span>${V.summaryStats? `[${slave.muscles}]`: ''}`; + r += `<span class="red">Weak</span>${V.summaryStats? `[${slave.muscles}]`: ''}`; } else { r += `Soft${V.summaryStats? `[${slave.muscles}]`: ''}`; } } else if (slave.muscles > -96) { if (V.arcologies[0].FSPhysicalIdealist === "unset") { - r += `<span class=red>Weak+</span>${V.summaryStats? `[${slave.muscles}]`: ''}`; + r += `<span class="red">Weak+</span>${V.summaryStats? `[${slave.muscles}]`: ''}`; } else { r += `Soft+${V.summaryStats? `[${slave.muscles}]`: ''}`; } } else { - r += `<span class=red>Weak++</span>${V.summaryStats? `[${slave.muscles}]`: ''}`; + r += `<span class="red">Weak++</span>${V.summaryStats? `[${slave.muscles}]`: ''}`; } r += " "; } @@ -2269,16 +2270,16 @@ window.SlaveSummaryUncached = (function() { */ function short_voice(slave) { if (slave.voice === 0) { - r += `<span class=red>Mute</span>`; + r += `<span class="red">Mute</span>`; } else { if (slave.accent === 3) { - r += `<span class=red>Acc--</span>`; + r += `<span class="red">Acc--</span>`; } else if (slave.accent === 2) { r += `Acc-`; } else if (slave.accent === 4) { r += `Acc--`; } else if (slave.accent === 1) { - r += `<span class=pink>Acc</span>`; + r += `<span class="pink">Acc</span>`; } } r += " "; @@ -2288,7 +2289,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_tits_ass(slave) { - r += `<span class=pink>`; + r += `<span class="pink">`; if ((slave.boobs >= 12000) && (slave.butt > 9)) { r += `T&A+++`; } else if ((slave.boobs > 4000) && (slave.butt > 8)) { @@ -2323,7 +2324,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_hips(slave) { - r += `<span class=red>`; + r += `<span class="red">`; if (slave.hips < -1) { if (slave.butt > 2 && (V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset")) { r += `Disp+`; @@ -2365,19 +2366,19 @@ window.SlaveSummaryUncached = (function() { */ function short_waist(slave) { if (slave.waist > 95) { - r += `<span class=red>Wst---${V.summaryStats? `[${slave.waist}]` : ''}</span>`; + r += `<span class="red">Wst---${V.summaryStats? `[${slave.waist}]` : ''}</span>`; } else if (slave.waist > 40) { - r += `<span class=red>Wst--${V.summaryStats? `[${slave.waist}]`: ''}</span>`; + r += `<span class="red">Wst--${V.summaryStats? `[${slave.waist}]`: ''}</span>`; } else if (slave.waist > 10) { - r += `<span class=red>Wst-${V.summaryStats? `[${slave.waist}]` : ''}</span>`; + r += `<span class="red">Wst-${V.summaryStats? `[${slave.waist}]` : ''}</span>`; } else if (slave.waist >= -10) { r += `Wst${V.summaryStats? `[${slave.waist}]`: ''}`; } else if (slave.waist >= -40) { - r += `<span class=pink>Wst+${V.summaryStats? `[${slave.waist}]` : ''}</span>`; + r += `<span class="pink">Wst+${V.summaryStats? `[${slave.waist}]` : ''}</span>`; } else if (slave.waist >= -95) { - r += `<span class=pink>Wst++${V.summaryStats? `[${slave.waist}]` : ''}</span>`; + r += `<span class="pink">Wst++${V.summaryStats? `[${slave.waist}]` : ''}</span>`; } else { - r += `<span class=pink>Wst+++${V.summaryStats? `[${slave.waist}]`: ''}</span>`; + r += `<span class="pink">Wst+++${V.summaryStats? `[${slave.waist}]`: ''}</span>`; } r += " "; } @@ -2386,7 +2387,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_implants(slave) { - r += `<span class=pink>`; + r += `<span class="pink">`; if ((slave.boobsImplant === 0) && (slave.buttImplant === 0) && (slave.waist >= -95) && (slave.lipsImplant === 0) && (slave.faceImplant <= 5) && (slave.bellyImplant === -1)) { r += `Natr`; } else { @@ -2431,7 +2432,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function long_age(slave) { - r += `<span class=pink>`; + r += `<span class="pink">`; if (V.showAgeDetail === 1) { r += `Age ` + `${slave.actualAge}` + `.`; } else if (slave.actualAge >= 40) { @@ -2476,7 +2477,7 @@ window.SlaveSummaryUncached = (function() { r += `Appears to have a ` + `${slave.visualAge}` + ` year old body. `; } if (slave.geneMods.NCS === 1) { - r += `(<span class=orange>NCS</span>) `; + r += `(<span class="orange">NCS</span>) `; } } @@ -2485,19 +2486,19 @@ window.SlaveSummaryUncached = (function() { */ function long_face(slave) { if (slave.face < -95) { - r += `<span class=red>Very ugly${V.summaryStats? `[${slave.face}]`: ''}</span>`; + r += `<span class="red">Very ugly${V.summaryStats? `[${slave.face}]`: ''}</span>`; } else if (slave.face < -40) { - r += `<span class=red>Ugly${V.summaryStats? `[${slave.face}]`: ''}</span>`; + r += `<span class="red">Ugly${V.summaryStats? `[${slave.face}]`: ''}</span>`; } else if (slave.face < -10) { - r += `<span class=red>Unattractive${V.summaryStats? `[${slave.face}]`: ''}</span>`; + r += `<span class="red">Unattractive${V.summaryStats? `[${slave.face}]`: ''}</span>`; } else if (slave.face <= 10) { r += `Average${V.summaryStats? `[${slave.face}]`: ''}`; } else if (slave.face <= 40) { - r += `<span class=pink>Attractive${V.summaryStats? `[${slave.face}]`: ''}</span>`; + r += `<span class="pink">Attractive${V.summaryStats? `[${slave.face}]`: ''}</span>`; } else if (slave.face <= 95) { - r += `<span class=pink>Beautiful${V.summaryStats? `[${slave.face}]`: ''}</span>`; + r += `<span class="pink">Beautiful${V.summaryStats? `[${slave.face}]`: ''}</span>`; } else { - r += `<span class=pink>Very beautiful${V.summaryStats? `[${slave.face}]`: ''}</span>`; + r += `<span class="pink">Very beautiful${V.summaryStats? `[${slave.face}]`: ''}</span>`; } r += ` ${slave.faceShape} face. `; } @@ -2507,9 +2508,9 @@ window.SlaveSummaryUncached = (function() { */ function long_eyes(slave) { if (slave.eyes <= -2) { - r += `<span class=red>Blind.</span>`; + r += `<span class="red">Blind.</span>`; } else if (((slave.eyes === -1) && (slave.eyewear !== "corrective glasses") && (slave.eyewear !== "corrective contacts")) || (slave.eyewear === "blurring glasses") || (slave.eyewear === "blurring contacts")) { - r += `<span class=yellow>Nearsighted.</span>`; + r += `<span class="yellow">Nearsighted.</span>`; } r += " "; } @@ -2519,9 +2520,9 @@ window.SlaveSummaryUncached = (function() { */ function long_ears(slave) { if (slave.hears <= -2) { - r += `<span class=red>Deaf.</span>`; + r += `<span class="red">Deaf.</span>`; } else if ((slave.hears === -1) && (slave.earwear !== "hearing aids")) { - r += `<span class=yellow>Hard of hearing.</span>`; + r += `<span class="yellow">Hard of hearing.</span>`; } r += " "; } @@ -2541,7 +2542,7 @@ window.SlaveSummaryUncached = (function() { } else if (slave.lips > 10) { r += `Normal lips${V.summaryStats? `[${slave.lips}]`: ''}.`; } else { - r += `<span class=red>Thin lips${V.summaryStats? `[${slave.lips}]`: ''}.</span>`; + r += `<span class="red">Thin lips${V.summaryStats? `[${slave.lips}]`: ''}.</span>`; } r += " "; } @@ -2551,9 +2552,9 @@ window.SlaveSummaryUncached = (function() { */ function long_teeth(slave) { if (slave.teeth === "crooked") { - r += `<span class=yellow>Crooked teeth.</span>`; + r += `<span class="yellow">Crooked teeth.</span>`; } else if (slave.teeth === "gapped") { - r += `<span class=yellow>Tooth gap.</span>`; + r += `<span class="yellow">Tooth gap.</span>`; } else if (slave.teeth === "cosmetic braces") { r += `Cosmetic braces.`; } else if (slave.teeth === "straightening braces") { @@ -2584,18 +2585,18 @@ window.SlaveSummaryUncached = (function() { r += `Soft${V.summaryStats? `[${slave.muscles}]`: ''}.`; } else if (slave.muscles > -31) { if (V.arcologies[0].FSPhysicalIdealist === "unset") { - r += `<span class=red>Weak${V.summaryStats? `[${slave.muscles}]`: ''}.</span>`; + r += `<span class="red">Weak${V.summaryStats? `[${slave.muscles}]`: ''}.</span>`; } else { r += `Weak${V.summaryStats? `[${slave.muscles}]`: ''}.`; } } else if (slave.muscles > -96) { if (V.arcologies[0].FSPhysicalIdealist === "unset") { - r += `<span class=red>Very weak${V.summaryStats? `[${slave.muscles}]`: ''}.</span>`; + r += `<span class="red">Very weak${V.summaryStats? `[${slave.muscles}]`: ''}.</span>`; } else { r += `Very weak${V.summaryStats? `[${slave.muscles}]`: ''}.`; } } else { - r += `<span class=red>Frail${V.summaryStats? `[${slave.muscles}]`: ''}.</span>`; + r += `<span class="red">Frail${V.summaryStats? `[${slave.muscles}]`: ''}.</span>`; } r += " "; } @@ -2634,16 +2635,16 @@ window.SlaveSummaryUncached = (function() { */ function long_voice(slave) { if (slave.voice === 0) { - r += `<span class=red>Mute.</span>`; + r += `<span class="red">Mute.</span>`; } else { if (slave.accent === 3) { - r += `<span class=red>Bad accent.</span>`; + r += `<span class="red">Bad accent.</span>`; } else if (slave.accent === 4) { - r += `<span class=red>No language skills.</span>`; + r += `<span class="red">No language skills.</span>`; } else if (slave.accent === 2) { r += `Accent.`; } else if (slave.accent === 1) { - r += `<span class=pink>Cute accent.</span>`; + r += `<span class="pink">Cute accent.</span>`; } } r += " "; @@ -2653,7 +2654,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function long_tits_ass(slave) { - r += `<span class=pink>`; + r += `<span class="pink">`; if ((slave.boobs >= 12000) && (slave.butt > 9)) { r += `Hyper T&A.`; } else if ((slave.boobs > 4000) && (slave.butt > 8)) { @@ -2688,7 +2689,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function long_hips(slave) { - r += `<span class=red>`; + r += `<span class="red">`; if (slave.hips < -1) { if (slave.butt > 2 && (V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset") && (V.arcologies[0].FSAssetExpansionist < 20 || V.arcologies[0].FSAssetExpansionist === "unset")) { r += `Disproportionately big butt.`; @@ -2730,19 +2731,19 @@ window.SlaveSummaryUncached = (function() { */ function long_waist(slave) { if (slave.waist > 95) { - r += `<span class=red>Masculine waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; + r += `<span class="red">Masculine waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; } else if (slave.waist > 40) { - r += `<span class=red>Ugly waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; + r += `<span class="red">Ugly waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; } else if (slave.waist > 10) { - r += `<span class=red>Unattractive waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; + r += `<span class="red">Unattractive waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; } else if (slave.waist >= -10) { r += `Average waist${V.summaryStats? `[${slave.waist}]`: ''}.`; } else if (slave.waist >= -40) { - r += `<span class=pink>Feminine waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; + r += `<span class="pink">Feminine waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; } else if (slave.waist >= -95) { - r += `<span class=pink>Hourglass waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; + r += `<span class="pink">Hourglass waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; } else { - r += `<span class=pink>Absurdly narrow waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; + r += `<span class="pink">Absurdly narrow waist${V.summaryStats? `[${slave.waist}]`: ''}.</span>`; } r += " "; } @@ -2751,7 +2752,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function long_implants(slave) { - r += `<span class=pink>`; + r += `<span class="pink">`; if ((slave.boobsImplant !== 0) || (slave.buttImplant !== 0) || (slave.lipsImplant !== 0) || (slave.bellyImplant !== -1)) { r += `Implants.`; } else if ((slave.faceImplant >= 30) || (slave.waist < -95)) { @@ -2800,53 +2801,53 @@ window.SlaveSummaryUncached = (function() { return; } else if (slave.intelligenceImplant >= 30) { if (intelligence >= 130) { - r += `<span class=deepskyblue>I++++(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I++++(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence > 95) { - r += `<span class=deepskyblue>I+++(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I+++(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence > 50) { - r += `<span class=deepskyblue>I++(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I++(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence > 15) { - r += `<span class=deepskyblue>I+(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I+(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence >= -15) { r += `I(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}`; } else if (intelligence >= -50) { - r += `<span class=orangered>I-(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="orange"red>I-(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence >= -95) { - r += `<span class=orangered>I--(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="orange"red>I--(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else { - r += `<span class=orangered>I---(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="orange"red>I---(e+)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } } else if (slave.intelligenceImplant >= 15) { if (intelligence > 95) { - r += `<span class=deepskyblue>I+++(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I+++(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence > 50) { - r += `<span class=deepskyblue>I++(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I++(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence > 15) { - r += `<span class=deepskyblue>I+(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I+(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence >= -15) { r += `I(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}`; } else if (intelligence >= -50) { - r += `<span class=orangered>I-(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="orange"red>I-(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence >= -95) { - r += `<span class=orangered>I--(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="orange"red>I--(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else { - r += `<span class=orangered>I---(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="orange"red>I---(e)${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } } else { if (intelligence > 95) { - r += `<span class=deepskyblue>I+++${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I+++${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence > 50) { - r += `<span class=deepskyblue>I++${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I++${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence > 15) { - r += `<span class=deepskyblue>I+${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="deepskyblue">I+${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence >= -15) { r += `I${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}`; } else if (intelligence >= -50) { - r += `<span class=orangered>I-${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="orange"red>I-${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else if (intelligence >= -95) { - r += `<span class=orangered>I--${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="orange"red>I--${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } else { - r += `<span class=orangered>I---${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; + r += `<span class="orange"red>I---${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}</span>`; } } r += " "; @@ -2857,7 +2858,7 @@ window.SlaveSummaryUncached = (function() { */ function short_sex_skills(slave) { let _SSkills = slave.skill.anal + slave.skill.oral; - r += `<span class=aquamarine>`; + r += `<span class="aquamarine">`; if (((_SSkills + slave.skill.whoring + slave.skill.entertainment) >= 400) && ((slave.vagina < 0) || (slave.skill.vaginal >= 100))) { r += `MSS`; } else { @@ -2916,7 +2917,7 @@ window.SlaveSummaryUncached = (function() { */ function short_prestige(slave) { if (slave.prestige > 0) { - r += `<span class=green>`; + r += `<span class="green">`; if (slave.prestige > 2) { r += `Prest++`; } else if (slave.prestige === 2) { @@ -2933,7 +2934,7 @@ window.SlaveSummaryUncached = (function() { */ function short_porn_prestige(slave) { if (slave.pornPrestige > 0) { - r += `<span class=green>`; + r += `<span class="green">`; if (slave.pornPrestige > 2) { r += `PPrest++`; } else if (slave.pornPrestige === 2) { @@ -2954,53 +2955,53 @@ window.SlaveSummaryUncached = (function() { return; } else if (slave.intelligenceImplant >= 30) { if (intelligence >= 130) { - r += `<span class=deepskyblue>Genius${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Genius${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence > 95) { - r += `<span class=deepskyblue>Brilliant, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Brilliant, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence > 50) { - r += `<span class=deepskyblue>Very smart, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Very smart, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence > 15) { - r += `<span class=deepskyblue>Smart, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Smart, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence >= -15) { r += `Average intelligence, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.`; } else if (intelligence >= -50) { - r += `<span class=orangered>Slow, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="orange"red>Slow, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence >= -95) { - r += `<span class=orangered>Very slow, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="orange"red>Very slow, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else { - r += `<span class=orangered>Moronic, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="orange"red>Moronic, well educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } } else if (slave.intelligenceImplant >= 15) { if (intelligence > 95) { - r += `<span class=deepskyblue>Brilliant, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Brilliant, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence > 50) { - r += `<span class=deepskyblue>Very smart, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Very smart, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence > 15) { - r += `<span class=deepskyblue>Smart, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Smart, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence >= -15) { r += `Average intelligence, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.`; } else if (intelligence >= -50) { - r += `<span class=orangered>Slow, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="orange"red>Slow, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence >= -95) { - r += `<span class=orangered>Very slow, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="orange"red>Very slow, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else { - r += `<span class=orangered>Moronic, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="orange"red>Moronic, educated${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } } else { if (intelligence > 95) { - r += `<span class=deepskyblue>Brilliant${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Brilliant${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence > 50) { - r += `<span class=deepskyblue>Very smart${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Very smart${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence > 15) { - r += `<span class=deepskyblue>Smart${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="deepskyblue">Smart${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence >= -15) { r += `Average intelligence${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.`; } else if (intelligence >= -50) { - r += `<span class=orangered>Slow${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="orange"red>Slow${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else if (intelligence >= -95) { - r += `<span class=orangered>Very slow${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="orange"red>Very slow${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } else { - r += `<span class=orangered>Moronic${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; + r += `<span class="orange"red>Moronic${V.summaryStats ? `[${slave.intelligence+slave.intelligenceImplant}]` : ''}.</span>`; } } r += " "; @@ -3011,7 +3012,7 @@ window.SlaveSummaryUncached = (function() { */ function long_sex_skills(slave) { let _SSkills = (slave.skill.anal + slave.skill.oral); - r += `<span class=aquamarine>`; + r += `<span class="aquamarine">`; if (((_SSkills + slave.skill.whoring + slave.skill.entertainment) >= 400) && ((slave.vagina < 0) || (slave.skill.vaginal >= 100))) { r += `Masterful Sex Slave. `; } else { @@ -3056,7 +3057,7 @@ window.SlaveSummaryUncached = (function() { */ function long_prestige(slave) { if (slave.prestige > 0) { - r += `<span class=green>`; + r += `<span class="green">`; if (slave.prestige > 2) { r += `Extremely prestigious.`; } else if (slave.prestige === 2) { @@ -3073,7 +3074,7 @@ window.SlaveSummaryUncached = (function() { */ function long_porn_prestige(slave) { if (slave.pornPrestige > 0) { - r += `<span class=green>`; + r += `<span class="green">`; if (slave.pornPrestige > 2) { r += `Porn star.`; } else if (slave.pornPrestige === 2) { @@ -3089,7 +3090,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_fetish(slave) { - r += `<span class=lightcoral>`; + r += `<span class="lightcoral">`; switch (slave.fetish) { case "submissive": if (slave.fetishStrength > 95) { @@ -3187,57 +3188,57 @@ window.SlaveSummaryUncached = (function() { */ function short_attraction(slave) { if (slave.attrXY <= 5) { - r += `<span class=red>XY---${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; + r += `<span class="red">XY---${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; } else if (slave.attrXY <= 15) { - r += `<span class=red>XY--${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; + r += `<span class="red">XY--${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; } else if (slave.attrXY <= 35) { - r += `<span class=red>XY-${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; + r += `<span class="red">XY-${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; } else if (slave.attrXY <= 65) { r += `XY${V.summaryStats? `[${slave.attrXY}]`: ''}`; } else if (slave.attrXY <= 85) { - r += `<span class=green>XY+${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; + r += `<span class="green">XY+${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; } else if (slave.attrXY <= 95) { - r += `<span class=green>XY++${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; + r += `<span class="green">XY++${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; } else if (slave.attrXX > 95) { if (slave.energy <= 95) { - r += `<span class=green>Omni!</span>`; + r += `<span class="green">Omni!</span>`; } else { - r += `<span class=green>Omni+Nympho!!</span>`; + r += `<span class="green">Omni+Nympho!!</span>`; } } else { - r += `<span class=green>XY+++${V.summaryStats? `[${slave.attrXY}]`: ''}</span>`; + 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>`; + r += `<span class="red">XX---${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; } else if (slave.attrXX <= 15) { - r += `<span class=red>XX--${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; + r += `<span class="red">XX--${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; } else if (slave.attrXX <= 35) { - r += `<span class=red>XX-${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; + r += `<span class="red">XX-${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; } else if (slave.attrXX <= 65) { r += `XX${V.summaryStats? `[${slave.attrXX}]`: ''}`; } else if (slave.attrXX <= 85) { - r += `<span class=green>XX+${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; + r += `<span class="green">XX+${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; } else if (slave.attrXX <= 95) { - r += `<span class=green>XX++${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; + r += `<span class="green">XX++${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; } else if (slave.attrXY <= 95) { - r += `<span class=green>XX+++${V.summaryStats? `[${slave.attrXX}]`: ''}</span>`; + 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>`; + r += `<span class="green">Nympho!</span>`; } } else if (slave.energy > 80) { - r += `<span class=green>SD++${V.summaryStats? `[${slave.energy}]`: ''}</span>`; + r += `<span class="green">SD++${V.summaryStats? `[${slave.energy}]`: ''}</span>`; } else if (slave.energy > 60) { - r += `<span class=green>SD+${V.summaryStats? `[${slave.energy}]`: ''}</span>`; + r += `<span class="green">SD+${V.summaryStats? `[${slave.energy}]`: ''}</span>`; } else if (slave.energy > 40) { - r += `<span class=yellow>SD${V.summaryStats? `[${slave.energy}]`: ''}</span>`; + r += `<span class="yellow">SD${V.summaryStats? `[${slave.energy}]`: ''}</span>`; } else if (slave.energy > 20) { - r += `<span class=red>SD-${V.summaryStats? `[${slave.energy}]`: ''}</span>`; + r += `<span class="red">SD-${V.summaryStats? `[${slave.energy}]`: ''}</span>`; } else { - r += `<span class=red>SD--${V.summaryStats? `[${slave.energy}]`: ''}</span>`; + r += `<span class="red">SD--${V.summaryStats? `[${slave.energy}]`: ''}</span>`; } r += " "; } @@ -3374,7 +3375,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_behavior_flaw(slave) { - r += `<span class=red>`; + r += `<span class="red">`; switch (slave.behavioralFlaw) { case "arrogant": r += `Arrog`; @@ -3416,58 +3417,58 @@ window.SlaveSummaryUncached = (function() { function short_sex_flaw(slave) { switch (slave.sexualFlaw) { case "hates oral": - r += `<span class=red>Oral-</span>`; + r += `<span class="red">Oral-</span>`; break; case "hates anal": - r += `<span class=red>Anal-</span>`; + r += `<span class="red">Anal-</span>`; break; case "hates penetration": - r += `<span class=red>Fuck-</span>`; + r += `<span class="red">Fuck-</span>`; break; case "shamefast": - r += `<span class=red>Shame</span>`; + r += `<span class="red">Shame</span>`; break; case "idealistic": - r += `<span class=red>Ideal</span>`; + r += `<span class="red">Ideal</span>`; break; case "repressed": - r += `<span class=red>Repre</span>`; + r += `<span class="red">Repre</span>`; break; case "apathetic": - r += `<span class=red>Apath</span>`; + r += `<span class="red">Apath</span>`; break; case "crude": - r += `<span class=red>Crude</span>`; + r += `<span class="red">Crude</span>`; break; case "judgemental": - r += `<span class=red>Judge</span>`; + r += `<span class="red">Judge</span>`; break; case "cum addict": - r += `<span class=yellow>CumAdd</span>`; + r += `<span class="yellow">CumAdd</span>`; break; case "anal addict": - r += `<span class=yellow>AnalAdd</span>`; + r += `<span class="yellow">AnalAdd</span>`; break; case "attention whore": - r += `<span class=yellow>Attention</span>`; + r += `<span class="yellow">Attention</span>`; break; case "breast growth": - r += `<span class=yellow>BoobObsess</span>`; + r += `<span class="yellow">BoobObsess</span>`; break; case "abusive": - r += `<span class=yellow>Abusive</span>`; + r += `<span class="yellow">Abusive</span>`; break; case "malicious": - r += `<span class=yellow>Malice</span>`; + r += `<span class="yellow">Malice</span>`; break; case "self hating": - r += `<span class=yellow>SelfHatr</span>`; + r += `<span class="yellow">SelfHatr</span>`; break; case "neglectful": - r += `<span class=yellow>SelfNeglect</span>`; + r += `<span class="yellow">SelfNeglect</span>`; break; case "breeder": - r += `<span class=yellow>BreedObsess</span>`; + r += `<span class="yellow">BreedObsess</span>`; break; default: slave.sexualFlaw = "none"; @@ -3480,7 +3481,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function short_behavior_quirk(slave) { - r += `<span class=green>`; + r += `<span class="green">`; switch (slave.behavioralQuirk) { case "confident": r += `Confid`; @@ -3559,7 +3560,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function long_fetish(slave) { - r += `<span class=lightcoral>`; + r += `<span class="lightcoral">`; switch (slave.fetish) { case "submissive": if (slave.fetishStrength > 95) { @@ -3654,55 +3655,55 @@ 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}]` : ''}, `; } 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)) { - r += `<span class=green>Nymphomaniac!</span>`; + r += `<span class="green">Nymphomaniac!</span>`; } } else if (slave.energy > 80) { - r += `<span class=green>Powerful sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; + r += `<span class="green">Powerful sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; } else if (slave.energy > 60) { - r += `<span class=green>Good sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; + r += `<span class="green">Good sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; } else if (slave.energy > 40) { - r += `<span class=yellow>Average sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; + r += `<span class="yellow">Average sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; } else if (slave.energy > 20) { - r += `<span class=red>Poor sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; + r += `<span class="red">Poor sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; } else { - r += `<span class=red>No sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; + r += `<span class="red">No sex drive${V.summaryStats? `[${slave.energy}]` : ''}.</span>`; } r += " "; } @@ -3812,7 +3813,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function long_behavior_flaw(slave) { - r += `<span class=red>`; + r += `<span class="red">`; switch (slave.behavioralFlaw) { case "arrogant": r += `Arrogant.`; @@ -3854,58 +3855,58 @@ window.SlaveSummaryUncached = (function() { function long_sex_flaw(slave) { switch (slave.sexualFlaw) { case "hates oral": - r += `<span class=red>Hates oral.</span>`; + r += `<span class="red">Hates oral.</span>`; break; case "hates anal": - r += `<span class=red>Hates anal.</span>`; + r += `<span class="red">Hates anal.</span>`; break; case "hates penetration": - r += `<span class=red>Hates penetration.</span>`; + r += `<span class="red">Hates penetration.</span>`; break; case "shamefast": - r += `<span class=red>Shamefast.</span>`; + r += `<span class="red">Shamefast.</span>`; break; case "idealistic": - r += `<span class=red>Sexually idealistic.</span>`; + r += `<span class="red">Sexually idealistic.</span>`; break; case "repressed": - r += `<span class=red>Sexually repressed.</span>`; + r += `<span class="red">Sexually repressed.</span>`; break; case "apathetic": - r += `<span class=red>Sexually apathetic.</span>`; + r += `<span class="red">Sexually apathetic.</span>`; break; case "crude": - r += `<span class=red>Sexually crude.</span>`; + r += `<span class="red">Sexually crude.</span>`; break; case "judgemental": - r += `<span class=red>Sexually judgemental.</span>`; + r += `<span class="red">Sexually judgemental.</span>`; break; case "cum addict": - r += `<span class=yellow>Cum addict.</span>`; + r += `<span class="yellow">Cum addict.</span>`; break; case "anal addict": - r += `<span class=yellow>Anal addict.</span>`; + r += `<span class="yellow">Anal addict.</span>`; break; case "attention whore": - r += `<span class=yellow>Attention whore.</span>`; + r += `<span class="yellow">Attention whore.</span>`; break; case "breast growth": - r += `<span class=yellow>Breast obsession.</span>`; + r += `<span class="yellow">Breast obsession.</span>`; break; case "abusive": - r += `<span class=yellow>Sexually abusive.</span>`; + r += `<span class="yellow">Sexually abusive.</span>`; break; case "malicious": - r += `<span class=yellow>Sexually malicious.</span>`; + r += `<span class="yellow">Sexually malicious.</span>`; break; case "self hating": - r += `<span class=yellow>Self hatred.</span>`; + r += `<span class="yellow">Self hatred.</span>`; break; case "neglectful": - r += `<span class=yellow>Self neglectful.</span>`; + r += `<span class="yellow">Self neglectful.</span>`; break; case "breeder": - r += `<span class=yellow>Breeding obsession.</span>`; + r += `<span class="yellow">Breeding obsession.</span>`; break; default: slave.sexualFlaw = "none"; @@ -3918,7 +3919,7 @@ window.SlaveSummaryUncached = (function() { * @param {App.Entity.SlaveState} slave */ function long_behavior_quirk(slave) { - r += `<span class=green>`; + r += `<span class="green">`; switch (slave.behavioralQuirk) { case "confident": r += `Confident.`; @@ -4166,7 +4167,7 @@ window.SlaveSummaryUncached = (function() { return s.ID === slave.rivalryTarget; }); if (_ssj !== -1) { - r += `<span class=lightsalmon>`; + r += `<span class="lightsalmon">`; if (slave.rivalry <= 1) { r += `Disl ${SlaveFullName(V.slaves[_ssj])}`; } else if (slave.rivalry <= 2) { @@ -4189,7 +4190,7 @@ window.SlaveSummaryUncached = (function() { return s.ID === slave.mother; }); if (_ssj !== -1) { - r += `${SlaveFullName(V.slaves[_ssj])}'s <span class=lightgreen>daughter`; + r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">daughter`; if (slave.relationshipTarget === V.slaves[_ssj].ID) { const friendShipShort = relationshipTerm(slave); r += ` and ${friendShipShort}`; @@ -4200,23 +4201,23 @@ window.SlaveSummaryUncached = (function() { } else if (slave.mother === -1) { r += `Your `; if (slave.relationship === -3) { - r += `<span class=lightgreen>daughter and wife.</span> `; + r += `<span class="lightgreen">daughter and wife.</span> `; handled = 1; } else if (slave.relationship === -2) { - r += `<span class=lightgreen>daughter and lover.</span> `; + r += `<span class="lightgreen">daughter and lover.</span> `; handled = 1; } else { - r += `<span class=lightgreen>daughter.</span> `; + r += `<span class="lightgreen">daughter.</span> `; } } else if (slave.mother in V.missingTable && V.showMissingSlavesSD && V.showMissingSlaves) { - r += `${V.missingTable[slave.mother].fullName}'s <span class=lightgreen>daughter.</span> `; + r += `${V.missingTable[slave.mother].fullName}'s <span class="lightgreen">daughter.</span> `; } if (slave.father > 0 && slave.father !== slave.mother) { const _ssj = V.slaves.findIndex(function(s) { return s.ID === slave.father; }); if (_ssj !== -1) { - r += `${SlaveFullName(V.slaves[_ssj])}'s <span class=lightgreen>daughter`; + r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">daughter`; if (slave.relationshipTarget === V.slaves[_ssj].ID) { const friendShipShort = relationshipTerm(slave); r += ` and ${friendShipShort}`; @@ -4227,23 +4228,23 @@ window.SlaveSummaryUncached = (function() { } else if (slave.father === -1 && slave.father !== slave.mother) { r += `Your `; if (slave.relationship === -3) { - r += `<span class=lightgreen>daughter and wife.</span> `; + r += `<span class="lightgreen">daughter and wife.</span> `; handled = 1; } else if (slave.relationship === -2) { - r += `<span class=lightgreen>daughter and lover.</span> `; + r += `<span class="lightgreen">daughter and lover.</span> `; handled = 1; } else { - r += `<span class=lightgreen>daughter.</span> `; + r += `<span class="lightgreen">daughter.</span> `; } } else if (slave.father in V.missingTable && slave.father !== slave.mother && V.showMissingSlavesSD && V.showMissingSlaves) { - r += `${V.missingTable[slave.father].fullName}'s <span class=lightgreen>daughter.</span> `; + r += `${V.missingTable[slave.father].fullName}'s <span class="lightgreen">daughter.</span> `; } if (slave.daughters === 1) { let _ssj = V.slaves.findIndex(function(s) { return s.mother === slave.ID; }); if (_ssj !== -1) { - r += `${SlaveFullName(V.slaves[_ssj])}'s <span class=lightgreen>mother`; + r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">mother`; if (slave.relationshipTarget === V.slaves[_ssj].ID) { const friendShipShort = relationshipTerm(slave); r += ` and ${friendShipShort}`; @@ -4255,7 +4256,7 @@ window.SlaveSummaryUncached = (function() { return s.father === slave.ID; }); if (_ssj !== -1) { - r += `${SlaveFullName(V.slaves[_ssj])}'s <span class=lightgreen>father`; + r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">father`; if (slave.relationshipTarget === V.slaves[_ssj].ID) { const friendShipShort = relationshipTerm(slave); r += ` and ${friendShipShort}`; @@ -4265,11 +4266,11 @@ window.SlaveSummaryUncached = (function() { } } else if (slave.daughters > 1) { if (slave.daughters > 10) { - r += `<span class=lightgreen>Has tons of daughters.</span> `; + r += `<span class="lightgreen">Has tons of daughters.</span> `; } else if (slave.daughters > 5) { - r += `<span class=lightgreen>Has many daughters.</span> `; + r += `<span class="lightgreen">Has many daughters.</span> `; } else { - r += `<span class=lightgreen>Has several daughters.</span> `; + r += `<span class="lightgreen">Has several daughters.</span> `; } } if (slave.sisters === 1) { @@ -4277,7 +4278,7 @@ window.SlaveSummaryUncached = (function() { return areSisters(s, slave) > 0; }); if (_ssj !== -1) { - r += `${SlaveFullName(V.slaves[_ssj])}'s <span class=lightgreen>sister`; + r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">sister`; if (slave.relationshipTarget === V.slaves[_ssj].ID) { const friendShipShort = relationshipTerm(slave); r += ` and ${friendShipShort}`; @@ -4287,11 +4288,11 @@ window.SlaveSummaryUncached = (function() { } } else if (slave.sisters > 1) { if (slave.sisters > 10) { - r += `<span class=lightgreen>One of many sisters.</span> `; + r += `<span class="lightgreen">One of many sisters.</span> `; } else if (slave.sisters > 5) { - r += `<span class=lightgreen>Has many sisters.</span> `; + r += `<span class="lightgreen">Has many sisters.</span> `; } else { - r += `<span class=lightgreen>Has several sisters.</span> `; + r += `<span class="lightgreen">Has several sisters.</span> `; } } if (slave.relationship > 0 && handled !== 1) { @@ -4301,14 +4302,14 @@ window.SlaveSummaryUncached = (function() { if (_ssj !== -1) { const friendship = relationshipTerm(slave); r += `${SlaveFullName(V.slaves[_ssj])}'s `; - r += `<span class=lightgreen>${friendship}.</span> `; + r += `<span class="lightgreen">${friendship}.</span> `; } } else if (slave.relationship === -3 && slave.mother !== -1 && slave.father !== -1) { - r += `<span class=lightgreen>Your wife.</span> `; + r += `<span class="lightgreen">Your wife.</span> `; } else if (slave.relationship === -2) { - r += `<span class=lightgreen>Emotionally bonded to you.</span> `; + r += `<span class="lightgreen">Emotionally bonded to you.</span> `; } else if (slave.relationship === -1) { - r += `<span class=lightgreen>Emotional slut.</span> `; + r += `<span class="lightgreen">Emotional slut.</span> `; } } @@ -4323,9 +4324,9 @@ window.SlaveSummaryUncached = (function() { if (_ssj !== -1) { r += `${SlaveFullName(V.slaves[_ssj])}'s `; if (slave.relationshipTarget !== slave.relationTarget) { - r += `<span class=lightgreen>${slave.relation}.</span> `; + r += `<span class="lightgreen">${slave.relation}.</span> `; } else { - r += `<span class=lightgreen>${slave.relation}</span> `; + r += `<span class="lightgreen">${slave.relation}</span> `; } if (slave.relationship <= 0) { r += ` `; @@ -4343,14 +4344,14 @@ window.SlaveSummaryUncached = (function() { } else { r += ` and `; } - r += `<span class=lightgreen>${friendship}.</span> `; + r += `<span class="lightgreen">${friendship}.</span> `; } } else if (slave.relationship === -3) { - r += `<span class=lightgreen>Your wife.</span> `; + r += `<span class="lightgreen">Your wife.</span> `; } else if (slave.relationship === -2) { - r += `<span class=lightgreen>Emotionally bonded to you.</span> `; + r += `<span class="lightgreen">Emotionally bonded to you.</span> `; } else if (slave.relationship === -1) { - r += `<span class=lightgreen>Emotional slut.</span> `; + r += `<span class="lightgreen">Emotional slut.</span> `; } } @@ -4359,7 +4360,7 @@ window.SlaveSummaryUncached = (function() { */ function long_clone(slave) { if (slave.clone !== 0) { - r += ` <span class=skyblue>Clone of ${slave.clone}.</span>`; + r += ` <span class="skyblue">Clone of ${slave.clone}.</span>`; } } @@ -4374,11 +4375,11 @@ window.SlaveSummaryUncached = (function() { }); if (_ssj !== -1) { if (slave.rivalry <= 1) { - r += `<span class=lightsalmon>Dislikes</span> ${SlaveFullName(V.slaves[_ssj])}.`; + r += `<span class="lightsalmon">Dislikes</span> ${SlaveFullName(V.slaves[_ssj])}.`; } else if (slave.rivalry <= 2) { - r += `${SlaveFullName(V.slaves[_ssj])}'s <span class=lightsalmon>rival.</span>`; + r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightsalmon">rival.</span>`; } else { - r += `<span class=lightsalmon>Hates</span> ${SlaveFullName(V.slaves[_ssj])}.`; + r += `<span class="lightsalmon">Hates</span> ${SlaveFullName(V.slaves[_ssj])}.`; } } r += " "; @@ -4844,7 +4845,7 @@ window.SlaveSummaryUncached = (function() { } else if (slave.shoes === "boots") { r += `Boots.`; } else if (slave.heels === 1) { - r += `<span class=yellow>Crawling.</span>`; + r += `<span class="yellow">Crawling.</span>`; } else if (slave.shoes === "flats") { r += `Flats.`; } @@ -4979,7 +4980,7 @@ window.SlaveSummaryUncached = (function() { */ function rules_assistant(slave) { if (slave.useRulesAssistant === 0) { - r += `<span class=lightgreen>RA-Exempt</span> `; + r += `<span class="lightgreen">RA-Exempt</span> `; } else if (V.abbreviateRulesets === 2 && (slave.currentRules !== undefined) && (slave.currentRules.length > 0)) { r += `Rules: ${V.defaultRules.filter(x => ruleApplied(slave, x)).map(x => x.name).join(", ") }`; } @@ -4993,7 +4994,7 @@ window.SlaveSummaryUncached = (function() { if (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1) { r += ` `; } - r += `<span class=gray>${slave.origin}</span>`; + r += `<span class="gray">${slave.origin}</span>`; } return SlaveSummaryUncached; @@ -5388,12 +5389,12 @@ App.UI.slaveSummaryList = function(passageName) { _Slave = slaves[_ssi]; /* restore devotion value so repeatedly changing clothes isn't an exploit */ } res.push(dividerAndImage(_Slave)); - if (App.Data.Facilities.headGirlSuite.manager.assignment === _Slave.assignment) res.push('<strong><span class=lightcoral>HG</span></strong> '); - else if (App.Data.Facilities.penthouse.manager.assignment === _Slave.assignment) res.push('<strong><span class=lightcoral>RC</span></strong> '); - else if (App.Data.Facilities.armory.manager.assignment === _Slave.assignment) res.push('<strong><span class=lightcoral>BG</span></strong> '); + if (App.Data.Facilities.headGirlSuite.manager.assignment === _Slave.assignment) res.push('<strong><span class="lightcoral">HG</span></strong> '); + else if (App.Data.Facilities.penthouse.manager.assignment === _Slave.assignment) res.push('<strong><span class="lightcoral">RC</span></strong> '); + else if (App.Data.Facilities.armory.manager.assignment === _Slave.assignment) res.push('<strong><span class="lightcoral">BG</span></strong> '); if (Array.isArray(V.personalAttention) && V.personalAttention.findIndex(s => s.ID === _Slave.ID) !== -1) { - res.push('<strong></span>.lightcoral; PA</span></strong> '); + res.push('<strong></span>."lightcoral"; PA</span></strong> '); } res.push(this.passageLink(_slaveName, 'Slave Interact', `$activeSlave = $slaves[${_ssi}]`)); /* lists their names */ break; @@ -5458,9 +5459,9 @@ App.UI.slaveSummaryList = function(passageName) { res.push(' will '); if ((_Slave.assignment === "rest") && (_Slave.health >= -20)) { - res.push("<strong><u><span class=lawngreen>rest</span></u></strong>"); + res.push(`<strong><u><span class="lawngreen">rest</span></u></strong>`); } else if ((_Slave.assignment === "stay confined") && ((_Slave.devotion > 20) || ((_Slave.trust < -20) && (_Slave.devotion >= -20)) || ((_Slave.trust < -50) && (_Slave.devotion >= -50)))) { - res.push("<strong><u><span class=lawngreen>stay confined.</span></u></strong>"); + res.push(`<strong><u><span class="lawngreen">stay confined.</span></u></strong>`); if (_Slave.sentence > 0) { res.push(` (${_Slave.sentence} weeks)`); } @@ -5517,7 +5518,7 @@ App.UI.slaveSummaryList = function(passageName) { } else if (slaveSelect !== undefined) { if (slaveSelect.facility.manager.slaveHasExperience(_Slave)) { res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : ''); - res.push('<span class=lime>Has applicable career experience.</span>'); + res.push('<span class="lime">Has applicable career experience.</span>'); } } switch (passageName) { diff --git a/src/js/utilJS.js b/src/js/utilJS.js index 73bec040170..643d0018dbe 100644 --- a/src/js/utilJS.js +++ b/src/js/utilJS.js @@ -843,18 +843,18 @@ Original SugarCube code Toned <<elseif _Slave.muscles > -6>> <<elseif _Slave.muscles > -31>> - <span class=red>weak</span> + <span class="red">weak</span> <<elseif _Slave.muscles > -96>> - <span class=red>weak+</span> + <span class="red">weak+</span> <<else>> - <span class=red>weak++</span> + <span class="red">weak++</span> <</if>> As a categorizer <<if ndef $cats>><<set $cats = {}>><</if>> <<if ndef $cats.muscleCat>> <!-- This only gets set once, skipping much of the code evaluation, and can be set outside of the code in an "init" passage for further optimization --> - <<set $cats.muscleCat = new Categorizer([96, 'Musc++'], [31, 'Musc+'], [6, 'Toned'], [-5, ''], [-30, '<span class=red>weak</span>'], [-95, '<span class=red>weak+</span>'], [-Infinity, '<span class=red>weak++</span>'])>> + <<set $cats.muscleCat = new Categorizer([96, 'Musc++'], [31, 'Musc+'], [6, 'Toned'], [-5, ''], [-30, '<span class="red">weak</span>'], [-95, '<span class="red">weak+</span>'], [-Infinity, '<span class="red">weak++</span>'])>> <</if>> <<print $cats.muscleCat.cat(_Slave.muscles)>> */ @@ -1027,9 +1027,9 @@ window.repFormat = function(s) { /* if (!s) { s = 0; }*/ if (V.cheatMode === 1 || V.debugMode === 1) { if (s > 0) { - return `<span class=green>${ num(Math.round(s * 100) / 100) } rep</span>`; + return `<span class="green">${ num(Math.round(s * 100) / 100) } rep</span>`; } else if (s < 0) { - return `<span class=red>${ num(Math.round(s * 100) / 100) } rep</span>`; + return `<span class="red">${ num(Math.round(s * 100) / 100) } rep</span>`; } else { return `${num(Math.round(s * 100) / 100) } rep`; } @@ -1037,27 +1037,27 @@ window.repFormat = function(s) { /* In order to calculate just how much any one category matters so we can show a "fuzzy" symbolic value to the player, we need to know how "busy" reputation was this week. To calculate this, I ADD income to expenses. Why? 100 - 100 and 10000 - 10000 BOTH are 0, but a +50 event matters a lot more in the first case than the second. I exclude overflow from the calculation because it's not a "real" expense for our purposes, and divide by half just to make percentages a bit easier. */ let weight = s / (((V.lastWeeksRepIncome.Total - V.lastWeeksRepExpenses.Total) + V.lastWeeksRepExpenses.overflow) / 2); if (weight > 0.60) { - return "<span class=green>+++++ rep</span>"; + return "<span class="green">+++++ rep</span>"; } else if (weight > 0.45) { - return "<span class=green>++++ rep</span>"; + return "<span class="green">++++ rep</span>"; } else if (weight > 0.30) { - return "<span class=green>+++ rep</span>"; + return "<span class="green">+++ rep</span>"; } else if (weight > 0.15) { - return "<span class=green>++ rep</span>"; + return "<span class="green">++ rep</span>"; } else if (weight > 0.0) { - return "<span class=green>+ rep</span>"; + return "<span class="green">+ rep</span>"; } else if (weight === 0) { return "0 rep"; } else if (weight < -0.60) { - return "<span class=red>----- rep</span>"; + return "<span class="red">----- rep</span>"; } else if (weight < -0.45) { - return "<span class=red>---- rep</span>"; + return "<span class="red">---- rep</span>"; } else if (weight < -0.30) { - return "<span class=red>--- rep</span>"; + return "<span class="red">--- rep</span>"; } else if (weight < -0.15) { - return "<span class=red>-- rep</span>"; + return "<span class="red">-- rep</span>"; } else if (weight < 0) { - return "<span class=red>- rep</span>"; + return "<span class="red">- rep</span>"; } /* return weight;*/ } @@ -1104,14 +1104,14 @@ window.budgetLine = function(category, title) { <td>${title}</td>\ <td>\ <<if (${income}.${category}) > 0>>\ - <span class=yellowgreen><<print cashFormat(${income}.${category})>></span> /*please don't put a plus sign in front of income, it's not done on a budget sheet. Safe to assume money is money unless it's in parenthesis or with a - sign.*/ + <span class="yellowgreen"><<print cashFormat(${income}.${category})>></span> /*please don't put a plus sign in front of income, it's not done on a budget sheet. Safe to assume money is money unless it's in parenthesis or with a - sign.*/ <<else>>\ <<print cashFormat(${income}.${category})>>\ <</if>>\ </td>\ <td>\ <<if (${expenses}.${category}) < 0>>\ - <span class=red>-<<print cashFormat(Math.abs(${expenses}.${category}))>>\ + <span class="red">-<<print cashFormat(Math.abs(${expenses}.${category}))>>\ <<else>>\ <<print cashFormat(${expenses}.${category})>>\ <</if>>\ @@ -1119,9 +1119,9 @@ window.budgetLine = function(category, title) { <<set ${profits}.${category} = (${income}.${category} + ${expenses}.${category})>>\ <td>\ <<if (${profits}.${category}) > 0>>\ - <span class=yellowgreen><<print cashFormat(${profits}.${category})>>.</span> + <span class="yellowgreen"><<print cashFormat(${profits}.${category})>>.</span> <<elseif (${profits}.${category}) < 0>>\ - <span class=red>-<<print cashFormat(Math.abs(${profits}.${category}))>>.</span> + <span class="red">-<<print cashFormat(Math.abs(${profits}.${category}))>>.</span> <<else>>\ <<print cashFormat(${profits}.${category})>>\ <</if>>\ @@ -1255,7 +1255,7 @@ window.jsInclude = function(passageTitle) { if (Story.has(passageTitle)) { return Story.get(passageTitle).processText(); } else { - return `<span class=red>Error: Passage ${passageTitle} does not exist.</span>`; + return `<span class="red">Error: Passage ${passageTitle} does not exist.</span>`; } }; @@ -1450,7 +1450,7 @@ window.induceLactation = function induceLactation(slave) { let r = ""; if (slave.induceLactation >= 10) { if (jsRandom(1, 100) < slave.induceLactation) { - r += `${His} breasts have been stimulated often enough to <span class=lime>induce lactation.</span>`; + r += `${His} breasts have been stimulated often enough to <span class="lime">induce lactation.</span>`; slave.induceLactation = 0; slave.lactationDuration = 2; slave.lactation = 1; @@ -1658,19 +1658,19 @@ window.SkillIncrease = (function() { if (slave.skill.oral <= 10) { if (slave.skill.oral + skillIncrease > 10) { - r = ` <span class=green>${He} now has basic knowledge about oral sex,</span> and can at least suck a dick without constant gagging.`; + r = `<span class="green">${He} now has basic knowledge about oral sex,</span> and can at least suck a dick without constant gagging.`; } } else if (slave.skill.oral <= 30) { if (slave.skill.oral + skillIncrease > 30) { - r = ` <span class=green>${He} now has some oral skills,</span> and can reliably bring dicks and pussies to climax with ${his} mouth.`; + r = `<span class="green">${He} now has some oral skills,</span> and can reliably bring dicks and pussies to climax with ${his} mouth.`; } } else if (slave.skill.oral <= 60) { if (slave.skill.oral + skillIncrease > 60) { - r = ` <span class=green>${He} is now an oral expert,</span> and has a delightfully experienced tongue.`; + r = `<span class="green">${He} is now an oral expert,</span> and has a delightfully experienced tongue.`; } } else if (slave.skill.oral < 100) { if (slave.skill.oral + skillIncrease >= 100) { - r = ` <span class=green>${He} has mastered oral sex,</span> and can learn nothing more about sucking dick or eating pussy.`; + r = `<span class="green">${He} has mastered oral sex,</span> and can learn nothing more about sucking dick or eating pussy.`; } } slave.skill.oral += skillIncrease; @@ -1689,19 +1689,19 @@ window.SkillIncrease = (function() { if (slave.skill.vaginal <= 10) { if (slave.skill.vaginal + skillIncrease > 10) { - r = `<span class=green>${He} now has basic knowledge about vaginal sex,</span> and can avoid some of the common pitfalls and turnoffs.`; + r = `<span class="green">${He} now has basic knowledge about vaginal sex,</span> and can avoid some of the common pitfalls and turnoffs.`; } } else if (slave.skill.vaginal <= 30) { if (slave.skill.vaginal + skillIncrease > 30) { - r = `<span class=green>${He} now has some vaginal sex skills,</span> and can do more than just lie there and take it.`; + r = `<span class="green">${He} now has some vaginal sex skills,</span> and can do more than just lie there and take it.`; } } else if (slave.skill.vaginal <= 60) { if (slave.skill.vaginal + skillIncrease > 60) { - r = `<span class=green>${He} is now a vaginal sex expert,</span> and has the muscular control to massage anything that's inside $him.`; + r = `<span class="green">${He} is now a vaginal sex expert,</span> and has the muscular control to massage anything that's inside $him.`; } } else if (slave.skill.vaginal < 100) { if (slave.skill.vaginal + skillIncrease >= 100) { - r = `<span class=green>${He} has mastered vaginal sex,</span> and can learn nothing more about tribbing or taking dick.`; + r = `<span class="green">${He} has mastered vaginal sex,</span> and can learn nothing more about tribbing or taking dick.`; } } slave.skill.vaginal += skillIncrease; @@ -1721,19 +1721,19 @@ window.SkillIncrease = (function() { if (slave.skill.anal <= 10) { if (slave.skill.anal + skillIncrease > 10) { - r = `<span class=green>${He} now has basic knowledge about anal sex,</span> and can accept penetration of ${his} anus without danger.`; + r = `<span class="green">${He} now has basic knowledge about anal sex,</span> and can accept penetration of ${his} anus without danger.`; } } else if (slave.skill.anal <= 30) { if (slave.skill.anal + skillIncrease > 30) { - r = `<span class=green>${He} now has some anal sex skills,</span> and needs less preparation before taking rough penetration.`; + r = `<span class="green">${He} now has some anal sex skills,</span> and needs less preparation before taking rough penetration.`; } } else if (slave.skill.anal <= 60) { if (slave.skill.anal + skillIncrease > 60) { - r = `<span class=green>${He} is now an anal sex expert,</span> and knows how to use ${his} sphincter to please.`; + r = `<span class="green">${He} is now an anal sex expert,</span> and knows how to use ${his} sphincter to please.`; } } else if (slave.skill.anal < 100) { if (slave.skill.anal + skillIncrease >= 100) { - r = `<span class=green>${He} has mastered anal sex,</span> and can learn nothing more about taking it up the ass.`; + r = `<span class="green">${He} has mastered anal sex,</span> and can learn nothing more about taking it up the ass.`; } } slave.skill.anal += skillIncrease; @@ -1753,19 +1753,19 @@ window.SkillIncrease = (function() { if (slave.skill.whoring <= 10) { if (slave.skill.whoring + skillIncrease > 10) { - r = `<span class=green>${He} now has basic knowledge about how to whore,</span> and can avoid some potentially dangerous situations.`; + r = `<span class="green">${He} now has basic knowledge about how to whore,</span> and can avoid some potentially dangerous situations.`; } } else if (slave.skill.whoring <= 30) { if (slave.skill.whoring + skillIncrease > 30) { - r = `<span class=green>${He} now has some skill as a whore,</span> and knows how to sell ${his} body at a good price.`; + r = `<span class="green">${He} now has some skill as a whore,</span> and knows how to sell ${his} body at a good price.`; } } else if (slave.skill.whoring <= 60) { if (slave.skill.whoring + skillIncrease > 60) { - r = `<span class=green>${He} is now an expert whore,</span> and can often make clients forget that $he's a prostitute they're paying for.`; + r = `<span class="green">${He} is now an expert whore,</span> and can often make clients forget that $he's a prostitute they're paying for.`; } } else if (slave.skill.whoring < 100) { if (slave.skill.whoring + skillIncrease >= 100) { - r = `<span class=green>${He} is now a masterful whore,</span> and can learn nothing more about prostitution.`; + r = `<span class="green">${He} is now a masterful whore,</span> and can learn nothing more about prostitution.`; } } slave.skill.whoring += skillIncrease; @@ -1784,19 +1784,19 @@ window.SkillIncrease = (function() { if (slave.skill.entertainment <= 10) { if (slave.skill.entertainment + skillIncrease > 10) { - r = `<span class=green>${He} now has basic knowledge about how to be entertaining,</span> and can usually avoid serious faux pas.`; + r = `<span class="green">${He} now has basic knowledge about how to be entertaining,</span> and can usually avoid serious faux pas.`; } } else if (slave.skill.entertainment <= 30) { if (slave.skill.entertainment + skillIncrease > 30) { - r = `<span class=green>${He} now has some skill as an entertainer,</span> and can flirt, dance, and strip acceptably.`; + r = `<span class="green">${He} now has some skill as an entertainer,</span> and can flirt, dance, and strip acceptably.`; } } else if (slave.skill.entertainment <= 60) { if (slave.skill.entertainment + skillIncrease > 60) { - r = `<span class=green>${He} is now an expert entertainer,</span> and can flirt engagingly, dance alluringly, and strip arousingly.`; + r = `<span class="green">${He} is now an expert entertainer,</span> and can flirt engagingly, dance alluringly, and strip arousingly.`; } } else if (slave.skill.entertainment < 100) { if (slave.skill.entertainment + skillIncrease >= 100) { - r = `<span class=green>${He} is now a masterful entertainer,</span> and can learn nothing more about flirting, dancing, or stripping.`; + r = `<span class="green">${He} is now a masterful entertainer,</span> and can learn nothing more about flirting, dancing, or stripping.`; } } slave.skill.entertainment += skillIncrease; @@ -1968,19 +1968,19 @@ window.IncreasePCSkills = function(input, increase = 1) { player[input] += increase; if (oldSkill <= 10) { if (player[input] >= 10) { - return ` <span class='green'> <br>You have gained basic knowlege in ${input}.</span>`; + return `<span class="green"> <br>You have gained basic knowlege in ${input}.</span>`; } } else if (oldSkill <= 30) { if (player[input] >= 30) { - return ` <span class='green'> <br>You have gained some knowlege in ${input}.</span>`; + return `<span class="green"> <br>You have gained some knowlege in ${input}.</span>`; } } else if (oldSkill <= 60) { if (player[input] >= 60) { - return ` <span class='green'> <br>You have become an expert in ${input}.</span>`; + return `<span class="green"> <br>You have become an expert in ${input}.</span>`; } } else if (oldSkill < 100) { if (player[input] >= 100) { - return ` <span class='green'> <br>You have mastered ${input}.</span>`; + return `<span class="green"> <br>You have mastered ${input}.</span>`; } } }; diff --git a/src/js/vignettes.js b/src/js/vignettes.js index 5a8ae752abf..602652eb705 100644 --- a/src/js/vignettes.js +++ b/src/js/vignettes.js @@ -1731,7 +1731,7 @@ window.GetVignette = function GetVignette(slave) { break; case 3: vignettes.push({ - text: `the most interesting thing that happened to ${him} at work was that ${he} had to move to follow the <span class=green>most prominent citizens</span> to a newly fashionable hall,`, + text: `the most interesting thing that happened to ${him} at work was that ${he} had to move to follow the <span class="green">most prominent citizens</span> to a newly fashionable hall,`, type: "rep", effect: 0, }); -- GitLab