diff --git a/src/markets/specificMarkets/customSlaveMarket.js b/src/markets/specificMarkets/customSlaveMarket.js index 4a86349e4fd4480fcda82d00829a30c3b86b7563..41555b62b2894258f3f371eb28a2d89f03a6fd52 100644 --- a/src/markets/specificMarkets/customSlaveMarket.js +++ b/src/markets/specificMarkets/customSlaveMarket.js @@ -34,14 +34,15 @@ App.Markets["Custom Slave"] = function() { el.append(tastes()); el.append(limbs()); el.append(nationality()); + + // Links to reset things el.append(reset()); el.append(orderControls()); - el.append(hears()); return el; function intro() { - const { heA } = getPronouns(assistant.pronouns().main).appendSuffix('A'); + const {heA} = getPronouns(assistant.pronouns().main).appendSuffix('A'); let r = []; if (V.customSlaveOrdered === 0) { r.push(`You work up a new slave order for posting where slave merchants can work to fulfill it.`); @@ -227,7 +228,7 @@ App.Markets["Custom Slave"] = function() { function description() { for (const [value, text] of choices) { if (slave.heightMod === value) { - return `${text}.`; + return `${text} height.`; } } } @@ -255,7 +256,7 @@ App.Markets["Custom Slave"] = function() { function description() { for (const [value, text] of choices) { if (slave.weight >= Number(value)) { - return `${text}.`; + return `${text} weight.`; } } } @@ -280,7 +281,7 @@ App.Markets["Custom Slave"] = function() { function description() { for (const [value, text] of choices) { if (slave.face >= Number(value)) { - return `${text}.`; + return `${text} face.`; } } } @@ -316,13 +317,18 @@ App.Markets["Custom Slave"] = function() { el.append(select); function description() { - return App.UI.DOM.makeTextBox( - slave.race, - (v) => { - slave.race = v; - jQuery("#race-text").empty().append(description()); - } + const el = new DocumentFragment(); + el.append("Ethnicity: "); + el.append( + App.UI.DOM.makeTextBox( + slave.race, + (v) => { + slave.race = v; + jQuery("#race-text").empty().append(description()); + } + ) ); + return el; } return el; @@ -353,13 +359,18 @@ App.Markets["Custom Slave"] = function() { el.append(select); function description() { - return App.UI.DOM.makeTextBox( - slave.skin, - (v) => { - slave.skin = v; - jQuery("#skin-text").empty().append(description()); - } + const el = new DocumentFragment(); + el.append("Skin tone: "); + el.append( + App.UI.DOM.makeTextBox( + slave.skin, + (v) => { + slave.skin = v; + jQuery("#skin-text").empty().append(description()); + } + ) ); + return el; } return el; @@ -459,12 +470,11 @@ App.Markets["Custom Slave"] = function() { function description() { for (const [value, text] of choices) { - if (slave.virgin === 0) { + if (slave.virgin === Number(value)) { return `${text}.`; - } else { - return `Virginity not important.`; } } + return `Virginity not important.`; } return el; @@ -627,17 +637,12 @@ App.Markets["Custom Slave"] = function() { el.append(choicesMaker(slaveProperty, choices, description)); function description() { - for (const [value, text] of choices) { - if (slave.skills >= Number(value)) { - switch (value) { - case "65": - return `Sexually skilled.`; - case "35": - return `Basic sex skills.`; - case "0": - return `Sexually unskilled.`; - } - } + if (slave.skills <= 10) { + return `Sexually unskilled.`; + } else if (slave.skills <= 15) { + return `Basic sex skills.`; + } else { + return `Sexually skilled.`; } } @@ -657,17 +662,12 @@ App.Markets["Custom Slave"] = function() { el.append(choicesMaker(slaveProperty, choices, description)); function description() { - for (const [value, text] of choices) { - if (slave.skill.whore >= Number(value)) { - switch (value) { - case "65": - return `Skilled at prostitution and entertainment.`; - case "35": - return `Basic skills at prostitution and entertainment.`; - case "0": - return `Unskilled at prostitution and entertainment.`; - } - } + if (slave.skill.whore <= 10) { + return `Unskilled at prostitution and entertainment.`; + } else if (slave.skills <= 15) { + return `Basic skills at prostitution and entertainment.`; + } else { + return `Skilled at prostitution and entertainment.`; } } @@ -926,7 +926,7 @@ App.Markets["Custom Slave"] = function() { } function description(hasLimb, text) { - return `${text}: ${(hasLimb) ? `Yes` : `No`} `; + return `${text}: ${(hasLimb) ? `Yes` : `No`}. `; } return el; @@ -1017,9 +1017,9 @@ App.Markets["Custom Slave"] = function() { } /** - * + * * @param {HTMLElement} element - * @param {function} text + * @param {Function} text * @param {string} id */ function createDescription(element, text, id) { @@ -1030,10 +1030,10 @@ App.Markets["Custom Slave"] = function() { } /** - * - * @param {String} slaveParam - * @param {Map} choices - * @param {Function} description + * + * @param {string} slaveParam + * @param {Map} choices + * @param {Function} description */ function choicesMaker(slaveParam, choices, description) { const linkArray = [];