[changed] cleaned up the shaving part of din_van to make it less complicated at a glance

[added] new variables to facilitate ease of reading/understanding/coding
[added] customized description and action text for shaving
[changed] masseuse job text in stat_display

locations/din_van.qsrc

@@ -2,6 +2,9 @@
 
 !!pcs_leghair = leg hair 0 - 3 for smooth <= 6 for stubble <= 9 for light after that hairy
 !!pcs_pubes = pubes 0 - 3 for smooth <= 10 for stubble <= 20 for light hair after that its hairy
+!!pubestyle = the style in which you have determined to shave your pubic hair
+!!shave_length = the length that your pubic hair will be shortened to after shaving/trimming
+!!shave_trigger = the length that your pubic hair needs to be to shave/trim it
 !!stanok = razor
 !!$brit = shaving dynamic
 
@@ -263,48 +266,68 @@ $bath = {
 
 $brit = {
 	if shave_menu = 1  and stanok > 1:
-		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12) and pcs_pubes > 19) or (pubestyle = 10 and pcs_pubes > 29) or (pubestyle = 11 and pcs_pubes > 10):
-			act 'Shave yourself (0:15)':
-				menu_off = 1
-				*clr & cla
-				minut += 15
-				pcs_leghair = 0
-				if pubestyle = 1:
-					pcs_pubes = 1
-				elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
-					pcs_pubes = 16
-				elseif pubestyle = 10 and pcs_pubes > 29:
-					pcs_pubes = 26
-				elseif pubestyle = 11 and pcs_pubes > 10:
-					pcs_pubes = 0
-				end
-				pcs_horny += 5
-				stanok -= 2
-				if obdysh = 1 and rand(0, 5) = 0:gt 'vann', 'brit1'
-				if $loc ='gadbana':
-					'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-				end
-				*nl
+		if pcs_leghair > 3 or (pcs_pubes >= shave_trigger):
+			if pcs_leghair > 3 and pcs_pubes >= shave_trigger:
 				if daystart < 10 and StoryLine = 0 and ntstart = 0:
-					'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.'
-					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
+					$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.'
+					$shave_txt2 = 'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
 				elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 					pcs_mood += 10
-					'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
+					$shave_txt1 = 'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
 				elseif pubestyle = 1 or pubestyle = 11:
-					'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle <= 12:
-					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time cleaning up the area around your neatly trimmed and styled patch of pussy hair as well.'
+					$shave_act = 'Shave your legs and pussy'
+					if pcs_pubes < 10:
+						$shave_txt1 = 'You do your legs first before lathering up your crotch and completely shaving away the hair that covers it. Once you''re finished you glide your hands over the top of your pussy, marvelling at the silky smooth feeling.'
+					else
+						$shave_txt1 = 'You lather up your legs and crotch, carefully shaving away the stubble that covers them. Once you''re finished you glide your hands over your smooth skin, enjoying the feeling.'
+					end
+				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle = 12:
+					if pcs_pubes >= shave_trigger + 5:
+						$shave_act = 'Shave your legs and pussy'
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'
+					else
+						$shave_act = 'Shave your legs and trim your bush'
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you spend some time cleaning up the area around your styled pubic hair, trimming back stubble and hair until it''s neat and tidy again.'
+					end
 				elseif pubestyle = 9:
-					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your small neat bush as well.'
+					$shave_act = 'Shave your legs and trim your bush'
+					if pcs_pubes >= 26:
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time trimming back your thick bush of pubic hair, until it is a neat and tidy lawn of hair instead.'
+					else
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it short and neat.'
+					end
 				elseif pubestyle = 10:
-					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your	bush as well.'
+					$shave_act = 'Shave your legs and trim your bush'
+					if pcs_pubes >= 40:
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
+					else
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it neat and tidy.'
+					end
+				end
+			
+				act '<<$shave_act>> (0:15)':
+					menu_off = 1
+					*clr & cla
+					minut += 15
+					pcs_leghair = 0
+					pcs_pubes = shave_length
+					pcs_horny += 5
+					stanok -= 2
+					if obdysh = 1 and rand(0, 5) = 0:gt 'vann', 'brit1'
+					if $loc ='gadbana':
+						'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+					end
+					*nl
+					'<<$shave_txt1>>'
+					*nl
+					'<<$shave_txt2>>'
+					dynamic $dryOff
+					gs'selfplay','bathtub_dildo_check'
+					gs'selfplay','shower_dildo_check'
 				end
-				dynamic $dryOff
-				gs'selfplay','bathtub_dildo_check'
-				gs'selfplay','shower_dildo_check'
 			end
 			
 			if pcs_leghair > 3:
