Răsfoiți Sursa

[added] new "Shave options" menu to private bathrooms, with multiple pubic style selection. You cannot select a pubic style unless your pubic hair is long enough for that style. You are required to select a style prior to selecting a shaving option. Selecting not to shave pussy will reset shaving styles to nil (wild).
[changed] you now need to choose which locations get shaved whenever you use the shave action. Selections are none, both, pussy and legs.
[changed] enema, butt plug and vibrator are now their own dynamic $toymanage. Underwear removal is no longer part of basin. private bathroom now has a submenu for underwear and toy management.

3xpurt 5 ani în urmă
părinte
comite
c13d8120a9

+ 2 - 78
locations/Gadbana.qsrc

@@ -98,6 +98,7 @@ if mira = 0:
 	gs 'din_van', 'prvt_pee'
 	dynamic $tampon
 	dynamic $wearpan
+	dynamic $removepan
 	dynamic $basin
 
 	if painkiller > 0:
@@ -161,71 +162,8 @@ if mira = 0:
 			gt 'lact_lib', 'bp_milking'
 		end
 	end
-	if analplug = 1 and analplugin = 1:
-		act 'Remove your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 0
-
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.' & !!0.2.6: Removed unneccessary var check
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Insert your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 1
-
-			if pcs_ass < 10:pcs_ass += 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 0
 
-			if pcs_vag < 30:pcs_vag += 1
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 1
-
-			if pcs_vag < 30:pcs_vag += 2
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
+	dynamic $toymanage
 
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
@@ -239,20 +177,6 @@ if mira = 0:
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	if (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			'You use Baba''s enema to clean yourself out down there. Your ass is now ready for anal sex without any awkward surprises.'
-			act 'Finish':gt 'Gadbana'
-		end
-	end
 else
 	!125st
 	act 'Undress':

+ 20 - 22
locations/body.qsrc

@@ -1575,51 +1575,49 @@ if lashair = 0:
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'roughly-stubbled'
 		$pcdesc_pubes = 'stubbly'
 		$pcdesc_pubeswordy = 'scratchy, roughly-stubbled'
-	elseif pcs_pubes <= 15 and pcs_bush = 1:
+	elseif pcs_pubes <= 15:
 		lobkoef = 0
-		$pcs_pubes = 'You have stubble growing at the edges of your <a href="exec:view''images/pc/body/pussy/bpussy.jpg''">trimmed pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have a tidy patch of hair growing above your '+iif(pubestyle >= 2 and pubestyle <=7,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/3.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
-		if rand_pubes = 0:$pcdesc_pubesrandom = 'trimmed-back'
-		if rand_pubes = 1:$pcdesc_pubesrandom = 'lightly-furred'
-		if rand_pubes = 3:$pcdesc_pubesrandom = 'mostly well-kept'
+		if rand_pubes = 0:$pcdesc_pubesrandom = 'almost bare'
+		if rand_pubes = 1:$pcdesc_pubesrandom = 'barely-haired'
+		if rand_pubes = 3:$pcdesc_pubesrandom = 'well-kept'
 		$pcdesc_pubes = 'stubbly'
 		$pcdesc_pubeswordy = 'scratchy, roughly-stubbled'
-	elseif pcs_pubes <= 20 and pcs_bush = 1:
-		lobkoef = 3 
-		$pcs_pubes = 'You have a small neat bush of hair at the top of your <a href="exec:view''images/pc/body/pussy/3.jpg''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
-		rand_pubes = rand(0,2)
-		if rand_pubes = 0:$pcdesc_pubesrandom = 'neatly-trimmed'
-		if rand_pubes = 1:$pcdesc_pubesrandom = 'lightly-furred'
-		if rand_pubes = 3:$pcdesc_pubesrandom = 'well-kept'
-		$pcdesc_pubes = 'neatly-trimmed'
-		$pcdesc_pubeswordy = 'trimmed, well-kept'
 	elseif pcs_pubes <= 20:
 		lobkoef = 0
-		$pcs_pubes = 'You have neatly trimmed triangle of hair around your <a href="exec:view''images/pc/body/pussy/spussy.jpg''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have neatly trimmed section of hair around your '+iif(pubestyle = 8,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/spussy.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,3)
 		if rand_pubes = 0:$pcdesc_pubesrandom = 'wispy-haired'
 		if rand_pubes = 1:$pcdesc_pubesrandom = 'lightly-furred'
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'trimmed'
-		if rand_pubes = 3:$pcdesc_pubesrandom = 'well-kept'
+		if rand_pubes = 3:$pcdesc_pubesrandom = 'mostly well-kept'
 		$pcdesc_pubes = 'neatly-trimmed'
 		$pcdesc_pubeswordy = 'trimmed, well-kept'
-	elseif pcs_pubes <= 30:
-		pcs_bush = 0
+	elseif pcs_pubes <= 25:
 		lobkoef = 0
 		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/hpussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
+		if rand_pubes = 0:$pcdesc_pubesrandom = 'mildly-furred'
+		if rand_pubes = 1:$pcdesc_pubesrandom = 'slightly-bushy'
+		if rand_pubes = 2:$pcdesc_pubesrandom = 'well-maintained'
+		$pcdesc_pubes = 'bushy'
+		$pcdesc_pubeswordy = 'bushy, thick'
+	elseif pcs_pubes <= 30:
+		lobkoef = 0
+		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/shave/h_bush1.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+		rand_pubes = rand(0,2)
 		if rand_pubes = 0:$pcdesc_pubesrandom = 'furred'
 		if rand_pubes = 1:$pcdesc_pubesrandom = 'bushy'
-		if rand_pubes = 2:$pcdesc_pubesrandom = 'well-maintained'
+		if rand_pubes = 2:$pcdesc_pubesrandom = 'partially-maintained'
 		$pcdesc_pubes = 'bushy'
 		$pcdesc_pubeswordy = 'bushy, thick'
-	else
-		pcs_bush = 0
+	elseif pcs_pubes >= 31
 		lobkoef = 0
 		$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''images/pc/body/pussy/hrypussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:$pcdesc_pubesrandom = 'thickly-furred'
-		if rand_pubes = 1:$pcdesc_pubesrandom = 'hairy'
+		if rand_pubes = 1:$pcdesc_pubesrandom = 'very hairy'
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'ill-maintained'
 		$pcdesc_pubes = 'hairy'
 		$pcdesc_pubeswordy = 'hairy, wild-maned'

+ 2 - 84
locations/brothel.qsrc

@@ -504,93 +504,11 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 		dynamic $brit
 	end
 	gs 'din_van', 'prvt_pee'
-	if klismaday < daystart:
-		act 'Give yourself an enema (0:05)':
-			'<h3>Girl room</h3>'
-			'<h5>Enema</h5>'
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1 = 1
-
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			*nl
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-
-			act 'Finish':gt 'brothel', $metka
-		end
-	end
-	if analplug = 1 and analplugin = 1:
-		act 'Remove your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 0
-
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Insert your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 1
-
-			if pcs_ass < 10:pcs_ass += 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. This should help with some anal stretching before today''s activities.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, especially in a place like this. You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 0
-
-			if pcs_vag < 30:pcs_vag += 1
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 1
-
-			if pcs_vag < 30:pcs_vag += 2
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and slowly insert the vibrator in your pussy, hoping the added arrousal will aid with today''s activities.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
+	dynamic $toymanage
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 	dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':

+ 2 - 6
locations/brother_voyeur.qsrc

@@ -748,18 +748,14 @@ if $ARGS[0] = 'brother_wash':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	if pcs_leghair > 3 or pcs_pubes > 3 or pcs_bush > 0:
+	if pcs_leghair > 3 or pcs_pubes > 3:
 		*nl
 		if pcs_leghair > 3 and pcs_pubes > 3:
 			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_legs>> legs and <<$pcdesc_pubes>> pussy.'
-		elseif pcs_leghair > 3 and pcs_bush > 0:
-			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_legs>> legs and the stubble growing around the patch of hair above your pussy.'
 		elseif pcs_leghair > 3 and pcs_pubes < 3:
 			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_legs>> legs.'
 		elseif pcs_leghair < 3 and pcs_pubes > 3:
 			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_pubes>> pussy.'
-		elseif pcs_leghair < 3 and pcs_bush > 0:
-			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_pubes>> pussy.'
 		end
 		'	"Aren''t you going to shave?"'
 		if stanok = 0:
@@ -986,7 +982,7 @@ if $ARGS[0] = 'brother_shower_shave':
 			*nl
 			if pcs_pubes > 3:
 				if pcs_pubes <= 20:'	Kolka frowns. "You''re not going to shave your pussy?"'
-				if pcs_pubes >= 21 or pcs_bush > 0:'	Kolka frowns. "You''re not going to shave that bush?"'
+				if pcs_pubes >= 21:'	Kolka frowns. "You''re not going to shave that bush?"'
 				if stanok = 0:
 					act'"I can''t. Razor''s gone dull"':
 						cla

+ 1 - 0
locations/butoilet.qsrc

@@ -30,6 +30,7 @@ if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
+dynamic $removepan
 
 --- butoilet ---------------------------------
 

+ 1 - 0
locations/club.qsrc

@@ -253,6 +253,7 @@ if $ARGS[0] = 'tou':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'dance':

+ 1 - 0
locations/dimaHome.qsrc

@@ -213,6 +213,7 @@ if $ARGS[0] = 'bathroom2':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
+	dynamic $removepan
 	act 'Leave the bathroom': gt 'dimaHome','hallway2'
 end
 

+ 303 - 430
locations/din_van.qsrc

@@ -206,146 +206,32 @@ $bath = {
 }
 
 $brit = {
-	if pcs_leghair > 3 and stanok > 1:
-		if pcs_pubes > 3 or pcs_bush > 0:
-			if pubestyle > 1 or pubestyle = 0:
-				act 'Shave your legs and pussy (0:15)':
-					cla
-					*clr
+	if shave_menu = 1  and stanok > 1:
+		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (pubestyle >= 2 and pubestyle <=7 and pcs_pubes > 11) or (pubestyle = 8 and pcs_pubes > 11) or (pubestyle = 9 and pcs_pubes > 20) or (pubestyle = 10 and pcs_pubes > 26):
+			if pubestyle > 0:
+				act 'Shave yourself (0:15)':
+					*clr & cla
 					minut += 15
 					pcs_leghair = 0
-					if pubestyle = 4 or pubestyle = 2:
+					if pubestyle = 1 and pcs_pubes > 3:
 						pcs_pubes = 0
-						pcs_bush = 0
-					elseif pubestyle = 3:
-						pcs_pubes = 11
-						pcs_bush = 1
-					elseif pubestyle = 4 and pcs_pubes > 11:
+					elseif (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11:
 						pcs_pubes = 11
+					elseif pubestyle = 8 and pcs_pubes > 11:
+						pcs_pubes = 16
+					elseif pubestyle = 9 and pcs_pubes > 20:
+						pcs_pubes = 20
+					elseif pubestyle = 10 and pcs_pubes > 26:
+						pcs_pubes = 26
 					end
 					pcs_horny += 5
 					stanok -= 2
-
 					if obdysh = 1 and rand(0, 5) = 0:gt 'vann', 'brit1'
-
 					if $loc ='Gadbana':
 						'<center><video src="images/shared/home/bathroom/shave.mp4"></center>'
 					else
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 					end
-
-					*nl
-					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. So 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?'
-					elseif pubestyle = 2:
-						'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 bush tidy as well.'
-					elseif pubestyle = 3:
-						'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 neat patch of pussy hair as well.'
-					elseif pubestyle >= 4:
-						'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.'
-					else
-						'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.'
-					end
-
-					dynamic $dryOff
-				end
-			end
-		end
-	end
-	
-	if pcs_leghair > 3 and stanok > 0:
-		act 'Shave your legs (0:10)':
-			cla
-			*clr
-			minut += 10
-			pcs_leghair = 0
-			pcs_horny += 5
-			stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			*nl
-			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. So 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?'
-			else
-				'You lather up your legs and then start carefully shaving them. Once you''re finished you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
-			end
-
-			dynamic $dryOff
-		end
-	end
-
-	if pcs_pubes > 3 and stanok > 0:
-		if pubestyle = 2 or pubestyle = 0:
-			act 'Shave your pussy (0:10)':
-				cla
-				*clr
-				minut += 10
-				pcs_pubes = 0
-				pcs_bush = 0
-				pcs_horny += 5
-				stanok -= 1
-				if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-				if $loc ='Gadbana':
-					'<center><video src="images/shared/home/bathroom/shave.mp4"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-				end
-
-				*nl
-				'You lather your crotch with some soapy water and carefully shave your pubic region. 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 pcs_pubes > 15:
-			act 'Trim your pussy (0:10)':
-				cla
-				*clr
-				minut += 10
-				pcs_pubes = 11
-				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 bush, not shaving it away completely but careful to make it neat and tidy.'
-				dynamic $dryOff
-			end
-		end
-	end
-	
-	if pcs_leghair > 3 and stanok > 1:
-		if pubestyle > 1 or pubestyle = 0:
-			if pcs_pubes > 3 or pcs_bush > 0:
-				act 'Shave your legs and pussy (0:15)':
-					cla
-					*clr
-					minut += 15
-					pcs_leghair = 0
-					if pubestyle = 4 or pubestyle = 2:
-						pcs_pubes = 0
-						pcs_bush = 0
-					elseif pubestyle = 3:
-						pcs_pubes = 11
-						pcs_bush = 1
-					elseif pubestyle = 4 and pcs_pubes > 11:
-						pcs_pubes = 11
-					elseif pubestyle = 5 and pcs_pubes > 24:
-						pcs_pubes = 21
-					end
-					pcs_horny += 5
-					stanok -= 2
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 					*nl
 					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.'
@@ -353,79 +239,58 @@ $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 >= 3:
-						'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 pubes as well.'
-					else
+					elseif pubestyle = 1:
 						'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:
+						'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 trimed 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:
+						'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.'
 					end
-
 					dynamic $dryOff
 				end
 			end
 		end
-	end
-
-	if pcs_leghair > 3 and stanok > 0:
-		act 'Shave your legs (0:10)':
-			cla
-			*clr
-			minut += 10
-			pcs_leghair = 0
-			pcs_horny += 5
-			stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			*nl
-			'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.'
-
-			dynamic $dryOff
-		end
-	end
-
-	if stanok > 0:
-		if pcs_pubes > 3 or pcs_bush > 0:
-			if pubestyle = 2 or pubestyle = 0:
+	elseif shave_menu = 2 and stanok > 0:
+		if pcs_pubes > 3:
+			if pubestyle = 1:
 				act 'Shave your pussy (0:10)':
-					cla
-					*clr
+					*clr & cla
 					minut += 10
 					pcs_pubes = 0
-					pcs_bush = 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 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 = 3 and pcs_pubes > 15:
+			elseif (pubestyle >= 2 and pubestyle <= 7) and pcs_pubes > 15:
 				act 'Trim your pussy (0:10)':
-					cla
-					*clr
+					*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 neat bush left at the top.'
+						'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 neat bush you have at the top.'
+						'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_bush = 1
 					pcs_horny += 5
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 4 and pcs_pubes > 15:
-				act 'Trim your bush (0:10)':
-					cla
-					*clr
+			elseif pubestyle = 8 and pcs_pubes > 19:
+				act 'Trim your pubic hair (0:10)':
+					*clr & cla
 					minut += 10
-					pcs_pubes = 11
+					pcs_pubes = 19
 					pcs_horny += 5
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
@@ -434,10 +299,9 @@ $brit = {
 					'You spend some time trimming back your pubic hair, not shaving it away completely but careful to make it neat and tidy.'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 5 and pcs_pubes >= 25:
-				act 'Trim back your bush (0:10)':
-					cla
-					*clr
+			elseif pubestyle = 9 and pcs_pubes >= 25:
+				act 'Trim your bush (0:10)':
+					*clr & cla
 					minut += 10
 					pcs_pubes = 21
 					pcs_horny += 5
@@ -445,12 +309,47 @@ $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 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 >= 30:
+				act 'Trim back your bush (0:10)':
+					*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
 				end
 			end
 		end
-		act 'Shave options': gt 'din_van', 'shave_options'
+	elseif shave_menu = 3 and stanok > 0:
+		if pcs_leghair > 3:
+			act 'Shave your legs (0:05)':
+				*clr & cla
+				minut += 5
+				pcs_leghair = 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/shave.jpg"></center>'
+				*nl
+				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. So 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?'
+				else
+					'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
+			end
+		end
 	end
 }
 
@@ -512,31 +411,45 @@ $quickwash = {
 
 $wearpan = {
 	if $pantyworntype = 'none':
-		act 'Wear panties': gt 'panties', 'view_panty_list', 'bathroom'
+		act 'Wear panties (0:02)': 
+			minut += 2
+			gs 'stat'
+			gt 'panties', 'view_panty_list', 'bathroom'
+		end
 	end
 
 	if $braworntype = 'none':
-		act 'Wear a bra': gt 'bras', 'view_bra_list', 'bathroom'
+		act 'Wear a bra (0:02)': 
+			minut += 2
+			gs 'stat'
+			gt 'bras', 'view_bra_list', 'bathroom'
+		end
 	end
 }
 
 $removepan = {
 	if $pantyworntype ! 'none' and $braworntype ! 'none':
-		act 'Remove underwear':
+		act 'Remove underwear (0:02)':
+			minut += 2
+			gs 'stat'
 			gs 'underwear', 'remove'
 			gt $loc, $metka
 		end
 	end
 
 	if $pantyworntype ! 'none':
-		act 'Remove panties':
+		act 'Remove panties (0:02)':
+			minut += 2
+			gs 'stat'
 			gs 'panties', 'remove'
 			gt $loc, $metka
 		end
 	end
 
 	if $braworntype ! 'none':
-		act 'Remove bra':
+		act 'Remove bra (0:02)':
+			minut += 2
+			gs 'stat'
 			gs 'bras', 'remove'
 			gt $loc, $metka
 		end
@@ -563,7 +476,7 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
+
 	if body_write > 0 or face_write > 0:
 		act 'Wash the writings off your body (0:10)':
 			cla
@@ -595,7 +508,7 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
+
 	if pcs_makeup ! 1:
 		act 'Wash off cosmetics (0:10)':
 			cla
@@ -629,15 +542,13 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
-	dynamic $removepan
 }
 
 $pir_title = {
 	cla
 	*clr
 	'<center><b>Available piercings - select one by clicking the image</b></center>'
-	*nl	
+	*nl
 }
 $pirTongue = {
 	dynamic $pir_title
@@ -790,227 +701,7 @@ $pirManage = {
 	act'<b>Back</b>':gt $loc, $metka
 }
 
-if $ARGS[0] = 'private':
-	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings.'
-	
-	'Pubic Shaving Style:'
-	if pubestyle = 0:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <u>None</u>'
-	if pubestyle = 1:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <u>Never Shave</u> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 2:'<u>Clean Shave</u> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 3:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <u>Small Bush</u> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 4:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <u>Trimmed</u> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 5:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <u>Full Bush</u> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	
-	!WD: heal chafe
-	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
-
-	if tampon = 0 and sanpad = 0:
-		'<b><font color="red">You have no tampons left.</font></b>'
-	elseif tampon = 1:
-		'<font color="red">You have only <b><<tampon>></b> tampon left.</font>'
-	else
-		'You have <b><<tampon>></b> tampons.'
-	end
-	if sanpad = 0 and tampon = 0:
-		'<b><font color="red">You have no pads left.</font></b>'
-	elseif sanpad = 1:
-		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
-	else
-		'You have <b><<sanpad>></b> pads.'
-	end
-
-	if shampoo > 0 or $loc = 'vanrPar':
-		if $loc = 'vanrPar':
-			if shampoo < 1:shampoo = 1
-			'You are using your parents'' shampoo.'
-		else
-			'You have enough shampoo for <b><<shampoo>></b> uses.'
-		end
-		dynamic $shower
-		dynamic $bath
-	elseif shampoo = 0 and $loc = 'tanvanr':
-		shampoo = 1
-		'You can use Tanyas shampoo.'
-		gs 'din_van', 'prvt_pee'
-	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
-		gs 'din_van', 'prvt_pee'
-	end
-
-	if painkiller > 0:
-		$pluralS = 's'
-		if painkiller = 1:$pluralS = ''
-		'You have <b><<painkiller>></b> painkiller<<$pluralS>>.'
-		if pain['total'] > 0 and pain['killer'] = 0:
-			act 'Take a painkiller':
-				cla
-				pain['killer'] += 1
-				painkiller -= 1
-				pcs_hydra += 20
-				gs 'stat'
-
-				*nl
-				'You take a painkiller and gulp it down with a glass of water.'
-
-				act 'Finish':gt $loc, $metka
-			end
-		end
-	end
-
-	if bcream_have > 0:
-		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
-	end
-
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings.</a>'
-
-	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into breast implants.</a>'
-	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from breast implants.</a>'
-
-	dynamic $bteeth
-
-	dynamic $tampon
-
-	dynamic $wearpan
-	act 'Check weight on the scales':
-		cla
-		*clr
-		msg 'Your body fat is = (<<salo>>)'
-		gt $loc, $metka
-	end
-	gs 'din_van', 'prvt_pee'
-
-	dynamic $basin
-
-	if pcs_leghair > 3 and stanok > 1:
-		if pubestyle > 1 or pubestyle = 0:
-			if pcs_pubes > 3 or pcs_bush > 0:
-				act 'Shave your legs and pussy (0:15)':
-					cla
-					*clr
-					minut += 15
-					pcs_leghair = 0
-					if pubestyle = 4 or pubestyle = 2:
-						pcs_pubes = 0
-						pcs_bush = 0
-					elseif pubestyle = 3:
-						pcs_pubes = 11
-						pcs_bush = 1
-					elseif pubestyle = 4 and pcs_pubes > 11:
-						pcs_pubes = 11
-					elseif pubestyle = 5 and pcs_pubes > 24:
-						pcs_pubes = 21
-					end
-					pcs_horny += 5
-					stanok -= 2
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					*nl
-					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. So 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?'
-					
-					elseif pubestyle = 2:
-						'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 pubes as well.'
-					else
-						'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.'
-					end
-
-					act 'Finish':gt $loc, $metka
-				end
-			end
-		end
-	end
-
-	if pcs_leghair > 3 and stanok > 0:
-		act 'Shave your legs (0:10)':
-			cla
-			*clr
-			minut += 10
-			pcs_leghair = 0
-			pcs_horny += 5
-			stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			*nl
-			'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.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-
-	if stanok > 0:
-		if pcs_pubes > 3 or pcs_bush > 0:
-			if pubestyle = 2 or pubestyle = 0:
-				act 'Shave your pussy (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 0
-					pcs_bush = 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 shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-
-					act 'Finish':gt $loc, $metka
-				end
-			elseif pubestyle = 3 and pcs_pubes > 15:
-				act 'Trim your pussy (0:10)':
-					cla & *clr
-					'<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 neat 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 neat bush you have at the top.'
-					end
-					minut += 10
-					pcs_pubes = 11
-					pcs_bush = 1
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					act 'Finish':gt $loc, $metka
-				end
-			elseif pubestyle = 4 and pcs_pubes > 15:
-				act 'Trim your bush (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 11
-					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 pubic hair, not shaving it away completely but careful to make it neat and tidy.'
-					act 'Finish':gt $loc, $metka
-				end
-			elseif pubestyle = 5 and pcs_pubes >= 25:
-				act 'Trim back your bush (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 21
-					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.'
-					act 'Finish':gt $loc, $metka
-				end
-			end
-		end
-		act 'Shave options': gt 'din_van', 'shave_options'
-	end
-
+$toymanage = {
 	if analplug = 1 and analplugin = 1:
 		act 'Remove your butt plug (0:05)':
 			cla
@@ -1095,6 +786,118 @@ if $ARGS[0] = 'private':
 			act 'Finish':gt $loc, $metka
 		end
 	end
+}
+
+if $ARGS[0] = 'private':
+	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+
+	!WD: heal chafe
+	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
+
+	if tampon = 0 and sanpad = 0:
+		'<b><font color="red">You have no tampons left.</font></b>'
+	elseif tampon = 1:
+		'<font color="red">You have only <b><<tampon>></b> tampon left.</font>'
+	else
+		'You have <b><<tampon>></b> tampons.'
+	end
+	if sanpad = 0 and tampon = 0:
+		'<b><font color="red">You have no pads left.</font></b>'
+	elseif sanpad = 1:
+		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
+	else
+		'You have <b><<sanpad>></b> pads.'
+	end
+
+	if shampoo > 0 or $loc = 'vanrPar':
+		if $loc = 'vanrPar':
+			if shampoo < 1:shampoo = 1
+			'You are using your parents'' shampoo.'
+		else
+			'You have enough shampoo for <b><<shampoo>></b> uses.'
+		end
+		dynamic $shower
+		dynamic $bath
+	elseif shampoo = 0 and $loc = 'tanvanr':
+		shampoo = 1
+		'You can use Tanyas shampoo.'
+		gs 'din_van', 'prvt_pee'
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+		gs 'din_van', 'prvt_pee'
+	end
+
+	if painkiller > 0:
+		$pluralS = 's'
+		if painkiller = 1:$pluralS = ''
+		'You have <b><<painkiller>></b> painkiller<<$pluralS>>.'
+		if pain['total'] > 0 and pain['killer'] = 0:
+			act 'Take a painkiller':
+				cla
+				pain['killer'] += 1
+				painkiller -= 1
+				pcs_hydra += 20
+				gs 'stat'
+
+				*nl
+				'You take a painkiller and gulp it down with a glass of water.'
+
+				act 'Finish':gt $loc, $metka
+			end
+		end
+	end
+
+	if bcream_have > 0:
+		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
+	end
+
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings.</a>'
+
+	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into breast implants.</a>'
+	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from breast implants.</a>'
+
+	dynamic $bteeth
+
+	dynamic $tampon
+
+	act 'Change clothes and toys':
+		cla
+		dynamic $wearpan
+		dynamic $removepan
+
+		if $curloc = 'vanrPar' and $clothingworntype = 'nude':
+			act 'Wear clothes (0:05)':
+				*clr & cla
+				minut = 5
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+				'You get dressed'
+				gs 'clothing', 'wear_last_worn'
+				gs 'stat'
+				act 'Return': gt $loc, $metka
+			end
+		elseif $curloc = 'vanrPar' and $clothingworntype ! 'nude':
+			act 'Remove clothes (0:05)':
+				*clr & cla
+				minut = 5
+				'<center><video autoplay loop src="images/shared/Accessories/computer/webcam/undress1.mp4"></video></center>'
+				'You remove your clothing'
+				gs 'clothing', 'strip'
+				gs 'stat'
+				act 'Return': gt $loc, $metka
+			end
+		end
+		dynamic $toymanage
+
+		act 'Return':gt $loc, $metka
+	end
+
+	'<a href="exec:msg ''Your body fat is = (<<salo>>)''">Check weight on the scales</a>'
+
+	gs 'din_van', 'prvt_pee'
+
+	dynamic $basin
+
+	dynamic $brit
 
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
@@ -1147,8 +950,8 @@ if $ARGS[0] = 'private':
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
-	!!breast pump is now in the menue, not on the screen
+
+	!!breast pump is now in the menu, not on the screen
 	if breastpump > 0:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'
@@ -1523,54 +1326,124 @@ if $ARGS[0] = 'pblc_pee_end':
 end
 
 if $ARGS[0] = 'shave_options':
-	*clr
-	if shave_img_hgt = 0:shave_img_hgt = 250
-
+	*clr & cla
+	if shave_img_hgt = 0:shave_img_hgt = 100
+	!if pubestyle = 0 = never shave (uses $pcs_pubes)
+	!if pubestyle = 1: $pubeimage = 'images/pc/body/pussy/pussy.jpg' (uses $pcs_pubes)
+	if pubestyle = 2: $pubeimage = 'images/pc/body/pussy/shave/v1.jpg'
+	if pubestyle = 3: $pubeimage = 'images/pc/body/pussy/shave/triangle1.jpg'
+	if pubestyle = 4: $pubeimage = 'images/pc/body/pussy/shave/landing1.jpg'
+	if pubestyle = 5: $pubeimage = 'images/pc/body/pussy/shave/heart1.jpg'
+	if pubestyle = 6: $pubeimage = 'images/pc/body/pussy/shave/flame1.jpg'
+	if pubestyle = 7: $pubeimage = 'images/pc/body/pussy/shave/cross1.jpg'
+	if pubestyle = 8: $pubeimage = 'images/pc/body/pussy/shave/s_bush1.jpg'
+	!if pubestyle = 9: $pubeimage = 'images/pc/body/pussy/spussy.jpg'  (uses $pcs_pubes)
+	!if pubestyle = 10: $pubeimage = 'images/pc/body/pussy/hpussy.jpg' (uses $pcs_pubes)
 	'<h3><center><b><font color="maroon">Shaving optons</b></h3><br><center><font color="maroon">Here you can choose your style for pubic hair and which body parts you wish to shave.</font></center>'
 	'<br><center><table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
-	*P '<TR><TD><center><a href="exec:pubestyle = 2 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD><TD><center><a href="exec:pubestyle = 3 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/v1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/v1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/triangle1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/triangle1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/landing1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/landing1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/heart1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/heart1.jpg"></a></center></TD>'
 	'<TR><TD><center>'
-	if pubestyle ! 2:
-		'<a href="exec:pubestyle = 2 & gt ''din_van'', ''shave_options''">Clean Shave</a>'
+	if pubestyle ! 1:
+		'<a href="exec:pubestyle = 1 & '+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 ! 3:
-		'<a href="exec:pubestyle = 3 & gt ''din_van'', ''shave_options''">Small Bush</a>'
+	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>'
 	else
-		'Small Bush'
+		'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>'
+	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>'
+	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>'
+	else
+		'Heart-shaped'
 	end
 	'</center></TD>'
-	*P '<TR><TD><center><a href="exec:pubestyle = 1 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD><TD><center><a href="exec:pubestyle = 4 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/shave/flame1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/flame1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/cross1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/cross1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/s_bush1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/s_bush1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/spussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/spussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/hpussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hpussy.jpg"></a></center></TD>'
 	'<TR><TD><center>'
-	if pubestyle ! 1:
-		'<a href="exec:pubestyle = 1 & gt ''din_van'', ''shave_options''">Full Bush</a>'
+	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>'
 	else
-		'Full Bush'
+		'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>'
+	else
+		'Cross-Shaped'
 	end
 	'</center></TD><TD><center>'
-	if pubestyle ! 4:
-		'<a href="exec:pubestyle = 4 & gt ''din_van'', ''shave_options''">Trimmed</a>'
+	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>'
 	else
 		'Trimmed'
 	end
-	'</center></TD>
-	<TR><center>'
+	'</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>'
+	else
+		'Small Bush'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 10 and pcs_pubes > 30:
+		'<a href="exec:pubestyle = 10 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
+	else
+		'Full Bush'
+	end
+	'</center></TD><TR><center>'
 	'Your razor will last for <b><<stanok>></b> more shaves.'
-	'</center>'
+	*nl
+	'<center><b>Change your shaving routine:</b></center>'
+	'<center><font color="grey">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.</font></center>'
+	*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 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>'
+	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>'
+	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>'
+	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'
+	end
+	*nl
+	'<center>Your current routine <<$shave_chosen>> <br><<$shave_time>></center>'
 	'</table></center>'
-	
+
 	act 'Set image height for this view':
-		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 250, min 100, max 500)")
-		if shave_img_hgt < 100:
-			shave_img_hgt = 250
+		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 100, min 50, max 500)")
+		if shave_img_hgt < 50:
+			shave_img_hgt = 50
 		elseif shave_img_hgt > 500:
 			shave_img_hgt = 500
 		end
 		gt 'din_van', 'shave_options'
 	end
-	if pubestyle > 0: act 'Disable shave styles': pubestyle = 0 & gt 'din_van', 'shave_options'
 	act 'Return':gt $loc, $metka
 end
 

+ 1 - 0
locations/gdktoilet.qsrc

@@ -338,6 +338,7 @@ if $ARGS[0] = 'mens':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'mensmast':

+ 1 - 0
locations/gschool_grounds.qsrc

@@ -628,6 +628,7 @@ if $ARGS[0] = 'change_room':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
 

+ 29 - 28
locations/igorhome.qsrc

@@ -32,9 +32,9 @@ if $ARGS[0] = 'entrance':
 	elseif IgorLove <= 0:
 		IgorLoverQW = -1
 		if month > 8 or month < 4:
-			'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/school/walk_homew'+ rand(1,2) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homew'+ rand(1,2) +'.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/school/walk_home'+ rand(1,3) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_home'+ rand(1,3) +'.jpg"></center>'
 		end
 		'As you walk towards Igor''s house, he starts having second thoughts "<<$pcs_firstname>>, you know I love you very much, but we don''t know each other well enough, so I''m wondering if we should let it be."'
 		act 'Leave': gt 'pavResidential'
@@ -46,7 +46,7 @@ if $ARGS[0] = 'entrance':
 !!			cls
 !!			minut += 15
 !!			gs 'stat'
-!!			'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
+!!			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
 !!			'You follow Igor home. Once you get to his place, he unlocks the door and invites you in.'
 !!			act 'Walk around his home': gt 'igorhome','hallway'
 !!			act 'Go to his room': gt 'igorhome', 'igorroom'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'hallway':
 	killvar '$locclass'
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
 	'This is the entrance hall to Igor''s house, it is tastefully decorated. It leads to all the other rooms in the house.'
 	act 'Igor''s Room': gt 'igorhome','igorroom'
 	act 'Bathroom': gt 'igorhome','bathroom'
@@ -83,12 +83,12 @@ if $ARGS[0] = 'bathroom':
 	gs 'stat'
 	$location_type = 'bathroom'
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/vann.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/vann.jpg"></center>'
 	'The bathroom has a large sink area and tile floors. The toilet sits along the far wall. There is also a walk-in shower and bath tub. It all looks very nice.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
 
-    if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
 
 	act 'Take a shower':
 		cls
@@ -103,8 +103,9 @@ if $ARGS[0] = 'bathroom':
 	dynamic $bath
 	gs 'din_van', 'prvt_pee'
 	dynamic $bteeth
-    dynamic $tampon
-    dynamic $basin
+	dynamic $tampon
+	dynamic $basin
+	dynamic $removepan
 
 	act 'Leave the bathroom': gt 'igorhome','hallway'
 end
@@ -115,7 +116,7 @@ if $ARGS[0] = 'igorroom':
 	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kom.jpg"></center>'
 	'The room is surprisingly clean and organized for a boys room. It is fairly tastefully decorated. In the center of the room against one wall is a single narrow bed. Against the opposite wall is a desk and a chair, with a computer sitting on the desk. Next to the desk is a book shelf with a fairly large collection of books, just below the shelves leaning against the wall rests a guitar.'
 !!This one I think is if he is dating Dima, not sure.
 	if DimaLoveIgor > 1:'Sitting on the bed is a Teddy Bear with a red heart in its little hands.'
@@ -128,7 +129,7 @@ if $ARGS[0] = 'igorroom':
 		if IgorloverQW = 1:
 			*clr & cla
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 			'Igor looks at his watch. "If you stay any later, my mom will come in and make a fuss and talk about how unseemly it is for a boy to have a girl in his room this late."'
 			'You nod to him. "I understand, then I guess I will see you later."'
 			act 'Say goodbye and go home': gt 'pavResidential'
@@ -140,7 +141,7 @@ if $ARGS[0] = 'igorroom':
 		else
 			cls
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 			'You look at the clock saying that it''s really late and that you need to go home.'
 			act 'Say goodbye and go home': gt 'pavResidential'
 		end
@@ -148,9 +149,9 @@ if $ARGS[0] = 'igorroom':
 		cls
 		'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 		if IgorloverQW = 1:
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 		end
 		if week = 5 or week = 6:
 			'Igor looks at his watch and asks you "I want to have fun tonight. Let''s go to the disco!"'
@@ -161,7 +162,7 @@ if $ARGS[0] = 'igorroom':
 			'Igor tells you its getting late, you could take the hint and leave or maybe chat just a little longer.'
 			act 'Take the hint and go home': gt 'pavResidential'
 			act 'Chat just a little longer':gt 'igorhome','Chat'
-		end			
+		end
 	end
 	act 'Leave Igor''s room': gt 'igorhome','hallway'
 end
@@ -172,9 +173,9 @@ if $ARGS[0] = 'Chat':
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 	if IgorloverQW = 1:
-		'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 	end
 	if npcrel['A4'] > 50:
 		i = rand(0,10)
@@ -228,9 +229,9 @@ if $ARGS[0] = 'Chat':
 			cla
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 			if IgorloverQW = 1:
-				'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 			end
 			'Igor asks you, "<<$pcs_nickname>> lets go see a movie, my treat."'
 			act 'Agree': gt 'IgorEv', 'Movies'
@@ -239,9 +240,9 @@ if $ARGS[0] = 'Chat':
 				cla
 				'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 				if IgorloverQW = 1:
-					'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 				else
-					'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 				end
 				'You shake your head no. "I would rather just stay here." He nods and smiles.'
 				act 'Continue': gt 'IgorHome', 'Chat'
@@ -269,7 +270,7 @@ if $ARGS[0] = 'study':
 	cls
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/study.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/study.jpg"></center>'
 	'You sit down next to Igor and he pulls out his history book and notes. He starts tutoring you in history, he is very good tutor and your learn a lot.'
 	act 'Study More':gt 'igorhome','study'
 	act 'Chat':gt 'igorhome','Chat'
@@ -727,13 +728,13 @@ if $ARGS[0] = 'livingroom4':
 end
 
 if $ARGS[0] = 'kitchen':
-    *clr & cla
-    minut += 1
+	*clr & cla
+	minut += 1
 	$locclass = 'kitr'
-    gs 'stat'
-    '<center><b><font color = maroon>Kitchen</font></b></center>'
-    '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kitchen.jpg"></center>'
-    'The room is very clean and neat. Everything is perfectly in place, the counters are polished to a near mirror like quality. The wood floor is also highly polished.'
+	gs 'stat'
+	'<center><b><font color = maroon>Kitchen</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kitchen.jpg"></center>'
+	'The room is very clean and neat. Everything is perfectly in place, the counters are polished to a near mirror like quality. The wood floor is also highly polished.'
 !!this is a elseif, if it is 06:00 to 07:00 igors mother is here, or if it is 18:00 to 23:00 she is here during the week. On weekends she is here from 08:00 to 23:00
 	if (week <=5 and (hour = 6 or (hour >= 18 and hour < 23))) or (week > 5 and hour >= 8 and hour < 23):
 		'You see Igor''s mother Inga is in the kitchen drinking tea. She is very neatly dressed, you don''t think she has noticed you yet.'
@@ -1129,7 +1130,7 @@ end
 
 !!new scene for going to Igors house with out following him from school.
 if $ARGS[0] = 'home':
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/house.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/house.jpg"></center>'
 	'You walk up to the front door and knock.'
 !!This will have a lot of if's and elseif's.
 	if SchoolAtestat = 1 and kanikuli > 0:

+ 1 - 0
locations/kafe2.qsrc

@@ -48,6 +48,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'givi':

+ 1 - 0
locations/koncepod1.qsrc

@@ -118,6 +118,7 @@ if $ARGS[0] = 'vnr2x':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0]='bdr2x':

+ 1 - 0
locations/laketoilet.qsrc

@@ -36,6 +36,7 @@ if $ARGS[0] = 'main':
 		dynamic $tampon
 		dynamic $quickwash
 		dynamic $basin
+		dynamic $removepan
 	end
 end
 

+ 1 - 0
locations/leonid.qsrc

@@ -862,6 +862,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- leonid ---------------------------------

+ 1 - 0
locations/qwBarPoletToilet.qsrc

@@ -23,6 +23,7 @@ if temp <= 6:
 	'The <a href="exec:gt ''mirror'', ''start''">mirror</a> you see above the sinks has some cracks radiating from one of the corners, but other than that, it''s perfectly usable.'
 	act 'Return to the main room': minut += 1 & gt 'qwBarPolet'
 	dynamic $basin
+	dynamic $removepan
 	dynamic $quickwash
 elseif temp = 7:
 	if pcs_horny < 90: pcs_horny += 10

+ 2 - 58
locations/rolanbath.qsrc

@@ -392,6 +392,7 @@ if $ARGS[0] = 'start':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
+	dynamic $removepan
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Clean semen stains from your clothing (0:15)':
 			*clr & cla
@@ -404,43 +405,6 @@ if $ARGS[0] = 'start':
 			act 'Finish': gt 'rolanbath', 'start'
 		end
 	end
-	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			*clr & cla
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	end
-	if analplug = 1 and analplugin = 1:
-		act 'Take out your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 0
-			if pcs_ass < 30:pcs_ass += 1
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Wear your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 1
-			if pcs_ass < 10:pcs_ass = pcs_ass + 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	end
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
 			cla
@@ -457,27 +421,7 @@ if $ARGS[0] = 'start':
 			act 'Finish':gt 'rolanbath', 'start'
 		end
 	end
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 0
-			if pcs_vag < 30:pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag > 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 1
-			if pcs_vag < 30:pcs_vag += 2
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	end
+	dynamic $toymanage
 end
 
 !Bathroom, Rolan caught:

+ 2 - 16
locations/saunawhore.qsrc

@@ -1054,23 +1054,8 @@ if $ARGS[0] = 'bathroom':
 		'Your razor blade looks in good enough shape for <b><<stanok>></b> more shaves.'	
 	end
 	gs 'din_van', 'prvt_pee'
-	if klismaday < daystart:
-		act 'Give yourself an enema (0:05)':
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1 = 1
-
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			*nl
-			'You give yourself an enema, feeling clean down there, hopefully avoiding any awkward surprises for clients.'
 
-			act 'Continue':gt $locM, $metkaM
-		end
-	end
+	dynamic $toymanage
 
 	if workdolg > 0:
 		if (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0:
@@ -1095,6 +1080,7 @@ if $ARGS[0] = 'bathroom':
 	dynamic $quickwash
 	dynamic $bteeth
 	dynamic $basin
+	dynamic $removepan
 	if breastpump > 0:
 		act 'Use breast pump':gt 'lact_lib', 'bp_milking'
 	end

+ 1 - 0
locations/sexshop.qsrc

@@ -673,6 +673,7 @@ if $ARGS[0] = 'toi':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'pip':

+ 2 - 63
locations/shulgabath.qsrc

@@ -43,6 +43,7 @@ if $ARGS[0] = 'start':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $wearpan
+	dynamic $removepan
 	dynamic $basin
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
@@ -59,47 +60,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			*clr & cla
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	end
-
-	if analplug = 1 and analplugin = 1:
-		act 'Take out your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 0
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Wear your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 1
-			if pcs_ass < 10:pcs_ass = pcs_ass + 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	end
+	dynamic $toymanage
 
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
@@ -118,28 +79,6 @@ if $ARGS[0] = 'start':
 			act 'Finish':gt 'shulgabath', 'start'
 		end
 	end
-
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 0
-			if pcs_vag < 30:pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag > 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 1
-			if pcs_vag < 30:pcs_vag += 2
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	end
 end
 
 !Bathroom, Sonia choice opening event:

+ 2 - 19
locations/stwork.qsrc

@@ -151,28 +151,11 @@ if $ARGS[0] = 'toilet':
 		dynamic $brit
 	end
 	gs 'din_van', 'prvt_pee'
-	if klismaday < daystart:
-		act 'Give yourself an enema (0:05)':
-			'<h3>Toilet</h3>'
-			'<h5>Enema</h5>'
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1 = 1
-
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			*nl
-			'You give yourself an enema, feeling clean down there, hopefully avoiding any awkward surprises.'
-
-			act 'Continue':gt $locM, $metkaM
-		end
-	end
+	dynamic $toymanage
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- stwork ---------------------------------

+ 1 - 0
locations/vokmantoiev.qsrc

@@ -32,6 +32,7 @@ if $ARGS[0] = 'female':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'male':

+ 2 - 1
locations/vokzaltoilet.qsrc

@@ -31,6 +31,7 @@ if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
-	
+dynamic $removepan
+
 --- vokzaltoilet ---------------------------------
 

+ 1 - 0
locations/zaprF.qsrc

@@ -121,6 +121,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- zaprF ---------------------------------