diff --git a/src/Mods/Catmod/events/scheduled/vatcatboy.js b/src/Mods/Catmod/events/scheduled/vatcatboy.js index 360c1df8717f48d6d39ef8bf93a0ddbdab7009ca..8cc88296dd9105288275337e80d5723a4003dc06 100644 --- a/src/Mods/Catmod/events/scheduled/vatcatboy.js +++ b/src/Mods/Catmod/events/scheduled/vatcatboy.js @@ -8,7 +8,7 @@ App.Events.SEVatCatBoy = class SEVatCatBoy extends App.Events.BaseEvent { execute(node) { const slave = growCatgirl("XY", {minAge: 16, maxAge: 16}); - slave.origin = "$He is a vat-grown catgirl created by Dr. Nieskowitz and the science team in your genelab."; + slave.origin = "$He is a vat-grown catboy created by Dr. Nieskowitz and the science team in your genelab."; App.Events.addParagraph(node, [ `With their latest genemodding project complete, Dr. Nieskowitz proudly presents to you a healthy, unconscious catboy, floating suspended in the tube of thick green liquid you use to grow them. "Looks like he came out just fine." The aging doctor says with an authoritative gesture. "Another successful project. ${slave.slaveName} is going to make a lovely addition to your little collection."` diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js index c17ee47cbc65f2ce97e5a19fee0dbfde1a149362..57d40f7c4d7a3fb3d95611cdd03a56fbddeccc3c 100644 --- a/src/endWeek/saChoosesOwnClothes.js +++ b/src/endWeek/saChoosesOwnClothes.js @@ -186,9 +186,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) { } selection = jsEither(clothing); } else { - if (V.arcologies[0].FSChattelReligionist > 0) { - clothing.push({text: `and wears a chattel habit to conform to your arcology's culture.`, clothes: "a chattel habit"}); - } else if (slave.assignment === Job.NURSE) { /* Chooses clothes according to assignment (no exceptions)*/ + if (slave.assignment === Job.NURSE) { /* Chooses clothes according to assignment (no exceptions)*/ if (slave.energy > 95 || slave.need > 100) { wardrobeAssignment.push({text: `and wears a slutty nurse outfit to make it clear just how much this nurse needs ${his} daily lay.`, clothes: "a slutty nurse outfit"}); } else if (slave.energy > 80) { @@ -277,7 +275,9 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) { wardrobeAssignment.push({text: `and wears a slutty suit to give ${him} an air of authority while keeping all eyes focused on ${him}.`, clothes: "slutty business attire"}); wardrobeAssignment.push({text: `and wears a schoolgirl outfit to help keep ${his} charges focused on ${him}.`, clothes: "a schoolgirl outfit"}); wardrobeAssignment.push({text: `and dresses up as a succubus to give ${his} sex lessons an extra kick.`, clothes: "a succubus outfit"}); - if (isItemAccessible.entry("conservative clothing") === true) { + if (slave.race === "middle eastern" && isItemAccessible.entry("a burqa") === true) { + wardrobeAssignment.push({text: `and wears a conservative burqa to not detract from this week's lesson.`, clothes: "a burqa"}); + } else if (isItemAccessible.entry("conservative clothing") === true) { wardrobeAssignment.push({text: `and wears conservative clothes to not detract from this week's lesson.`, clothes: "conservative clothing"}); } if (isItemAccessible.entry("a toga") === true) { @@ -661,13 +661,16 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) { wardrobeFS.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a long qipao"}); } if (isItemAccessible.entry("a kimono") === true) { - wardrobeAssignment.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a kimono"}); + wardrobeFS.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a kimono"}); } if (isItemAccessible.entry("a hanbok") === true) { - wardrobeAssignment.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a hanbok"}); + wardrobeFS.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a hanbok"}); } } } + if (V.arcologies[0].FSChattelReligionist > 0) { + wardrobeFS.push({text: `and wears a chattel habit to conform to your arcology's culture.`, clothes: "a chattel habit"}); + } if (V.arcologies[0].FSSubjugationist > 0) { if (V.arcologies[0].FSSubjugationistRace === "black") { @@ -979,6 +982,17 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) { clothing.push(wardrobeTastes[i]); } } + if (V.arcologies[0].FSChattelReligionist > 0) { + // Chattel religionism is currently the only FS with a hard advancement link to clothing. Accepting slaves should never voluntarily select an outfit that won't help. + clothing.deleteWith(c => { + const clothes = App.Data.clothes.get(c.clothes); + const goodForChattel = clothes.fs && clothes.fs.loves && clothes.fs.loves.has("FSChattelReligionist"); + return !goodForChattel; + }); + if (clothing.length < 1) { + clothing.push({text: `and wears a chattel habit to conform to your arcology's culture.`, clothes: "a chattel habit"}); + } + } selection = jsEither(clothing); }