@@ -336,76 +359,53 @@ $brit = {
 			'<br>You don''t need to shave.'
 		end
 	elseif shave_menu = 2 and stanok > 0:
-		if pcs_pubes > 3:
-			if pubestyle = 1 or (pubestyle = 11 and pcs_pubes > 10):
-				act 'Shave your pussy (0:10)':
-					menu_off = 1
-					*clr & cla
-					minut += 10
-					pcs_pubes = 0
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					*nl
-					'You lather your crotch with some soapy water and carefully shave your pubic hair. After you''re done, you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-					dynamic $dryOff
-					gs'selfplay','bathtub_dildo_check'
-					gs'selfplay','shower_dildo_check'
+		if pcs_pubes >= shave_trigger:
+			if pubestyle = 1 or pubestyle = 11:
+				$shave_act = 'Shave your pussy'
+				if pcs_pubes > 10:
+					$shave_txt1 = 'You lather up your crotch and completely shave away the hair that covers it. Once you''re finished you glide your hands over the top of your pussy, marvelling at the silky smooth feeling.'
+				else
+					$shave_txt1 = 'You lather up your crotch, carefully shaving away the stubble that covers it. Once you''re finished you glide your hands over your smooth skin, enjoying the feeling.'
 				end
-			elseif ((pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12) and pcs_pubes > 19:
-				act 'Trim your pubic hair (0:10)':
-					menu_off = 1
-					*clr & cla
-					minut += 10
-					pcs_pubes = 16
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					'You spend some time carefully shaving your pubic hair to your desired shape before trimming it to make it neat and tidy.'
-					dynamic $dryOff
-					gs'selfplay','bathtub_dildo_check'
-					gs'selfplay','shower_dildo_check'
+			elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle = 12:
+				if pcs_pubes >= shave_trigger + 5:
+					$shave_act = 'Shave your pussy'
+					$shave_txt1 = 'You lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'
+				else
+					$shave_act = 'Trim your bush'
+					$shave_txt1 = 'You lather up your crotch and spend some time cleaning up the area around your styled pubic hair, shaving away stubble and hair until it''s neat and tidy again.'
 				end
-			elseif pubestyle = 9 and pcs_pubes > 19:
-				act 'Trim your pubic hair (0:10)':
-					menu_off = 1
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					if pcs_pubes >= 20:
-						'You carefully shave away the hair at the edges of your pussy, trimming it all away until there is only a neatly styled bush left at the top.'
-					else
-						'You carefully shave away the stubble at the edges of your pussy, careful to only trim and maintain the neatly styled bush you have at the top.'
-					end
-					minut += 10
-					pcs_pubes = 16
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					dynamic $dryOff
-					gs'selfplay','bathtub_dildo_check'
-					gs'selfplay','shower_dildo_check'
+			elseif pubestyle = 9:
+				$shave_act = 'Trim your bush'
+				if pcs_pubes >= 26:
+					$shave_txt1 = 'You spend some time trimming back your thick bush of pubic hair, until it is a neat and tidy lawn of hair instead.'
+				else
+					$shave_txt1 = 'You spend some time maintaining your bush, keeping it short and neat.'
 				end
-			elseif pubestyle = 10 and pcs_pubes >= 29:
-				act 'Trim back your bush (0:10)':
-					menu_off = 1
-					*clr & cla
-					minut += 10
-					pcs_pubes = 26
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					'You spend some time trimming back your thick bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
-					dynamic $dryOff
-					gs'selfplay','bathtub_dildo_check'
-					gs'selfplay','shower_dildo_check'
+			elseif pubestyle = 10:
+				if pcs_pubes >= 40:
+					$shave_act = 'Trim back your bush'
+					$shave_txt1 = 'You spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
+				else
+					$shave_act = 'Trim your bush'
+					$shave_txt1 = 'You spend some time maintaining your bush, trimming back the edges, keeping it neat and tidy.'
 				end
 			end
+			act '<<$shave_act>> (0:10)':
+				menu_off = 1
+				*clr & cla
+				minut += 10
+				pcs_pubes = shave_length
+				pcs_horny += 5
+				stanok -= 1
+				if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+				*nl
+				'<<$shave_txt1>>'
+				dynamic $dryOff
+				gs'selfplay','bathtub_dildo_check'
+				gs'selfplay','shower_dildo_check'
+			end
 		end
 	elseif shave_menu = 3 and stanok > 0:
 		if pcs_leghair > 3:
@@ -1639,25 +1639,25 @@ if $ARGS[0] = 'shave_options':
 	end
 	'</center></TD><TD><center>'
 	if pubestyle ! 2 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 2 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">V-shaped</a>'
+		'<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 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Triangle-shaped</a>'
+		'<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 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Landing-strip</a>'
+		'<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 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Heart-shaped</a>'
+		'<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
@@ -1665,31 +1665,31 @@ if $ARGS[0] = 'shave_options':
 	*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 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
+		'<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 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Cross-Shaped</a>'
+		'<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 > 20:
-		'<a href="exec:pubestyle = 8 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Trimmed</a>'
+		'<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 > 25:
-		'<a href="exec:pubestyle = 9 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Small Bush</a>'
+		'<a href="exec:pubestyle = 9 & shave_length = 16 & shave_trigger = 21 & '+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 and pcs_pubes > 35:
-		'<a href="exec:pubestyle = 10 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
+	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
@@ -1697,7 +1697,7 @@ if $ARGS[0] = 'shave_options':
 	*nl
 	'<TR><TD><center>'
 	if pubestyle ! 11 and pcs_pubes > 10:
-		'<a href="exec:pubestyle = 11 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Lazy</a>'
+		'<a href="exec:pubestyle = 11 & shave_length = 2 & shave_trigger = 10 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Lazy</a>'
 		'(don''t immediately shave stubble)'
 	else
 		'Lazy'
@@ -1705,19 +1705,19 @@ if $ARGS[0] = 'shave_options':
 	end
 	'</center></TD><TD><center>'
 	if pubestyle ! 12 and pcs_pubes > 15:
-		'<a href="exec:pubestyle = 12 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Mini Bush</a>'
+		'<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><TD><center>'
 	if pubestyle ! 13 and pcs_pubes > 20:
-		'<a href="exec:pubestyle = 13 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Bushy Strip</a>'
+		'<a href="exec:pubestyle = 13 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Bushy Strip</a>'
 	else
 		'Bushy Strip'
 	end
 	'</center></TD><TD><center>'
 	if pubestyle ! 14 and pcs_pubes > 20:
-		'<a href="exec:pubestyle = 14 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Rectangle</a>'
+		'<a href="exec:pubestyle = 14 & shave_length = 16 & shave_trigger = 21 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Rectangle</a>'
 	else
 		'Rectangle'
 	end

locations/stat_display.qsrc

@@ -761,7 +761,7 @@ if cheatStatusIcons = 0:
 	if pcs_sweat > 19: $statusIconBarTab += '<td><a href="exec:msg $stat_sweat_msg"><img title="<<$stat_sweat_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/need_shower.png"></a></td>'
 
 	if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12) and pcs_pubes > 19) or (pubestyle = 10 and pcs_pubes > 29) or (pubestyle = 11 and pcs_pubes > 10):
