diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js index 732920f44693897538798ec8963e9080184ba7a3..58773c817c636c9d7ee5a3f6d9be3ff2c0f7382a 100644 --- a/src/data/backwardsCompatibility/datatypeCleanup.js +++ b/src/data/backwardsCompatibility/datatypeCleanup.js @@ -581,7 +581,7 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() { slave.pubicHStyle = "neat"; } if (typeof slave.underArmHColor !== "string") { - slave.underArmHColor = "slave.hColor"; + slave.underArmHColor = slave.hColor; } if (typeof slave.underArmHStyle !== "string") { slave.underArmHStyle = "waxed"; @@ -1234,13 +1234,13 @@ window.childHairDatatypeCleanup = function childHairDatatypeCleanup(child) { child.pubicHStyle = "neat"; } if (typeof child.underArmHColor !== "string") { - child.underArmHColor = "child.hColor"; + child.underArmHColor = child.hColor; } if (typeof child.underArmHStyle !== "string") { child.underArmHStyle = "waxed"; } if (typeof child.eyebrowHColor !== "string") { - child.eyebrowHColor = "child.hColor"; + child.eyebrowHColor = child.hColor; } if (typeof child.eyebrowHStyle !== "string") { child.eyebrowHStyle = "natural"; diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js index c44044aff2695d8826c417af06dcc7b33d64e8da..324eb42e460ca128f66577678ce4783cc5e91093 100644 --- a/src/data/backwardsCompatibility/updateSlaveObject.js +++ b/src/data/backwardsCompatibility/updateSlaveObject.js @@ -372,6 +372,13 @@ App.Update.Slave = function(slave) { slave.markings = "beauty mark"; } + if (slave.underArmHColor === "slave.hColor") { + slave.underArmHColor === slave.hColor; + } + if (slave.eyebrowHColor === "slave.hColor") { + slave.eyebrowHColor === slave.hColor; + } + if (slave.genes === undefined) { if (slave.ovaries === 1) { slave.genes = "XX"; diff --git a/src/facilities/nursery/nurseryDatatypeCleanup.js b/src/facilities/nursery/nurseryDatatypeCleanup.js index 90f31a73975b4a470702db334fb77092662b1773..9e80c4b3e2c2e5deb6e13a6c2f2c0ec96dcdb3eb 100644 --- a/src/facilities/nursery/nurseryDatatypeCleanup.js +++ b/src/facilities/nursery/nurseryDatatypeCleanup.js @@ -108,13 +108,13 @@ App.Facilities.Nursery.ChildDatatypeCleanup = function(child) { child.pubicHStyle = "neat"; } if (typeof child.underArmHColor !== "string") { - child.underArmHColor = "child.hColor"; + child.underArmHColor = child.hColor; } if (typeof child.underArmHStyle !== "string") { child.underArmHStyle = "waxed"; } if (typeof child.eyebrowHColor !== "string") { - child.eyebrowHColor = "child.hColor"; + child.eyebrowHColor = child.hColor; } if (typeof child.eyebrowHStyle !== "string") { child.eyebrowHStyle = "natural"; @@ -562,7 +562,7 @@ App.Facilities.Nursery.InfantDatatypeCleanup = function(child) { child.pubicHStyle = "neat"; } if (typeof child.eyebrowHColor !== "string") { - child.eyebrowHColor = "child.hColor"; + child.eyebrowHColor = child.hColor; } }