diff --git a/CHANGELOG.md b/CHANGELOG.md index ca65acf61570b65fc0b8815298625e98bd8c6fc1..a76389e7f1002d914e0adec4522ee9621f032ddf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## Unreleased +* added event reSiblingPlease +* fixes + ## 0.10.7.1-4.0.0-alpha.8 - 2021-08-17 * Elohiem's webGL art update 4 diff --git a/src/events/RE/reSiblingPlease.js b/src/events/RE/reSiblingPlease.js index ccbbba305159ac9e82e571d229bb43b23653f1d8..e5206ad6071af3b4abd70769ade94f5fc4e89e1e 100644 --- a/src/events/RE/reSiblingPlease.js +++ b/src/events/RE/reSiblingPlease.js @@ -50,7 +50,7 @@ App.Events.RESiblingPlease = class RESiblingPlease extends App.Events.BaseEvent const t = new SpacedTextAccumulator(node); t.push(`After you complete your weekly inspection of`); t.push(App.UI.DOM.combineNodes(contextualIntro(V.PC, dau, "DOM"), `, your instincts tell you that the ${SlaveTitle(dau)} has something more on ${his} mind.`)); - t.push(`You take a moment to look at ${him}, standing there in front of your desk. ${He}'s devoted to you, willing to please you for the sake of pleasing you, rather than to avoid punishment or to make ${his} own life easier, and ${he} trusts you implicitly. With that in mind, you ask what's bothering ${him}.`); + t.push(`You take a moment to look at ${him}, ${canStand(dau) ? "standing" : "sitting"} there in front of your desk. ${He}'s devoted to you, willing to please you for the sake of pleasing you, rather than to avoid punishment or to make ${his} own life easier, and ${he} trusts you implicitly. With that in mind, you ask what's bothering ${him}.`); t.toParagraph(); t.push(Spoken(dau, `"I...I was thinking about family, and mom. Can...can I have a little sister, ${Master}? We could do all sorts of things together!"`)); @@ -279,12 +279,12 @@ App.Events.RESiblingPlease = class RESiblingPlease extends App.Events.BaseEvent const t = new SpacedTextAccumulator(); t.push(`You pause for a moment. You could, of course, grant ${his} request, but you have a better idea. You inform ${him} that ${he}'ll soon have a daughter of ${his} own, so ${he} won't be needing a baby sister.`); - if (dau.intelligence > 50) { + if (dau.intelligence + dau.intelligenceImplant > 50) { t.push(`${He}'s a sharp slave, and immediately grasps your meaning. ${He}`); } else { t.push(`It takes ${him} a couple of seconds before ${he} grasps your meaning. When ${he} does, ${he}`); } - t.push(`grins and clasps ${his} hands in front of ${himself}, bouncing eagerly.`); + t.push(`grins and ${hasBothArms(dau) ? `clasps ${his} hands in front of ${himself}, bouncing` : `bounces`} eagerly.`); t.push(Spoken(dau, `"Oh, that's even better, ${Master}! Can we do it now?"`)); t.toParagraph(); @@ -327,7 +327,7 @@ App.Events.RESiblingPlease = class RESiblingPlease extends App.Events.BaseEvent /* Por qué no los dos? */ - t.push(`You explain to ${dau.slaveName} that you're more than willing to get ${mom.slaveName} pregnant, but you want ${him} to carry a child for you as well. ${He} grins and clasps ${his} hands in front of ${himself}, bouncing eagerly.`); + t.push(`You explain to ${dau.slaveName} that you're more than willing to get ${mom.slaveName} pregnant, but you want ${him} to carry a child for you as well. ${He} grins and ${hasBothArms(dau) ? `clasps ${his} hands in front of ${himself}, bouncing` : `bounces`} eagerly.`); t.push(Spoken(dau, `"When can we start, ${Master}?"`)); t.push(`You spend a few moments letting ${him} know what you expect from ${him} during the upcoming session; ${he} knows what's coming, but ${his} mother doesn't yet.`); t.toParagraph(); diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js index 99fd7a17f802dc70e9450de98c901f6426668442..827336702f5ad44d5630b667d785abc8883255a6 100644 --- a/src/events/intro/initNationalities.js +++ b/src/events/intro/initNationalities.js @@ -339,6 +339,7 @@ App.Intro.initNationalities = function() { case "RomanRevivalist": newArcology.FSRomanRevivalist = V.targetArcology.FSProgress; newArcology.FSRomanRevivalistDecoration = decoration; + V.language = "Latin"; break; case "NeoImperialist": newArcology.FSNeoImperialist = V.targetArcology.FSProgress; @@ -347,22 +348,27 @@ App.Intro.initNationalities = function() { case "AztecRevivalist": newArcology.FSAztecRevivalist = V.targetArcology.FSProgress; newArcology.FSAztecRevivalistDecoration = decoration; + V.language = "Nahuatl"; break; case "EgyptianRevivalist": newArcology.FSEgyptianRevivalist = V.targetArcology.FSProgress; newArcology.FSEgyptianRevivalistDecoration = decoration; + V.language = "Ancient Egyptian"; break; case "EdoRevivalist": newArcology.FSEdoRevivalist = V.targetArcology.FSProgress; newArcology.FSEdoRevivalistDecoration = decoration; + V.language = "Japanese"; break; case "ArabianRevivalist": newArcology.FSArabianRevivalist = V.targetArcology.FSProgress; newArcology.FSArabianRevivalistDecoration = decoration; + V.language = "Arabic"; break; case "ChineseRevivalist": newArcology.FSChineseRevivalist = V.targetArcology.FSProgress; newArcology.FSChineseRevivalistDecoration = decoration; + V.language = "Chinese"; break; case "Eugenics": newArcology.FSRestart = V.targetArcology.FSProgress;