diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables index d0523cd46fd3a3374c5c042d81ad484c08984765..7022646238585f2dd6c9bf744b4690c36bde680e 100644 --- a/devTools/javaSanityCheck/ignoredVariables +++ b/devTools/javaSanityCheck/ignoredVariables @@ -19,6 +19,7 @@ MILKMAID TEACHER MASTER BABY +SERVER penthousePositions REST weather @@ -67,7 +68,7 @@ unborn childSurname;nurseryUpgrade facilityRemove boobsWombVolume;emptyDefaultRule;rule;removeImplant;changeImplant -assign;commit;Agent;thigh;breast;mouth +assign;commit;thigh;breast;mouth Std neutral htmlFor @@ -77,7 +78,6 @@ generic;whip;burn;cutting;chain;exotic childNodes;margin firstChild true -selector missingLegs;missingArms; toy base;pmod @@ -86,7 +86,8 @@ plural bimboMaleNames RuleHasError DefaultRulesError -canGrow;canImplant;implantError +canGrow;canImplant;implantError;growOrgan;removeOrgan +totalChildTime;handler # PC criticalDamage marriage diff --git a/src/js/assayJS.js b/src/js/assayJS.js index ecf623fcb03cb36382952d7d5e7aee90d622fd49..4508676cd4844c563b1155f35df66953bb8f5b6f 100644 --- a/src/js/assayJS.js +++ b/src/js/assayJS.js @@ -1800,7 +1800,7 @@ window.retirementReady = function RetirementReady(slave) { if (V.BirthsMilestoneRetirement === 1 && slave.counter.births > V.retirementBirths) { return true; } - if (V.KillsMilestoneRetirement === 1 && slave.counter.kills > V.retirementKills) { + if (V.KillsMilestoneRetirement === 1 && slave.counter.pitKills > V.retirementKills) { return true; } diff --git a/src/uncategorized/underperformingSlaves.tw b/src/uncategorized/underperformingSlaves.tw index f0c2c1249d824ab42d1b5acc4fda09eb925f5034..eec5dffe3cea13bca9ce52f4ff93076ad4dab7a4 100644 --- a/src/uncategorized/underperformingSlaves.tw +++ b/src/uncategorized/underperformingSlaves.tw @@ -37,7 +37,7 @@ return ratio > 0 ? ratio : 100000000 + ratio; }, count: 7, - filter:(slave)=>( + filter:(slave) => ( ["get milked", "work in the dairy", "whore", "work in the brothel", "work a glory hole", "be confined in the arcade"].includes(slave.assignment) && ((slave.weekAcquired + 1) < V.week) && slave.lastWeeksCashIncome @@ -46,7 +46,7 @@ ), [], App.UI.SlaveList.SlaveInteract.stdInteract, - (slave)=>$(document.createDocumentFragment()).append( + (slave) => $(document.createDocumentFragment()).append( `Worth ${cashFormatColor(slaveCost(slave))} / Nets ${cashFormatColor(slave.lastWeeksCashIncome - getSlaveCost(slave))} a week = ${(Math.trunc(slaveCost(slave) / (slave.lastWeeksCashIncome - getSlaveCost(slave)))) > 0 ? (Math.trunc(slaveCost(slave) / (slave.lastWeeksCashIncome - getSlaveCost(slave)))) : "infinite"} weeks` ).get(0) )>> @@ -61,9 +61,9 @@ <<print App.UI.SlaveList.render.listMarkup( getBestSlavesIndices( { - part:(slave)=>(slave.lastWeeksCashIncome - getSlaveCost(slave)), + part:(slave) => (slave.lastWeeksCashIncome - getSlaveCost(slave)), count: 7, - filter:(slave)=>( + filter:(slave) => ( ["get milked", "work in the dairy", "whore", "work in the brothel", "work a glory hole", "be confined in the arcade"].includes(slave.assignment) && ((slave.weekAcquired + 1) < V.week) && slave.lastWeeksCashIncome @@ -72,7 +72,7 @@ ), [], App.UI.SlaveList.SlaveInteract.stdInteract, - (slave)=>$(document.createDocumentFragment()).append( + (slave) => $(document.createDocumentFragment()).append( `${cashFormatColor(Math.trunc(slave.lastWeeksCashIncome - getSlaveCost(slave)))} net last week` ).get(0) )>>