From ba29baa0c1de15ed82bf90e2a8d9db7461f42f22 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 17 Dec 2020 19:40:46 -0500
Subject: [PATCH] cleanup hair
---
src/facilities/salon/salonPassage.js | 8 ++++++++
src/npc/startingGirls/startingGirls.js | 5 -----
src/npc/startingGirls/startingGirls.tw | 1 -
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/facilities/salon/salonPassage.js b/src/facilities/salon/salonPassage.js
index 7e0d601640c..66137447ee0 100644
--- a/src/facilities/salon/salonPassage.js
+++ b/src/facilities/salon/salonPassage.js
@@ -174,6 +174,14 @@ App.UI.salon = function(slave, cheat = false) {
if (showChoices) {
if (slave.hLength > 1) {
+ // Original color
+ if (cheat) {
+ option = options.addOption("Natural color", "origHColor", slave);
+ for (const color of App.Medicine.Modification.Color.Primary) {
+ option.addValue(capFirstChar(color.value), color.value, billMod);
+ }
+ option.pulldown();
+ }
// Color
option = options.addOption("Primary color", "hColor", slave);
if (slave.origHColor !== slave.hColor) {
diff --git a/src/npc/startingGirls/startingGirls.js b/src/npc/startingGirls/startingGirls.js
index 15c12bda60d..8a03b57faeb 100644
--- a/src/npc/startingGirls/startingGirls.js
+++ b/src/npc/startingGirls/startingGirls.js
@@ -37,11 +37,6 @@ App.StartingGirls.cleanup = function(slave) {
resetEyeColor(slave, "both");
slave.origRace = slave.race;
- slave.skin = slave.origSkin;
- slave.hColor = slave.origHColor;
- slave.eyebrowHColor = slave.hColor;
- slave.pubicHColor = slave.hColor;
- slave.underArmHColor = slave.hColor;
if (slave.balls === 0) {
slave.scrotum = 0;
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 4bf26fbf2ab..f919335a4de 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -960,7 +960,6 @@
<br>''Career:'' <span id="career-textbox"><<textbox "$activeSlave.career" $activeSlave.career "Starting Girls">></span>
<span id="careers"></span>
<script>jQuery('#careers').empty().append(App.StartingGirls.career(V.activeSlave));</script>
- <br>''Hair color:'' <<textbox "$activeSlave.origHColor" $activeSlave.origHColor "Starting Girls">> //This will also set eyebrow, pubic, and underarm hair color.//
<br>''Eye color:'' <<textbox "$activeSlave.eye.origColor" $activeSlave.eye.origColor "Starting Girls">>
<<if def $pupil_temp>>
<<set $activeSlave.eye.left.pupil = $pupil_temp, $activeSlave.eye.right.pupil = $pupil_temp, delete $pupil_temp>>
--
GitLab