-		if (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12) and pcs_pubes > 19) or (pubestyle = 10 and pcs_pubes > 29) or (pubestyle = 11 and pcs_pubes > 10):
+		if pcs_pubes >= shave_trigger:
 			$stat_shave_msg = 'You need to shave your'+iif(pcs_leghair > 3, ' legs and ', ' ')+'pussy.'
 		elseif pcs_leghair > 3:
 			$stat_shave_msg = 'You need to shave your legs.'
@@ -1913,15 +1913,6 @@ if enable_extra_msg = 1:
 		$stat_msg += '<BR><b><font color="red">You need to work on the market now.</font></b>'
 	end
 	
-	if masseuse['jobtype'] > 0:
-		if masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_1'] = 1:
-			$stat_msg += '<BR><b><font color="red">You have a shift at the salon today at 9:00.</font></b>'
-		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_2'] = 1:
-			$stat_msg += '<BR><b><font color="red">You have a shift at the salon today at 13:00.</font></b>'
-		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_3'] = 1:
-			$stat_msg += '<BR><b><font color="red">You have a shift at the salon today at 17:00.</font></b>'
-		end
-	end
 
 	if model['status'] > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
 		$stat_msg += '<BR><b>You have no more modeling jobs available this week.</b>'
@@ -1960,18 +1951,18 @@ if enable_extra_msg = 1:
 	end
 	
 	if masseuse['jobtype'] > 0:
-		if masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_1'] = 1 and hour < 9:
-			'<BR><b><font color="blue">You have a shift at the salon today at 9:00.</font></b>'
-		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_1'] = 1 and hour < 9:
-			'<BR><b><font color="red">You''re late for your 9:00 shift at the salon!</font></b>'
-		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_2'] = 1 and hour < 13:
-			'<BR><b><font color="blue">You have a shift at the salon today at 13:00.</font></b>'
-		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_2'] = 1 and hour < 13:
-			'<BR><b><font color="red">You''re late for your 13:00 shift at the salon!</font></b>'
-		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_3'] and hour < 17:
-			'<BR><b><font color="blue">You have a shift at the salon today at 17:00.</font></b>'
-		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_3'] = 1 and hour < 17:
-			'<BR><b><font color="red">You''re late for your 17:00 shift at the salon!</font></b>'
+		if masseuse['<<week>>_shift_1'] = 1 and hour < 9:
+			$stat_msg +='<BR><b><font color="blue">You have a shift at the salon today at 9:00.</font></b>'
+		elseif masseuse['<<week>>_shift_1'] = 1 and hour < 9:
+			$stat_msg +='<BR><b><font color="red">You''re late for your 9:00 shift at the salon!</font></b>'
+		elseif masseuse['<<week>>_shift_2'] = 1 and hour < 13:
+			$stat_msg +='<BR><b><font color="blue">You have a shift at the salon today at 13:00.</font></b>'
+		elseif masseuse['<<week>>_shift_2'] = 1 and hour < 13:
+			$stat_msg +='<BR><b><font color="red">You''re late for your 13:00 shift at the salon!</font></b>'
+		elseif masseuse['<<week>>_shift_3'] and hour < 17:
+			$stat_msg +='<BR><b><font color="blue">You have a shift at the salon today at 17:00.</font></b>'
+		elseif masseuse['<<week>>_shift_3'] = 1 and hour < 17:
+			$stat_msg +='<BR><b><font color="red">You''re late for your 17:00 shift at the salon!</font></b>'
 		end
 	end