From 86d05aa60ed3033f7ea785925730e2fd44feeff6 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Tue, 24 Mar 2020 19:37:35 -0400 Subject: [PATCH] eye fix --- .../backwardsCompatibility/updateSlaveObject.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js index 6c98695e4ce..13844aea85d 100644 --- a/src/data/backwardsCompatibility/updateSlaveObject.js +++ b/src/data/backwardsCompatibility/updateSlaveObject.js @@ -213,9 +213,10 @@ App.Update.Slave = function(slave) { } } - if (V.releaseID < 1059) { + if (V.releaseID < 1059 || !(slave.eye)) { slave.eye = new App.Entity.EyeState(); - setGeneticEyeColor(slave, slave.origEye); + const origEye = slave.origEye || "brown"; + setGeneticEyeColor(slave, origEye); if (slave.eyes === -4) { eyeSurgery(slave, "both", "remove"); } else { @@ -229,17 +230,14 @@ App.Update.Slave = function(slave) { } else if (slave.eyes === -1) { eyeSurgery(slave, "both", "blur"); } - setEyeColorFull(slave, slave.eyeColor, slave.pupil, slave.sclerae, "both"); + const eyeColor = slave.pupil || "brown"; + const pupil = slave.pupil || "circular"; + const sclerae = slave.pupil || "white"; + setEyeColorFull(slave, eyeColor, pupil, sclerae, "both"); if (typeof slave.geneticQuirks.heterochromia === "string") { setEyeColor(slave.geneticQuirks.heterochromia, "left"); } } - delete slave.eyes; - delete slave.eyesImplant; - delete slave.eyeColor; - delete slave.origEye; - delete slave.pupil; - delete slave.sclerae; } if (slave.eyes !== undefined) {delete slave.eyes;} -- GitLab