diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js index f20b84685d13679ee622b33c6851dd5c8872df6e..94afd3571a6116751a14840c177f41235cc4a504 100644 --- a/src/endWeek/saWhore.js +++ b/src/endWeek/saWhore.js @@ -445,7 +445,7 @@ window.saWhore = (function saWhore() { slave.devotion += 1; } if (slave.sexualQuirk === "caring") { - r += ` ${slave.slaveName} sees ${his} role as helping people with their sexual needs, and ${he} <span class=">trusts that ${his} place</span> in society is an important one.`; + r += ` ${slave.slaveName} sees ${his} role as helping people with their sexual needs, and ${he} <span class="mediumaquamarine">trusts that ${his} place</span> in society is an important one.`; slave.trust += 1; } if (slave.assignment === "work in the brothel" && slave.devotion > 50) { @@ -728,7 +728,6 @@ window.saWhore = (function saWhore() { r += ` ${He}'s a better whore because prostitution is ${his} main sexual outlet.`; } - // TODO: double check this block if (V.familyTesting === 1) { if (totalRelatives(slave) > 0) { let children = []; diff --git a/src/js/assayJS.js b/src/js/assayJS.js index b259946ef550c3872138a183a664a6193c1019f8..3b9a38cf3225ef9f4a44bd6d3803bf6ad99d8937 100644 --- a/src/js/assayJS.js +++ b/src/js/assayJS.js @@ -187,9 +187,7 @@ window.newSlave = function newSlave(slave) { V.genePool.push(slave); /* Store non-albino stats in genePool */ if (slave.geneticQuirks.albinism === 2) { - const albInd = V.genePool.findIndex(function(s) { - return s.ID === slave.ID; - }); + const albInd = V.genePool.findIndex(function(s) {return s.ID === slave.ID;}); V.genePool[albInd].origSkin = slave.albinismOverride.skin; V.genePool[albInd].origEye = slave.albinismOverride.eyeColor; V.genePool[albInd].origHColor = slave.albinismOverride.hColor; @@ -199,11 +197,7 @@ window.newSlave = function newSlave(slave) { slave.albinismOverride = 0; } } else { - if (V.genePool.findIndex(function(s) { - return s.ID === slave.ID; - }) === -1) { - V.genePool.push(slave); - } + if (V.genePool.findIndex(function(s) {return s.ID === slave.ID;}) === -1) {V.genePool.push(slave);} } assignJob(slave, slave.assignment); @@ -332,9 +326,7 @@ window.getSlave = function getSlave(ID) { }; window.getChild = function getChild(ID) { const V = State.variables; - return V.cribs.find(function(s) { - return s.ID === ID; - }); + return V.cribs.find(function(s) {return s.ID === ID;}); }; /** * @param {App.Entity.SlaveState} slave diff --git a/src/js/assignJS.js b/src/js/assignJS.js index c80085fbaaf27ee76d663c529f51d25b11ac1bf2..c38af6ef0058cc6fd3dd51405729317261f2f3f1 100644 --- a/src/js/assignJS.js +++ b/src/js/assignJS.js @@ -303,9 +303,7 @@ window.assignJob = function assignJob(slave, job) { } if (slave.assignmentVisible === 0 && Array.isArray(V.personalAttention)) { - const awi = V.personalAttention.findIndex(function(s) { - return s.ID === slave.ID; - }); + const awi = V.personalAttention.findIndex(function(s) {return s.ID === slave.ID;}); if (awi !== -1) { V.personalAttention.deleteAt(awi); if (V.personalAttention.length === 0) { @@ -499,9 +497,7 @@ window.removeJob = function removeJob(slave, assignment) { if (slave.relationshipTarget > 0) { /* following code assumes there can be at most one companion */ - const _lover = V.slaves.findIndex(function(s) { - return haveRelationshipP(s, slave) && s.assignment === "live with your agent"; - }); + const _lover = V.slaves.findIndex(function(s) {return haveRelationshipP(s, slave) && s.assignment === "live with your agent";}); if (_lover !== -1) { V.slaves[_lover].assignment = "rest"; V.slaves[_lover].assignmentVisible = 1;