diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js index 596e6491122f2be4f1df86133580de2ca7d14386..65b60dbc0a99a9733a9ead14dbbacc8b327974ac 100644 --- a/src/endWeek/saChoosesOwnClothes.js +++ b/src/endWeek/saChoosesOwnClothes.js @@ -48,7 +48,7 @@ window.saChoosesOwnClothes = (function() { r += `${shoeChoice.text} `; slave.shoes = shoeChoice.shoes; } - r += `Allowing ${him} permission to dress as ${he} sees fit <span class="mediumorchid">increases ${his} independence.</span>`; + r += `Allowing ${him} permission to dress as ${he} sees fit <span class="devotion dec">increases ${his} independence.</span>`; slave.devotion -= 5; } else { const neckChoice = todaysCollar(slave); @@ -57,7 +57,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="devotion inc">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/saGetMilked.js b/src/endWeek/saGetMilked.js index 81cea8418c0eac287ce88131a77fcc1c5a83de65..ef0bf5a9f7ef7969b4304f6d4c2feb289905f715 100644 --- a/src/endWeek/saGetMilked.js +++ b/src/endWeek/saGetMilked.js @@ -365,7 +365,7 @@ window.saGetMilked = (function saGetMilked() { function milkingEffects(slave) { if (slave.fetishKnown) { if (slave.fetish === "boobs" || slave.energy > 95) { - r += ` Getting constantly milked is as good as sex, as far as ${he}'s concerned. <span class="hotpink">$He is happy</span> to have ${his} breasts receive so much attention.`; + r += ` Getting constantly milked is as good as sex, as far as ${he}'s concerned. <span class="devotion inc">$He is happy</span> to have ${his} breasts receive so much attention.`; slave.devotion += 1; if (slave.need > 0) { slave.need = 0; @@ -374,7 +374,7 @@ window.saGetMilked = (function saGetMilked() { } if (slave.career === "a dairy cow" && slave.fetish !== "mindbroken" && slave.fuckdoll === 0) { - r += ` ${He} feels like <span class="hotpink">${he} was made to be milked,</span> <span class="mediumaquamarine">not that ${he}'d complain about such a good feeling.</span>`; + r += ` ${He} feels like <span class="devotion inc">${he} was made to be milked,</span> <span class="trust inc">not that ${he}'d complain about such a good feeling.</span>`; slave.devotion++; slave.trust++; if (slave.need > 0) { @@ -385,10 +385,10 @@ window.saGetMilked = (function saGetMilked() { if (slave.nipples !== "huge") { if (slave.nipples === "inverted") { if (slave.fetish === "masochist" && slave.fetishKnown === 1) { - r += ` Having the milkers constantly haul ${his} inverted nipples out is <span class="hotpink">extremely uncomfortable; ${he} loves it.</span>`; + r += ` Having the milkers constantly haul ${his} inverted nipples out is <span class="devotion inc">extremely uncomfortable; ${he} loves it.</span>`; slave.devotion += 3; } else { - r += ` Having the milkers constantly haul ${his} inverted nipples out is <span class="mediumorchid">extremely uncomfortable.</span>`; + r += ` Having the milkers constantly haul ${his} inverted nipples out is <span class="devotion dec">extremely uncomfortable.</span>`; slave.devotion -= 3; } if (jsRandom(1, 100) > 50) { @@ -403,10 +403,10 @@ window.saGetMilked = (function saGetMilked() { } } else if (slave.nipples === "partially inverted") { if (slave.fetish === "masochist" && slave.fetishKnown === 1) { - r += ` Having the milkers constantly haul ${his} inverted nipples out is <span class="hotpink">quite uncomfortable; ${he} loves it.</span>`; + r += ` Having the milkers constantly haul ${his} inverted nipples out is <span class="devotion inc">quite uncomfortable; ${he} loves it.</span>`; slave.devotion += 1; } else { - r += ` Having the milkers constantly haul ${his} inverted nipples out is <span class="mediumorchid">quite uncomfortable.</span>`; + r += ` Having the milkers constantly haul ${his} inverted nipples out is <span class="devotion dec">quite uncomfortable.</span>`; slave.devotion -= 1; } if (jsRandom(1, 100) > 30) { @@ -693,7 +693,7 @@ window.saGetMilked = (function saGetMilked() { * */ function cumEffects(slave) { if (slave.energy > 95) { - r += ` Getting ${his} dick constantly milked is almost as good as getting constant blowjobs as far as ${he}'s concerned. <span class="hotpink">${He} is happy</span> to have ${his} member receive so much attention.`; + r += ` Getting ${his} dick constantly milked is almost as good as getting constant blowjobs as far as ${he}'s concerned. <span class="devotion inc">${He} is happy</span> to have ${his} member receive so much attention.`; slave.devotion += 1; } @@ -703,7 +703,7 @@ window.saGetMilked = (function saGetMilked() { } if (!canAchieveErection(slave)) { - r += ` Since ${he} cannot maintain an erection, ${he} requires <span class="gold">painful</span> and <span class="mediumorchid">degrading</span> anal electrostimulation to produce.`; + r += ` Since ${he} cannot maintain an erection, ${he} requires <span class="trust dec">painful</span> and <span class="devotion dec">degrading</span> anal electrostimulation to produce.`; slave.devotion -= 2; slave.trust -= 2; if (slave.anus === 0) { @@ -711,7 +711,7 @@ window.saGetMilked = (function saGetMilked() { slave.anus = 1; } } else if (slave.devotion <= 20) { - r += ` Since ${he}'s unaroused by ${his} situation, ${he} requires <span class="gold">painful</span> and <span class="mediumorchid">degrading</span> anal electrostimulation to produce.`; + r += ` Since ${he}'s unaroused by ${his} situation, ${he} requires <span class="trust dec">painful</span> and <span class="devotion dec">degrading</span> anal electrostimulation to produce.`; slave.devotion -= 2; slave.trust -= 2; if (slave.anus === 0) { @@ -832,7 +832,7 @@ window.saGetMilked = (function saGetMilked() { function mentalEffects(slave) { if (slave.assignment === "get milked" || (slave.assignment === "work in the dairy" && V.dairyRestraintsSetting < 2)) { if (slave.behavioralQuirk === "fitness") { - r += ` ${slave.slaveName} <span class="hotpink">privately enjoys</span> the focus on ${his} health and fitness that comes with being a cow.`; + r += ` ${slave.slaveName} <span class="devotion inc">privately enjoys</span> the focus on ${his} health and fitness that comes with being a cow.`; slave.devotion += 1; } } @@ -865,23 +865,23 @@ window.saGetMilked = (function saGetMilked() { } 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="devotion inc">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; + r += `<span class="devotion inc">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class="hotpink">reducing ${his} dislike of you.</span>`; + r += `<span class="devotion inc">reducing ${his} dislike of you.</span>`; } else { - r += `<span class="hotpink">reducing ${his} hatred of you.</span>`; + r += `<span class="devotion inc">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="devotion dec">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; + r += `<span class="devotion dec">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; + r += `<span class="devotion dec">increasing ${his} dislike of you.</span>`; } else { - r += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; + r += `<span class="devotion dec">increasing ${his} hatred of you.</span>`; } } else { r += `an incident without lasting effect.`; @@ -890,19 +890,19 @@ window.saGetMilked = (function saGetMilked() { } 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="trust inc">increasing ${his} trust in you.</span>`; } else if (slave.trust >= -50) { - r += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; + r += `<span class="trust inc">reducing ${his} fear of you.</span>`; } else { - r += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; + r += `<span class="trust inc">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="trust dec">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - r += `<span class="gold">increasing ${his} fear of you.</span>`; + r += `<span class="trust dec">increasing ${his} fear of you.</span>`; } else { - r += `<span class="gold">increasing ${his} terror of you.</span>`; + r += `<span class="trust dec">increasing ${his} terror of you.</span>`; } } else { r += `an incident without lasting effect.`; diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js index af3d3bfffe984a0ba74f7795629c38e394519f67..547ee8a3f4dff8daa48d7e65f0971864e9ba84f2 100644 --- a/src/endWeek/saNanny.js +++ b/src/endWeek/saNanny.js @@ -154,23 +154,23 @@ window.saNanny = function saNanny(slave) { 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="devotion inc">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; + t += `<span class="devotion inc">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class="hotpink">reducing ${his} dislike of you.</span>`; + t += `<span class="devotion inc">reducing ${his} dislike of you.</span>`; } else { - t += `<span class="hotpink">reducing ${his} hatred of you.</span>`; + t += `<span class="devotion inc">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="devotion dec">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; + t += `<span class="devotion dec">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; + t += `<span class="devotion dec">increasing ${his} dislike of you.</span>`; } else { - t += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; + t += `<span class="devotion dec">increasing ${his} hatred of you.</span>`; } } else { t += `an incident without lasting effect.`; @@ -188,19 +188,19 @@ window.saNanny = function saNanny(slave) { 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="trust inc">increasing ${his} trust in you.</span>`; } else if (slave.trust > -10) { - t += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; + t += `<span class="trust inc">reducing ${his} fear of you.</span>`; } else { - t += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; + t += `<span class="trust inc">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="trust dec">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - t += `<span class="gold">increasing ${his} fear of you.</span>`; + t += `<span class="trust dec">increasing ${his} fear of you.</span>`; } else { - t += `<span class="gold">increasing ${his} terror of you.</span>`; + t += `<span class="trust dec">increasing ${his} terror of you.</span>`; } } else { t += `an incident without lasting effect.`; diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js index 962785e0e9daca3efc33fb141feef3f0c7615de3..41e0c8d28c6a01c0fd0debcf0834eb177d176886 100644 --- a/src/endWeek/saRest.js +++ b/src/endWeek/saRest.js @@ -39,18 +39,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="trust inc">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="trust inc">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="trust inc">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="trust inc">reduces ${his} fear</span> of you.`; slave.trust += 4; } } @@ -97,23 +97,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="devotion inc">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; + t += `<span class="devotion inc">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class="hotpink">reducing ${his} dislike of you.</span>`; + t += `<span class="devotion inc">reducing ${his} dislike of you.</span>`; } else { - t += `<span class="hotpink">reducing ${his} hatred of you.</span>`; + t += `<span class="devotion inc">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="devotion dec">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; + t += `<span class="devotion dec">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; + t += `<span class="devotion dec">increasing ${his} dislike of you.</span>`; } else { - t += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; + t += `<span class="devotion dec">increasing ${his} hatred of you.</span>`; } } else { t += `an incident without lasting effect.`; @@ -122,19 +122,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="trust inc">increasing ${his} trust in you.</span>`; } else if (slave.trust > -10) { - t += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; + t += `<span class="trust inc">reducing ${his} fear of you.</span>`; } else { - t += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; + t += `<span class="trust inc">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="trust dec">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - t += `<span class="gold">increasing ${his} fear of you.</span>`; + t += `<span class="trust dec">increasing ${his} fear of you.</span>`; } else { - t += `<span class="gold">increasing ${his} terror of you.</span>`; + t += `<span class="trust dec">increasing ${his} terror of you.</span>`; } } else { t += `an incident without lasting effect.`; diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js index 18b4e6f84f9c4591a6600f7b1e9bed97ea6cf248..3ae5d76d1803e024d3c640dc86b6e595ef8a0055 100644 --- a/src/endWeek/saServant.js +++ b/src/endWeek/saServant.js @@ -21,14 +21,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="trust dec">corrective rape</span> when ${his} service is imperfect, <span class="devotion inc">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="devotion inc">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="devotion inc">sex as a reward,</span> getting ${him} off when ${he} <span class="yellowgreen">works harder.</span>`; slave.devotion++; } if (!(canHear(slave))) { @@ -158,23 +158,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="devotion inc">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; + t += `<span class="devotion inc">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class="hotpink">reducing ${his} dislike of you.</span>`; + t += `<span class="devotion inc">reducing ${his} dislike of you.</span>`; } else { - t += `<span class="hotpink">reducing ${his} hatred of you.</span>`; + t += `<span class="devotion inc">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="devotion dec">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - t += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; + t += `<span class="devotion dec">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion > -10) { - t += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; + t += `<span class="devotion dec">increasing ${his} dislike of you.</span>`; } else { - t += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; + t += `<span class="devotion dec">increasing ${his} hatred of you.</span>`; } } else { t += `an incident without lasting effect.`; @@ -183,19 +183,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="trust inc">increasing ${his} trust in you.</span>`; } else if (slave.trust > -10) { - t += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; + t += `<span class="trust inc">reducing ${his} fear of you.</span>`; } else { - t += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; + t += `<span class="trust inc">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="trust dec">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - t += `<span class="gold">increasing ${his} fear of you.</span>`; + t += `<span class="trust dec">increasing ${his} fear of you.</span>`; } else { - t += `<span class="gold">increasing ${his} terror of you.</span>`; + t += `<span class="trust dec">increasing ${his} terror of you.</span>`; } } else { t += `an incident without lasting effect.`; diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js index 93c0ccc40326830f15a0d6971553a6e34b1dab28..c7664c3ea293e56ef6fad424205834021161ddda 100644 --- a/src/endWeek/saServeThePublic.js +++ b/src/endWeek/saServeThePublic.js @@ -291,14 +291,14 @@ 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="devotion inc">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="devotion inc">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="trust inc">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) { @@ -391,15 +391,15 @@ window.saServeThePublic = (function saServeThePublic() { 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="devotion inc">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="devotion inc">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="devotion dec">hate</span> and <span class="trust dec">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; @@ -415,15 +415,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="devotion inc">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="devotion inc">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="devotion dec">hatred</span> and <span class="trust dec">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; @@ -479,15 +479,15 @@ 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="devotion inc">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="devotion dec">you're responsible,</span> and <span class="trust dec">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="devotion inc">wears away at ${his} will.</span>`; slave.devotion += 4; } } else { @@ -1549,23 +1549,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="devotion inc">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; + r += `<span class="devotion inc">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class="hotpink">reducing ${his} dislike of you.</span>`; + r += `<span class="devotion inc">reducing ${his} dislike of you.</span>`; } else { - r += `<span class="hotpink">reducing ${his} hatred of you.</span>`; + r += `<span class="devotion inc">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="devotion dec">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; + r += `<span class="devotion dec">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; + r += `<span class="devotion dec">increasing ${his} dislike of you.</span>`; } else { - r += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; + r += `<span class="devotion dec">increasing ${his} hatred of you.</span>`; } } else { r += `an incident without lasting effect.`; @@ -1574,19 +1574,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="trust inc">increasing ${his} trust in you.</span>`; } else if (slave.trust >= -50) { - r += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; + r += `<span class="trust inc">reducing ${his} fear of you.</span>`; } else { - r += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; + r += `<span class="trust inc">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="trust dec">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - r += `<span class="gold">increasing ${his} fear of you.</span>`; + r += `<span class="trust dec">increasing ${his} fear of you.</span>`; } else { - r += `<span class="gold">increasing ${his} terror of you.</span>`; + r += `<span class="trust dec">increasing ${his} terror of you.</span>`; } } else { r += `an incident without lasting effect.`; diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js index 2259c017701c90cf7972dabd99baf9eb60c6a2cd..0ea858cdf70d543ac13be99883b3e31968721f91 100644 --- a/src/endWeek/saStayConfined.js +++ b/src/endWeek/saStayConfined.js @@ -14,28 +14,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="devotion inc">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="devotion inc">${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="devotion dec">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="trust dec">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="trust dec">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="trust dec">trust you less,</span> and fear you more.`; slave.trust -= 5; } @@ -97,7 +97,7 @@ 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="devotion accept">do as ${he}'s told,</span>`; } t += ` so <span class="yellow">${his} assignment has defaulted to rest.</span>`; if (slave.assignment === "be confined in the cellblock") { diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js index bab08437462921d9e6b3a58307b70ea5f2deaefc..dd2fc6c1e5fd7b9f3ed7353762ae25130a569ff1 100644 --- a/src/endWeek/saTakeClasses.js +++ b/src/endWeek/saTakeClasses.js @@ -71,26 +71,26 @@ window.saTakeClasses = (function saServeThePublic() { } r += ` under ${V.Schoolteacher.slaveName}'s supervision;`; if (slave.devotion > 20) { - r += ` ${he} is such an obedient slave that ${schoolteacherPronouns.pronoun} <span class="hotpink">encourages ${him}</span> to be the best slave ${he} can.`; + r += ` ${he} is such an obedient slave that ${schoolteacherPronouns.pronoun} <span class="devotion inc">encourages ${him}</span> to be the best slave ${he} can.`; slave.devotion += 2; } else if (slave.trust < -20) { - r += ` ${he} obeys out of fear, so ${schoolteacherPronouns.pronoun} <span class="hotpink">encourages ${him}</span> to be a better slave.`; + r += ` ${he} obeys out of fear, so ${schoolteacherPronouns.pronoun} <span class="devotion inc">encourages ${him}</span> to be a better slave.`; slave.devotion++; } else { - r += ` ${he} is resistant, so ${schoolteacherPronouns.pronoun} ends up mostly <span class="gold">punishing ${him},</span> increasing ${his} <span class="mediumorchid">dislike for slavery.</span>`; + r += ` ${he} is resistant, so ${schoolteacherPronouns.pronoun} ends up mostly <span class="trust dec">punishing ${him},</span> increasing ${his} <span class="devotion dec">dislike for slavery.</span>`; slave.devotion -= 2; slave.trust -= 4; } } else { r += ` under ${V.assistantName}'s supervision;`; if (slave.devotion > 20) { - r += ` ${he} is such an obedient slave that ${V.assistantName} mostly <span class="hotpink">encourages ${him}.</span>`; + r += ` ${he} is such an obedient slave that ${V.assistantName} mostly <span class="devotion inc">encourages ${him}.</span>`; slave.devotion += 2; } else if (slave.trust < -20) { - r += ` ${he} obeys out of fear, so ${V.assistantName} mostly <span class="hotpink">encourages ${him}</span> to be a better slave.`; + r += ` ${he} obeys out of fear, so ${V.assistantName} mostly <span class="devotion inc">encourages ${him}</span> to be a better slave.`; slave.devotion++; } else { - r += ` ${he} is resistant, so ${V.assistantName} mostly <span class="gold">punishes ${him},</span> increasing ${his} <span class="mediumorchid">dislike for slavery.</span>`; + r += ` ${he} is resistant, so ${V.assistantName} mostly <span class="trust dec">punishes ${him},</span> increasing ${his} <span class="devotion dec">dislike for slavery.</span>`; slave.devotion -= 2; slave.trust -= 4; } @@ -275,7 +275,7 @@ window.saTakeClasses = (function saServeThePublic() { } for (let lessons = 0; lessons < learning; lessons++) { if (slave.devotion <= 20 && undevoted === 0) { - r += ` Since ${he} is wanting in basic obedience, ${he} suffers through courses on <span class="hotpink">$his place</span> in the Free Cities world.`; + r += ` Since ${he} is wanting in basic obedience, ${he} suffers through courses on <span class="devotion inc">$his place</span> in the Free Cities world.`; slave.devotion += 10; undevoted++; } else if (slave.skill.oral <= 10) { diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js index e5e59cd9f58fb538328993ce4cce0e07788a885a..59e9b14ed651f8b55247f488d44acf7ff29e462c 100644 --- a/src/endWeek/saWhore.js +++ b/src/endWeek/saWhore.js @@ -322,14 +322,14 @@ 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="devotion inc">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="devotion inc">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="trust inc">trusts that ${his} place</span> in society is an important one.`; slave.trust += 1; } if (slave.assignment === "work in the brothel" && slave.devotion > 50) { @@ -453,15 +453,15 @@ window.saWhore = (function saWhore() { 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="devotion inc">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="devotion inc">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="devotion dec">hate</span> and <span class="trust dec">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; @@ -477,15 +477,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="devotion inc">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="devotion inc">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="devotion dec">hatred</span> and <span class="trust dec">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; @@ -559,15 +559,15 @@ 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="devotion inc">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="devotion dec">you're responsible,</span> and <span class="trust dec">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="devotion inc">wears away at ${his} will.</span>`; slave.devotion += 4; } } else { @@ -1634,23 +1634,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="devotion inc">increasing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class="hotpink">increasing ${his} acceptance of you.</span>`; + r += `<span class="devotion inc">increasing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class="hotpink">reducing ${his} dislike of you.</span>`; + r += `<span class="devotion inc">reducing ${his} dislike of you.</span>`; } else { - r += `<span class="hotpink">reducing ${his} hatred of you.</span>`; + r += `<span class="devotion inc">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="devotion dec">reducing ${his} devotion to you.</span>`; } else if (slave.devotion >= -20) { - r += `<span class="mediumorchid">reducing ${his} acceptance of you.</span>`; + r += `<span class="devotion dec">reducing ${his} acceptance of you.</span>`; } else if (slave.devotion >= -50) { - r += `<span class="mediumorchid">increasing ${his} dislike of you.</span>`; + r += `<span class="devotion dec">increasing ${his} dislike of you.</span>`; } else { - r += `<span class="mediumorchid">increasing ${his} hatred of you.</span>`; + r += `<span class="devotion dec">increasing ${his} hatred of you.</span>`; } } else { r += `an incident without lasting effect.`; @@ -1659,19 +1659,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="trust inc">increasing ${his} trust in you.</span>`; } else if (slave.trust >= -50) { - r += `<span class="mediumaquamarine">reducing ${his} fear of you.</span>`; + r += `<span class="trust inc">reducing ${his} fear of you.</span>`; } else { - r += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`; + r += `<span class="trust inc">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="trust dec">reducing ${his} trust in you.</span>`; } else if (slave.trust >= -20) { - r += `<span class="gold">increasing ${his} fear of you.</span>`; + r += `<span class="trust dec">increasing ${his} fear of you.</span>`; } else { - r += `<span class="gold">increasing ${his} terror of you.</span>`; + r += `<span class="trust dec">increasing ${his} terror of you.</span>`; } } else { r += `an incident without lasting effect.`; diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js index f0bbfbc3b6d600ec6d5eb668172955aff702b2e3..81004f4ab3bd235b26fe7015cfecab3ee1ed5207 100644 --- a/src/endWeek/saWorkAGloryHole.js +++ b/src/endWeek/saWorkAGloryHole.js @@ -159,7 +159,7 @@ 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="trust dec">painful</span> and <span class="devotion dec">degrading</span> way.`; slave.devotion -= 10; slave.trust -= 10; slave.vagina = 1; @@ -181,7 +181,7 @@ 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="trust dec">painful</span> and <span class="devotion dec">degrading</span> way.`; slave.devotion -= 5; slave.trust -= 5; slave.anus = 1; @@ -225,15 +225,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="devotion dec">${his} devotion is hurt</span> and ${he} is <span class="trust dec">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="devotion dec">${His} obedience is hurt</span> and ${he} is <span class="trust dec">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="devotion dec">${His} obedience is reduced</span> and ${he} is <span class="trust dec">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="devotion dec">${his} resistance is increased</span> and ${he} is <span class="trust dec">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="devotion dec">${his} hatred of you is increased</span> and ${he} is <span class="trust dec">filled with fear</span> ${he} won't be let out.`; } slave.devotion -= 5; slave.trust -= 5; @@ -243,15 +243,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="devotion dec">${His} devotion is hurt</span> and ${he} is <span class="trust dec">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="devotion dec">${His} obedience is hurt</span> and ${he} is <span class="trust dec">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="devotion dec">${His} obedience is reduced</span> and ${he} is <span class="trust dec">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="devotion dec">${His} resistance is increased</span> and ${he} is <span class="trust dec">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="devotion dec">${His} helpless hatred of you is increased</span> and ${he} is <span class="trust dec">filled with fear</span> ${he} won't be let out.`; } slave.devotion -= 10; slave.trust -= 10; diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js index 913596d344d4701bcc1be693240595fcfa4e6597..d2a362218139ad1a8c38899ef300fffa0892095b 100644 --- a/src/endWeek/saWorkTheFarm.js +++ b/src/endWeek/saWorkTheFarm.js @@ -432,9 +432,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="devotion inc">${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="devotion inc">${He} is happy</span> to spend ${his} days doing something so degrading. `; // TODO: not sure how degrading putting on shows is } } slave.devotion += 1; @@ -443,7 +443,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 ${V.farmyardName}. `; + t += `${slave.slaveName} <span class="devotion inc">privately enjoys</span> the exercise ${he} receives while working in ${V.farmyardName}. `; slave.devotion += 1; } @@ -468,23 +468,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="devotion inc">increasing ${his} devotion to you.</span> `; } else if (slave.devotion >= 20) { - t += ` <span class="hotpink">increasing ${his} acceptance of you.</span> `; + t += ` <span class="devotion inc">increasing ${his} acceptance of you.</span> `; } else if (slave.devotion >= -20) { - t += ` <span class="hotpink">reducing ${his} dislike of you.</span> `; + t += ` <span class="devotion inc">reducing ${his} dislike of you.</span> `; } else { - t += ` <span class="hotpink">reducing ${his} hatred of you.</span> `; + t += ` <span class="devotion inc">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="devotion dec">reducing ${his} devotion to you.</span> `; } else if (slave.devotion >= 20) { - t += ` <span class="mediumorchid">reducing ${his} acceptance of you.</span> `; + t += ` <span class="devotion dec">reducing ${his} acceptance of you.</span> `; } else if (slave.devotion >= -20) { - t += ` <span class="mediumorchid">increasing ${his} dislike of you.</span> `; + t += ` <span class="devotion dec">increasing ${his} dislike of you.</span> `; } else { - t += ` <span class="mediumorchid">increasing ${his} hatred of you.</span> `; + t += ` <span class="devotion dec">increasing ${his} hatred of you.</span> `; } } else { t += ` an incident without lasting effect. `; @@ -493,19 +493,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="trust inc">increasing ${his} trust in you.</span> `; } else if (slave.trust >= -20) { - t += ` <span class="mediumaquamarine">reducing ${his} fear of you.</span> `; + t += ` <span class="trust inc">reducing ${his} fear of you.</span> `; } else { - t += ` <span class="mediumaquamarine">reducing ${his} terror of you.</span> `; + t += ` <span class="trust inc">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="trust dec">reducing ${his} trust in you.</span> `; } else if (slave.trust >= -20) { - t += ` <span class="gold">increasing ${his} fear of you.</span> `; + t += ` <span class="trust dec">increasing ${his} fear of you.</span> `; } else { - t += ` <span class="gold">increasing ${his} terror of you.</span> `; + t += ` <span class="trust dec">increasing ${his} terror of you.</span> `; } } else { t += ` an incident without lasting effect. `; diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js index cb4ef5362206841de0fc3536120a2ee2b2df9dab..46eed76b34e4c21d2b33223fa922708d1890eb29 100644 --- a/src/facilities/nursery/nurseryWidgets.js +++ b/src/facilities/nursery/nurseryWidgets.js @@ -2666,49 +2666,49 @@ App.Facilities.Nursery.ChildSummary = function(child) { function shortDevotion(child) { r += `<br>`; if (child.fetish === "mindbroken") { - r += `<span class="red">MB</span> `; + r += `<span class="mindbroken">MB</span> `; } else if (child.devotion < -95) { - r += `<span class="darkviolet">Hate${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; + r += `<span class="devotion hateful">Hate${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; } else if (child.devotion < -50) { - r += `<span class="darkviolet">Hate${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; + r += `<span class="devotion hateful">Hate${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; } else if (child.devotion < -20) { - r += `<span class="mediumorchid">Res${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; + r += `<span class="devotion resistant">Res${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; } else if (child.devotion <= 20) { - r += `<span class="yellow">Ambiv${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; + r += `<span class="devotion ambivalent">Ambiv${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; } else if (child.devotion <= 50) { - r += `<span class="hotpink">Accept${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; + r += `<span class="devotion accept">Accept${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; } else if (child.devotion <= 95) { - r += `<span class="deeppink">Devo${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; + r += `<span class="devotion devoted">Devo${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; } else { - r += `<span class="magenta">Wor${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; + r += `<span class="devotion worship">Wor${V.summaryStats ? `[${child.devotion}]` : ''}</span> `; } if (child.fetish === "mindbroken") { return; } else if (child.trust < -95) { - r += `<span class="darkgoldenrod">ETerr${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="trust extremely-terrified">ETerr${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } else if (child.trust < -50) { - r += `<span class="goldenrod">Terr${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="trust terrified">Terr${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } else if (child.trust < -20) { - r += `<span class="gold">Fright${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="trust frightened">Fright${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } else if (child.trust <= 20) { - r += `<span class="yellow">Fear${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="trust fearful">Fear${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } else if (child.trust <= 50) { if (child.devotion < -20) { - r += `<span class="orange">Caref${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="defiant careful">Caref${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } else { - r += `<span class="mediumaquamarine">Caref${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="trust careful">Caref${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } } else if (child.trust < 95) { if (child.devotion < -20) { - r += `<span class="orangered">Bold${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="defiant bold">Bold${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } else { - r += `<span class="mediumseagreen">Trust${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="trust trusting">Trust${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } } else { if (child.devotion < -20) { - r += `<span class="darkred">Defiant${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="defiant full">Defiant${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } else { - r += `<span class="seagreen">VTrust ${V.summaryStats ? `[${child.trust}]` : ''}</span> `; + r += `<span class="trust prof-trusting">VTrust ${V.summaryStats ? `[${child.trust}]` : ''}</span> `; } } } @@ -2719,49 +2719,49 @@ App.Facilities.Nursery.ChildSummary = function(child) { function longDevotion(child) { r += `<br>`; if (child.fetish === "mindbroken") { - r += `<span class="red">Mindbroken.</span> `; + r += `<span class="mindbroken">Mindbroken.</span> `; } else if (child.devotion < -95) { - r += `<span class="darkviolet">Very hateful${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; + r += `<span class="devotion hateful">Very hateful${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; } else if (child.devotion < -50) { - r += `<span class="darkviolet">Hateful${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; + r += `<span class="devotion hateful">Hateful${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; } else if (child.devotion < -20) { - r += `<span class="mediumorchid">Resistant${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; + r += `<span class="devotion resistant">Resistant${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; } else if (child.devotion <= 20) { - r += `<span class="yellow">Ambivalent${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; + r += `<span class="devotion ambivalent">Ambivalent${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; } else if (child.devotion <= 50) { - r += `<span class="hotpink">Accepting${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; + r += `<span class="devotion accept">Accepting${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; } else if (child.devotion <= 95) { - r += `<span class="deeppink">Devoted${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; + r += `<span class="devotion devoted">Devoted${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; } else { - r += `<span class="magenta">Worshipful${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; + r += `<span class="devotion worship">Worshipful${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `; } if (child.fetish === "mindbroken") { return; } else if (child.trust < -95) { - r += `<span class="darkgoldenrod">Extremely terrified${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="trust extremely-terrified">Extremely terrified${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } else if (child.trust < -50) { - r += `<span class="goldenrod">Terrified${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="trust terrifies">Terrified${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } else if (child.trust < -20) { - r += `<span class="gold">Frightened${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="trust frightened">Frightened${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } else if (child.trust <= 20) { - r += `<span class="yellow">Fearful${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="trust fearful">Fearful${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } else if (child.trust <= 50) { if (child.devotion < -20) { - r += `<span class="orange">Careful${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="defiant careful">Careful${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } else { - r += `<span class="mediumaquamarine">Careful${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="trust careful">Careful${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } } else if (child.trust < 95) { if (child.devotion < -20) { - r += `<span class="orangered">Bold${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="defiant bold">Bold${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } else { - r += `<span class="mediumseagreen">Trusting${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="trust trusting">Trusting${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } } else { if (child.devotion < -20) { - r += `<span class="darkred">Defiant${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="defiant full">Defiant${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } else { - r += `<span class="seagreen">Profoundly trusting${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; + r += `<span class="trust prof-trusting">Profoundly trusting${V.summaryStats ? `[${child.trust}]` : ''}.</span> `; } } } @@ -12949,46 +12949,46 @@ App.Facilities.Nursery.LongChildDescription = function(child) { r += ` is `; if (child.devotion < -95) { - r += `a <span class="darkviolet">hate-filled,</span> `; + r += `a <span class="devotion hateful">hate-filled,</span> `; } else if (child.devotion < -50) { - r += `a <span class="darkviolet">hateful,</span> `; + r += `a <span class="devotion hateful">hateful,</span> `; } else if (child.devotion < -20) { - r += `a <span class="mediumorchid">reluctant,</span> `; + r += `a <span class="devotion resistant">reluctant,</span> `; } else if (child.devotion <= 20) { - r += `a <span class="yellow">hesitant,</span> `; + r += `a <span class="devotion ambivalent">hesitant,</span> `; } else if (child.devotion <= 50) { - r += `an <span class="hotpink">accepting,</span> `; + r += `an <span class="devotion accept">accepting,</span> `; } else if (child.devotion <= 95) { - r += `a <span class="deeppink">devoted,</span> `; + r += `a <span class="devotion devoted">devoted,</span> `; } else { - r += `a <span class="magenta">worshipful,</span> `; + r += `a <span class="devotion worship">worshipful,</span> `; } if (child.trust < -95) { - r += `<span class="goldenrod">abjectly terrified</span> `; + r += `<span class="trust extremely-terrified">abjectly terrified</span> `; } else if (child.devotion < -50) { - r += `<span class="goldenrod">terrified</span> `; + r += `<span class="trust terrified">terrified</span> `; } else if (child.devotion < -20) { - r += `<span class="gold">frightened</span> `; + r += `<span class="trust frightened">frightened</span> `; } else if (child.devotion <= 20) { - r += `<span class="yellow">fearful</span> `; + r += `<span class="trust fearful">fearful</span> `; } else if (child.devotion <= 50) { if (child.devotion < -20) { - r += `<span class="orange">careful</span> `; + r += `<span class="defiant careful">careful</span> `; } else { - r += `<span class="mediumaquamarine">careful</span> `; + r += `<span class="trust careful">careful</span> `; } } else if (child.devotion <= 95) { if (child.devotion < -20) { - r += `<span class="orangered">bold</span> `; + r += `<span class="defiant bold">bold</span> `; } else { - r += `<span class="mediumseagreen">trusting</span> `; + r += `<span class="trust trusting">trusting</span> `; } } else { if (child.devotion < -20) { - r += `<span class="darkred">defiant</span> `; + r += `<span class="defiant full">defiant</span> `; } else { - r += `<span class="seagreen">profoundly trusting</span> `; + r += `<span class="trust prof-trusting">profoundly trusting</span> `; } } diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index c4a1f9af801c806f0edef532249d8b3c863c7d9c..1f7a13f67cac6c82a1d6a2b23a8427a7e110054c 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -2801,10 +2801,6 @@ window.DefaultRules = (function() { // Apply brands: if (["left", "right", "anywhere"].includes(brandPlace)) { - if (slave.devotion < 18) { - slave.devotion -= 5; - } - slave.trust -= 5; healthDamage(slave, 10); r += `<br>${slave.slaveName} has been branded on the `; if (brandPlace === "left") { @@ -2817,16 +2813,20 @@ window.DefaultRules = (function() { slave.brand[rule.brandTarget] = rule.brandDesign; r += `${rule.brandTarget}`; } - r += `, with <span class="gold">fear</span>${slave.devotion < 18 ? `, <span class="mediumorchid">regard,</span>` : ``} and <span class="red">health</span> consequences.`; + r += `, with <span class="trust dec">fear</span>${slave.devotion < 18 ? `, <span class="devotion dec">regard,</span>` : ``} and <span class="red">health</span> consequences.`; + if (slave.devotion < 18) { + slave.devotion -= 5; + } + slave.trust -= 5; } else if (brandPlace === "both") { slave.brand[left] = rule.brandDesign; slave.brand[right] = rule.brandDesign; + healthDamage(slave, 20); + r += `<br>${slave.slaveName} has been branded on both ${rule.brandTarget}, with <span class="trust dec">fear</span>${slave.devotion < 18 ? `, <span class="devotion dec">regard,</span>` : ``} and <span class="red">health</span> consequences.`; if ((slave.devotion < 18)) { slave.devotion -= 10; } slave.trust -= 10; - healthDamage(slave, 20); - r += `<br>${slave.slaveName} has been branded on both ${rule.brandTarget}, with <span class="gold">fear</span>${slave.devotion < 18 ? `, <span class="mediumorchid">regard,</span>` : ``} and <span class="red">health</span> consequences.`; } } }