diff --git a/devTools/javaSanityCheck/excluded b/devTools/javaSanityCheck/excluded
index c6ad348b185bfd1857e16bf40230c56821df3856..77372f70251a771e95c1337a2d66e75f3d6f4b8c 100644
--- a/devTools/javaSanityCheck/excluded
+++ b/devTools/javaSanityCheck/excluded
@@ -5,7 +5,6 @@
#
src/art/;LO
src/gui/svgFilters.tw;L
-src/pregmod/editGenetics.tw;L
#
#JS files, logic won't be checked here anyways
src/js/economyJS.js;S
diff --git a/src/004-base/facility.js b/src/004-base/facility.js
index 2d520d272fceba5ae490510b279042f2175a15d2..d292356c61fbbf2fdd17ca3b484573759cd6107c 100644
--- a/src/004-base/facility.js
+++ b/src/004-base/facility.js
@@ -535,7 +535,7 @@ App.Entity.Facilities.Facility = class {
const managerStr = this.manager && this.manager.currentEmployee ? (
long ? `, ${this.manager.desc.position}` : `, ${this.manager.positionAbbreviation}`) : "";
const slavesStr = long ? ` ${this.job().desc.position}${this.capacity !== 1 ? 's' : ''}` : "";
- return `${this.hostedSlaves()}${nonEmployees ? `+${nonEmployees}` : ""}/${this.capacity}${slavesStr}${managerStr}`;
+ return `${num(this.hostedSlaves())}${nonEmployees ? `+${num(nonEmployees)}` : ""}/${num(this.capacity)}${slavesStr}${managerStr}`;
}
/**
diff --git a/src/endWeek/economics/persBusiness.js b/src/endWeek/economics/persBusiness.js
index 004de45cc05e2f8f8bac7f5177f479dfbbefd831..63d37a6902422f05ef609363b04e4d817a5eb983 100644
--- a/src/endWeek/economics/persBusiness.js
+++ b/src/endWeek/economics/persBusiness.js
@@ -1386,7 +1386,7 @@ App.EndWeek.personalBusiness = function() {
} else {
r.push(`not a bad sum for the effort.`);
}
- // Add sexual openess policy stuff here
+ // TODO: Add sexual openness policy stuff here
r.push(`Doing such lewd things for money <span class="red">tarnishes your reputation.</span>`);
repX((V.rep * .6) - V.rep, "personalBusiness");
V.enduringRep *= .6;
diff --git a/src/facilities/dairy/freeRangeDairyAssignmentScene.js b/src/facilities/dairy/freeRangeDairyAssignmentScene.js
index 21ab965c10b577573f545915bd9c86925f7e6e18..392d26d9064dbc49fadd08cf618b01742f19b04d 100644
--- a/src/facilities/dairy/freeRangeDairyAssignmentScene.js
+++ b/src/facilities/dairy/freeRangeDairyAssignmentScene.js
@@ -33,8 +33,7 @@ App.Facilities.Dairy.freeRangeAssignmentScene = function(slave) {
r.push(`to ${his} designated stall, ${he} passes the other cows currently at their milking machines. Not being hurried, ${he} occasionally watches a cow in detail.`);
App.Events.addParagraph(node, r);
r = [];
- if (slave.fetish === "boobs") {
- /* TODO: check if there actually are lactating cows at the dairy */
+ if (slave.fetish === "boobs" && V.slaves.filter(s => s.assignment === Job.DAIRY && s.lactation > 0).length > 0) {
aroused = true;
r.push(`${He} cannot help but to feel aroused at the view of all those udders being thoroughly milked.`);
if (slave.sexualFlaw === "breast growth") {
diff --git a/src/facilities/incubator/incubatorInteract.js b/src/facilities/incubator/incubatorInteract.js
index 7736fe959bf3f8deb78023cac66ee24a7ee46d77..dd3b29e70d72a2a11e40766091dfed1e9fbec003 100644
--- a/src/facilities/incubator/incubatorInteract.js
+++ b/src/facilities/incubator/incubatorInteract.js
@@ -134,13 +134,13 @@ App.UI.incubator = function() {
const reservedChildren = FetusGlobalReserveCount("incubator");
const incubatorSlaves = V.incubator.tanks.length;
const freeTanks = V.incubator.capacity - incubatorSlaves;
- r.push(`Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of ${V.incubator.capacity} tanks, ${freeTanks}`);
+ r.push(`Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of ${num(V.incubator.capacity)} tanks, ${num(freeTanks)}`);
if (freeTanks === 1) {
r.push(`is`);
} else {
r.push(`are`);
}
- r.push(`unoccupied. Of those, ${reservedChildren}`);
+ r.push(`unoccupied. Of those, ${num(reservedChildren)}`);
if (reservedChildren === 1) {
r.push(`tank is`);
} else {
@@ -162,11 +162,11 @@ App.UI.incubator = function() {
*/
const sortingBarFunc = function(sortingOptions) {
const el = new DocumentFragment();
- App.UI.DOM.appendNewElement("span", el, "Sorting: ", "note");
+ App.UI.DOM.appendNewElement("span", el, "Sorting: ", ["note"]);
const linkArray = [];
for (const [title, attr] of sortingOptions) {
if (V.sortIncubatorList === title) {
- linkArray.push(App.UI.DOM.makeElement("span", title, "bold"));
+ linkArray.push(App.UI.DOM.makeElement("span", title, ["bold"]));
} else {
linkArray.push(
App.UI.DOM.link(
@@ -432,7 +432,7 @@ App.UI.incubator = function() {
}
const noRoom = new DocumentFragment();
noRoom.append(`You have `);
- App.UI.DOM.appendNewElement("span", noRoom, `no room for ${his} offspring.`, "red");
+ App.UI.DOM.appendNewElement("span", noRoom, `no room for ${his} offspring.`, ["red"]);
linkArray.push(noRoom);
}
eligibility = 1;
@@ -447,7 +447,7 @@ App.UI.incubator = function() {
sortByPreviousSort();
el.append(qlIncubator);
if (eligibility === 0) {
- App.UI.DOM.appendNewElement("div", el, `You have no pregnant slaves bearing eligible children.`, "note");
+ App.UI.DOM.appendNewElement("div", el, `You have no pregnant slaves bearing eligible children.`, ["note"]);
}
if (reservedChildren !== 0 || childrenReserved === 1) { // the oops I made it go negative somehow button
@@ -558,7 +558,7 @@ App.UI.incubator = function() {
App.UI.DOM.makeElement(
"span",
`Your ${(WL === 1) ? `child is` : `children are`} already reserved for ${V.nurseryName}`,
- "note"
+ ["note"]
)
);
linkArray.push(
@@ -655,7 +655,7 @@ App.UI.incubator = function() {
He, His,
he, him, his
} = getPronouns(V.incubator.tanks[i]);
- r.push(App.UI.DOM.makeElement("span", SlaveFullName(V.incubator.tanks[i]), "pink"));
+ r.push(App.UI.DOM.makeElement("span", SlaveFullName(V.incubator.tanks[i]), ["pink"]));
r.push(`occupies this tank.`);
if (V.geneticMappingUpgrade >= 1) {
r.push(`${He} is a`);
@@ -874,12 +874,12 @@ App.UI.incubator = function() {
}
)
);
- r.push(App.UI.DOM.makeElement("span", `Given name only`, `note`));
+ r.push(App.UI.DOM.makeElement("span", `Given name only`, [`note`]));
App.Events.addNode(p, r, "div");
if (V.cheatMode === 1) {
row = document.createElement("div");
- App.UI.DOM.appendNewElement("span", row, `Cheatmode: `, "bold");
+ App.UI.DOM.appendNewElement("span", row, `Cheatmode: `, ["bold"]);
row.append(
App.UI.DOM.link(
"Retrieve immediately",
@@ -981,11 +981,11 @@ App.UI.incubator = function() {
);
}
if (vision.left === 0 && vision.right === 0 && tankOrgans.leftEye === 1 && tankOrgans.rightEye === 1) {
- linkArray.push(App.UI.DOM.makeElement("span", `Both eyes are already prepared.`, `detail`));
+ linkArray.push(App.UI.DOM.makeElement("span", `Both eyes are already prepared.`, [`detail`]));
} else if (tankOrgans.leftEye === 1) {
- linkArray.push(App.UI.DOM.makeElement("span", `A left eye is already prepared.`, `detail`));
+ linkArray.push(App.UI.DOM.makeElement("span", `A left eye is already prepared.`, [`detail`]));
} else if (tankOrgans.rightEye === 1) {
- linkArray.push(App.UI.DOM.makeElement("span", `A right eye is already prepared.`, `detail`));
+ linkArray.push(App.UI.DOM.makeElement("span", `A right eye is already prepared.`, [`detail`]));
}
}
App.UI.DOM.appendNewElement("div", p, App.UI.DOM.generateLinksStrip(linkArray));
@@ -995,7 +995,7 @@ App.UI.incubator = function() {
if (tankOrgans.voicebox !== 1) {
r.push(makeLink("Prepare vocal cords", () => { App.Medicine.OrganFarm.growIncubatorOrgan(V.incubator.tanks[i], "voicebox"); }, refresh));
} else {
- r.push(App.UI.DOM.makeElement("span", `Vocal cords are already prepared.`, `detail`));
+ r.push(App.UI.DOM.makeElement("span", `Vocal cords are already prepared.`, [`detail`]));
}
App.Events.addNode(p, r, "div");
}
@@ -1005,7 +1005,7 @@ App.UI.incubator = function() {
if (tankOrgans.cochleae !== 1) {
r.push(makeLink("Prepare cochleae", () => { App.Medicine.OrganFarm.growIncubatorOrgan(V.incubator.tanks[i], "cochleae"); }, refresh));
} else {
- r.push(App.UI.DOM.makeElement("span", `Cochleae are already prepared.`, `detail`));
+ r.push(App.UI.DOM.makeElement("span", `Cochleae are already prepared.`, [`detail`]));
}
App.Events.addNode(p, r, "div");
}
@@ -1085,7 +1085,7 @@ App.UI.incubator = function() {
)
);
r.push(App.UI.DOM.generateLinksStrip(linkArray));
- r.push(App.UI.DOM.makeElement("span", `Setting will not be applied to tanks in use.`, "note"));
+ r.push(App.UI.DOM.makeElement("span", `Setting will not be applied to tanks in use.`, ["note"]));
App.Events.addNode(el, r, "p");
section = document.createElement("p");
diff --git a/src/gui/quicklinks.js b/src/gui/quicklinks.js
index 5af78e852e750b9a0c541aa5f159e6c52cb25999..6de3dd70385f101fd28155ec9c534b1b94e9d22c 100644
--- a/src/gui/quicklinks.js
+++ b/src/gui/quicklinks.js
@@ -319,7 +319,7 @@ App.UI.quickMenu = (function() {
a.onclick = goBack;
const hotkey = App.UI.Hotkeys.hotkeys("historyBack");
if (hotkey !== "") {
- div.append(a, " ", App.UI.DOM.makeElement("span", hotkey, "hotkey"));
+ div.append(a, " ", App.UI.DOM.makeElement("span", hotkey, ["hotkey"]));
}
// insert at second position
linkList.splice(1, 0, div);
@@ -474,7 +474,7 @@ App.UI.quickMenu = (function() {
div.prepend(a);
const hotkeyString = App.UI.Hotkeys.hotkeys(passage);
if (hotkeyString !== "") {
- div.append(" ", App.UI.DOM.makeElement("span", hotkeyString, "hotkey"));
+ div.append(" ", App.UI.DOM.makeElement("span", hotkeyString, ["hotkey"]));
}
}