diff --git a/src/js/PenthouseNaming.js b/src/js/PenthouseNaming.js
index 2df44f652f07d3cc675630f57efad64c2aa24eff..6e85f6ab59a4e61cc0f9708a1031132165704503 100644
--- a/src/js/PenthouseNaming.js
+++ b/src/js/PenthouseNaming.js
@@ -1,7 +1,7 @@
/**
* @return {string}
*/
-window.MasterSuiteUIName = function () {
+window.MasterSuiteUIName = function() {
const V = State.variables;
const name = (V.masterSuiteNameCaps === "The Master Suite") ? "Master Suite" : V.masterSuiteNameCaps;
return `<<link "${name}""Master Suite">><</link>> `;
@@ -10,7 +10,7 @@ window.MasterSuiteUIName = function () {
/**
* @return {string}
*/
-window.HeadGirlSuiteUIName = function () {
+window.HeadGirlSuiteUIName = function() {
const V = State.variables;
const name = (V.HGSuiteNameCaps === "The Head Girl Suite") ? "Head Girl Suite" : V.HGSuiteNameCaps;
return `<<link "${name}""Head Girl Suite">><</link>> `;
@@ -19,7 +19,7 @@ window.HeadGirlSuiteUIName = function () {
/**
* @return {string}
*/
-window.ServantQuartersUIName = function () {
+window.ServantQuartersUIName = function() {
const V = State.variables;
const name = (V.servantsQuartersNameCaps === "The Servants' Quarters") ? "Servants' Quarters" : V.servantsQuartersNameCaps;
return `<<link "${name}""Servants' Quarters">><</link>> `;
@@ -37,7 +37,7 @@ window.SpaUIName = function() {
/**
* @return {string}
*/
-window.NurseryUIName = function () {
+window.NurseryUIName = function() {
const V = State.variables;
const name = (V.nurseryNameCaps === "The Nursery") ? "Nursery" : V.nurseryNameCaps;
return `<<link "${name}""Nursery">><</link>> `;
@@ -46,7 +46,7 @@ window.NurseryUIName = function () {
/**
* @return {string}
*/
-window.ClinicUIName = function () {
+window.ClinicUIName = function() {
const V = State.variables;
const name = (V.clinicNameCaps === "The Clinic") ? "Clinic" : V.clinicNameCaps;
return `<<link "${name}""Clinic">><</link>> `;
@@ -55,7 +55,7 @@ window.ClinicUIName = function () {
/**
* @return {string}
*/
-window.SchoolRoomUIName = function () {
+window.SchoolRoomUIName = function() {
const V = State.variables;
const name = (V.schoolroomNameCaps === "The Schoolroom") ? "Schoolroom" : V.schoolroomNameCaps;
return `<<link "${name}""Schoolroom">><</link>> `;
@@ -64,7 +64,7 @@ window.SchoolRoomUIName = function () {
/**
* @return {string}
*/
-window.CellblockUIName = function () {
+window.CellblockUIName = function() {
const V = State.variables;
const name = (V.cellblockNameCaps === "The Cellblock") ? "Cellblock" : V.cellblockNameCaps;
return `<<link "${name}""Cellblock">><</link>> `;
@@ -73,7 +73,7 @@ window.CellblockUIName = function () {
/**
* @return {string}
*/
-window.IncubatorUIName = function () {
+window.IncubatorUIName = function() {
const V = State.variables;
const name = (V.incubatorNameCaps === "The Incubator") ? "Incubator" : V.incubatorNameCaps;
return `<<link "${name}""Incubator">><</link>> `;
diff --git a/src/js/optionsMacro.js b/src/js/optionsMacro.js
index 25de71e2e3cd7fba75161cf3d1826d9199bb33a0..8f20091d84b6f360183a058ccc1756ad38a5495c 100644
--- a/src/js/optionsMacro.js
+++ b/src/js/optionsMacro.js
@@ -21,7 +21,7 @@ Macro.add('options', {
skipArgs : false,
tags : ['option', 'comment', 'optionlt', 'optionlte', 'optiongt', 'optiongte',
'optiondefault', 'optionif'],
- handler : function () {
+ handler : function() {
try {
var currentOption = this.payload[0].args[0];
var currentOptionIsNumber = typeof currentOption === "number";
@@ -111,9 +111,7 @@ Macro.add('options', {
} else {
throw new Error("Missing variable to <<options>>");
}
-
}
-
}
var showSelectedOption = true; //this.payload.length !== 3 || !description;
diff --git a/src/js/pregJS.js b/src/js/pregJS.js
index f9ddf6030ec983b663cea2838f5ae20140bee947..8b4d7eb1d511814346e5309ed7e4d556e5fa9fbf 100644
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -7,12 +7,12 @@ window.getPregBellySize = function(s) {
var fetuses = s.pregType;
var phi = 1.618;
- if(gestastionWeek <= 32) {
+ if (gestastionWeek <= 32) {
targetLen = ((0.00006396 * Math.pow(gestastionWeek, 4)) - (0.005501 * Math.pow(gestastionWeek, 3)) + (0.161 * Math.pow(gestastionWeek, 2)) - (0.76 * gestastionWeek) + 0.208);
- } else if(gestastionWeek <= 106) {
+ } else if (gestastionWeek <= 106) {
targetLen = ((-0.0000004675 * Math.pow(gestastionWeek, 4)) + (0.0001905 * Math.pow(gestastionWeek, 3)) - (0.029 * Math.pow(gestastionWeek, 2)) + (2.132 * gestastionWeek) - 16.575);
} else {
- targetLen = ((-0.00003266 * Math.pow(gestastionWeek,2)) + (0.076 * gestastionWeek) + 43.843);
+ targetLen = ((-0.00003266 * Math.pow(gestastionWeek, 2)) + (0.076 * gestastionWeek) + 43.843);
}
var bellySize = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((targetLen / 2), 3)) * fetuses);
@@ -22,38 +22,38 @@ window.getPregBellySize = function(s) {
/** @param {App.Entity.SlaveState} slave */
window.bellyAdjective = function(slave) {
slave = slave || State.variables.activeSlave;
- if(slave.belly >= 1500) {
- if(slave.belly >= 1000000) {
- if(slave.preg > slave.pregData.normalBirth/4) {
+ if (slave.belly >= 1500) {
+ if (slave.belly >= 1000000) {
+ if (slave.preg > slave.pregData.normalBirth/4) {
return 'unfathomably distended, brimming with life';
} else {
return 'unfathomable';
}
- } else if(slave.belly >= 750000) {
- if(slave.preg > slave.pregData.normalBirth/4) {
+ } else if (slave.belly >= 750000) {
+ if (slave.preg > slave.pregData.normalBirth/4) {
return 'monolithic bulging';
} else {
return 'monolithic';
}
- } else if(slave.belly >= 600000) {
- if(slave.preg > slave.pregData.normalBirth/4) {
+ } else if (slave.belly >= 600000) {
+ if (slave.preg > slave.pregData.normalBirth/4) {
return 'titanic bulging';
} else {
return 'titanic';
}
- } else if(slave.belly >= 450000) {
- if(slave.preg > slave.pregData.normalBirth/4) {
+ } else if (slave.belly >= 450000) {
+ if (slave.preg > slave.pregData.normalBirth/4) {
return 'gigantic bulgy';
} else {
return 'gigantic';
}
- } else if(slave.belly >= 300000) {
+ } else if (slave.belly >= 300000) {
return 'massive';
- } else if(slave.belly >= 100000) {
+ } else if (slave.belly >= 100000) {
return 'giant';
- } else if(slave.belly >= 15000) {
+ } else if (slave.belly >= 15000) {
return 'huge';
- } else if(slave.belly >= 10000) {
+ } else if (slave.belly >= 10000) {
return 'big';
} else {
return 'swollen';
@@ -81,301 +81,301 @@ window.setPregType = function(actor) {
*/
- if(actor.broodmother < 1) { // Broodmothers should be not processed here. Necessary now.
- if(typeof actor.readyOva === "number" && actor.readyOva !== 0) {
+ if (actor.broodmother < 1) { // Broodmothers should be not processed here. Necessary now.
+ if (typeof actor.readyOva === "number" && actor.readyOva !== 0) {
ovum = actor.readyOva; //just single override; for delayed impregnation cases
- } else if(actor.ID === -1) {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
- if(actor.fertDrugs === 1) {
+ } else if (actor.ID === -1) {
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ if (actor.fertDrugs === 1) {
ovum += jsEither([2, 3, 3, 3, 3, 4, 4, 5]);
} else {
ovum += jsEither([1, 1, 2, 2, 3, 3, 4]);
}
- if(actor.forcedFertDrugs > 0) {
+ if (actor.forcedFertDrugs > 0) {
ovum += jsEither([3, 3, 4, 4, 5]);
}
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
- if(actor.fertDrugs === 1) {
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ if (actor.fertDrugs === 1) {
ovum += jsEither([1, 2, 2, 2, 2, 3, 3, 4]);
} else {
ovum += jsEither([0, 1, 1, 1, 1, 1, 2, 3]);
}
- if(actor.forcedFertDrugs > 0) {
+ if (actor.forcedFertDrugs > 0) {
ovum += jsEither([2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4]);
}
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
- if(actor.fertDrugs === 1) {
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ if (actor.fertDrugs === 1) {
ovum += jsEither([1, 1, 2, 2, 2, 2, 3, 3]);
} else {
ovum += jsEither([0, 0, 0, 1, 1, 1, 1, 1, 1, 2]);
}
- if(actor.forcedFertDrugs > 0) {
+ if (actor.forcedFertDrugs > 0) {
ovum += jsEither([1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4]);
}
} else {
- if(actor.fertDrugs === 1) {
+ if (actor.fertDrugs === 1) {
ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3]);
} else {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
}
- if(actor.forcedFertDrugs > 0) {
+ if (actor.forcedFertDrugs > 0) {
ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4]);
}
}
ovum = Math.clamp(ovum, 0, 8);
- } else if(actor.pregType === 0) {
- if(actor.eggType === "horse" || actor.eggType === "cow") {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ } else if (actor.pregType === 0) {
+ if (actor.eggType === "horse" || actor.eggType === "cow") {
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsEither([0, 0, 0, 0, 0, 0, 1]);
fertilityStack += .8;
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
fertilityStack += .4;
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
fertilityStack += .2;
}
- if(actor.ovaImplant === "fertility") {
+ if (actor.ovaImplant === "fertility") {
fertilityStack += .3;
}
- if(actor.hormones === 2) {
+ if (actor.hormones === 2) {
fertilityStack += .2;
}
- if(actor.hormoneBalance >= 200) {
+ if (actor.hormoneBalance >= 200) {
fertilityStack += .3;
}
- if(actor.diet === "fertility") {
+ if (actor.diet === "fertility") {
fertilityStack += .3;
}
- if(State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
+ if (State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
fertilityStack += .5;
}
- if(State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ if (State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
fertilityStack += .2;
}
- if(actor.drugs === "super fertility drugs") {
+ if (actor.drugs === "super fertility drugs") {
fertilityStack += 1.6;
- } else if(actor.drugs === "fertility drugs") {
+ } else if (actor.drugs === "fertility drugs") {
fertilityStack += .6;
}
fertilityStack = Math.floor(fertilityStack);
- if(State.variables.seeHyperPreg === 1) {
- if(actor.drugs === "super fertility drugs") {
+ if (State.variables.seeHyperPreg === 1) {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(0, fertilityStack*2);
} else {
ovum += jsRandom(0, fertilityStack);
}
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
}
} else {
ovum += jsRandom(0, fertilityStack);
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
- if(ovum > 4) {
+ if (ovum > 4) {
ovum = 4;
}
- } else if(ovum > 3) {
+ } else if (ovum > 3) {
ovum = 3;
}
}
- } else if(actor.eggType === "dog") {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ } else if (actor.eggType === "dog") {
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsEither([1, 2, 2, 3]);
fertilityStack++;
fertilityStack++;
fertilityStack++;
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
ovum += jsEither([0, 1, 1, 2]);
fertilityStack++;
fertilityStack++;
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
ovum += jsEither([0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(actor.ovaImplant === "fertility") {
+ if (actor.ovaImplant === "fertility") {
ovum += jsEither([0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(actor.hormones === 2) {
+ if (actor.hormones === 2) {
ovum += jsEither([0, 0, 0, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.hormoneBalance >= 200) {
+ if (actor.hormoneBalance >= 200) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.diet === "fertility") {
+ if (actor.diet === "fertility") {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
+ if (State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
ovum += jsEither([0, 0, 0, 1, 1, 2, 2, 2, 3, 3]);
fertilityStack++;
fertilityStack++;
}
- if(State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ if (State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
fertilityStack++;
}
- if(actor.drugs === "super fertility drugs") {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsEither([1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5]);
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
- } else if(actor.drugs === "fertility drugs") {
+ } else if (actor.drugs === "fertility drugs") {
ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3]);
fertilityStack++;
}
- if(State.variables.seeHyperPreg === 1) {
- if(actor.drugs === "super fertility drugs") {
+ if (State.variables.seeHyperPreg === 1) {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(0, fertilityStack*2);
} else {
ovum += jsRandom(0, fertilityStack);
}
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
}
} else {
ovum += jsRandom(0, fertilityStack);
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
- if(ovum > 8) {
+ if (ovum > 8) {
ovum = jsEither([6, 8]);
}
- } else if(ovum > 8) {
+ } else if (ovum > 8) {
ovum = jsRandom(6, 8);
}
}
- } else if(actor.eggType === "pig") {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ } else if (actor.eggType === "pig") {
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsRandom(4, 8);
fertilityStack += 16;
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
ovum += jsRandom(2, 6);
fertilityStack += 10;
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
ovum += jsRandom(2, 4);
fertilityStack += 6;
}
- if(actor.ovaImplant === "fertility") {
+ if (actor.ovaImplant === "fertility") {
ovum += jsRandom(4, 12);
fertilityStack += 6;
}
- if(actor.hormones === 2) {
+ if (actor.hormones === 2) {
ovum += jsRandom(0, 4);
fertilityStack += 3;
}
- if(actor.hormoneBalance >= 200) {
+ if (actor.hormoneBalance >= 200) {
ovum += jsRandom(0, 4);
fertilityStack += 3;
}
- if(actor.diet === "fertility") {
+ if (actor.diet === "fertility") {
ovum += jsRandom(4, 10);
fertilityStack += 6;
}
- if(State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
+ if (State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
ovum += jsRandom(8, 16);
fertilityStack += 10;
}
- if(State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ if (State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
fertilityStack += 2;
}
- if(actor.drugs === "super fertility drugs") {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(10, 40);
fertilityStack += 32;
- } else if(actor.drugs === "fertility drugs") {
+ } else if (actor.drugs === "fertility drugs") {
ovum += jsRandom(10, 20);
fertilityStack += 16;
}
- if(State.variables.seeHyperPreg === 1) {
- if(actor.drugs === "super fertility drugs") {
+ if (State.variables.seeHyperPreg === 1) {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(fertilityStack/2, fertilityStack*2);
} else {
ovum += jsRandom(fertilityStack/4, fertilityStack);
}
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
}
} else {
ovum += jsRandom(0, fertilityStack);
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
- if(ovum > 76) {
+ if (ovum > 76) {
ovum = jsEither([70, 72, 74, 76]);
}
- } else if(ovum > 75) {
+ } else if (ovum > 75) {
ovum = jsRandom(60, 75);
}
}
} else {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsEither([1, 2, 2, 3]);
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
ovum += jsEither([0, 1, 1, 2]);
fertilityStack++;
fertilityStack++;
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
ovum += jsEither([0, 0, 0, 0, 1]);
fertilityStack++;
} else {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
}
- if(actor.ovaImplant === "fertility") {
+ if (actor.ovaImplant === "fertility") {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(actor.hormones === 2) {
+ if (actor.hormones === 2) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.hormoneBalance >= 200) {
+ if (actor.hormoneBalance >= 200) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.diet === "fertility") {
+ if (actor.diet === "fertility") {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
+ if (State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
ovum += jsEither([0, 0, 0, 1, 1, 2, 2, 2, 3, 3]);
fertilityStack++;
fertilityStack++;
}
- if(State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ if (State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
fertilityStack++;
}
- if(actor.drugs === "super fertility drugs") {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsEither([1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5]);
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
- } else if(actor.drugs === "fertility drugs") {
+ } else if (actor.drugs === "fertility drugs") {
ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3]);
fertilityStack++;
}
- if(State.variables.seeHyperPreg === 1) {
- if(actor.drugs === "super fertility drugs") {
+ if (State.variables.seeHyperPreg === 1) {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(0, fertilityStack*2);
} else {
ovum += jsRandom(0, fertilityStack);
}
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
}
} else {
ovum += jsRandom(0, fertilityStack);
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
- if(ovum > 12) {
+ if (ovum > 12) {
ovum = jsEither([10, 12]);
}
- } else if(ovum > 12) {
+ } else if (ovum > 12) {
ovum = jsRandom(6, 12);
}
}
@@ -406,9 +406,8 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
He = capFirstChar(pronouns.pronoun);
}
if (V.seePreg !== 0) {
- if (jsRandom(0,99) < (chance + (V.reproductionFormula*((target.pregSource <= 0) ? ((target.ID === -1) ? 0 : 10) : 20)))) {
+ if (jsRandom(0, 99) < (chance + (V.reproductionFormula*((target.pregSource <= 0) ? ((target.ID === -1) ? 0 : 10) : 20)))) {
if (target.mpreg === hole) {
-
if (target.pregWeek <= 0) {
target.preg = 1;
target.pregSource = (!fatherID ? 0 : fatherID);
@@ -432,9 +431,7 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
} else {
target.pregKnown = 1;
}
-
} else if (hole === 2) {
-
if (target.pregWeek <= 0) {
target.preg = 1;
target.pregSource = (!fatherID ? 0 : fatherID);
@@ -479,12 +476,10 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
};
window.getIncubatorReserved = function(/*slaves*/) {
-
return FetusGlobalReserveCount("incubator");
};
-window.getNurseryReserved = function (/*slaves*/) {
-
+window.getNurseryReserved = function(/*slaves*/) {
return FetusGlobalReserveCount("nursery");
};
diff --git a/src/js/quickListJS.js b/src/js/quickListJS.js
index 66f91135143c858f09bd7aef04c43d3156ba3168..60ad59a54442e5d5155b8b0f844f6c24a97dee38 100644
--- a/src/js/quickListJS.js
+++ b/src/js/quickListJS.js
@@ -1,7 +1,7 @@
/* eslint-disable no-undef */
-window.sortDomObjects = function (objects, attrName, reverse = 0) {
+window.sortDomObjects = function(objects, attrName, reverse = 0) {
reverse = (reverse) ? -1 : 1;
- function sortingByAttr (a, b) {
+ function sortingByAttr(a, b) {
var aVal = a.getAttribute(attrName);
var bVal = b.getAttribute(attrName);
var aInt = parseInt(aVal);
@@ -14,21 +14,21 @@ window.sortDomObjects = function (objects, attrName, reverse = 0) {
return objects.toArray().sort(sortingByAttr);
};
-window.sortButtonsByDevotion = function () {
+window.sortButtonsByDevotion = function() {
var $sortedButtons = $('#qlWrapper button').remove();
$sortedButtons = sortDomObjects($sortedButtons, 'data-devotion');
$($sortedButtons).appendTo($('#qlWrapper'));
quickListBuildLinks();
};
-window.sortButtonsByTrust = function () {
+window.sortButtonsByTrust = function() {
var $sortedButtons = $('#qlWrapper button').remove();
$sortedButtons = sortDomObjects($sortedButtons, 'data-trust');
$($sortedButtons).appendTo($('#qlWrapper'));
quickListBuildLinks();
};
-window.quickListBuildLinks = function () {
+window.quickListBuildLinks = function() {
$("[data-scroll-to]").click(function() {
var $this = $(this), $toElement = $this.attr('data-scroll-to');
// note the * 1 enforces $offset to be an integer, without
@@ -42,31 +42,31 @@ window.quickListBuildLinks = function () {
});
};
-window.sortIncubatorPossiblesByName = function () {
+window.sortIncubatorPossiblesByName = function() {
var $sortedIncubatorPossibles = $('#qlIncubator div.possible').detach();
$sortedIncubatorPossibles = sortDomObjects($sortedIncubatorPossibles, 'data-name');
$($sortedIncubatorPossibles).appendTo($('#qlIncubator'));
};
-window.sortIncubatorPossiblesByPregnancyWeek = function () {
+window.sortIncubatorPossiblesByPregnancyWeek = function() {
var $sortedIncubatorPossibles = $('#qlIncubator div.possible').detach();
$sortedIncubatorPossibles = sortDomObjects($sortedIncubatorPossibles, 'data-preg-week');
$($sortedIncubatorPossibles).appendTo($('#qlIncubator'));
};
-window.sortIncubatorPossiblesByPregnancyCount = function () {
+window.sortIncubatorPossiblesByPregnancyCount = function() {
var $sortedIncubatorPossibles = $('#qlIncubator div.possible').detach();
$sortedIncubatorPossibles = sortDomObjects($sortedIncubatorPossibles, 'data-preg-count');
$($sortedIncubatorPossibles).appendTo($('#qlIncubator'));
};
-window.sortIncubatorPossiblesByReservedSpots = function () {
+window.sortIncubatorPossiblesByReservedSpots = function() {
var $sortedIncubatorPossibles = $('#qlIncubator div.possible').detach();
$sortedIncubatorPossibles = sortDomObjects($sortedIncubatorPossibles, 'data-reserved-spots');
$($sortedIncubatorPossibles).appendTo($('#qlIncubator'));
};
-window.sortIncubatorPossiblesByPreviousSort = function () {
+window.sortIncubatorPossiblesByPreviousSort = function() {
var sort = State.variables.sortIncubatorList;
if ('unsorted' !== sort) {
if ('Name' === sort) {
@@ -81,31 +81,31 @@ window.sortIncubatorPossiblesByPreviousSort = function () {
}
};
-window.sortNurseryPossiblesByName = function () {
+window.sortNurseryPossiblesByName = function() {
var $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-name');
$($sortedNurseryPossibles).appendTo($('#qlNursery'));
};
-window.sortNurseryPossiblesByPregnancyWeek = function () {
+window.sortNurseryPossiblesByPregnancyWeek = function() {
var $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-preg-week');
$($sortedNurseryPossibles).appendTo($('#qlNursery'));
};
-window.sortNurseryPossiblesByPregnancyCount = function () {
+window.sortNurseryPossiblesByPregnancyCount = function() {
var $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-preg-count');
$($sortedNurseryPossibles).appendTo($('#qlNursery'));
};
-window.sortNurseryPossiblesByReservedSpots = function () {
+window.sortNurseryPossiblesByReservedSpots = function() {
var $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-reserved-spots');
$($sortedNurseryPossibles).appendTo($('#qlNursery'));
};
-window.sortNurseryPossiblesByPreviousSort = function () {
+window.sortNurseryPossiblesByPreviousSort = function() {
var sort = State.variables.sortNurseryList;
if ('unsorted' !== sort) {
if ('Name' === sort) {
diff --git a/src/js/rbuttonJS.js b/src/js/rbuttonJS.js
index 8c37e7336e3da3cdf4b56975ae41eb9b304c04ba..dfc4bbf63676b7ee9d8e3677e6402756f641c9b5 100644
--- a/src/js/rbuttonJS.js
+++ b/src/js/rbuttonJS.js
@@ -60,37 +60,33 @@ Macro.add('rbutton', {
*/
jQuery(el)
.attr({
- id : `${this.name}-${varId}-${TempState[this.name][varId]++}`,
- name : `${this.name}-${varId}`,
- type : 'radio',
- tabindex : 0 // for accessibility
+ id: `${this.name}-${varId}-${TempState[this.name][varId]++}`,
+ name: `${this.name}-${varId}`,
+ type: 'radio',
+ tabindex: 0 // for accessibility
})
.addClass(`macro-${this.name}`)
- .on('change', function () {
+ .on('change', function() {
if (this.checked) {
Wikifier.setValue(varName, checkValue);
- if (replaceID.length > 0 && replaceText.length > 0){
-
+ if (replaceID.length > 0 && replaceText.length > 0) {
var replaceEl = document.getElementById(replaceID);
//alert (replaceEl);
if (replaceEl !== null) {
replaceEl.innerHTML = replaceText;
}
-
}
}
})
- .ready (function () {
+ .ready(function() {
//alert ("DOM finished");
- if (el.checked && replaceID.length > 0 && replaceText.length > 0){
-
+ if (el.checked && replaceID.length > 0 && replaceText.length > 0) {
var replaceEl = document.getElementById(replaceID);
//alert (replaceEl);
if (replaceEl !== null) {
replaceEl.innerHTML = replaceText;
}
-
}
})
.appendTo(this.output);
diff --git a/src/js/relationshipChecks.js b/src/js/relationshipChecks.js
index 4c8cd40cee79a6aa58570f1ba6d1a5338d4ab625..6507db75550936deff4929d2eed5760f90ca1a3b 100644
--- a/src/js/relationshipChecks.js
+++ b/src/js/relationshipChecks.js
@@ -1,4 +1,4 @@
-window.rivalryTerm = function (id) {
+window.rivalryTerm = function(id) {
if (id.rivalry === 1) {
return `growing rival`;
} else if (id.rivalry === 2) {
@@ -7,7 +7,7 @@ window.rivalryTerm = function (id) {
return `bitter rival`;
}
};
-window.relationshipTerm = function (id) {
+window.relationshipTerm = function(id) {
if (id.relationship === 1) {
return `friend`;
} else if (id.relationship === 2) {
@@ -20,7 +20,7 @@ window.relationshipTerm = function (id) {
return `slave wife`;
}
};
-window.relationshipTermShort = function (id) {
+window.relationshipTermShort = function(id) {
if (id.relationship === 1) {
return `friend`;
} else if (id.relationship === 2) {
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index e7de19f189f92cd5fc0bcf2ba942b4d96571c604..3e5f00e1fed25307841e426c16248445b6e40221 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -3,7 +3,7 @@
* @param {Object[]} rules
* @returns {boolean}
*/
-window.hasSurgeryRule = function (slave, rules) {
+window.hasSurgeryRule = function(slave, rules) {
return rules.some(
rule => ruleApplied(slave, rule) && rule.set.autoSurgery > 0);
};
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 6def7e4abbd192564625f28d3690e4e340e991b4..cb0de4b17f8beb346b64a8d675bfa588615c779b 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -479,7 +479,7 @@ window.rulesAssistantOptions = (function() {
constructor(root) {
super("Current rule", V.defaultRules.map(i => [i.name, i]));
this.setValue(current_rule.name);
- this.onchange = function (rule) {
+ this.onchange = function(rule) {
V.currentRule = rule.ID;
reload(root);
};
@@ -2271,7 +2271,7 @@ window.rulesAssistantOptions = (function() {
setValue(val) {
if (val === undefined) val = this.combine();
- this.label.innerText = val + " ";
+ this.label.innerText = `${val} `;
current_rule.set.eyeColor = val;
}
}
@@ -3541,7 +3541,7 @@ window.rulesAssistantOptions = (function() {
this.onchange = (value) => current_rule.set.surgery_holes = value;
}
}
-
+
class TummyTuckSurgeryList extends List {
constructor() {
const items = [
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index 2ecea065d7933c6a59f0dfd1d121cc4280ace806..6381032237a4fbe06a9d0374a27e8fb43b545629 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -156,7 +156,7 @@ window.SlaveStatsChecker = (function() {
}
}());
-window.isSlim = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+window.isSlim = /** @param {App.Entity.SlaveState} slave */ function(slave) {
let slim = false;
const ArcologyZero = State.variables.arcologies[0];
@@ -184,7 +184,7 @@ window.isSlim = /** @param {App.Entity.SlaveState} slave */ function (slave) {
return slim;
};
-window.slimPass = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+window.slimPass = /** @param {App.Entity.SlaveState} slave */ function(slave) {
let slimPass = 0;
const ArcologyZero = State.variables.arcologies[0];
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8a3a619f689ce1165dad83c007c9a77414e309fb..83044ab262c9604263ea2213bd88fbfeb2e80a8f 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -18,10 +18,11 @@ window.SlaveSummary = /** @param {App.Entity.SlaveState} slave */ function Slave
}
//this.output.appendChild(setup.summaryCache[State.temporary.Slave.ID].cloneNode(true))
return setup.summaryCache[slave.ID];
- } else return SlaveSummaryUncached(slave);
+ }
+ return SlaveSummaryUncached(slave);
};
-window.SlaveSummaryUncached = (function () {
+window.SlaveSummaryUncached = (function() {
"use strict";
let V;
let r;
@@ -3850,7 +3851,7 @@ window.SlaveSummaryUncached = (function () {
function short_extended_family(slave) {
let handled = 0;
if (slave.mother > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.mother;
});
if (_ssj !== -1) {
@@ -3876,7 +3877,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.mother].fullName}'s daughter `;
}
if (slave.father > 0 && slave.father !== slave.mother) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.father;
});
if (_ssj !== -1) {
@@ -3902,7 +3903,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.father].fullName}'s daughter`;
}
if (slave.daughters === 1) {
- let _ssj = V.slaves.findIndex(function (s) {
+ let _ssj = V.slaves.findIndex(function(s) {
return s.mother === slave.ID;
});
if (_ssj !== -1) {
@@ -3914,7 +3915,7 @@ window.SlaveSummaryUncached = (function () {
}
}
r += " ";
- _ssj = V.slaves.findIndex(function (s) {
+ _ssj = V.slaves.findIndex(function(s) {
return s.father === slave.ID;
});
if (_ssj !== -1) {
@@ -3930,7 +3931,7 @@ window.SlaveSummaryUncached = (function () {
r += `multiple daughters `;
}
if (slave.sisters === 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return areSisters(s, slave) > 0;
});
if (_ssj !== -1) {
@@ -3946,7 +3947,7 @@ window.SlaveSummaryUncached = (function () {
r += `multiple sisters `;
}
if (slave.relationship > 0 && handled !== 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -3967,7 +3968,7 @@ window.SlaveSummaryUncached = (function () {
/** @param {App.Entity.SlaveState} slave */
function short_legacy_family(slave) {
if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationTarget;
});
if (_ssj !== -1) {
@@ -3975,7 +3976,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4007,7 +4008,7 @@ window.SlaveSummaryUncached = (function () {
function short_rival(slave) {
if (slave.rivalry !== 0) {
r += ` `;
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.rivalryTarget;
});
if (_ssj !== -1) {
@@ -4028,7 +4029,7 @@ window.SlaveSummaryUncached = (function () {
function long_extended_family(slave) {
let handled = 0;
if (slave.mother > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.mother;
});
if (_ssj !== -1) {
@@ -4055,7 +4056,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.mother].fullName}'s <span class="lightgreen">daughter.</span> `;
}
if (slave.father > 0 && slave.father !== slave.mother) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.father;
});
if (_ssj !== -1) {
@@ -4082,7 +4083,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.father].fullName}'s <span class="lightgreen">daughter.</span> `;
}
if (slave.daughters === 1) {
- let _ssj = V.slaves.findIndex(function (s) {
+ let _ssj = V.slaves.findIndex(function(s) {
return s.mother === slave.ID;
});
if (_ssj !== -1) {
@@ -4094,7 +4095,7 @@ window.SlaveSummaryUncached = (function () {
}
r += `.</span> `;
}
- _ssj = V.slaves.findIndex(function (s) {
+ _ssj = V.slaves.findIndex(function(s) {
return s.father === slave.ID;
});
if (_ssj !== -1) {
@@ -4116,7 +4117,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.sisters === 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return areSisters(s, slave) > 0;
});
if (_ssj !== -1) {
@@ -4138,7 +4139,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.relationship > 0 && handled !== 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4158,7 +4159,7 @@ window.SlaveSummaryUncached = (function () {
/** @param {App.Entity.SlaveState} slave */
function long_legacy_family(slave) {
if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationTarget;
});
if (_ssj !== -1) {
@@ -4174,7 +4175,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4206,7 +4207,7 @@ window.SlaveSummaryUncached = (function () {
function long_rival(slave) {
if (slave.rivalry !== 0) {
r += ` `;
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.rivalryTarget;
});
if (_ssj !== -1) {
@@ -4615,7 +4616,7 @@ window.SlaveSummaryUncached = (function () {
break;
case "porcelain mask":
r += `Porcelain mask.`;
- break
+ break;
default:
break;
}
@@ -4843,9 +4844,9 @@ App.UI.PassageSlaveFilers = {
"Spa": s => ((s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "rest in the spa") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "rest in the spa") ||
- (State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Attendant.ID))) ||
+ (State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Attendant.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
- (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "rest in the spa")))),
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "rest in the spa")))),
"Attendant Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canHear(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
(State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.spa.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.spa.manager.careers.includes(s.career))))),
@@ -4875,8 +4876,8 @@ App.UI.PassageSlaveFilers = {
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "get treatment in the clinic") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Nurse.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
- (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "get treatment in the clinic")))),
- "Nurse Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s)) &&
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "get treatment in the clinic")))),
+ "Nurse Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
(State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.clinic.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.clinic.manager.careers.includes(s.career))))),
"Schoolroom": s => ((s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
@@ -4884,7 +4885,7 @@ App.UI.PassageSlaveFilers = {
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "learn in the schoolroom") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Schoolteacher.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
- (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "learn in the schoolroom")))),
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "learn in the schoolroom")))),
"Schoolteacher Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canTalk(s) && canHear(s) && canSee(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
(State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.schoolroom.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.schoolroom.manager.careers.includes(s.career))))),
@@ -4950,7 +4951,7 @@ App.UI.PassageSlaveFilers = {
* @param {string} passageName
* @returns {string}
*/
-App.UI.slaveSummaryList = function (passageName) {
+App.UI.slaveSummaryList = function(passageName) {
'use strict';
const V = State.variables;
@@ -5012,15 +5013,15 @@ App.UI.slaveSummaryList = function (passageName) {
return r.join("");
}
- const _filteredSlaveIdxs = slaves.map(function (slave, idx) {
+ const _filteredSlaveIdxs = slaves.map(function(slave, idx) {
return _passagePreFilter(slave) ? idx : null;
- }).filter(function (idx) {
+ }).filter(function(idx) {
return idx !== null;
});
- const _indexSlavesIdxs = slaves.map(function (slave, idx) {
+ const _indexSlavesIdxs = slaves.map(function(slave, idx) {
return _passagePreFilter(slave) ? idx : null;
- }).filter(function (idx) {
+ }).filter(function(idx) {
return idx !== null;
});
@@ -5124,10 +5125,10 @@ App.UI.slaveSummaryList = function (passageName) {
"HG Select": makeSelectionPassageInfo(App.Entity.facilities.headGirlSuite, "HG Workaround"),
"BG Select": makeSelectionPassageInfo(App.Entity.facilities.armory, "Bodyguard Workaround"),
"Attendant Select": makeSelectionPassageInfo(App.Entity.facilities.spa, "Attendant Workaround"),
- "Concubine Select": makeSelectionPassageInfo(App.Entity.facilities.masterSuite, "Concubine Workaround"),
+ "Concubine Select": makeSelectionPassageInfo(App.Entity.facilities.masterSuite, "Concubine Workaround"),
"Matron Select": makeSelectionPassageInfo(App.Entity.facilities.nursery, "Matron Workaround"),
"Madam Select": makeSelectionPassageInfo(App.Entity.facilities.brothel, "Madam Workaround"),
- "Milkmaid Select": makeSelectionPassageInfo(App.Entity.facilities.dairy, "Milkmaid Workaround"),
+ "Milkmaid Select": makeSelectionPassageInfo(App.Entity.facilities.dairy, "Milkmaid Workaround"),
"Nurse Select": makeSelectionPassageInfo(App.Entity.facilities.clinic, "Nurse Workaround"),
"DJ Select": makeSelectionPassageInfo(App.Entity.facilities.club, "DJ Workaround"),
"Farmer Select": makeSelectionPassageInfo(App.Entity.facilities.farmyard, "Farmer Workaround"),
@@ -5178,7 +5179,7 @@ App.UI.slaveSummaryList = function (passageName) {
let rejectString = rejects.length === 1 ?
rejects[0]:
`${_slaveName}: <ul>${rejects.map(e => `<li>${e}</li>`).join('')}</ul>`;
- res.push(rejectString + '</div>');
+ res.push(`${rejectString}</div>`);
continue;
} else {
res.push(dividerAndImage(_Slave));
@@ -5294,7 +5295,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
const _numFacilities = V.brothel + V.club + V.dairy + V.farmyard + V.servantsQuarters + V.masterSuite + V.spa + V.clinic + V.schoolroom + V.cellblock + V.arcade + V.HGSuite;
-
+
if (_numFacilities > 0) {
if (passageName === "Main" || passageName === "Head Girl Suite" || passageName === "Spa" || passageName === "Brothel" || passageName === "Club" || passageName === "Arcade" || passageName === "Clinic" || passageName === "Schoolroom" || passageName === "Dairy" || passageName === "Farmyard" || passageName === "Servants' Quarters" || passageName === "Master Suite" || passageName === "Cellblock") {
V.returnTo = passageName;
@@ -5327,7 +5328,7 @@ App.UI.slaveSummaryList = function (passageName) {
res.push(`<<link "Send ${_Slave.object} to ${passageFacility.name}" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.SlaveSummaryFiler === "occupying") {
res.push(`<<link "Remove ${_Slave.object} from ${passageFacility.name}" "Retrieve">><<set $i = ${_ssi}>><</link>>`);
- } else if (passageFacility.desc.manager !== null){
+ } else if (passageFacility.desc.manager !== null) {
const managerCapName = capFirstChar(passageFacility.desc.manager.position);
res.push(`[[Change or remove ${managerCapName}|${managerCapName} Select]]`);
}
@@ -5379,7 +5380,7 @@ App.UI.slaveSummaryList = function (passageName) {
* Adds/removes a slave with the given id to/from the personal attention array
* @param {number} id slave id
*/
-App.UI.selectSlaveForPersonalAttention = function (id) {
+App.UI.selectSlaveForPersonalAttention = function(id) {
const V = State.variables;
if (!Array.isArray(V.personalAttention)) {
@@ -5389,7 +5390,7 @@ App.UI.selectSlaveForPersonalAttention = function (id) {
trainingRegimen: "undecided"
}];
} else {
- const _pai = V.personalAttention.findIndex(function (s) {
+ const _pai = V.personalAttention.findIndex(function(s) {
return s.ID === id;
});
if (_pai === -1) {