[fixed/changed] early shaving and `Shave Options` menu; adjusted `shave_length` and `shave_trigger` for clean and lazy shave options

locations/din_van.qsrc

@@ -310,10 +310,11 @@ $SkinCare = {
 }
 
 $brit = {
-	if lashair ! 1:
-		if shave_menu = 1 and (mc_inventory['razor'] > 1 or pcs_shave['free_razor'] = 1):
-			if pcs_leghair > 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
-				if pcs_leghair > 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
+	if lashair ! 1 and (pcs_shave['free_razor'] = 1 or mc_inventory['razor'] > 0):
+		!! if shave_menu = 1: legs and pussy
+		if shave_menu = 1 and mc_inventory['razor'] > 2:
+			if pcs_leghair >= 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
+				if pcs_leghair >= 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
 					if daystart < 10 and $start_type[1] = 'tg':
 						$shave_act = 'Shave your legs and pussy'
 						$shave_txt1 = 'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
@@ -368,17 +369,15 @@ $brit = {
 						act '<<$shave_act>> (0:15)':
 							menu_off = 1
 							*clr & cla
-	!!						if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
-							if $loc ='gadbana':
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-							elseif pcs_pubes <= 10 and shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-							elseif shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-							elseif shave_length > 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
+							!! if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
+							if shave_length < 2:
+								if pcs_pubes <= 10:
+									'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
+								else
+									'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
+								end
 							else
-								'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
 							end
 							*nl
 							'<<$shave_txt1>>'
@@ -393,11 +392,11 @@ $brit = {
 							if pcs_shave['free_razor'] = 1:
 								pcs_shave['free_razor'] = 0
 							else
-								mc_inventory['razor'] -=  2
+								mc_inventory['razor'] -= 3
 							end
 							dynamic $dryOff
-							gs'selfplay','bathtub_dildo_check'
-							gs'selfplay','shower_dildo_check'
+							gs 'selfplay', 'bathtub_dildo_check'
+							gs 'selfplay', 'shower_dildo_check'
 						end
 					end
 				end
@@ -405,16 +404,15 @@ $brit = {
 				'<br>You don''t need to shave.'
 			end
 		end
-		
 
-		if (shave_menu = 2 or shave_menu = 1) and (mc_inventory['razor'] > 0 or pcs_shave['free_razor'] = 1):
+		!! if shave_menu = 2: pussy only
+		if (shave_menu = 2 or shave_menu = 1):
 			if pubestyle > 0 and pcs_pubes >= shave_trigger:
 				if pubestyle = 1:
 					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
 						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.' 
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
-						
 					else
 						$shave_txt1 = 'You lather up your crotch and take a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
 					end
@@ -456,14 +454,14 @@ $brit = {
 					act '<<$shave_act>> (0:10)':
 						menu_off = 1
 						*clr & cla
-						if pcs_pubes <= 10 and shave_length = 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-						elseif shave_length = 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-						elseif shave_length > 2:
-							'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
+						if shave_length < 2:
+							if pcs_pubes <= 10:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
+							else
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
+							end
 						else
-							'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+							'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
 						end
 						*nl
 						minut += 10
@@ -479,15 +477,16 @@ $brit = {
 						*nl
 						'<<$shave_txt2>>'
 						dynamic $dryOff
-						gs'selfplay','bathtub_dildo_check'
-						gs'selfplay','shower_dildo_check'
+						gs 'selfplay', 'bathtub_dildo_check'
+						gs 'selfplay', 'shower_dildo_check'
 					end
 				end
 			end
 		end
-		
-		if (shave_menu = 3 or shave_menu = 1) and (mc_inventory['razor'] > 0 or pcs['free_razor'] = 1):
-			if pcs_leghair > 3:
+
+		!! if shave_menu = 3: legs only
+		if (shave_menu = 3 or shave_menu = 1) and mc_inventory['razor'] > 1:
+			if pcs_leghair >= 3:
 				act 'Shave your legs (0:05)':
 					menu_off = 1
 					*clr & cla
@@ -501,8 +500,8 @@ $brit = {
 					else
 						mc_inventory['razor'] -= 2
 					end
-					!!				if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
+					!! if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
+					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
 					*nl
 					if daystart < 10 and $start_type[1] = 'tg':
 						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
@@ -514,162 +513,8 @@ $brit = {
 						'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
 					end
 					dynamic $dryOff
-					gs'selfplay','bathtub_dildo_check'
-					gs'selfplay','shower_dildo_check'
-				end
-			end
-		end
-		
-		if shave_menu > 0 and (mc_inventory['razor'] > 0 or pcs['free_razor'] = 1) and (pcs_leghair > 0 or (pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3)):
-			act'Shave early':
-				cla
-				if shave_menu = 1 and pcs_leghair > 0 and pcs_leghair < 4 and pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3:
-					if pubestyle = 1:
-						$shave_both_act = 'Shave early - legs and pussy'
-						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance now. You lather up your legs and crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your legs and pussy.'
-					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
-						$shave_both_act = 'Trim early - legs and bush'
-						$shave_txt1 = 'Inspecting your pubes, it''s not quite time for you to shave the stubble at the edges, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your trim has well maintained edges. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 9:
-						$shave_both_act = 'Trim early - legs and bush'
-						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pubes are a nice even lawn between your smooth legs. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 10:
-						$shave_both_act = 'Trim early - legs and bush'
-						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. Might as well do your legs too while you''re at it. You lather up and grab your razor, carefully scraping the blade around the edges of your bush and up and down your legs.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your bush is a well shaped hedge. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 11:
-						$shave_both_act = 'Shave early - legs and pussy'
-						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet and you''re usually too lazy to get to it before it starts growing into actual hair, but you''re feeling motivated so you might as well do it right now. You lather up your legs and crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your legs and pussy.'
-					else
-						$shave_both_act = ''
-					end
-					
-					if $shave_both_act ! '':
-						act '<<$shave_both_act>> (0:10)':
-							menu_off = 1
-							*clr & cla
-							if $locM = 'uni_dorm' and rand(0, 5) = 0:gt 'vann', 'brit1'
-							if $loc ='gadbana':
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-							elseif pcs_pubes <= 10 and shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-							elseif shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-							elseif shave_length > 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
-							else
-								'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-							end
-							*nl
-							'<<$shave_txt1>>'
-							*nl
-							'<<$shave_txt2>>'
-							minut += 10
-							pcs_leghair = 0
-							stat['leg_hair_growth_timer'] = totminut
-							pcs_pubes = shave_length
-							stat['pube_growth_timer'] = totminut
-							pcs_horny += 5
-							if pcs_shave['free_razor'] = 1:
-								pcs_shave['free_razor'] = 0
-							else
-								mc_inventory['razor'] -=  2
-							end
-							dynamic $dryOff
-							gs'selfplay','bathtub_dildo_check'
-							gs'selfplay','shower_dildo_check'
-						end
-					end
-				end
-				
-				if (shave_menu = 2 or shave_menu = 1) and pcs_pubes < shave_trigger and pcs_pubes > shave_trigger - 3:
-					if pubestyle = 1:
-						$shave_act = 'Shave early - pussy only'
-						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance now. You lather up your crotch, grabbing your razor and carefully scrape the blade across your still-smooth skin.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your shaving areas are clean. Satisfied, you rinse off, pleased with the extra smooth feeling of your pussy.'
-					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
-						$shave_act = 'Trim early - pubes only'
-						$shave_txt1 = 'Inspecting your pubes, it''s not quite time for you to shave the stubble at the edges, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your razor, carefully scraping the blade around the edges of your pubes.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your trim has well maintained edges. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 9:
-						$shave_act = 'Trim early - bush only'
-						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your shaving implements and start carefully clipping and trimming around the edges of your bush.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pubes are a nice even lawn between your legs. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 10:
-						$shave_act = 'Trim early - bush only'
-						$shave_txt1 = 'Inspecting your bush, it''s not quite time for you to shave yet, but you''re not sure if you''ll be able to get to it later and decide to do some early maintenance. You lather up and grab your shaving implements and start carefully clipping and trimming around the edges of your bush.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your bush is a well shaped hedge. Satisfied, you rinse off, feeling clean, neat, and tidy.'
-					elseif pubestyle = 11:
-						$shave_act = 'Shave early - pussy only'
-						$shave_txt1 = 'Inspecting yourself, it''s not quite time for you to shave yet and you''re usually too lazy to get to it before it starts growing into actual hair, but you''re feeling motivated so you might as well do it right now. You lather up your crotch, grab your razor, and carefully scrape the blade across your still-smooth skin.' 
-						$shave_txt2 = 'After a few minutes of work, the razor has tiny little bits of hair and skin stuck in it and your pussy is perfectly cleanshaven. Satisfied, you rinse off, pleased with the extra smooth feeling between your legs.'
-					else
-						$shave_act = ''
-					end
-						
-					if $shave_act ! '':
-						act '<<$shave_act>> (0:05)':
-							menu_off = 1
-							*clr & cla
-							if $locM = 'uni_dorm' and rand(0, 5) = 0:gt 'vann', 'brit1'
-							if $loc ='gadbana':
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-							elseif pcs_pubes <= 10 and shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-							elseif shave_length = 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-							elseif shave_length > 2:
-								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
-							else
-								'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-							end
-							*nl
-							'<<$shave_txt1>>'
-							*nl
-							'<<$shave_txt2>>'
-							minut += 5
-							pcs_leghair = 0
-							stat['leg_hair_growth_timer'] = totminut
-							pcs_pubes = shave_length
-							stat['pube_growth_timer'] = totminut
-							pcs_horny += 5
-							if pcs_shave['free_razor'] = 1:
-								pcs_shave['free_razor'] = 0
-							else
-								mc_inventory['razor'] -=  2
-							end
-							dynamic $dryOff
-							gs'selfplay','bathtub_dildo_check'
-							gs'selfplay','shower_dildo_check'
-						end
-					end
-				end
-				
-				if (shave_menu = 3 or shave_menu = 1) and pcs_leghair > 0:
-					act'Shave early - Legs only (0:03)':
-						menu_off = 1
-						*clr & cla
-						minut += 3
-						pcs_leghair = 0
-						stat['leg_hair_growth_timer'] = totminut
-						pcs_horny += 5
-						if pcs_shave['free_razor'] = 1:
-							pcs_shave['free_razor'] = 0
-						else
-							mc_inventory['razor'] -= 1
-						end
-						if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
-						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
-						*nl
-						'Inspecting your legs, it''s not really time to shave them yet, but there''s no reason you can''t just do a quick pass right now and save effort later. You lather your legs up and grab your razor. After spending a few minutes methodically shaving away every last hair, your legs are smooth and clean. The feeling of your silky skin turns you on a little.'
-						dynamic $dryOff
-						gs'selfplay','bathtub_dildo_check'
-						gs'selfplay','shower_dildo_check'
-					end
+					gs 'selfplay', 'bathtub_dildo_check'
+					gs 'selfplay', 'shower_dildo_check'
 				end
 			end
 		end
@@ -1832,118 +1677,138 @@ if $ARGS[0] = 'shave_options':
 	*clr & cla
 	if shave_img_hgt = 0:shave_img_hgt = 100
 	!! images handled using FUNC(''$pube_image'')
-	'<h3><center><b>Shaving optons</b></h3><br><center>Here you can choose your style for pubic hair and which body parts you wish to shave.</center>'
-	'<br><center><table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>"></a></center></TD>'
-	'<TR><TD><center>'
-	if pubestyle ! 1:
-		'<a href="exec:pubestyle = 1 & shave_length = 1 & shave_trigger = 4 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
-	else
-		'Clean Shave'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 2 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 2 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">V-shaped</a>'
-	else
-		'V-shaped'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 3 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 3 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Triangle-shaped</a>'
-	else
-		'Triangle-shaped'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 4 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 4 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Landing-strip</a>'
-	else
-		'Landing-strip'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 5 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 5 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Heart-shaped</a>'
-	else
-		'Heart-shaped'
-	end
-	'</center></TD>'
-	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>"></a></center></TD>'
-	'<TR><TD><center>'
-	if pubestyle ! 6 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 6 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
-	else
-		'Flame-shaped'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 7 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 7 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Cross-Shaped</a>'
-	else
-		'Cross-Shaped'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 8 and pcs_pubes > 16:
-		'<a href="exec:pubestyle = 8 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Trimmed</a>'
-	else
-		'Trimmed'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 9 and pcs_pubes > 20:
-		'<a href="exec:pubestyle = 9 & shave_length = 20 & shave_trigger = 26 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Small Bush</a>'
-	else
-		'Small Bush'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 10:
-		'<a href="exec:pubestyle = 10 & shave_length = 26 & shave_trigger = 31 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
-	else
-		'Full Bush'
-	end
-	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD>'
+	*p '<center><h3><b>Shaving optons</b></h3>'
+	'Here you can choose your style for pubic hair and which body parts you wish to shave.'
 	*nl
-	'<TR><TD><center>'
-	if pubestyle ! 11 and pcs_pubes > 10:
-		'<a href="exec:pubestyle = 11 & shave_length = 2 & shave_trigger = 8 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Lazy</a>'
-		'(don''t immediately shave stubble)'
-	else
-		'Lazy'
-		'(don''t immediately shave stubble)'
-	end
-	'</center></TD><TD><center>'
-	if pubestyle ! 12 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 12 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Mini Bush</a>'
-	else
-		'Mini Bush'
-	end
-	
-	'</center></TD><TR><center>'
-	'Your razor will last for <b><<mc_inventory[''razor'']>></b> more shaves.'
+	'Your razor will last for&nbsp;<b><<mc_inventory[''razor'']>></b>&nbsp;more shaves.'
+	*nl
+	'<b>Change your shaving routine:'
 	*nl
-	'<center><b>Change your shaving routine:</b></center>'
-	'<center><b>Note: Choosing to never shave, or to shave legs only, will remove your chosen shave style.<br> You can only choose a style if you currently have enough hair to support it.</b></center>'
+	'Note: Choosing to never shave, or to shave legs only, will remove your chosen shave style.'
+	'You can only choose a style if you currently have enough hair to support it.</b>'
 	*nl
 	!if shave_menu = 0:nothing
 	!if shave_menu = 1:legs and pussy
 	!if shave_menu = 2:pussy only
 	!if shave_menu = 3:legs only
+	if pubestyle = 0:
+		*p iif(shave_menu = 1, 'Everything&nbsp;|&nbsp;', '<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 2, 'Pussy only&nbsp;|&nbsp;', '<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 3, 'Legs only&nbsp;|&nbsp;', '<a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 0, 'Never shave', '<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a>')
+	else
+		*p iif(shave_menu = 1, 'Everything&nbsp;|&nbsp;', '<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 2, 'Pussy only&nbsp;|&nbsp;', '<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 3, 'Legs only&nbsp;|&nbsp;', '<a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>&nbsp;|&nbsp;')
+		*p iif(shave_menu = 0, 'Never shave', '<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a>')
+	end
+	*nl
+	*nl
 	if shave_menu = 0:
-		$shave_chosen = 'doesn''t include any shaving options.'
-		$shave_time = ''
-		'Never shave | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+		'Your current routine doesn''t include any shaving options.'
 	elseif shave_menu = 1:
-		$shave_chosen = 'involves shaving your legs and maintaining your current pubic style.'
-		$shave_time = 'It takes 15 minutes to complete this routine.'
-		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | Everything | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+		'Your current routine involves shaving your legs and maintaining your current pubic style.'
+		'It takes 15 minutes to complete this routine.'
 	elseif shave_menu = 2:
-		$shave_chosen = 'involves not shaving your legs and maintaining your current pubic style.'
-		$shave_time = 'It takes 10 minutes to complete this routine.'
-		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | Pussy only | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+		'Your current routine involves not shaving your legs and maintaining your current pubic style.'
+		'It takes 10 minutes to complete this routine.'
 	elseif shave_menu = 3:
-		$shave_chosen = 'involves shaving your legs and not maintaining any chosen pubic style.'
-		$shave_time = 'It takes 5 minutes to complete this routine.'
-		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | Legs only'
+		'Your current routine involves shaving your legs and not maintaining any chosen pubic style.'
+		'It takes 5 minutes to complete this routine.'
 	end
 	*nl
-	'<center>Your current routine <<$shave_chosen>> <br><<$shave_time>></center>'
-	'</table></center>'
+	*p '<table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
+
+	!! ROW 1: IMAGES
+		*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],2)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],3)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],4)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],5)>>"></a></center></TD></TR>'
+
+	!! ROW 1: TEXT
+		*p'<TR><TD><center>'
+		if pubestyle ! 1:
+			*p '<a href="exec:pubestyle = 1 & shave_length = 0 & shave_trigger = 3 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
+		else
+			*p 'Clean Shave'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 2 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 2 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">V-shaped</a>'
+		else
+			*p 'V-shaped'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 3 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 3 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Triangle-shaped</a>'
+		else
+			*p 'Triangle-shaped'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 4 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 4 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Landing-strip</a>'
+		else
+			*p 'Landing-strip'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 5 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 5 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Heart-shaped</a>'
+		else
+			*p 'Heart-shaped'
+		end
+		*p '</center></TD></TR>'
+
+	!! ROW 2: IMAGES
+		*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],6)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],7)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],8)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],9)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',26,pcs_pubecol[2],10)>>"></a></center></TD></TR>'
+	
+	!! ROW 2: TEXT
+		*p '<TR><TD><center>'
+		if pubestyle ! 6 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 6 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
+		else
+			*p 'Flame-shaped'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 7 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 7 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Cross-Shaped</a>'
+		else
+			*p 'Cross-Shaped'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 8 and pcs_pubes > 16:
+			*p '<a href="exec:pubestyle = 8 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Trimmed</a>'
+		else
+			*p 'Trimmed'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 9 and pcs_pubes > 20:
+			*p '<a href="exec:pubestyle = 9 & shave_length = 20 & shave_trigger = 26 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Small Bush</a>'
+		else
+			*p 'Small Bush'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 10:
+			*p '<a href="exec:pubestyle = 10 & shave_length = 26 & shave_trigger = 31 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
+		else
+			*p 'Full Bush'
+		end
+
+	!! ROW 3: IMAGES
+		*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD></TR>'
+
+	!! ROW 3: TEXT
+		*p '<TR><TD><center>'
+		if pubestyle ! 11 and pcs_pubes > 10:
+			*p '<a href="exec:pubestyle = 11 & shave_length = 0 & shave_trigger = 8 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Lazy</a>'
+		else
+			*p 'Lazy'
+		end
+		*p '</center></TD><TD><center>'
+		if pubestyle ! 12 and pcs_pubes > 15:
+			*p '<a href="exec:pubestyle = 12 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Mini Bush</a>'
+		else
+			*p 'Mini Bush'
+		end
+
+	*p '</center></TD></TR></table>'
+	*p '<sub><small>Lazy - (don''t immediately shave stubble)</small></sub></center>'
 
 	act 'Return':menu_off = 0 & gt $loc, $loc_arg
 	act 'Set image height for this view':