diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index 6f26a5d5f465b71fc70ecd1908b836e2bbdeff5d..84b316bf113b3b8843395c58901f96dbd22964cd 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -3,8 +3,11 @@ <<set $nextButton = "Continue", $nextLink = "Slave Interact">> <<set $showEncyclopedia = 1>><<set $encyclopedia = "The Auto Salon">> - -<<set _oldHLength = $activeSlave.hLength, _newHLength = 0>> +<<if $showInches == 2>> + <<set _oldHLength = Math.round($activeSlave.hLength/2.54), _newHLength = 0>> +<<else>> + <<set _oldHLength = $activeSlave.hLength, _newHLength = 0>> +<</if>> <h1>The Auto Salon</h1> @@ -433,14 +436,15 @@ Set horn color: <<elseif $activeSlave.hLength < 150>> | [[Apply extensions|Salon][$activeSlave.hLength += 10,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <</if>> - /* FIXME: get this to work | Custom length: <<textbox "_newHLength" _oldHLength "Salon">> - <<if (_newHLength < _oldHLength) && (_newHLength > 0)>> - <<set $activeSlave.hLength = _newHLength>> - <<else>> - <<set $activeSlave.hLength = _oldHLength>> - <</if>> - */ + <<if $showInches == 1>> + cm (<<= cmToInchString($activeSlave.hLength)>>) + <<elseif $showInches == 2>> + inches + <<else>> + cm + <</if>> + [[Apply|Salon][cashX(forceNeg($modCost), "slaveMod", $activeSlave), $activeSlave.hLength = (Number(_newHLength) || $activeSlave.hLength)]] <br> Have $his hair carefully maintained at its current length: