diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js index 1379a5aaa112e15c0a222a59d1d877ea4cadc719..105bed289f35a83fed9acd511f8106084c67f7bc 100644 --- a/src/art/vector_revamp/vectorRevampedArtControl.js +++ b/src/art/vector_revamp/vectorRevampedArtControl.js @@ -795,8 +795,7 @@ class ClothingControl { clothing = this.joinSettings(clothing, this.bodysuit); break; case "a leotard": - /* return this.leotard;*/ - clothing.styleSettings.shoe_primary.fill = "#111111"; + clothing = this.joinSettings(clothing, this.leotard); break; case "a bra": clothing = this.joinSettings(clothing, this.bra); @@ -1346,6 +1345,7 @@ class ClothingControl { boob: {fill: defaultOutfitColor}, areola: {fill: defaultOutfitColor}, bellySkin: {fill: defaultOutfitColor}, + shoe_primary: {fill: "#111111"}, muscleTone: {"fill-opacity": 0}, bellyDetails: {"fill-opacity": 0} } diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index c71f8ae59cc0be5ee1d33b969eede4b14304546a..61fbc7a9ad2987c34b10b9604b9d764c73b666a8 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -785,6 +785,13 @@ App.RA.options = (function() { return what === "" ? null : parseInt(what); } + setValue(what) { + if (_.isNumber(what)) { // shortcut list data is just numbers, turn them into targets + what = App.RA.makeTarget(this.opSelector.value, what); + } + super.setValue(what); + } + setTextValue(what) { if (typeof what === 'number') { // comes from a pre-set this.numEditor.value = what.toString(); @@ -933,6 +940,13 @@ App.RA.options = (function() { return res; } + setValue(what) { + if (_.isNumber(what)) { // shortcut list data is just numbers, turn them into targets + what = App.RA.makeTarget(this.opSelector.value, what); + } + super.setValue(what); + } + setTextValue(what) { if (typeof what === 'number') { this.numEditor.value = what.toString();