diff --git a/src/events/RESS/devotedVirgin.js b/src/events/RESS/devotedVirgin.js index 5a9b3cd19076eff58f32c2f0cf91c82e1d33fb6e..53db5a5f9ff09417d76dee98b2d66a4b732e2e9b 100644 --- a/src/events/RESS/devotedVirgin.js +++ b/src/events/RESS/devotedVirgin.js @@ -23,7 +23,7 @@ App.Events.RESSDevotedVirgin = class RESSDevotedVirgin extends App.Events.BaseEv const { He, he, his, him, himself } = getPronouns(eventSlave); - const {S, s, ss, say, title: Master} = getEnunciation(eventSlave); + const {s, say, title: Master} = getEnunciation(eventSlave); /** @type {App.Entity.PlayerState} */ let PC = V.PC; diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js index 7f674f5ba94ba8ecc990a8dd01ea629842d7e0f0..70901bb8e33577bacf1bdf85988feb75d1f2d4a4 100644 --- a/src/facilities/farmyard/farmyard.js +++ b/src/facilities/farmyard/farmyard.js @@ -410,7 +410,7 @@ App.Facilities.Farmyard.farmyard = function() { 'are', "End breeding", ["farmyardShows"], - [ "farmyardBreeding", "farmyardRestraints"] + ["farmyardBreeding", "farmyardRestraints"] ); frag.append(rule); @@ -644,10 +644,10 @@ App.Facilities.Farmyard.farmyard = function() { `all kinds of dogs`, canines = CL === 1 ? V.canines[0].species === "dog" ? V.canines[0].breed : V.canines[0].speciesPlural : CL < 3 ? - `several different ${V.canines.every( - c => c.species === "dog") ? - `breeds of dogs` : `species of canines`}` : - `all kinds of canines`, + `several different ${V.canines.every( + c => c.species === "dog") ? + `breeds of dogs` : `species of canines`}` : + `all kinds of canines`, kennels = document.createElement("div"), kennelsUpgrade = App.UI.DOM.makeElement("div", '', "indent"), @@ -748,10 +748,10 @@ App.Facilities.Farmyard.farmyard = function() { `all kinds of cats`, felines = FL === 1 ? V.felines[0].species === "cat" ? V.felines[0].breed : V.felines[0].speciesPlural : FL < 3 ? - `several different ${V.felines.every( - c => c.species === "cat") ? - `breeds of cats` : `species of felines`}` : - `all kinds of felines`, + `several different ${V.felines.every( + c => c.species === "cat") ? + `breeds of cats` : `species of felines`}` : + `all kinds of felines`, cages = document.createElement("div"), cagesUpgrade = App.UI.DOM.makeElement("div", '', "indent"), diff --git a/src/facilities/incubator/incubatorFramework.js b/src/facilities/incubator/incubatorFramework.js index bf1867fa54dd85fa93e66e6489e680d5fb5d75d4..da746eeacd68b383c446a86e883057c1620ff5d2 100644 --- a/src/facilities/incubator/incubatorFramework.js +++ b/src/facilities/incubator/incubatorFramework.js @@ -34,7 +34,6 @@ App.Entity.Facilities.Incubator = class extends App.Entity.Facilities.Facility { tank: new App.Entity.Facilities.IncubatorTankJob() }); } - }; App.Entity.facilities.incubator = new App.Entity.Facilities.Incubator(); diff --git a/src/facilities/nursery/utils/nurseryUtils.js b/src/facilities/nursery/utils/nurseryUtils.js index d733eda01cbb3ccb877fc6e96660d7de3008c7ab..349b826e1e01327db973f64aaf4d54df83b2f170 100644 --- a/src/facilities/nursery/utils/nurseryUtils.js +++ b/src/facilities/nursery/utils/nurseryUtils.js @@ -377,12 +377,13 @@ App.Facilities.Nursery.nameChild = function nameChild(child) { arcology = V.arcologies[0], girl = child.genes === "XX" ? "girl" : "boy"; - let - r = ``, - father = 0, - mother = 0; + let r = ``; + /** @type {App.Entity.SlaveState} */ + let father = 0; + /** @type {App.Entity.SlaveState} */ + let mother = 0; - const {him} = getPronouns(child); + const {him, his, he} = getPronouns(child); if (child.father === -1 && child.mother === -1) { father = PC; @@ -508,7 +509,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) { <</link>>`; } if (mother !== PC && mother !== 0) { - App.Utils.setLocalPronouns(mother, 2); + const {He2, he2, his2} = getPronouns(mother).appendSuffix('2'); if (mother.ID === V.ConcubineID) { r += `<br> <<link "Permit your Concubine to name _his2 daughter">> @@ -557,7 +558,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) { } } if (father !== PC && father !== 0 && father !== mother) { - App.Utils.setLocalPronouns(father, 2); + const {He2, he2, his2} = getPronouns(father).appendSuffix('2'); if (father.ID === V.ConcubineID) { r += `<br> <<link "Permit your Concubine to name ${his2} daughter">> @@ -683,7 +684,7 @@ App.Facilities.Nursery.cribsToIndices = function cribsToIndices(cribs = V.cribs) /** * Returns index in the children array for the given ID - * @param {number} ID child's ID + * @param {number} id child's ID * @returns {number} */ App.Facilities.Nursery.childIndexForID = function childIndexForID(id) { @@ -730,6 +731,7 @@ App.Facilities.Nursery.nurserySort = function nurserySort() { for (let i = 0; i < SL; i++) { const slave = V.slaves[i]; + const {His, his} = getPronouns(slave); App.Utils.setLocalPronouns(slave); @@ -915,7 +917,7 @@ App.Facilities.Nursery.nurserySort = function nurserySort() { if (reservedChildrenNursery || nurseryHasReservedChildren) { r += `<br>`; - r += App.UI.passageLink("Clear all reserved children", "Nursery", `${V.slaves.forEach(WombCleanGenericReserve(slave, "nursery", 9999))}, ${WombCleanGenericReserve(PC, "nursery", 9999)}`); + r += App.UI.passageLink("Clear all reserved children", "Nursery", `${V.slaves.forEach((slave) => WombCleanGenericReserve(slave, "nursery", 9999))}, ${WombCleanGenericReserve(PC, "nursery", 9999)}`); } function byName() {