diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js index 8b2dc789b7002700b16b38a071dc888d22956560..a1ae95032148049df671ac078bb20ec5d73a7f82 100644 --- a/js/003-data/miscData.js +++ b/js/003-data/miscData.js @@ -268,6 +268,7 @@ App.Data.misc = { eyebrowFullness: new Set(["pencil-thin", "thin", "threaded", "natural", "tapered", "thick", "bushy"]), pubicStyles: new Set(["waxed", "in a strip", "neat", "bushy", "bushy in the front and neat in the rear", "very bushy"]), armpitStyles: new Set(["waxed", "shaved", "neat", "bushy"]), + hornColor: new Set(["golden", "copper", "red", "deep red", "green", "pink", "dark brown", "brown", "burgundy", "jet black", "black", "grey", "silver", "white", "blue-violet", "purple", "dark orchid", "sea green", "green-yellow", "dark blue", "blazing red", "neon green", "neon blue", "neon pink"]), /* START Custom Nationalities region filter */ /* Not currently weighted, but will accept weights */ diff --git a/src/facilities/salon/salonPassage.js b/src/facilities/salon/salonPassage.js index fda1b816e908b25cca27730cb1ec8c6eb2ce8870..ab89dc939e74914346c9a72b613fac8ab6265f47 100644 --- a/src/facilities/salon/salonPassage.js +++ b/src/facilities/salon/salonPassage.js @@ -111,9 +111,10 @@ App.UI.salon = function(slave, cheat = false) { App.UI.DOM.appendNewElement("h3", el, "Horns"); const options = new App.UI.OptionsGroup(); - options.addOption(`Set the color of ${his} ${slave.horn}`, "hornColor", slave) - .addValueList(makeAList(App.Medicine.Modification.Color.Primary.map(color => color.value))) - .addCallbackToEach(billMod); + const option = options.addOption(`Set the color of ${his} ${slave.horn}`, "hornColor", slave); + for (const hornColor of App.Data.misc.hornColor) { + option.addValue(capFirstChar(hornColor), hornColor, billMod); + } el.append(options.render()); diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index c176fb9f72c73a4e7bfe7743e67fad785e29a3ff..7dfd93909563c160256ad570f1320dd9f5f07b62 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -3029,32 +3029,7 @@ globalThis.rulesAssistantOptions = (function() { class HornColorList extends ListSelector { constructor() { - const pairs = [ - ["golden"], - ["copper"], - ["red"], - ["deep red"], - ["green"], - ["pink"], - ["dark brown"], - ["brown"], - ["burgundy"], - ["jet black"], - ["black"], - ["grey"], - ["silver"], - ["white"], - ["blue-violet"], - ["purple"], - ["dark orchid"], - ["sea green"], - ["green-yellow"], - ["dark blue"], - ["blazing red"], - ["neon green"], - ["neon blue"], - ["neon pink"] - ]; + const pairs = Array.from(App.Data.misc.hornColor, color => [color]); super("Horn color", pairs); this.setValue(current_rule.set.hornColor); this.onchange = (value) => current_rule.set.hornColor = value; @@ -3121,7 +3096,7 @@ globalThis.rulesAssistantOptions = (function() { class PubicHairStyleList extends ListSelector { constructor() { - const pairs = Array.from(App.Data.misc.pubicStyles, style => [capFirstChar(style), style]); + const pairs = Array.from(App.Data.misc.pubicStyles, style => [style]); super("Pubic hairstyle", pairs); this.setValue(current_rule.set.pubicHStyle); this.onchange = (value) => current_rule.set.pubicHStyle = value; @@ -3139,7 +3114,7 @@ globalThis.rulesAssistantOptions = (function() { class ArmpitHairStyleList extends ListSelector { constructor() { - const pairs = Array.from(App.Data.misc.armpitStyles, style => [capFirstChar(style), style]); + const pairs = Array.from(App.Data.misc.armpitStyles, style => [style]); super("Underarm hair style", pairs); this.setValue(current_rule.set.underArmHStyle); this.onchange = (value) => current_rule.set.underArmHStyle = value;