diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js index 23cfd18dde559a74cb2e38f67e768b5ae82c8b04..56448a7cdaff6b1903353af712062a70682d37b8 100644 --- a/src/data/backwardsCompatibility/updateSlaveObject.js +++ b/src/data/backwardsCompatibility/updateSlaveObject.js @@ -1319,12 +1319,12 @@ App.Update.Slave = function(slave, genepool = false) { } break; } - case "mother": + case "daughter": // we know your mother. that's easy. slave.mother = slave.relationTarget; V.relationLinks[slave.ID] = {mother: slave.mother, father: 0}; break; - case "daughter": + case "mother": // we know you are your daughter's mother. keep track of that in case she's forgotten somehow. if (!V.relationLinks[slave.relationTarget]) { V.relationLinks[slave.relationTarget] = {mother: slave.ID, father: 0}; @@ -1433,7 +1433,7 @@ App.Update.Slave = function(slave, genepool = false) { } if (V.releaseID < 1182) { - if (slave.skill.combat === 1) { + if (slave.skill?.combat === 1) { slave.skill.combat = 70; } } diff --git a/src/endWeek/saPregnancy.js b/src/endWeek/saPregnancy.js index 20a2c114ea03a67e04ef1b8dd7fef860973d5479..02e08dc3c95cd56643ef2f2f5bd83636706f5b93 100644 --- a/src/endWeek/saPregnancy.js +++ b/src/endWeek/saPregnancy.js @@ -1767,7 +1767,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) { // Sperm mod leavings around the penthouse. Gives servants more of a point too. let slobs = V.slaves.filter(s => canFemImpreg(slave, s) && isSlaveAvailable(s) && s.geneMods.aggressiveSperm === 1 && (s.fetish === "mindbroken" || s.energy > 95 || (s.devotion < -20 && s.trust > 20) || (s.intelligence + s.intelligenceImplant < -10))); if (slobs.length > (totalServantCapacity() / 5)) { - knockMeUp(slave, -50, 2, slobs.random()); + tryKnockMeUp(slave, -50, 2, slobs.random()); } } } /* closes assignment checks */ diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js index 00fb514fe546c4c25c495f1d057f7a770ed1018e..45e0681696ce01b6a724d4545ffc957796123928 100644 --- a/src/js/statsChecker/statsChecker.js +++ b/src/js/statsChecker/statsChecker.js @@ -479,7 +479,7 @@ globalThis.isPure = function(slave) { }; /** - * @param {App.Entity.SlaveState} slave + * @param {FC.HumanState} slave * @returns {boolean} */ globalThis.isVirile = function(slave) { @@ -1117,7 +1117,7 @@ globalThis.isVegetable = function(slave) { /** * Returns the hair color the slave was (or would be) born with. * - * @param {App.Entity.SlaveState} slave + * @param {FC.HumanState} slave * @returns {string} */ globalThis.getGeneticHairColor = function(slave) { @@ -1130,7 +1130,7 @@ globalThis.getGeneticHairColor = function(slave) { /** * Returns the skin color the slave was (or would be) born with. * - * @param {App.Entity.SlaveState} slave + * @param {FC.HumanState} slave * @returns {string} */ globalThis.getGeneticSkinColor = function(slave) { @@ -1141,7 +1141,6 @@ globalThis.getGeneticSkinColor = function(slave) { }; /** - * * @param {App.Entity.SlaveState} slave * @returns {boolean} */ @@ -1172,13 +1171,17 @@ globalThis.milkFlavor = function(slave) { return `${slave.milkFlavor}-flavored `; }; +/** + * @param {FC.HumanState} slave + * @returns {boolean} + */ globalThis.canBeDeflowered = function(slave) { return (slave.vagina === 0 && canDoVaginal(slave)) || (slave.anus === 0 && canDoAnal(slave)); }; /** * A consolidated function for checking if an actor is currently aroused. - * @param {App.Entity.HumanState} actor + * @param {FC.HumanState} actor * @returns {boolean} */ globalThis.isHorny = function(actor) { diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js index 54e5149ca8e6ce07d6523bcab73c489d7dfb9afe..ef4f1d8c425ce80ddde5fa79ca3b525179e04f02 100644 --- a/src/player/js/PlayerState.js +++ b/src/player/js/PlayerState.js @@ -2039,6 +2039,10 @@ App.Entity.PlayerState = class PlayerState { * * 0: stable; 1: gaining; -1: losing */ this.weightDirection = 0; + /** Stores the exact colors of the albinism quirk + * @type {{skin:string, eyeColor:string, hColor:string}} + */ + this.albinismOverride = null; // exclusive minor player variables (probably) here /** have you been drugged with fertility drugs * diff --git a/src/player/pcSalon.js b/src/player/pcSalon.js index 1c99c140dc96b4a359ed9a4ddecc06347e973811..e63c46a24df84ca385114bd8e347e3169d12823b 100644 --- a/src/player/pcSalon.js +++ b/src/player/pcSalon.js @@ -35,9 +35,11 @@ App.UI.playerSalon = function(PC) { if (PC.tail !== "none") { el.append(tail()); } + /* if (PC.appendages !== "none") { el.append(appendages()); } + */ el.append(skin()); } return el; @@ -615,7 +617,7 @@ App.UI.playerSalon = function(PC) { if (PC.markings === "birthmark") { option = options.addOption(`You have a large visible birthmark`, "markings", PC) .addValue("Bleach it", "none", billMod); - if (PC.prestige > 0 || PC.porn.prestige > 1) { + if (PC.prestige > 0) { option.addComment(`It makes you look unique among your peers.`); } }