diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js index 9ada0875804b82605b5d63e9b4052e1a51fe67ce..f8dc76f97a14a81786ba18c43710ce045ef1a540 100644 --- a/src/js/statsChecker/statsChecker.js +++ b/src/js/statsChecker/statsChecker.js @@ -251,22 +251,22 @@ globalThis.SlaveStatsChecker = (function() { */ globalThis.isSlim = function(slave) { let slim = false; - const ArcologyZero = V.arcologies[0]; + const arcology = V.arcologies[0]; - if (ArcologyZero.FSSlimnessEnthusiastLaw === 1) { + if (arcology.FSSlimnessEnthusiastLaw === 1) { return (slimLawPass(slave) === 1); } if ((slave.boobs < 500) && (slave.butt < 3)) { - if ((slave.muscles <= 30) && (ArcologyZero.FSPhysicalIdealist === "unset") && (slave.weight <= 10) && (ArcologyZero.FSHedonisticDecadence === "unset")) { + if ((slave.muscles <= 30) && (arcology.FSPhysicalIdealist === "unset") && (slave.weight <= 10) && (arcology.FSHedonisticDecadence === "unset")) { slim = true; - } else if (ArcologyZero.FSPhysicalIdealist !== "unset") { - if ((ArcologyZero.FSPhysicalIdealistStrongFat === 1) && (slave.weight <= 30)) { + } else if (arcology.FSPhysicalIdealist !== "unset") { + if ((arcology.FSPhysicalIdealistStrongFat === 1) && (slave.weight <= 30)) { slim = true; } else if (slave.weight <= 10) { slim = true; } - } else if ((ArcologyZero.FSHedonisticDecadence !== "unset") && (slave.weight <= 30)) { - if (ArcologyZero.FSHedonisticDecadenceStrongFat === 1) { + } else if ((arcology.FSHedonisticDecadence !== "unset") && (slave.weight <= 30)) { + if (arcology.FSHedonisticDecadenceStrongFat === 1) { slim = true; } else if (slave.muscles <= 30) { slim = true; @@ -285,6 +285,7 @@ globalThis.genderLawPass = function(slave) { let genderLawPass = 1; const arcology = V.arcologies[0]; + if (arcology.FSPhysicalIdealist === "unset" && arcology.FSHedonisticDecadenceStrongFat === 0 && slave.muscles > 30) { /* muscle check */ genderLawPass = 0; @@ -315,14 +316,14 @@ globalThis.genderLawPass = function(slave) { */ globalThis.slimLawPass = function(slave) { let slimLawPass = 0; - const ArcologyZero = V.arcologies[0]; + const arcology = V.arcologies[0]; - if (ArcologyZero.FSSlimnessEnthusiastLaw === 1) { + if (arcology.FSSlimnessEnthusiastLaw === 1) { if ((slave.boobs < 300) && (slave.butt <= 1) && (slave.waist <= 10)) { - if ((ArcologyZero.FSPhysicalIdealist === "unset") && (ArcologyZero.FSHedonisticDecadenceStrongFat === 0) && (slave.muscles > 30)) { + if ((arcology.FSPhysicalIdealist === "unset") && (arcology.FSHedonisticDecadenceStrongFat === 0) && (slave.muscles > 30)) { /* muscle check*/ slimLawPass = 0; - } else if ((ArcologyZero.FSHedonisticDecadence !== "unset") || (ArcologyZero.FSPhysicalIdealistStrongFat === 1)) { + } else if ((arcology.FSHedonisticDecadence !== "unset") || (arcology.FSPhysicalIdealistStrongFat === 1)) { slimLawPass = 1; /* weight check*/ if (slave.weight > 30) { @@ -345,7 +346,7 @@ globalThis.slimLawPass = function(slave) { * @returns {boolean} */ globalThis.heightPass = function(slave) { - let arcology = V.arcologies[0]; + const arcology = V.arcologies[0]; if (arcology.FSPetiteAdmiration !== "unset") { if (arcology.FSPetiteAdmirationLaw2 === 1) { @@ -584,6 +585,8 @@ globalThis.isStupid = function(slave) { * @returns {boolean} Whether the slave is a part of the "superior" race */ globalThis.isSuperiorRace = function(slave) { + const arcology = V.arcologies[0]; + if (!slave || arcology.FSSupremacist === "unset") { return null; } else { @@ -599,6 +602,8 @@ globalThis.isSuperiorRace = function(slave) { * @returns {boolean} Whether the slave is a part of the "inferior" race */ globalThis.isInferiorRace = function(slave) { + const arcology = V.arcologies[0]; + if (!slave || arcology.FSSubjugationist === "unset") { return null; } else {