From 8823a75eacfd0ade7bf0266d6984189f4bb94b8b Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 16 Dec 2020 22:45:12 -0500
Subject: [PATCH] don't color the bald
---
src/facilities/salon/salonPassage.js | 29 ++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/facilities/salon/salonPassage.js b/src/facilities/salon/salonPassage.js
index 802e8cd5c00..779b3487c04 100644
--- a/src/facilities/salon/salonPassage.js
+++ b/src/facilities/salon/salonPassage.js
@@ -173,22 +173,23 @@ App.UI.salon = function(slave, cheat = false) {
}
if (showChoices) {
- // Color
- option = options.addOption("Primary color", "hColor", slave);
- if (slave.origHColor !== slave.hColor) {
- option.addValue("Restore natural color", slave.origHColor, billMod);
- }
- for (const color of App.Medicine.Modification.Color.Primary) {
- option.addValue(capFirstChar(color.value), color.value, billMod);
- }
- option.pulldown();
+ if (slave.hLength > 1) {
+ // Color
+ option = options.addOption("Primary color", "hColor", slave);
+ if (slave.origHColor !== slave.hColor) {
+ option.addValue("Restore natural color", slave.origHColor, billMod);
+ }
+ for (const color of App.Medicine.Modification.Color.Primary) {
+ option.addValue(capFirstChar(color.value), color.value, billMod);
+ }
+ option.pulldown();
- option = options.addOption("Secondary color", "hColor", slave);
- for (const color of App.Medicine.Modification.Color.Secondary) {
- option.addValue(color.title, (slave.hColor + color.value), billMod);
+ option = options.addOption("Secondary color", "hColor", slave);
+ for (const color of App.Medicine.Modification.Color.Secondary) {
+ option.addValue(color.title, (slave.hColor + color.value), billMod);
+ }
+ option.pulldown();
}
- option.pulldown();
-
// Style
if (slave.hLength > 1) {
title = `Style ${hasWig ? "wig" : "hair"} `;
--
GitLab