diff --git a/game/03-JavaScript/save.js b/game/03-JavaScript/save.js index f1060f587a1501c5c8f6dc2cbfe50efad83a008a..52eb55028ac50bad0aff68d964b2dbbbe2af0459 100644 --- a/game/03-JavaScript/save.js +++ b/game/03-JavaScript/save.js @@ -576,7 +576,7 @@ const importSettingsData = function (data) { if (V.passage === "Start" && S.starting != null) { const listObject = settingsObjects("starting"); const listKey = Object.keys(listObject); - const namedObjects = ["player", "skinColor"]; + const namedObjects = ["player"]; for (let i = 0; i < listKey.length; i++) { if (namedObjects.includes(listKey[i]) && S.starting[listKey[i]] != null) { @@ -601,7 +601,7 @@ const importSettingsData = function (data) { if (S.general != null) { const listObject = settingsObjects("general"); const listKey = Object.keys(listObject); - const namedObjects = ["map", "skinColor", "shopDefaults", "options"]; + const namedObjects = ["map", "shopDefaults", "options"]; // correct swapped min/max values if (S.general.breastsizemin > S.general.breastsizemax) { const temp = S.general.breastsizemin; @@ -701,7 +701,6 @@ function exportSettings(data, type) { const S = { general: { map: {}, - skinColor: {}, shopDefaults: {}, options: {}, }, @@ -713,11 +712,10 @@ function exportSettings(data, type) { if (V.passage === "Start") { S.starting = { player: {}, - skinColor: {}, }; listObject = settingsObjects("starting"); listKey = Object.keys(listObject); - namedObjects = ["player", "skinColor"]; + namedObjects = ["player"]; for (let i = 0; i < listKey.length; i++) { if (namedObjects.includes(listKey[i]) && V[listKey[i]] != null) { @@ -741,7 +739,7 @@ function exportSettings(data, type) { listObject = settingsObjects("general"); listKey = Object.keys(listObject); - namedObjects = ["map", "skinColor", "shopDefaults", "options"]; + namedObjects = ["map", "shopDefaults", "options"]; for (let i = 0; i < listKey.length; i++) { if (namedObjects.includes(listKey[i]) && V[listKey[i]] != null) { @@ -933,14 +931,13 @@ function settingsObjects(type) { textMap: { 0: "Slender", 1: "Slim", 2: "Modest", 3: "Cushioned" }, randomize: "characterAppearance", }, - }, - skinColor: { - natural: { - strings: ["light", "medium", "dark", "gyaru", "ylight", "ymedium", "ydark", "ygyaru"], - randomize: "characterAppearance", - displayName: "Natural Skintone:", + skin: { + color: { + strings: ["light", "medium", "dark", "gyaru", "ylight", "ymedium", "ydark", "ygyaru"], + randomize: "characterAppearance", + displayName: "Natural Skintone:", + }, }, - range: { min: 0, max: 100, decimals: 0, randomize: "characterAppearance", displayName: "Initial Tan Value:" }, }, }; break; @@ -1274,7 +1271,7 @@ function settingsConvert(exportType, type, settings) { const keys = Object.keys(listObject); for (let i = 0; i < keys.length; i++) { if (result[keys[i]] === undefined) continue; - if (["map", "skinColor", "player", "shopDefaults", "options"].includes(keys[i])) { + if (["map", "player", "shopDefaults", "options"].includes(keys[i])) { const itemKey = Object.keys(listObject[keys[i]]); for (let j = 0; j < itemKey.length; j++) { if (result[keys[i]][itemKey[j]] === undefined) continue; @@ -1337,7 +1334,7 @@ window.loadExternalExportFile = function () { window.randomizeSettings = function (filter) { const settingsResult = {}; - const settingContainers = ["player", "skinColor"]; + const settingContainers = ["player"]; const randomizeSettingLoop = function (settingsObject, mainObject, subObject) { if (mainObject && !settingsResult[mainObject]) { settingsResult[mainObject] = {};