diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index fea02011f300ebb97a780c4cbd6f6c87cc3e9013..84b316bf113b3b8843395c58901f96dbd22964cd 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -3,7 +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,18 +437,14 @@ Set horn color: | [[Apply extensions|Salon][$activeSlave.hLength += 10,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <</if>> | Custom length: <<textbox "_newHLength" _oldHLength "Salon">> - <<if $showInches >= 1>> <<if $showInches == 1>> cm (<<= cmToInchString($activeSlave.hLength)>>) + <<elseif $showInches == 2>> + inches <<else>> - in + cm <</if>> [[Apply|Salon][cashX(forceNeg($modCost), "slaveMod", $activeSlave), $activeSlave.hLength = (Number(_newHLength) || $activeSlave.hLength)]] - <<else>> - cm - [[Apply|Salon][cashX(forceNeg($modCost), "slaveMod", $activeSlave), $activeSlave.hLength = (Number(_newHLength) || $activeSlave.hLength)]] - <</if>> - <br> Have $his hair carefully maintained at its current length: