Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/din_van.qsrc

@@ -259,7 +259,7 @@ $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 <= 7) or pubestyle = 12) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or ((pubestyle = 9 or pubestyle >= 13) and pcs_pubes > 25) or (pubestyle = 10 and pcs_pubes >= 35) or (pubestyle = 11 and pcs_pubes > 10):
+		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
@@ -269,7 +269,7 @@ $brit = {
 					pcs_pubes = 0
 				elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
 					pcs_pubes = 16
-				elseif pubestyle = 10 and pcs_pubes >= 35:
+				elseif pubestyle = 10 and pcs_pubes > 29:
 					pcs_pubes = 26
 				elseif pubestyle = 11 and pcs_pubes > 10:
 					pcs_pubes = 0
@@ -289,16 +289,14 @@ $brit = {
 				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?'
-				elseif pubestyle = 1:
+				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 <=7:
+				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.'
-				elseif pubestyle = 8:
-					'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 shaving off the stubble around your small patch of hair tidy as well.'
-				elseif pubestyle >= 9:
+				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.'
-				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.'
+				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.'
 				end
 				dynamic $dryOff
 			end
@@ -331,7 +329,7 @@ $brit = {
 		end
 	elseif shave_menu = 2 and stanok > 0:
 		if pcs_pubes > 3:
-			if pubestyle = 1:
+			if pubestyle = 1 or (pubestyle = 11 and pcs_pubes > 10):
 				act 'Shave your pussy (0:10)':
 					menu_off = 1
 					*clr & cla
@@ -345,25 +343,7 @@ $brit = {
 					'You lather your crotch with some soapy water and carefully shave your pubic hair. After shaving 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
 				end
-			elseif ((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15:
-				act 'Trim your pussy (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 = 11
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					dynamic $dryOff
-				end
-			elseif pubestyle = 8 and pcs_pubes >= 20:
+			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
@@ -374,24 +354,28 @@ $brit = {
 					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 pubic hair, not shaving it away completely but careful to make it neat and tidy.'
+					'You spend some time carefully shaving your pubic hair to your desired shape, and then trim it to make it neat and tidy.'
 					dynamic $dryOff
 				end
-			elseif (pubestyle = 9 or pubestyle >= 13) and pcs_pubes >= 26:
-				act 'Trim your bush (0:10)':
+			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 = 21
+					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 trimming back your light bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 10 and pcs_pubes >= 40:
+			elseif pubestyle = 10 and pcs_pubes >= 29:
 				act 'Trim back your bush (0:10)':
 					menu_off = 1
 					*clr & cla