diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js index 169954d1deb64cc6713f7cd8d660202718c1ecf1..6107a7d7e63d1f592c07e0a7dffddd3b7bcdae28 100644 --- a/src/endWeek/saChoosesOwnClothes.js +++ b/src/endWeek/saChoosesOwnClothes.js @@ -618,8 +618,10 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) { wardrobeFS.push({text: `and wears spats and a tank top to look younger and more energetic.`, clothes: "spats and a tank top"}); } if (V.arcologies[0].FSPhysicalIdealist > 0) { - wardrobeFS.push({text: `and coats ${himself} in body oil to show off how ${he}'s part of your physical idealism.`, clothes: "body oil"}); - wardrobeFS.push({text: `and goes totally nude to show off how ${he}'s part of your physical idealism.`, clothes: "no clothing"}); + if (slave.sexualFlaw !== "shamefast") { + wardrobeFS.push({text: `and coats ${himself} in body oil to show off how ${he}'s part of your physical idealism.`, clothes: "body oil"}); + wardrobeFS.push({text: `and goes totally nude to show off how ${he}'s part of your physical idealism.`, clothes: "no clothing"}); + } wardrobeFS.push({text: `and slips into a leotard for ${his} next workout.`, clothes: "a leotard"}); wardrobeFS.push({text: `and slips into some spats for ${his} next workout.`, clothes: "spats and a tank top"}); } else if (V.arcologies[0].FSHedonisticDecadence > 0) { @@ -642,15 +644,19 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) { } if (V.arcologies[0].FSBodyPurist > 0) { wardrobeFS.push({text: `and wears a leotard to show off the purity of ${his} body.`, clothes: "a leotard"}); - wardrobeFS.push({text: `but decides ${his} body is too nice to hide with clothing.`, clothes: "no clothing"}); - if (isItemAccessible.entry("body oil") === true) { - wardrobeFS.push({text: `and coats ${his} pure body in oil to make it stand out.`, clothes: "body oil"}); + if (slave.sexualFlaw !== "shamefast") { + wardrobeFS.push({text: `but decides ${his} body is too nice to hide with clothing.`, clothes: "no clothing"}); + if (isItemAccessible.entry("body oil") === true) { + wardrobeFS.push({text: `and coats ${his} pure body in oil to make it stand out.`, clothes: "body oil"}); + } } } else if (V.arcologies[0].FSTransformationFetishist > 0) { wardrobeFS.push({text: `and decides squeezing into a latex suit will only complement ${his} unnatural appearance.`, clothes: "restrictive latex"}); - wardrobeFS.push({text: `and decides to go nude, ensuring everyone sees ${his} assets.`, clothes: "no clothing"}); - if (isItemAccessible.entry("body oil") === true) { - wardrobeFS.push({text: `and coats ${his} assets in body oil to give them some extra shine.`, clothes: "body oil"}); + if (slave.sexualFlaw !== "shamefast") { + wardrobeFS.push({text: `and decides to go nude, ensuring everyone sees ${his} assets.`, clothes: "no clothing"}); + if (isItemAccessible.entry("body oil") === true) { + wardrobeFS.push({text: `and coats ${his} assets in body oil to give them some extra shine.`, clothes: "body oil"}); + } } } if (V.arcologies[0].FSAssetExpansionist > 0) { @@ -701,7 +707,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) { } } if (V.arcologies[0].FSChattelReligionist > 0) { - if (V.arcologies[0].FSChattelReligionistLaw2 === 1) { + if (V.arcologies[0].FSChattelReligionistLaw2 === 1 && slave.sexualFlaw !== "shamefast") { wardrobeFS.push({text: `but chooses to stay nude to promote Holy Nudism.`, clothes: "no clothing"}); if (isItemAccessible.entry("body oil") === true) { wardrobeFS.push({text: `and coats ${his} body in oil to highlight what God has given ${him}.`, clothes: "body oil"}); diff --git a/src/endWeek/saClothes.js b/src/endWeek/saClothes.js index 5269ecd65078d6b51489a23ea20fb1c74c028afe..dd3f6677b956d0327e228368269276630a0f8be2 100644 --- a/src/endWeek/saClothes.js +++ b/src/endWeek/saClothes.js @@ -315,6 +315,19 @@ App.SlaveAssignment.clothes = function saClothes(slave) { slave.trust += 1; } break; + case "body oil": + if (slave.sexualFlaw === "shamefast") { + r.push(`${He} is <span class="mediumorchid">mortified</span> that ${he} has nothing but oil to cover up ${his} body, and is incapable of taking pleasure in getting all oiled up.`); + slave.devotion -= 3; + } else if (slave.devotion < -20) { + r.push(`${He} is <span class="mediumorchid">inappropriately pleased</span> by the sensual process of oiling up ${his} body.`); + slave.devotion -= 3; + } else { + r.push(`${His} <span class="mediumaquamarine">confidence</span> and <span class="hotpink">devotion</span> are reinforced by the sensual process of oiling up ${his} body every morning.`); + slave.devotion += 1; + slave.trust += 1; + } + break; default: if (slave.devotion <= 20) { if (App.Data.clothes.get(slave.clothes).exposure === 0) { diff --git a/src/events/recFS/recfsYouthPreferentialist.js b/src/events/recFS/recfsYouthPreferentialist.js index 7b22a5752ff95eb136489c0799d587b5169dab4c..edbc2a43132299bfabf538de63c4431f45096dfe 100644 --- a/src/events/recFS/recfsYouthPreferentialist.js +++ b/src/events/recFS/recfsYouthPreferentialist.js @@ -21,12 +21,7 @@ App.Events.recFSYouthPreferentialist = class recFSYouthPreferentialist extends A setHealth(slave, jsRandom(-40, 30), undefined, undefined, 0, 70); slave.devotion = random(10, 15); slave.trust = random(-55, -75); - /* - slave.anus = random(2,3); - slave.weight = random(-80,-20); - slave.boobs -= 50*random(1,2); - slave.butt -= random(0,1); - */ + slave.birthWeek = 0; // turns {age} this week slave.behavioralFlaw = either("anorexic", "devout", "gluttonous", "hates men", "hates women", "odd"); slave.sexualFlaw = either("apathetic", "hates anal", "hates oral", "repressed", "shamefast");