diff --git a/src/art/genAI/eyePromptPart.js b/src/art/genAI/eyePromptPart.js index e99d2bb5438d8a9de5d7c349dd912a4b76a05f9c..6727dd19322e4463b24415e54fa8c39b18e90757 100644 --- a/src/art/genAI/eyePromptPart.js +++ b/src/art/genAI/eyePromptPart.js @@ -3,10 +3,18 @@ App.Art.GenAI.EyePromptPart = class EyePromptPart extends App.Art.GenAI.PromptPa * @returns {string} */ positive() { - if (this.slave.eye.left.iris === this.slave.eye.right.iris) { - return `${this.slave.eye.left.iris} eyes`; + if (hasBothEyes(this.slave)) { + if (this.slave.eye.left.iris === this.slave.eye.right.iris) { + return `${this.slave.eye.left.iris} eyes`; + } else { + return `heterochromia, ${this.slave.eye.left.iris} left eye, ${this.slave.eye.right.iris} right eye`; + } + } else if (hasLeftEye(this.slave)) { // one-eyed prompts don't seem to work well regardless of wording (no/empty/missing/etc) + return `no right eye, ${this.slave.eye.left.iris} left eye`; + } else if (hasRightEye(this.slave)) { + return `no left eye, ${this.slave.eye.right.iris} right eye`; } else { - return `heterochromia, ${this.slave.eye.left.iris} left eye, ${this.slave.eye.right.iris} right eye`; + return `no eyes`; } } diff --git a/src/art/genAI/eyebrowPromptPart.js b/src/art/genAI/eyebrowPromptPart.js index d8ac6bbdce7788dc6ebb180706acf27e54cf0c40..1e9303a20cffcefefa65821b83493e88986b1c95 100644 --- a/src/art/genAI/eyebrowPromptPart.js +++ b/src/art/genAI/eyebrowPromptPart.js @@ -6,7 +6,7 @@ App.Art.GenAI.EyebrowPromptPart = class EyebrowPromptPart extends App.Art.GenAI. if (this.slave.eyebrowHStyle === "shaved" || this.slave.eyebrowHStyle === "bald" || this.slave.eyebrowHStyle === "hairless") { return; } - return `${this.slave.eyebrowFullness} ${this.slave.eyebrowHColor} eyebrows`; + return `${this.slave.eyebrowFullness} eyebrows`; } /** diff --git a/src/events/recETS/recetsIncestBrotherSister.js b/src/events/recETS/recetsIncestBrotherSister.js index f14ea1a81a4b122960eb72135ac7e6048435c4a4..6bc1ec55b5d6069d30fb6e5064ff9fa27ad12385 100644 --- a/src/events/recETS/recetsIncestBrotherSister.js +++ b/src/events/recETS/recetsIncestBrotherSister.js @@ -59,9 +59,9 @@ App.Events.recetsIncestBrotherSister = class recetsIncestBrotherSister extends A sis.preg = random(20, 30); sis.pregType = either(1, 1, 1, 1, 1, 2, 2, 3); sis.pregKnown = 1; + sis.pregSource = bro.ID; sis.pregWeek = sis.preg; SetBellySize(sis); - sis.pregSource = bro.ID; WombChangeGene(sis, "fatherName", bro.slaveName); WombChangeGene(sis, "motherName", sis.slaveName); } diff --git a/src/events/recETS/recetsIncestFatherDaughter.js b/src/events/recETS/recetsIncestFatherDaughter.js index 9c7e22cdc6d4f72fcfcb91cf4dd458f1b2070e76..7db9a04bbd6b4ba45fd78a7c216d6c2562fbcf08 100644 --- a/src/events/recETS/recetsIncestFatherDaughter.js +++ b/src/events/recETS/recetsIncestFatherDaughter.js @@ -67,9 +67,9 @@ App.Events.recetsIncestFatherDaughter = class recetsIncestFatherDaughter extends daughter.preg = random(20, 30); daughter.pregType = either(1, 1, 1, 1, 1, 2, 2, 3); daughter.pregKnown = 1; + daughter.pregSource = father.ID; daughter.pregWeek = daughter.preg; SetBellySize(daughter); - daughter.pregSource = father.ID; WombChangeGene(daughter, "fatherName", father.slaveName); WombChangeGene(daughter, "motherName", daughter.slaveName); } diff --git a/src/events/recETS/recetsIncestMotherSon.js b/src/events/recETS/recetsIncestMotherSon.js index 9c8eed57a575d4fbb9f1458a9542e484aa4e7263..e5bcd632aaec496fca2b9a992914544a69d10a65 100644 --- a/src/events/recETS/recetsIncestMotherSon.js +++ b/src/events/recETS/recetsIncestMotherSon.js @@ -74,9 +74,9 @@ App.Events.recetsIncestMotherSon = class recetsIncestMotherSon extends App.Event mother.preg = random(20, 30); mother.pregType = either(1, 1, 1, 1, 1, 2, 2, 3); mother.pregKnown = 1; + mother.pregSource = son.ID; mother.pregWeek = mother.preg; SetBellySize(mother); - mother.pregSource = son.ID; WombChangeGene(mother, "fatherName", son.slaveName); WombChangeGene(mother, "motherName", mother.slaveName); } diff --git a/src/events/recETS/recetsIncestTwinsMixed.js b/src/events/recETS/recetsIncestTwinsMixed.js index 29b0ae079dc01a0df4946f797550f836d51a51bb..3f75229dc672c6a3019e7985fc4775e9ef3ab785 100644 --- a/src/events/recETS/recetsIncestTwinsMixed.js +++ b/src/events/recETS/recetsIncestTwinsMixed.js @@ -69,9 +69,9 @@ App.Events.recetsIncestTwinsMixed = class recetsIncestTwinsMixed extends App.Eve sis.preg = random(20, 30); sis.pregType = either(1, 1, 1, 1, 1, 2, 2, 3); sis.pregKnown = 1; + sis.pregSource = bro.ID; sis.pregWeek = sis.preg; SetBellySize(sis); - sis.pregSource = bro.ID; WombChangeGene(sis, "fatherName", bro.slaveName); WombChangeGene(sis, "motherName", sis.slaveName); }