diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js index 817f7e16407de81e1412077dbf7b237684621e80..4e0ec490e5fce9162c65b4b8fddbec5fb0adc7d0 100644 --- a/src/data/backwardsCompatibility/datatypeCleanup.js +++ b/src/data/backwardsCompatibility/datatypeCleanup.js @@ -756,7 +756,6 @@ globalThis.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() { slave.earImplant = Math.clamp(+slave.earImplant, 0, 1) || 0; slave.shouldersImplant = Math.clamp(+slave.shouldersImplant, -1, 1) || 0; slave.hipsImplant = Math.clamp(+slave.hipsImplant, -1, 1) || 0; - } /** diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js index d3d0dfb5561760680eaeebc67db52840b09e82a3..9cd184f6c4f32357e04dc4d75fa799aa9261ba6d 100644 --- a/src/data/backwardsCompatibility/updateSlaveObject.js +++ b/src/data/backwardsCompatibility/updateSlaveObject.js @@ -1,6 +1,7 @@ -App.Update.Slave = function(slave, genepool=false) { - - slave.geneticQuirks = Object.assign({macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, mGain: 0, mLoss: 0, androgyny: 0, girlsOnly: 0}, slave.geneticQuirks); +App.Update.Slave = function(slave, genepool = false) { + slave.geneticQuirks = Object.assign({ + macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, mGain: 0, mLoss: 0, androgyny: 0, girlsOnly: 0 + }, slave.geneticQuirks); if (genepool) { slave.womb = []; } else { @@ -243,12 +244,12 @@ App.Update.Slave = function(slave, genepool=false) { } } - if (slave.eyes !== undefined) {delete slave.eyes;} - if (slave.eyeColor !== undefined) {delete slave.eyeColor;} - if (slave.eyesImplant !== undefined) {delete slave.eyesImplant;} - if (slave.origEye !== undefined) {delete slave.origEye;} - if (slave.pupil !== undefined) {delete slave.pupil;} - if (slave.sclerae !== undefined) {delete slave.sclerae;} + if (slave.eyes !== undefined) { delete slave.eyes; } + if (slave.eyeColor !== undefined) { delete slave.eyeColor; } + if (slave.eyesImplant !== undefined) { delete slave.eyesImplant; } + if (slave.origEye !== undefined) { delete slave.origEye; } + if (slave.pupil !== undefined) { delete slave.pupil; } + if (slave.sclerae !== undefined) { delete slave.sclerae; } if (slave.origin === "Shortly after birth, $he was sealed in an aging tank until $he was of age. $He knows only of the terror that awaits $him should $he not obey $his master.") { slave.tankBaby = 2; diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js index 0f76886ea32cd5c42bd794cbddff8db9bc5cf0a3..0709728bf60b42edc8b0285e300b8789f0ffe19a 100644 --- a/src/interaction/slaveInteract.js +++ b/src/interaction/slaveInteract.js @@ -263,7 +263,6 @@ App.UI.SlaveInteract.drugs = function(slave) { drugLevelOptions.push({text: `None`, updateSlave: {drugs: `no drugs`}}); } if (slave.indentureRestrictions < 2) { - // Psych if (slave.intelligence > -100 && slave.indentureRestrictions < 1) { psych.push({text: `Psychosuppressants`, updateSlave: {drugs: `psychosuppressants`}}); diff --git a/src/js/assayJS.js b/src/js/assayJS.js index 03762812ba6282bd41786c3234df9b74d3d38d5a..d8cff43edd10e1f1e52804906f8f753c4997b248 100644 --- a/src/js/assayJS.js +++ b/src/js/assayJS.js @@ -1849,7 +1849,7 @@ globalThis.retirementReady = function(slave) { * @param {App.Entity.SlaveState} slave * @param {boolean} [forceDevelopment=false] */ -globalThis.ageSlave = function (slave, forceDevelopment=false) { +globalThis.ageSlave = function(slave, forceDevelopment=false) { slave.physicalAge++; slave.actualAge++; if (slave.geneMods.NCS === 0) { diff --git a/src/npc/surgery/reproductiveOrgans.js b/src/npc/surgery/reproductiveOrgans.js index 3c818ca149a7806d5ac748749e7916540286d42f..02eaa93868820b5733f2eb82c64a68e5bc4837b1 100644 --- a/src/npc/surgery/reproductiveOrgans.js +++ b/src/npc/surgery/reproductiveOrgans.js @@ -223,7 +223,7 @@ App.Medicine.OrganFarm.AnalWombImplantAction = class extends App.Medicine.OrganF canImplant: s => ((!this.animal || V.animalTesticles > 0) && s.ovaries === 0 && s.vagina <= -1 && s.mpreg === 0 && s.bellyImplant < 0), implantError: s => { if (this.animal && V.animalTesticles === 0) { return ""; } - if (s.bellyImplant >= 0) {return "This slave has a fillable abdominal implant."; } + if (s.bellyImplant >= 0) { return "This slave has a fillable abdominal implant."; } return "This slave has existing reproductive Organs."; }, implant: s => { diff --git a/src/pregmod/FCTV/FCTV.js b/src/pregmod/FCTV/FCTV.js index 95dd65e9359951e869284d4ed2fbc8538dc3e01c..177bc44d6a5628a52d107dd66b61fc33a5d43973 100644 --- a/src/pregmod/FCTV/FCTV.js +++ b/src/pregmod/FCTV/FCTV.js @@ -63,7 +63,7 @@ globalThis.FCTV = (function() { } function showChannel(i) { - let x = {canSelect: 1, text: `A notification is shown: ` }; + let x = {canSelect: 1, text: `A notification is shown: `}; switch(i) { case 3: case 4: if (V.usedRemote && (!V.cheatMode || !V.debugMode)) { @@ -167,9 +167,9 @@ globalThis.FCTV = (function() { if (channel === 14) { i.behavioralFlaw = "arrogant"; i.markings = "none"; if (i.weight > 130) { - i.weight -= 100; i.waist = random(-10,50); + i.weight -= 100; i.waist = random(-10, 50); } - i.health.condition = random(60,80); + i.health.condition = random(60, 80); } else if (channel === 4) { i.pubertyXX = 1; i.career = "a slave"; i.origin = "You purchased $him from FCTV's Home Slave Shopping stream channel."; @@ -187,7 +187,7 @@ globalThis.FCTV = (function() { Object.assign(i.skill, { 'vaginal': jsRandom(50, 80), 'oral': jsRandom(40, 80), - 'anal': jsRandom(20,50), + 'anal': jsRandom(20, 50), 'whoring': jsRandom(0, 50) }); } else if (V.show === 4) { @@ -203,7 +203,7 @@ globalThis.FCTV = (function() { 'entertainment': jsRandom(20, 80), 'oral': jsRandom(50, 100), 'anal': jsRandom(20, 80), - 'whoring': jsRandom(20,80) + 'whoring': jsRandom(20, 80) }); i.counter.birthsTotal = jsRandom(1, 3); } else if (V.show === 6) {