[fixed] hair styling

locations/body_desc.qsrc

@@ -1012,7 +1012,6 @@ if $ARGS[0] = 'hair':
 	if hbraids >= 1:
 		hscrunchw = 0
 		hpingripw = 0
-		hbangs = 0
 		hpigtail = 0
 	end
 

locations/mirror.qsrc

@@ -67,12 +67,12 @@ if $ARGS[0] = 'start':
 				$serv['pigtails desc']='<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''">Remove</a> your scrunchies and let your hair flow free again.'
 			end
 		end
-		if canBraidHair = 1 and mc_inventory['scrunchies'] >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
-			$serv['braid']='<a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''"><img src="images/system/icons/action/braiding.png"></a>'
-			$serv['braid desc']='You can spend half an hour <a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
+		if canBraidHair = 1 and mc_inventory['scrunchies'] >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hpigtail = 0:
+			$serv['braid']='<a href="exec:hbraids = 15 & minut += pcs_hairlng/10 & gs ''mirror'', ''start''"><img src="images/system/icons/action/braiding.png"></a>'
+			$serv['braid desc']='You can spend <<pcs_hairlng/10>> minutes <a href="exec:hbraids = 15 & minut += pcs_hairlng/10 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
 		elseif hbraids > 0:
-			$serv['braid']='<a href="exec:hbraids = 0 & minut += 30 & gs ''mirror'', ''start''"><img src="images/system/icons/action/braid.png"></a>'
-			$serv['braid desc']='Take half an hour removing your <a href="exec:hbraids = 0 & minut += 30 & gs ''mirror'', ''start''">braid</a>.'
+			$serv['braid']='<a href="exec:hbraids = 0 & minut += hbraids*2+pcs_hairlng/50 & gs ''mirror'', ''start''"><img src="images/system/icons/action/braid.png"></a>'
+			$serv['braid desc']='Take <<hbraids*2+pcs_hairlng/50>> minutes removing your <a href="exec:hbraids = 0 & minut += hbraids*2+pcs_hairlng/50 & gs ''mirror'', ''start''">braid</a>.'
 		end
 		! ----- actions
 		$serv['back']='<a href="exec: gt ''mirror'',''fin''"><img src="images/system/icons/action/back.png"></a>'
@@ -261,7 +261,7 @@ if $ARGS[0] = 'start':
 			if hscrunchw = 2: '<a href="exec:hpigtail = 0 & hscrunchw = 0 & gs ''mirror'', ''start''">Remove</a> your scrunchies and let your hair flow free again.'
 		end
 
-		if canBraidHair = 1 and mc_inventory['scrunchies'] >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hscrunchw = 0:
+		if canBraidHair = 1 and mc_inventory['scrunchies'] >= 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800) and hscrunchw = 0 and hpingripw = 0 and hpigtail = 0:
 			'You can spend half an hour <a href="exec:hbraids = 15 & minut += 30 & gs ''mirror'', ''start''">braiding</a> your hair, just the way your sister taught you.'
 		end
 
@@ -551,7 +551,7 @@ end
 if $ARGS[0] = 'brush':
 	menu_off = 1
 	*clr & cla
-	minut += 3
+	minut += max(1, pcs_hairlng/20)
 	pcs_hairbsh = 1
 	if newstylemirror = 1:
 		$serv['noaction'] = '<img <<$set_imgh>> src="images/system/icons/blank.png">'

locations/stat.qsrc

@@ -231,7 +231,7 @@ if hbraids > 5 and pcs_hairbsh = 0: hbraids -= rand(3,5) & pcs_hairbsh = 1
 if pcs_hairbsh <= 0:
 	if hscrunchw <> 0: hscrunchw = 0
 	if hpingripw <> 0: hpingripw = 0
-	if hscrunchw <> 0: hscrunchw = 0
+	if hpigtail <> 0: hpigtail = 0
 	if hbraids <> 0: hbraids = 0
 end
 

locations/stat_display.qsrc

@@ -1010,7 +1010,7 @@ if cheatStatusIcons = 0:
 	end
 
 	if pcs_hairbsh <> 1 and mc_inventory['comb'] > 0:
-		$statusIconBarTab += '<td><a href="exec: minut += 2 & pcs_hairbsh = 1 & gs ''stat''"><img title="Your hair is <<$pcs_hairbsh>>. Click to brush it." height = <<set_siconht>> src="images/system/icons/status/hair_0.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec: minut += max(1, pcs_hairlng/20) & pcs_hairbsh = 1 & gs ''stat''"><img title="Your hair is <<$pcs_hairbsh>>. Click to brush it." height = <<set_siconht>> src="images/system/icons/status/hair_0.png"></a></td>'
 	else
 		$stat_brush_msg = 'Your hair is <<$pcs_hairbsh>>.'
 		$statusIconBarTab += '<td><a href="exec:msg $stat_brush_msg"><img title="<<$stat_brush_msg>>" height = <<set_siconht>> src="images/system/icons/status/hair_'+pcs_hairbsh+'.png"></a></td>'